gentoo resync : 22.04.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-04-22 14:25:03 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-04-22 14:25:03 +0100
commit: 5e8702bcbbed438e6c6cce023e7ef0cc9baa3e02 (patch)
tree: b041acef19bb9ae66c228d5c9d34d1e00aeb2b95 /media-libs
parent: 5cfef3c94cd7e82136c69a0322f5ba21f7e64632 (diff)
220 files changed, 2198 insertions, 926 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 4277181baeef..0847c281c0c8 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/a52dec/Manifest b/media-libs/a52dec/Manifest
index 2eb5fbb646c7..290ab279181d 100644
--- a/media-libs/a52dec/Manifest
+++ b/media-libs/a52dec/Manifest
@@ -4,5 +4,5 @@ AUX a52dec-0.7.4-test-hidden-symbols.patch 637 BLAKE2B 542d1bfbf8722d900b25fa6bc
 AUX a52dec-0.7.4-tests-optional.patch 299 BLAKE2B af245be87277559c2fbc1695180d4e451ccc6a76157111d57fa86992c4cd4dd59e166b7a68a7d799bdda56d0ac5ae3ddfe5c433cbccf6eef4a999e2b336eda0e SHA512 9f5c0afbfd656287eafeba04eed34070f53a77cb53981d64ff71edb96bef6cc2c0638e0be6647086cbad87ead97aa0215cd6cb413258d0122bc3f45bcf4480b1
 DIST a52dec-0.7.4.tar.gz 241507 BLAKE2B e8475b391a3afe77883f5683f58a64d2babfcf93c08a3bcbd0208476323e9c86c5d268d2738efddd2093a1c47886deb22185cb8f00c4ec8b4153f64e1af1f49e SHA512 4b26fe9492f218b775fb190b76ecf06edaeb656adfe6dcbd24d0a0f86871c3ba917edb88a398eb12dccedaa1605b6f0a0be06b09f9fddd9a46e457b7dd244848
 EBUILD a52dec-0.7.4-r6.ebuild 1439 BLAKE2B b3d5cc7a25f0694ea9a771ae3af526a28a6522b0e2bf094dfc6eb6f56d424fe90502878a8697f12618288c27116deb5d4d4c861bf4b735ba889f8695f3209bdf SHA512 8437c6bdbb0ec560ad57829cf6a2227b07886c27db4a954c3c1b3e402313ad710ea8c0dad575c0f325deb64bb3ba9ddb064255aa37751a27f6f3b6578af54d50
-EBUILD a52dec-0.7.4-r7.ebuild 1699 BLAKE2B 0e5666822ba6024d91ae01f25cf0438864cb0018832b0d1bb5e0f40e513e4ea400176152cd2479f08493f11e259522dd11d7986f929e9ee553f3358cf054cf54 SHA512 aba8ae851c427adc2215bb687e4a246ccc3019bd184c0005c3aad1067f350cfa01fe6f48b5501737731abc85ea287fec48c3700d4438c9e5078017165aeff532
+EBUILD a52dec-0.7.4-r7.ebuild 1570 BLAKE2B 4ef77d35ca6798d64b988dff2b305041c07ebacc812cc07ad4e142987a19ad1a17972347df7ef9f7e7ff3f2547519a8d1653804acee2ef98f5cf243a8aed8a97 SHA512 a3430ca53b31cf7b5f8e6442ca0c5ad16cbfbe9f5b2cfea2c56317a7fa8e2da043a88cebb92e8bea08b7890cd7cb982a7c53fa3d682e42c5104605c24444988c
 MISC metadata.xml 442 BLAKE2B 6e92f797dedf977ed4dd7321249af91b56488c98f9bb64cc8df4fd1ed1012a501d0f49ef5cb063d52e0636583dca77c4376df2e1071da889f598415aa91d801a SHA512 acc8d37733d5efebd4e65401dfff5926a64e13f641dd383343a26b666fe13963191782990ec4571c18803584808b249cb60646a06d91437f0a6793237eb99ca0
diff --git a/media-libs/a52dec/a52dec-0.7.4-r7.ebuild b/media-libs/a52dec/a52dec-0.7.4-r7.ebuild
index 66e18ef381df..121fa7a0e6ce 100644
--- a/media-libs/a52dec/a52dec-0.7.4-r7.ebuild
+++ b/media-libs/a52dec/a52dec-0.7.4-r7.ebuild
@@ -14,9 +14,7 @@ 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"
 IUSE="djbfft oss static-libs"
 
-RDEPEND="djbfft? ( >=sci-libs/djbfft-0.76-r2[${MULTILIB_USEDEP}] )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r8
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND="djbfft? ( >=sci-libs/djbfft-0.76-r2[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 DOCS=( AUTHORS ChangeLog HISTORY NEWS README TODO doc/liba52.txt )
 
diff --git a/media-libs/adplug/Manifest b/media-libs/adplug/Manifest
index 496fadcedead..d4f5c15e02cf 100644
--- a/media-libs/adplug/Manifest
+++ b/media-libs/adplug/Manifest
@@ -1,6 +1,6 @@
 DIST adplug-2.2.1.tar.bz2 810257 BLAKE2B a51c85a10af6a1cc308a7ccfa657daab1e627800a0617f6cf8b874726a115bdef188dc3d82fb6af9fd2aadc2b28b12f0707ea12cb52f6656d2b8654849bad806 SHA512 e9b434ad58114a6677907e8f7007a325fa908f9228fbe283d72d1e2394fa27850b929309e038c84ae94f64f8db003b871775502ee8b231219caa51f6ba5d787f
-DIST adplug-2.3.tar.bz2 1462858 BLAKE2B e350c65827d1bfbcbc495bd2986e312a7f572d2f29708ef17566c912bad8ddd2a52d49e065f147fec6ee657def0f2ddedfe65ca6d3b7b0d37d371cf4150ada87 SHA512 591192032772fbedfec67924693fce3fc490e5bccb1898eea8d38b6d10f066373ebdc4868751041dd21461b5112b349f0be7ff047d7ccaa896fe4ece88ebab74
+DIST adplug-2.3.1.tar.bz2 1478424 BLAKE2B 8c2b65d11d3b12b4a3337bc9c6ada2920b07279ac0199d4bdf1fa2ceec2f51748a1bb9357456b3e7aba7c906253691066b274e7a7c7578c777d1e2e77f5131f0 SHA512 324ce084ecf5b0d180b335ebcacd5ab80806a5c9fbdeed6ef7cbd6c2f2cb476d9d9f38f596b7d6100e3d6cab42294300559200297b4b3f34190c1f516454c8c3
 EBUILD adplug-2.2.1.ebuild 624 BLAKE2B e762d87d6b15d6dc6e6c2367db8e8b1af9c504755e2be3a547129b3a21dc64b672a16ad1b5e7d5726a87a389e831a732f331279b1141c8f195311347b55fc5a6 SHA512 eaba3f130aa0a6174d2aadbbb65228beafd1ab86d6c7b08a275c33635bb86437ca3e8002e2ab26e82f06683a137a7c57d2e9ac6b7c8b80b6249776d3c4b9a090
-EBUILD adplug-2.3.ebuild 883 BLAKE2B 3bccf749902021fb68b2654130fbe07f3c1854c7c1a319188224b711d1f84379e12c986adb22e772bed116f7fdf6b0a1065e4f1345c8e01d74ca29949bd2d842 SHA512 86f74c66bf96edd1667f6ffcbcb30e831fede37df986fe6b0a8ba5f760f65fbd1952255b1853383d4f3a1bdd4173897617af5862792464880dc7a9186ca9f358
+EBUILD adplug-2.3.1.ebuild 889 BLAKE2B b32fe38edecda9aa0761619e805edfe0db455eb69e9545140e9e900f29ab5733c2c868d9e8aa0eff4955604fc7f8aa8d87070cc564cd32f0048e90a3ea334d70 SHA512 8e58d1ea4caffccc367a9e190786d0d1991d7433e5a644b58c383472557fde81bda4611fb9a97ac82fc762c5a155e22e804da72b45c00ff51a3f9b6d5f47f7e4
 EBUILD adplug-9999.ebuild 883 BLAKE2B 3bccf749902021fb68b2654130fbe07f3c1854c7c1a319188224b711d1f84379e12c986adb22e772bed116f7fdf6b0a1065e4f1345c8e01d74ca29949bd2d842 SHA512 86f74c66bf96edd1667f6ffcbcb30e831fede37df986fe6b0a8ba5f760f65fbd1952255b1853383d4f3a1bdd4173897617af5862792464880dc7a9186ca9f358
 MISC metadata.xml 329 BLAKE2B 27c4b8b5676c1d5f9b3c2d38b397d2edf65dd28fbdca6ea12feb61870a6758f1cd27ab50670674bcb5561f6a70515596b170600dcdf592897edb35153a12142a SHA512 a865c199afa30a18b4b810b4bdd981dfd77fd5843740a43dffc59c10b2e151c66a8e39d73bea04024f544e83f24400ae10aedc9ae3e93db9a67694adf886a073
diff --git a/media-libs/adplug/adplug-2.3.ebuild b/media-libs/adplug/adplug-2.3.1.ebuild
index 12fcc15d3f9c..bb4e78f11598 100644
--- a/media-libs/adplug/adplug-2.3.ebuild
+++ b/media-libs/adplug/adplug-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ else
 fi
 
 LICENSE="LGPL-2.1"
-SLOT="0"
+SLOT="0/${PV}"
 IUSE="debug static-libs"
 
 RDEPEND=">=dev-cpp/libbinio-1.4"
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index a98b4efa1789..d9e39eb7a960 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -3,8 +3,8 @@ DIST alsa-lib-1.1.2.tar.bz2 947423 BLAKE2B 09cd6a625d8f681c5515fd925191fb5468158
 DIST alsa-lib-1.1.4.1.tar.bz2 974584 BLAKE2B f3221fa55dc11c04f4a1bc3ee90d2a679ca9b8bde65e2801ae5762fa456ef8e45532624efa57bf7d62f82e5c172eaf10f2286f9acace5a47e20123acf5ce04d2 SHA512 7b548c4ee29c4a1230a0edcd5d19219831290f96a214180a6530628acc05278d1348376195287d188f4f44d6be1914391c63994f1b50985c3eee74352da26b0b
 DIST alsa-lib-1.1.5.tar.bz2 979225 BLAKE2B 75683b17bfd51c1e54f1a460ed32a170b07eb227bd6b9ee481d123116464f5c16bbb49f29dfc8d08baaf2f69c5333bf71b70c33b5d420c43e56ae4ace76a6ab0 SHA512 c79ceaa1ebfeda2caf41a0495ea31dd2748a11795989aebc341ae13a5c96d21495e4542571d5590e68b2575ceddd6e84059a950ddb78e6c0b9d94861faee4f58
 DIST alsa-lib-1.1.6.tar.bz2 989316 BLAKE2B 2aec62d262148571cc1b93ac8053002b61266951caf8b2855fc65b699ec928672748a21ba11a25e14e752a4a85f68b2f77b5ad6af9b2f1fc5e9de41313ace54a SHA512 00117769a3d5c609019b975188d6e7a07d035bd0461f54c5f291e14667620506f1adb6d61350f78d54648850f31965aae3ab0e697bf9e09c988e2d15bf6b09f0
-EBUILD alsa-lib-1.1.2.ebuild 2237 BLAKE2B 8137d76b3ba07ce93dc7808f14954b65b77d65b01a4541c1f7c173e57edcb397d5dcfc980ff4a80a1095bbecbd1378cd078b7878a8e519b50bf3ff1e95cc903a SHA512 458e843005031316acd8c6564f4eb39f9729c48d8275df01036242342967ae097b3dddb5768b49ba162905db6b1769fb1d3b3ed5aefad232b6f72c0b404abfd5
-EBUILD alsa-lib-1.1.4.1.ebuild 2246 BLAKE2B ae36e6f8b82850f3ad3c67e5cc0b26ecadb9a35b77b9f3147934a208145d8e9ea7e2ec0b62c8645c62eab95fa0892c8f30f23f3e651c1f9be7fca9ed4e10c514 SHA512 35c31a8b113f4cf7516c4ba56dba10b5bfa6b9d5d0ff5733d1c6c32bf72f5a6e61ac5230662cc3dc8a6aa95750f58ad84f67c16c86a05d935234f4d31250112b
-EBUILD alsa-lib-1.1.5.ebuild 2246 BLAKE2B ae36e6f8b82850f3ad3c67e5cc0b26ecadb9a35b77b9f3147934a208145d8e9ea7e2ec0b62c8645c62eab95fa0892c8f30f23f3e651c1f9be7fca9ed4e10c514 SHA512 35c31a8b113f4cf7516c4ba56dba10b5bfa6b9d5d0ff5733d1c6c32bf72f5a6e61ac5230662cc3dc8a6aa95750f58ad84f67c16c86a05d935234f4d31250112b
+EBUILD alsa-lib-1.1.2.ebuild 2105 BLAKE2B 2be4af40e69e4b3e06ce8ea954848c143090ed275f19dcbfd49b867d1edd03e497a248a2f16f5ed9181ea409be5ca46864445f729d634174e8376b256b877b8f SHA512 6f02e3234a638ebf9e88f5c6db7f6edca4f6f76acb1e7c09bc120825a6d1c994f83baa22d5c9b6c2f07fc6717a4e32714d7cab13ccddbc653e57ea489b17fdde
+EBUILD alsa-lib-1.1.4.1.ebuild 2114 BLAKE2B c604e7b3ed5eca1882eaa54d511d06644e5a0db18ba4933bba410850c89876e2f9592e71cc121d7b853b00ea1c66bd18b69e67290b0d78b3a2a27b491516220e SHA512 ad3f570a0c87c5e5f41d0183abaca0a8f20595d88748bdfa22ecd5a36730ef74f32c7c8ad5caf9a1accad0da89e44a1519a370dc38b259577977e86e66df42bb
+EBUILD alsa-lib-1.1.5.ebuild 2114 BLAKE2B c604e7b3ed5eca1882eaa54d511d06644e5a0db18ba4933bba410850c89876e2f9592e71cc121d7b853b00ea1c66bd18b69e67290b0d78b3a2a27b491516220e SHA512 ad3f570a0c87c5e5f41d0183abaca0a8f20595d88748bdfa22ecd5a36730ef74f32c7c8ad5caf9a1accad0da89e44a1519a370dc38b259577977e86e66df42bb
 EBUILD alsa-lib-1.1.6-r1.ebuild 2060 BLAKE2B 8a2e25921cba37d8e0e5985faab131ca359d363dae7c347dc9ff9f52b206cb3e5b59eb0ebb2b38487e85184a329eb335e2d4a5860cded27195fe64c6d181b8de SHA512 d46f1d30068df97006f3c3d84623bb16015e28a1f79cf0f8b44e8e78cc6d222ad1a4bae3a6957d6e4f55d29593e7916ca791aceaf42142dd5b33a8dc5bee597e
 MISC metadata.xml 502 BLAKE2B 06ee247fafa9de0b13dc4723279d82367bf580e8ad5216b301e23e1abf2a4ea464febaf456c31a91d223bec81603c1b65c2de0fb5fe491d464cfae754ecc6ad5 SHA512 0ca6ff20c3eda2f898d20df9e8a572b9a8d0504bf3a79bc1ef14026ea8b72e13638cbd3ef63ce2bf19efea80729ca25c27ca131d965edad4a4d3d23ac1352085
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.2.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.2.ebuild
index 31132aaef773..abe8e719be71 100644
--- a/media-libs/alsa-lib/alsa-lib-1.1.2.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.1.2.ebuild
@@ -17,11 +17,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc elibc_uclibc python"
 
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-soundlibs-20130224-r1
-		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-	)"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
 	doc? ( >=app-doc/doxygen-1.2.6 )"
 
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.4.1.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.4.1.ebuild
index 7116e25d8966..3cfe8ecf8ff9 100644
--- a/media-libs/alsa-lib/alsa-lib-1.1.4.1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.1.4.1.ebuild
@@ -17,11 +17,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc elibc_uclibc python"
 
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-soundlibs-20130224-r1
-		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-	)"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
 	doc? ( >=app-doc/doxygen-1.2.6 )"
 
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.5.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.5.ebuild
index 7116e25d8966..3cfe8ecf8ff9 100644
--- a/media-libs/alsa-lib/alsa-lib-1.1.5.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.1.5.ebuild
@@ -17,11 +17,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc elibc_uclibc python"
 
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-soundlibs-20130224-r1
-		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-	)"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
 	doc? ( >=app-doc/doxygen-1.2.6 )"
 
diff --git a/media-libs/alsa-oss/Manifest b/media-libs/alsa-oss/Manifest
index 8f2f7e4fabf0..ba9c5d7c7b23 100644
--- a/media-libs/alsa-oss/Manifest
+++ b/media-libs/alsa-oss/Manifest
@@ -1,6 +1,6 @@
 AUX alsa-oss-1.0.12-hardened.patch 370 BLAKE2B ed779e5565ece8412880faa806d7b595bf6a0fcea7809090872639e7928f1c58acb000e8f965b5f06a8c5c14e5a46f9c3f4078a5ddb2d907f5cdcceb49c7fb6c SHA512 126bd73800844c0b9e4c2af05b3754bbbacf9e380288cdde7fef666621fcb0b1775bead7fd932c23375efea594ec9f1d3eccf009a90a7994d18b101ba21f1ee2
 DIST alsa-oss-1.0.28.tar.bz2 291500 BLAKE2B 8884c91809bbdb9a20a7ebad7c076786ac5896d312741abf612598429e3d476530a198d8b4e0adb3abe2aee118b0b4b875b2b99ac636403ec37a583a4e234bcd SHA512 7069b7d4d4c0b840608dcca99a660aae1f81f6ef45dcf48fc66553b05de260d033105aa685c8ca05fd4d157d12d83860746a05afdab4f310919c34fa235ab03e
 DIST alsa-oss-1.1.6.tar.bz2 291588 BLAKE2B 2db4b6d80a17518aeadff8a8f12a40eb4f9e549c46ef4df52d49333c039aa285320a179cb632df5dd48f51d56513499e59c71914236c9be1e0ba493d25bbb270 SHA512 f58ece2a5aeb846032a06d372eec0bfa1cde0bd0590b1700d4f7698aa29b10f13c8d53670297ec95a94448955ba6ea9e94a4a79129eb2cd734c8a3658197036d
-EBUILD alsa-oss-1.0.28.ebuild 1003 BLAKE2B a53a228fe9c83b1245fdd0f2b2c8018d0f0b0da80f22ef641e56cb953a0f9e35c5b091b17e3559887e41e480e2d1a98b9ed3957b8f527626a16a83b059c69bdf SHA512 963fefc41d1da59e9a94f169288404b4c02e499d3662e2183b6939dbf4fe8e3a94fcce7b65aa0e08ce0251c593253550ea96307fce2320879b630f62db7d6603
+EBUILD alsa-oss-1.0.28.ebuild 876 BLAKE2B e322d42d78583a296b49e32e316d4f7e0bc41fd4cc40bbc8873e5bfe0cc47a46c84af4813cfe9f916da8d5cf30a0577e0fe9030f2387f62b99cc8ac2a2a675c5 SHA512 519092dd88cb74fdb8a2fb9e87de716dcbbf9e19c0c75f82245535c2827467f9a1f429f4477f68f23a9804026b90e265fef20b31db48db41396fcfaaf37a417a
 EBUILD alsa-oss-1.1.6.ebuild 925 BLAKE2B 4e23d01b74363145fdf95cf16e9b019bab71360c3361278d6793147e8061d73ce7c5d6798f5b4e2e24b7e8b847ee5ceb54f9a1981654c65079c6379eaffa4e8e SHA512 71698c735292d40c0d1fc70d410bd9037f9db27a31bca76cb999fc9c1f7a1194ab1e1b05f2b60946189d4250ae894722052effbdfe33a162ad7c390a6afdd466
 MISC metadata.xml 217 BLAKE2B ee5131ede673a41d69ab787db1d05f6d64afc4d625294c8314d0db362124dddca5b31ff6d29cc41ebb3f464f4665e2bc9bccfac84f69231ebe819d262e8ed7c7 SHA512 783364e33af22e28ba41661e2380968c95f6464ae9ebb300d542ca159a54c4e53cf5e8b1053a72e75902f433e90fa26f6456fa127fca6daa44542bda57779e5a
diff --git a/media-libs/alsa-oss/alsa-oss-1.0.28.ebuild b/media-libs/alsa-oss/alsa-oss-1.0.28.ebuild
index 49417959c206..17d4aa3aa1aa 100644
--- a/media-libs/alsa-oss/alsa-oss-1.0.28.ebuild
+++ b/media-libs/alsa-oss/alsa-oss-1.0.28.ebuild
@@ -17,23 +17,20 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 
-RDEPEND=">=media-libs/alsa-lib-${PV}[${MULTILIB_USEDEP}]
-	abi_x86_32? (
-		!<app-emulation/emul-linux-x86-soundlibs-20140406-r1
-		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
-	)"
+RDEPEND=">=media-libs/alsa-lib-${PV}[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
+
 PATCHES=( "${FILESDIR}/${PN}-1.0.12-hardened.patch" )
 
+src_prepare() {
+	eautoreconf
+}
+
 multilib_src_configure() {
 	ECONF_SOURCE=${S} \
 	econf $(use_enable static-libs static)
 }
 
-src_prepare() {
-	eautoreconf
-}
-
 multilib_src_install_all() {
 	einstalldocs
 	prune_libtool_files --all
diff --git a/media-libs/aubio/Manifest b/media-libs/aubio/Manifest
index 4ebac60b1d90..53f45fa9aeec 100644
--- a/media-libs/aubio/Manifest
+++ b/media-libs/aubio/Manifest
@@ -1,4 +1,5 @@
 AUX aubio-0.4.1-ffmpeg29.patch 709 BLAKE2B 1247aba5a87283e48a7bd312aaf2399d920f4c4684caf84f2203ba3af1219c15a5cb87301bdced313188eafaa9abc725676555ea922b146ee98cc5532b1a2ba7 SHA512 7dfec25471d9d802d747cf13102067de0ff589e51501083cab35cc9e3fc8947e1ccdbd2087cfdc0caa7cf9129dde5dc37a3e90548fb8328322aa7a9ca89a6ae0
+AUX aubio-0.4.6-ffmpeg4.patch 442 BLAKE2B 41daeb41d18f1b964e625ba2199054a3ffd90f73710f40dd061c9c5bf1df6cf7caf90c1e51b8bf323d7c6cd3c0ccb1fb58b2268b955547c31811b8c5b3c12c98 SHA512 3dcaba80b3cd269627e60ad6fe8dc7a884492bca6365e74e55fb5279d8b2f1900ac5b078eb3c574f499389e06cb2aaed3de447cf00a3be46c83b062b970af187
 DIST aubio-0.4.1.tar.bz2 288136 BLAKE2B ba7368fab21fec73dc555ea0d7291eea010a415d8bc77601337cf311277f3c82564c2f021b971a4117a3f99ab69e7a61e55b8ee488ca24b9b5319ab4a00a3a6b SHA512 f36800f1a0cbe72509e05d15d79759ed25975e92701804597ed4c9d93e27d5e7b908e0aa65819ce763882945123ea174a0825c7aacf9f9494f56d72de5b8308c
 DIST aubio-0.4.2.tar.bz2 304216 BLAKE2B aab7e55d580105e6180503503ae2970d150d86e445d5c1b10d3f39c8cdf7496d0c280a57a2fc7ad3ea5142996d56c53cd2e1c6f736fb1a98b9b142438c919e04 SHA512 b57b6d147b305a264f0055726f76a8452f784b556a7fda911f056adbedd2855048e93c0e21b9f359e3f442f1542189aff0c214dd85141e2e06048a07f47703ff
 DIST aubio-0.4.5.tar.bz2 350615 BLAKE2B 2108b4e2c9ef7f15631d785f71d6bce6804b0b61a5022e75a841e9e0772b6a4e9e53fe11c74e3907aa74eb1191bc0a5082f4854d2fe0746e14a4f9ac50ae06b2 SHA512 0aeaee5efc117201ca7b1fe2a421826ade83ce5b3ba50c27a8cf65debeedb20dd5a5ac28e20935bb29ca2b0d1b70cf93feee298989dfc79978f689e989235608
@@ -6,5 +7,5 @@ DIST aubio-0.4.6.tar.bz2 363016 BLAKE2B 3847ed02b7d64d9796bd1f5a06044d945f5859ab
 EBUILD aubio-0.4.1-r1.ebuild 2290 BLAKE2B 8c8dd11e0a1b64a9d5643fd5c212f3afe881c2d58a923dd087008631b6319814d5ef8b40804b24714696dbf21ddd36532f225e6c5bd40450beff129e5623427f SHA512 104687177d18f338d7616995602e04da412aecd184ef2759739cce7e242b138769b0d4ea54baa1730d81fbe4c5b2a371e72f9b9127b9f1a180f5baea81f3db4b
 EBUILD aubio-0.4.2-r1.ebuild 2212 BLAKE2B dbf8a2d51acb131d2ff2ab5a67bc6c560f8fbf45c196f71b5db3efde58f8d7561023087600306ab6870e5696e994299b9aa5c3436328f80a9659e073a352fe99 SHA512 ed2478410501447475bea8474387339a291e6f790672fa4afe2a7ecbf5ab707a7b7c750e02083c705bf8f10da4dc04f0ca94987992c8dae19ccc3fae71323c4d
 EBUILD aubio-0.4.5-r1.ebuild 2241 BLAKE2B 9331e3674308833d0cfdf75274dc865ca605d450eb60e6221a8d1e7ddb7dc833c480b45e7dbab7db62f9a64afee123dca556bc3d264310283d64fc8c3ab1a283 SHA512 3d22857c85d7720c99ca12c01ebf8aa14616ac4de53a83faed08d84e65e9e6b2d7327d00104490de568c930e758b9ed9b835449d15990ff0b2bebcdec788e81d
-EBUILD aubio-0.4.6.ebuild 2241 BLAKE2B 9331e3674308833d0cfdf75274dc865ca605d450eb60e6221a8d1e7ddb7dc833c480b45e7dbab7db62f9a64afee123dca556bc3d264310283d64fc8c3ab1a283 SHA512 3d22857c85d7720c99ca12c01ebf8aa14616ac4de53a83faed08d84e65e9e6b2d7327d00104490de568c930e758b9ed9b835449d15990ff0b2bebcdec788e81d
+EBUILD aubio-0.4.6.ebuild 2293 BLAKE2B 47eac9ff599213674a34161525ba865a67358a0cedf7f0c9c52ca5fdbd3049897c303bab11c328ce97eb66798819e176e45388ba19f07b715813628790044a8b SHA512 fbf5390c609fcac1fc9c544438f4dddc86f03746a392336a823f0a355abe62e2c93e7decadcf9a68d90b2deaa1b3a9657daaaadb87af39091e1e7232fbc437b9
 MISC metadata.xml 346 BLAKE2B 00429033f506bf3818f26f13062d21d0d04d8fc84185244615a09d008c5da6e350df5f32bdcba2c07103039ed64f802cc563a0ca8cd79e117741b947e421142d SHA512 ff3830c2d2322fabdb34458fd27c3e05ad825b1d707eee6150417e4c21480bdffbe4e639ff33a9914cc28189b91e970719326f065746f4241e186f7b27b168d1
diff --git a/media-libs/aubio/aubio-0.4.6.ebuild b/media-libs/aubio/aubio-0.4.6.ebuild
index c02467cd6e71..9c6af6537ba0 100644
--- a/media-libs/aubio/aubio-0.4.6.ebuild
+++ b/media-libs/aubio/aubio-0.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -40,6 +40,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DOCS=( AUTHORS ChangeLog README.md )
 PYTHON_SRC_DIR="${S}"
+PATCHES=( "${FILESDIR}/${PN}-0.4.6-ffmpeg4.patch" )
 
 src_prepare() {
 	default
diff --git a/media-libs/aubio/files/aubio-0.4.6-ffmpeg4.patch b/media-libs/aubio/files/aubio-0.4.6-ffmpeg4.patch
new file mode 100644
index 000000000000..7df4665655bb
--- /dev/null
+++ b/media-libs/aubio/files/aubio-0.4.6-ffmpeg4.patch
@@ -0,0 +1,13 @@
+Index: aubio-0.4.6/src/io/source_avcodec.c
+===================================================================
+--- aubio-0.4.6.orig/src/io/source_avcodec.c
++++ aubio-0.4.6/src/io/source_avcodec.c
+@@ -58,7 +58,7 @@
+ #include "fmat.h"
+ #include "source_avcodec.h"
+ 
+-#define AUBIO_AVCODEC_MAX_BUFFER_SIZE FF_MIN_BUFFER_SIZE
++#define AUBIO_AVCODEC_MAX_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE
+ 
+ struct _aubio_source_avcodec_t {
+   uint_t hop_size;
diff --git a/media-libs/bio2jack/Manifest b/media-libs/bio2jack/Manifest
index 7db2551353a7..8acd969c45eb 100644
--- a/media-libs/bio2jack/Manifest
+++ b/media-libs/bio2jack/Manifest
@@ -1,4 +1,4 @@
 DIST bio2jack-0.9.tar.gz 527385 BLAKE2B 9f977e8f03a9de272c0b440c256569382876a62875dfc3d1f896c80388bd219d195d5544ba1dd5fb6b2141e63368f4293c3cb5081e1d2d8d3cdceef29a54285d SHA512 8faf73b9aa81d48eddb624146c0144094e466f16cad89fad3670f927963a5944d78f0342aba0f29cece422e3f012faf3e1a0c459fd5cef279406f5bebe66e66a
 EBUILD bio2jack-0.9-r1.ebuild 1124 BLAKE2B 629a4baf8176e3c724e507442eb39836e4fdcf28e2c0d734615e1d66bd9973b9336499355f716f6a1d5f2595a5cd9365342db913d8476c4d8af0f3a0d4c4760a SHA512 247054c9c07e628a71396f69286d240a6d468d566ccc223c2156d8c61658578ba1ae1660ca06b736147c2001cbd563e142794ad19617357ec0da48087b707038
-EBUILD bio2jack-0.9-r2.ebuild 1119 BLAKE2B 96f929982db123d15546c8b03ccb683a1c515a1233f89da9f98b7404e76fc33dbf86167408b8de22c68e8046ea16c9df2c49666f367cbbc73c0b3b83f7232481 SHA512 7096cdd764eebac626864880c147199cd64a24a32a1de9085e448b8bd265c54c7e0bad161f9010f7fcac0df28e95053c42ec4c58e03ce7b8d5e710c86b99bc6e
+EBUILD bio2jack-0.9-r2.ebuild 1118 BLAKE2B e8bcb3547bf545f0aa4f542da23b8c187883d63e61d4f5baa5c29a5c63dffaeb5480f8b9610c6e074a2a1b54fbc472053dbb1a4160cf4c7790fe038f3c488f56 SHA512 78ea95a3253c6884c30be132237917068e822c289900e7bba7370742634be8629bfae0d827dd9d478f36704df8393955db03d44f31c077a5b0ac57bfd4bc68db
 MISC metadata.xml 331 BLAKE2B 10b8c96e08bc97853a40647f2875aafc8c7de9994ba5af8cf5e2ed429efc2cd494b65d1d6dd424da234785568ebaeec822f15c0b088a0bc8df1a12322f2472bf SHA512 57c44fcd806d4de0339c0a6041635dac52545c8aa71516aefcde41613a8ec92f293c5e28f7b04ed3ab746fdccee306b80a44ef4faef24b2ade1abd2be831ca27
diff --git a/media-libs/bio2jack/bio2jack-0.9-r2.ebuild b/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
index ec1824b9d5cc..3083ae005de0 100644
--- a/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
+++ b/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/bio2jack/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static-libs"
 
 RDEPEND="media-libs/libsamplerate
diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index a6cc3f5ecbbf..e83cadba9527 100644
--- a/media-libs/chromaprint/Manifest
+++ b/media-libs/chromaprint/Manifest
@@ -9,5 +9,5 @@ EBUILD chromaprint-1.2-r1.ebuild 1130 BLAKE2B 035bee5657f5c579a0243716a1b3f29ad0
 EBUILD chromaprint-1.2.ebuild 1076 BLAKE2B 4042edcc33926c157cd7fda5ae9749c07b99a662bd12856b12973ff05044de6f32b79622d85cdc983d80dd070ae5b10abfb6042ed63905bc1e1288578c1c97bb SHA512 163e6bc812268032500c0ed1b97c277f97dc379bbaa6221dd8953b5797849a8f2af98c2eea52b518644ce6a99d5edae1462bb699fcb05a7116a3c0c492ccafcd
 EBUILD chromaprint-1.3.2.ebuild 1098 BLAKE2B 69614a6f80d2dd553f2eb61b5ca38ce69fa0cf69e812ead17a5ae15e23d55788996602a39ca795e19938a45f004d05a66444fb0a23e375f25d1d6ec1850efb92 SHA512 c15f598ff012bd91c312d26e25bd27c1981abf050fb76770a98cfe2f23d96faf50fa6a4e05dc4584d6fca5803a702c7f33bba328b5bcaf09c257509fceaa8da7
 EBUILD chromaprint-1.4.1.ebuild 1331 BLAKE2B 1fc4cb113fb92d29a5613687fc41a029df40e9cf9851171e3dc3ca417c14205128d2733d7aba59972add6b716364d32d362bf5d956723bec22dd708c309556d4 SHA512 9ed09f55707ddedfdb536f8b2613a5118d96e05878d9c37eda15c1a25dfacb07e6add91ffcef71a98a0a4b5b6caa9925074af449ec0e1edc7c333ceea986a256
-EBUILD chromaprint-1.4.2.ebuild 1347 BLAKE2B 5c875174244de9b04566a24f08c02654926c6b3e94b026df75d3dcb7d2fc6e4655c29fd109c893f6e5b37cf4106f6fceca275ff796950b4ee29e93d4418ca9a9 SHA512 b09f76f6fc4839df6ee9704490a838a5d081c6c48676019b27f2efa910067444f476a39d66da7c5d2cab04fc10f71bfac9a5e6a8e026824f4693fa3f9a174a71
+EBUILD chromaprint-1.4.2.ebuild 1354 BLAKE2B 15029b3527b9534047b54150899f4f7f2d2f2bbd6f4598eb6eb216150f44adca2a4a84a77e4b9fa545418212a0c86ec7044937eed41962d81f85c7ff92443ed3 SHA512 1589c4c72d09d8c89266f1cdf4e36153f88c42604c5596cf12fadfba594789257bdd7ca2b2886c66a03d2eeebc1bc2f6b74c631866eaa5dc38e4bdf8925a77be
 MISC metadata.xml 502 BLAKE2B b4f7420ba8b5e4004b6f8fa9cc70c0eddea04a0e1759c9724b94198e3df99c2505893706cb5232c643a43208822d7ef5bb56660c76029cadb52b9a0562fd8021 SHA512 229e807429496e637ba289f269af83eca274c53eb2fc2d9dc5f304c39118eaf1d0ae9a5cca01ffa1958d110c55537f1792e26343bf3309ad72b1f0411af9dafe
diff --git a/media-libs/chromaprint/chromaprint-1.4.2.ebuild b/media-libs/chromaprint/chromaprint-1.4.2.ebuild
index 98442fe31495..5b3796717902 100644
--- a/media-libs/chromaprint/chromaprint-1.4.2.ebuild
+++ b/media-libs/chromaprint/chromaprint-1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://bitbucket.org/acoustid/${PN}/downloads/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0/1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE="libav test tools"
 
 # note: use ffmpeg or libav instead of fftw because it's recommended and required for tools
diff --git a/media-libs/codec2/Manifest b/media-libs/codec2/Manifest
new file mode 100644
index 000000000000..8e918b4c5014
--- /dev/null
+++ b/media-libs/codec2/Manifest
@@ -0,0 +1,3 @@
+DIST codec2-0.7.tar.xz 8386048 BLAKE2B 04e2ab834539d6911300d30a7de00a0c351e29c53972482765cbefefe8d9e0f10b491496690e34beacce27f68da0c85bb6ad8bb75b93ce50e44eb13f1ad8070b SHA512 bf2f40071c21096d9504aacb293e7c293e1a51d732b91d870b5b35c372684cdb187fe4aafb6c27601c75167bd3783470e054d65b4be215facf67acee8afc56af
+EBUILD codec2-0.7.ebuild 373 BLAKE2B 9982711764a33b675fb6137f3156e6e2bd6e85af70ed704ecd4d840dab037d8ccc2df30b39f304df58c69ec5533e47053ba1d072ff89e4c5a1fd0f43a08f103c SHA512 eeb528bda0b49e7610bf3c1b50762a8f9dde81dd7c15918d0e3055dd2783413c11eaf4cf026311722dc86d098720760de92c772c18e6cc7a2a9dd1bf16b8eedf
+MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/codec2/codec2-0.7.ebuild b/media-libs/codec2/codec2-0.7.ebuild
new file mode 100644
index 000000000000..4703ed9d2077
--- /dev/null
+++ b/media-libs/codec2/codec2-0.7.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+DESCRIPTION="Low bit rate speech codec"
+HOMEPAGE="https://freedv.org/"
+SRC_URI="https://freedv.com/wp-content/uploads/sites/8/2017/10/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/media-libs/codec2/metadata.xml b/media-libs/codec2/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-libs/codec2/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-libs/faac/Manifest b/media-libs/faac/Manifest
index acbc274e48e4..05f3be0bcb25 100644
--- a/media-libs/faac/Manifest
+++ b/media-libs/faac/Manifest
@@ -5,7 +5,7 @@ AUX faac-1.28-libmp4v2_r479_compat.patch 4741 BLAKE2B e903d6f253c4bc66388d2af6b5
 DIST faac-1.28.tar.gz 678891 BLAKE2B c5d173649f3df77af7e9856150c52e3edd4dd6bac9c4d66463fa846edab1df4d209113946658820af6413abcd62a7a1101ad30366fc6cc07541c66f9cc7746ba SHA512 0ef721ad28835e95cad41afc0cb6130e1ebb634cb6dd4b40f649bc2269b7bb5bf2887f6d8f023c74628d521f8bdf55b4dd070f972ecff162a5fe0384e026235b
 DIST faac-1.29.8.3.tar.gz 483404 BLAKE2B b5301fe63da7a059d0d4cf298107585295a3f385262c0c7715f5aa252a7400288b5be85cf26ea1ccf43e017c0f00fbf6942a91b903637660843701e1a28a6799 SHA512 2f17d87245c5cdb1ea37f21fb67f5a239f24133bb863bd635bb1f223d8d54c13d23ad43e93954a89361109c39b01e3b506ee791ffdf52741f76feb8bd1ed316c
 DIST faac-1.29.9.2.tar.gz 483826 BLAKE2B f845e75ec640f2a6ac41ad10dfdf1dbc6a6ddef3cb8cc3fe63450515f888343126cb2ec1df4c4eaaefed3d7d5d56249078f14363fcb9d9484228e9b1754a8b99 SHA512 71aaf060d087e866700a3a7c7d447e85709f65709e148610c4b34f5a3e095fa4a5c19f49450610949fd7db12345422b8a116a1d061899c127ad9a1bc30e79c7c
-EBUILD faac-1.28-r4.ebuild 1716 BLAKE2B bd65d8890d9e96264e4a04f671c3b79b79ebea8a6967f016a1d9630a13e18a243a972c4a66755b2fdbe5ee1ff2cde5ed997e5aeac1a3eb99b2f135e1a0b02795 SHA512 86a56132cd2b52e5ef8ccbfc2c31969b728cca8889ca15fd5980950c2f6974404d40aaf7499e692a36292e9335d0aff31504f2dd3e0d6a44996bb56b9eeb3ef6
+EBUILD faac-1.28-r4.ebuild 1587 BLAKE2B 177ab6d68bc3565cc7114d40af48c3c15fd6df223d104f4e657782947e970c86337e177910a582095fa3696dd5752684c9365e948aeaca75ef01ee78708b8482 SHA512 40f3b88d7a797cddafef3ee698c5a1442deeef525a14365407a3a7c6b93f9c0e3ea7b88ce5716a939d0dfeba0f69aae977e670299f07901660ee2946f3e32a93
 EBUILD faac-1.29.8.3.ebuild 1143 BLAKE2B 69f410d878a122a34370885786b1c4c842e96087afefb93205ebc6fcefef071932b9a5421dd13307146a13723e00fc4893ec2ca98f82d7021b9c1b620d55a4f1 SHA512 2c9f0d2767acdba0a5a99e19e741816fd49b01b16e4e49c13a910ea53171f84b165fa53219516fac9b661577a9616debbbd6885713a184dca424ee3ff23339b6
 EBUILD faac-1.29.9.2.ebuild 1143 BLAKE2B 69f410d878a122a34370885786b1c4c842e96087afefb93205ebc6fcefef071932b9a5421dd13307146a13723e00fc4893ec2ca98f82d7021b9c1b620d55a4f1 SHA512 2c9f0d2767acdba0a5a99e19e741816fd49b01b16e4e49c13a910ea53171f84b165fa53219516fac9b661577a9616debbbd6885713a184dca424ee3ff23339b6
 MISC metadata.xml 327 BLAKE2B 3c3eabbf763b0f521edb87c8d91f43a9e64c22c2ef6b86d4b95b997208a5d575f55575cc97d2c2caf3b759cbfbba7ce91377cba0121dca9f7b1a18cdab7e0162 SHA512 a323b91cffc6e960e52f3aac94763767ba428361b736e635ddc6eaee7dab9bacc36cee8bbd38c4887f3243f3f060707f3533b1c4e4be49d14ba1f602e7bf6f80
diff --git a/media-libs/faac/faac-1.28-r4.ebuild b/media-libs/faac/faac-1.28-r4.ebuild
index 8cc1bde10d87..4196ae0cfde3 100644
--- a/media-libs/faac/faac-1.28-r4.ebuild
+++ b/media-libs/faac/faac-1.28-r4.ebuild
@@ -14,9 +14,7 @@ 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"
 IUSE="static-libs"
 
-RDEPEND="media-libs/libmp4v2:0=
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r1
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND="media-libs/libmp4v2:0="
 DEPEND="${RDEPEND}"
 DOCS=( AUTHORS ChangeLog NEWS README TODO )
 
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index 84dee03132d8..c9666954619a 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -5,7 +5,7 @@ AUX faad2-2.8.5-libmp4ff-shared-lib.patch 539 BLAKE2B 3ee6b86534612e6c96bc884e71
 DIST faad2-2.7.tar.gz 1137407 BLAKE2B 15f82689e671d8cc4ff21bf6f048aadb407abdaeff9ce59982e17b3b97e56c9e848664624e751fd8f4cc7876ab1a8e4c373e7b4a20d9970f5c085d8a0a9006e2 SHA512 8135370497dfcfee09094a03a4a9545ebc58b9e532b89c5d6e5037042549e12ddb75f8903aa05866afac9fa28df96320f1ed2eebffc0660578e54392a51c1161
 DIST faad2-2.8.6.tar.gz 1025654 BLAKE2B 16d5e08ea8f0ecfff8d1f5eb17f219d481afd9bc774c42b1cf4bc604f1d57eeb9bfedc0d5654e52d887a4bdf3ba8e6a215e51343a34f781613e588502532bbe2 SHA512 9b6d7e0277ae6c93a8a799f75e7fa9b9cde6419d61533a4c5ab4335382d0cb01aa0aa2fe0fe727bb94d66fafcfeb1b6871141ab5d8dff49600775ffde5b239b8
 DIST faad2-2.8.8.tar.gz 1069044 BLAKE2B 3e22e695d89cce0ecb673caec73dd3115b2249d18daf6d0c8cf2b5cc90086889c9da733e037bc8b58c0bdc145c66bd4218b9b5e237adb7ad1c6f0caf0d97d304 SHA512 3275d292b2a9fe984842962f4d81202894bddd17033f7cd6df95466554cc968dfcbf2890ae8b1df37da0cd25d645cca0a687f07e39b9fc37dd004fd5956a82af
-EBUILD faad2-2.7-r3.ebuild 1462 BLAKE2B e699c3a456709bf59b576402510347e33d12537fa256898cc5933ebe443e914d69e7264897a7591340f8c23211d3f83191d2071e53d364bce52e231b34b37a9d SHA512 d59e688d540477838ff9faa5f23857ff6f0144caff8aa8c32aecd03fd7ad47eb1be79fbadcb2686808d1d307a46d69d91d309d52076caddaaa9c49bc3267e63c
+EBUILD faad2-2.7-r3.ebuild 1335 BLAKE2B 6d6aaa794e196cb3b9d1ba0b202284ef9b507020fca2e903b875d7e4bd9093ccbc990079b607c25d0cfbcd674e0553c4f9628e4e9a0bccf5188793c6f410842f SHA512 5eac5e8acd0e4d32784053fd5c3d5130037366687ea17161c77c79bb0a681ae60f673468ee1a38a79f19ec46aad049fe590f28747d87c9b834db4573c1c36901
 EBUILD faad2-2.8.6.ebuild 1246 BLAKE2B 0ed1c6985c411391db68a12c9cc74eb7a41e0c406a06086fb95fb9c0e2241b36eedca9f8df1119d3c2aee079ef3e9ed60e433fbd8c2ff64d6c29c66b0e299b9e SHA512 d9281740cd1aa9fd1bc609e6779f209b894909da092a2485b68cc5f57061a5dd202e77e3c9dddea21d69c64e44196996f1417620d729b9cc5a7ba8d5947ed284
 EBUILD faad2-2.8.8.ebuild 1246 BLAKE2B 0ed1c6985c411391db68a12c9cc74eb7a41e0c406a06086fb95fb9c0e2241b36eedca9f8df1119d3c2aee079ef3e9ed60e433fbd8c2ff64d6c29c66b0e299b9e SHA512 d9281740cd1aa9fd1bc609e6779f209b894909da092a2485b68cc5f57061a5dd202e77e3c9dddea21d69c64e44196996f1417620d729b9cc5a7ba8d5947ed284
 MISC metadata.xml 619 BLAKE2B 3eb4a78c845f019f564e15c8aecc41bac00aa7a814f761a6f6b4b5810e245c4645149defb09c998a615c8e3ba551e569373475e7dd8ebb5f8656e6ac6b2992dc SHA512 b62370a9ce905bb0e96001422baee1b75af853080d9ef795148e56ed8c2b8dca9c7eae3a3ff29869dac4e9af5835327649eafa20bc7831b14bec07cb901960fd
diff --git a/media-libs/faad2/faad2-2.7-r3.ebuild b/media-libs/faad2/faad2-2.7-r3.ebuild
index 77d19e8993ae..d9b34c0d9f3d 100644
--- a/media-libs/faad2/faad2-2.7-r3.ebuild
+++ b/media-libs/faad2/faad2-2.7-r3.ebuild
@@ -13,8 +13,7 @@ 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"
 IUSE="digitalradio static-libs"
 DOCS=( AUTHORS ChangeLog NEWS README README.linux TODO )
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r1
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND=""
 DEPEND=""
 
 src_prepare() {
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 4a0972903f26..42097e042ef1 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,14 +1,10 @@
 AUX fontconfig-2.10.2-docbook.patch 648 BLAKE2B 70d66ae09a0729b667a4e5e57a7cf86926fb008285f89057bdf35f241bcd047dd8ad47d858d2fad26e67824c01e9f721877bb22afb2f8ffdd5538ed05694948c SHA512 b0adb7c406445c25c96c5dc37af9e6fcc8c75a0752af255465673812bdc332ce43439a100c056744ace0dd5b3350596eedd612489c33d19a6f6cd182c08e2961
-AUX fontconfig-2.12.2-gperf31.patch 2076 BLAKE2B 5691870b6f4ff9183403fd54b1a49e514806df92cf2c79f9f1c1c8bae9c71e66b72afc1209e01f1d905bb97707b0db8ce3bdc8934043f97b9094ea4e8e1685ce SHA512 0a88b0e2f7ca0cf934779c7612b87d9a476ab1396a512dafb2e89d26655657b333fb1b442773088ffc559c19782258128f366f5fc8a0e754288a7ea288506a6f
 AUX fontconfig-2.12.3-latin-update.patch 2049 BLAKE2B 5fdf036d307a09eaa3b475fc9b87d3c927e60f49deced429d41c46c9c677b5f90de12d7f82d55feadc003a8b841456c372084afe1ead3320cdf78d3e7bc474b1 SHA512 24520d40e7049d0fa5c05054dbe6d82149688d3e327b1818c6816bd3315de56969b040c88f8db0cbbf4f377d5ebf77199dbd3af5bc7bcae8bcaea69820d68ce6
 AUX fontconfig-2.13.0-add-missing-lintl.patch 1119 BLAKE2B 7b6b8deeb5b06ed3016add4e9e04c65ec7d8ef43223783950ea911c3544ec084c8ae78739be5eb79f4bcd91b91bdc943726d2d3d6dab46cabec69e2ce2b8338f SHA512 439470687be12c6cf3f9da21a5b0d1fac6c685296f740247aaf6cf1c1e22bf567ab2348408ed9fabe0c6f7b738e54b9813e562e9d762c861b61f70ee569ad754
 AUX fontconfig-2.13.0-locale.patch 4096 BLAKE2B 8ebb0d8b72af07053a0fb7ee5550558d530b874051c7cfe8abde7f504c643a8b52bdaf265d39205d9c9fd5375f464ddaed858c9b599e633d04b92f94873bf65f SHA512 845b2db1783840070a27de2f28ce8f9cc6968b5e07c89c91110248261e9977bf15edc886b5ed9badb2fa14efc1868c82c4ab0ee45aec8a0cfbc74b5ae459c939
 AUX fontconfig-2.13.0-names.patch 2421 BLAKE2B e8e922a445dee1d7bc77b72384cf3ab58b6fc7e1e1bc7b341d59bd1dcdfd818cd15071278fac69229e3f6b8b09d19a351390d76b7112ebf8d9749d2e1de29b8d SHA512 7c9bebf3eb76de05cfd1481e679715bebc5c429ea6976e96866c0e80b0021d3f00adae888e348897574193d7029e48409a0b73698dc2c8963e485992400192ad
-DIST fontconfig-2.12.4.tar.bz2 1613580 BLAKE2B 9d6b0d5d7bc61cd3dbab2ad769df3aa33c1b38d6c55e02e18aee875a1bef4162a5bba0b9bf8f09c0f94d63c64c3f6bf6f3c5d993f210f74076f861c696f5262c SHA512 f336e9220afe738e0bf7186d87a5eb09842342ad99ca2102c69820a1f0b232e15c61ef72ae3f5d56503f5be32557d09180a80e05690e85b4eb13ed88f5cece81
 DIST fontconfig-2.12.6.tar.bz2 1624683 BLAKE2B 48432f3d3cc90240ec19dffb6714e7f780eb6b401693b40e2efa2bb593bc89c42b03c99fce8f2ceb7c108da254dc248d91a790849d22feaa50a725338b80fd1f SHA512 2a1d3e62cae2bfcae2e67e9cb75ab6534a35bda4215f1ad4b8bf757e77e7d9d609c016562f5288fd10046a0e94655a807f6dd044d7868ed81a146c4275c4dd06
 DIST fontconfig-2.13.0.tar.bz2 1700500 BLAKE2B bf137b27c9f73c5e2763b7a4a443a4aa5016bd3c0e35138249c2cf8841eb364c8e7bbea6495b53b88de26e3d5a429ebfb598a9f4fe7d875028a621df592ff35a SHA512 f0ad8f2542c8b1e900f5c3d213466a31dd3785da726d6eb455b6734c71c6e5751b28172203e2f9668e9c8e1512072235ea46a1a5e6a85ec54ccc332adb4e5fbc
-EBUILD fontconfig-2.12.4.ebuild 4930 BLAKE2B 40ea1f8710e43736d7da02b1a30df092818cc5ac8d513ec2f09958d0ed6cad7a1446b143279779643229e473b1fadc206387820c8b31755974b5f1d76594ed95 SHA512 46110903d927e176a8346527503431ca66b4a1b08aa3a441e0621ea9c7eec5429b21191c18156c8782013cc0e8dfe7a0ba55acd1d6c9dd92ddee23fe3562d11d
-EBUILD fontconfig-2.12.6.ebuild 4995 BLAKE2B d7843faaa1b48b4db2138ec08fe53f797d3ba02c05b4eb1c6b91cf261edee105e94ea9bc200f5b08f9b08fced53d9bef93719ed529f7aff53fe7c4e589211190 SHA512 a15943efca6a4a88cae289702f6bc29c8fc603473c3a7565f8bbab64260d5c041918f2f1a70ee531f312d2900278da33b7b1ad4f5c0a7bd5347877e2ca342961
+EBUILD fontconfig-2.12.6.ebuild 4926 BLAKE2B b8b83130b0f82d6f9981ecede285f65ceb902a8a200c4debb4b1a259b70f1b8038def66c09a294200b51d01bfdd5c5f54da2e0539ecfdf514609581caba3b0be SHA512 a97bbeebdc22f9ffc7f1f72429b1061465b7744e2d653717f0897c4fe97579641e3beab2b8854778f4c19bde3fd645280ed79008f19d8dddc0a5a01f03698d52
 EBUILD fontconfig-2.13.0-r4.ebuild 5050 BLAKE2B a301c45c95b780453352e843a7a9dd81f634473eccde16a3b82480e76957ffbc5afbe98f22f756bf6f25e2558121e0f5cb42e920728a96f617230aa054c23791 SHA512 9045b0730d60e1c628f7a08a373b93416a0c4275155e31a541c7d0bdaf9aee718b9fabbd2649f7c89d63cf4532075c324a4214802eca7eeaaad144cfa4b19f0e
-EBUILD fontconfig-2.13.0.ebuild 4886 BLAKE2B 53afd9c7099bbca51d0b247b7af20ef985c373fe3a4217a58b22b1c27a26e111d171e2907759fb4f7101e319370cea32ab4ee24ed0c99851ed6a1089fffa7331 SHA512 8cddd384732d2115c4476f2d40fd6de6bc4616120fd484adb78e7d77aaaa9927e63b3cbac5e9364bc33870137a11e7c5e1f3ecb4b095903504d3db8757de8fe9
 MISC metadata.xml 500 BLAKE2B 5326535fbf21d56868f15d3e5cda11bddba722762423b8831da99f9ff31bee71ed6d4e5ec62af46a7981c233c9d516068257413cb473c02657d3543619692b24 SHA512 bfc956b5196face33a60fa495b7948cd8f01802f23efd02da9da41146443b76f3d01ef5192a7541dd65e107df5e1935f73f5bfdb939c14fdde599919c7fde190
diff --git a/media-libs/fontconfig/files/fontconfig-2.12.2-gperf31.patch b/media-libs/fontconfig/files/fontconfig-2.12.2-gperf31.patch
deleted file mode 100644
index ce90c450b360..000000000000
--- a/media-libs/fontconfig/files/fontconfig-2.12.2-gperf31.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 9878b306f6c673d3d6cd9db487f67eb426cc03df Mon Sep 17 00:00:00 2001
-From: Akira TAGOH <akira@tagoh.org>
-Date: Thu, 23 Feb 2017 21:39:10 +0900
-Subject: Fix the build issue with gperf 3.1
-
-To support the one of changes in gperf 3.1:
-* The 'len' parameter of the hash function and of the lookup function is now
-  of type 'size_t' instead of 'unsigned int'. This makes it safe to call these
-  functions with strings of length > 4 GB, on 64-bit machines.
-
-diff --git a/configure.ac b/configure.ac
-index 4948816..8fbf3d3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -193,6 +193,26 @@ fi
- AC_CHECK_MEMBERS([struct dirent.d_type],,,
- 	[#include <dirent.h>])
- 
-+# Check the argument type of the gperf hash/lookup function
-+AC_MSG_CHECKING([The type of len parameter of gperf hash/lookup function])
-+fc_gperf_test="$(echo 'foo' | gperf -L ANSI-C)"
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-+	#include <string.h>
-+
-+	const char *in_word_set(register const char *, register size_t);
-+	$fc_gperf_test
-+	]])], [FC_GPERF_SIZE_T=size_t],
-+	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-+		#include <string.h>
-+
-+		const char *in_word_set(register const char *, register unsigned int);
-+		$fc_gperf_test
-+	]])], [FC_GPERF_SIZE_T="unsigned int"],
-+	[AC_MSG_ERROR([Unable to determine the type of the len parameter of the gperf hash/lookup function])]
-+)])
-+AC_DEFINE_UNQUOTED(FC_GPERF_SIZE_T, $FC_GPERF_SIZE_T, [The type of len parameter of the gperf hash/lookup function])
-+AC_MSG_RESULT($FC_GPERF_SIZE_T)
-+
- #
- # Checks for iconv
- #
-diff --git a/src/fcobjs.c b/src/fcobjs.c
-index 16ff31c..33bba8d 100644
---- a/src/fcobjs.c
-+++ b/src/fcobjs.c
-@@ -25,10 +25,10 @@
- #include "fcint.h"
- 
- static unsigned int
--FcObjectTypeHash (register const char *str, register unsigned int len);
-+FcObjectTypeHash (register const char *str, register FC_GPERF_SIZE_T len);
- 
- static const struct FcObjectTypeInfo *
--FcObjectTypeLookup (register const char *str, register unsigned int len);
-+FcObjectTypeLookup (register const char *str, register FC_GPERF_SIZE_T len);
- 
- #include "fcobjshash.h"
- 
--- 
-cgit v0.10.2
-
diff --git a/media-libs/fontconfig/fontconfig-2.12.4.ebuild b/media-libs/fontconfig/fontconfig-2.12.4.ebuild
deleted file mode 100644
index 145a584a1438..000000000000
--- a/media-libs/fontconfig/fontconfig-2.12.4.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal readme.gentoo-r1
-
-DESCRIPTION="A library for configuring and customizing font access"
-HOMEPAGE="http://fontconfig.org/"
-SRC_URI="http://fontconfig.org/release/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="1.0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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="doc static-libs"
-
-# Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
-# default and used by every distro.  See bug #283191.
-RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.3-r1[${MULTILIB_USEDEP}]
-	abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( =app-text/docbook-sgml-dtd-3.1*
-		app-text/docbook-sgml-utils[jadetex] )"
-PDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig )
-	virtual/ttf-fonts"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.10.2-docbook.patch # 310157
-	"${FILESDIR}"/${PN}-2.12.3-latin-update.patch # 130466 + make liberation default
-)
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )
-
-pkg_setup() {
-	DOC_CONTENTS="Please make fontconfig configuration changes using
-	\`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be
-	overwritten. If you need to reset your configuration to upstream defaults,
-	delete the directory ${EROOT}etc/fonts/conf.d/ and re-emerge fontconfig."
-}
-
-src_prepare() {
-	default
-
-	# Revert gperf-3.1 fix as it breaks compilation
-	eapply -R "${FILESDIR}"/${PN}-2.12.2-gperf31.patch
-	export GPERF=$(type -P true)
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local addfonts
-	# harvest some font locations, such that users can benefit from the
-	# host OS's installed fonts
-	case ${CHOST} in
-		*-darwin*)
-			addfonts=",/Library/Fonts,/System/Library/Fonts"
-		;;
-		*-solaris*)
-			[[ -d /usr/X/lib/X11/fonts/TrueType ]] && \
-				addfonts=",/usr/X/lib/X11/fonts/TrueType"
-			[[ -d /usr/X/lib/X11/fonts/Type1 ]] && \
-				addfonts="${addfonts},/usr/X/lib/X11/fonts/Type1"
-		;;
-		*-linux-gnu)
-			use prefix && [[ -d /usr/share/fonts ]] && \
-				addfonts=",/usr/share/fonts"
-		;;
-	esac
-
-	local myeconfargs=(
-		$(use_enable doc docbook)
-		$(use_enable static-libs static)
-		--enable-docs
-		--localstatedir="${EPREFIX}"/var
-		--with-default-fonts="${EPREFIX}"/usr/share/fonts
-		--with-add-fonts="${EPREFIX}/usr/local/share/fonts${addfonts}"
-		--with-templatedir="${EPREFIX}"/etc/fonts/conf.avail
-	)
-
-	ECONF_SOURCE="${S}" \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	default
-
-	# avoid calling this multiple times, bug #459210
-	if multilib_is_native_abi; then
-		# stuff installed from build-dir
-		emake -C doc DESTDIR="${D}" install-man
-
-		insinto /etc/fonts
-		doins fonts.conf
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name "*.la" -delete || die
-
-	# fc-lang directory contains language coverage datafiles
-	# which are needed to test the coverage of fonts.
-	insinto /usr/share/fc-lang
-	doins fc-lang/*.orth
-
-	dodoc doc/fontconfig-user.{txt,pdf}
-
-	if [[ -e ${ED}usr/share/doc/fontconfig/ ]];  then
-		mv "${ED}"usr/share/doc/fontconfig/* "${ED}"/usr/share/doc/${P} || die
-		rm -rf "${ED}"usr/share/doc/fontconfig
-	fi
-
-	# Changes should be made to /etc/fonts/local.conf, and as we had
-	# too much problems with broken fonts.conf we force update it ...
-	echo 'CONFIG_PROTECT_MASK="/etc/fonts/fonts.conf"' > "${T}"/37fontconfig
-	doenvd "${T}"/37fontconfig
-
-	# As of fontconfig 2.7, everything sticks their noses in here.
-	dodir /etc/sandbox.d
-	echo 'SANDBOX_PREDICT="/var/cache/fontconfig"' > "${ED}"/etc/sandbox.d/37fontconfig
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# Bug #193476
-	# /etc/fonts/conf.d/ contains symlinks to ../conf.avail/ to include various
-	# config files.  If we install as-is, we'll blow away user settings.
-	ebegin "Syncing fontconfig configuration to system"
-	if [[ -e ${EROOT}/etc/fonts/conf.d ]]; then
-		for file in "${EROOT}"/etc/fonts/conf.avail/*; do
-			f=${file##*/}
-			if [[ -L ${EROOT}/etc/fonts/conf.d/${f} ]]; then
-				[[ -f ${ED}etc/fonts/conf.avail/${f} ]] \
-					&& ln -sf ../conf.avail/"${f}" "${ED}"etc/fonts/conf.d/ &>/dev/null
-			else
-				[[ -f ${ED}etc/fonts/conf.avail/${f} ]] \
-					&& rm "${ED}"etc/fonts/conf.d/"${f}" &>/dev/null
-			fi
-		done
-	fi
-	eend $?
-}
-
-pkg_postinst() {
-	einfo "Cleaning broken symlinks in "${EROOT}"etc/fonts/conf.d/"
-	find -L "${EROOT}"etc/fonts/conf.d/ -type l -delete
-
-	readme.gentoo_print_elog
-
-	if [[ ${ROOT} = / ]]; then
-		multilib_pkg_postinst() {
-			ebegin "Creating global font cache for ${ABI}"
-			"${EPREFIX}"/usr/bin/${CHOST}-fc-cache -srf
-			eend $?
-		}
-
-		multilib_parallel_foreach_abi multilib_pkg_postinst
-	fi
-}
diff --git a/media-libs/fontconfig/fontconfig-2.12.6.ebuild b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
index 2ead8d98ff7b..f912eab68233 100644
--- a/media-libs/fontconfig/fontconfig-2.12.6.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
@@ -17,8 +17,7 @@ IUSE="doc static-libs"
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
 # default and used by every distro.  See bug #283191.
 RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.7.1[${MULTILIB_USEDEP}]
-	abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )"
+	>=media-libs/freetype-2.7.1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( =app-text/docbook-sgml-dtd-3.1*
diff --git a/media-libs/fontconfig/fontconfig-2.13.0.ebuild b/media-libs/fontconfig/fontconfig-2.13.0.ebuild
deleted file mode 100644
index 731522903e31..000000000000
--- a/media-libs/fontconfig/fontconfig-2.13.0.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal readme.gentoo-r1 versionator
-
-DESCRIPTION="A library for configuring and customizing font access"
-HOMEPAGE="http://fontconfig.org/"
-SRC_URI="http://fontconfig.org/release/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="1.0"
-[[ "$(get_version_component_range 3)" -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="doc static-libs"
-
-# Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
-# default and used by every distro.  See bug #283191.
-RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.8.1[${MULTILIB_USEDEP}]
-	sys-apps/util-linux[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( =app-text/docbook-sgml-dtd-3.1*
-		app-text/docbook-sgml-utils[jadetex] )"
-PDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig )
-	virtual/ttf-fonts"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.10.2-docbook.patch # 310157
-	"${FILESDIR}"/${PN}-2.12.3-latin-update.patch # 130466 + make liberation default
-)
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )
-
-pkg_setup() {
-	DOC_CONTENTS="Please make fontconfig configuration changes using
-	\`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be
-	overwritten. If you need to reset your configuration to upstream defaults,
-	delete the directory ${EROOT}etc/fonts/conf.d/ and re-emerge fontconfig."
-}
-
-src_prepare() {
-	default
-	export GPERF=$(type -P true)  # avoid dependency on gperf, #631980
-	sed -i -e 's/FC_GPERF_SIZE_T="unsigned int"/FC_GPERF_SIZE_T=size_t/' \
-		configure.ac || die # rest of gperf dependency fix, #631920
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local addfonts
-	# harvest some font locations, such that users can benefit from the
-	# host OS's installed fonts
-	case ${CHOST} in
-		*-darwin*)
-			addfonts=",/Library/Fonts,/System/Library/Fonts"
-		;;
-		*-solaris*)
-			[[ -d /usr/X/lib/X11/fonts/TrueType ]] && \
-				addfonts=",/usr/X/lib/X11/fonts/TrueType"
-			[[ -d /usr/X/lib/X11/fonts/Type1 ]] && \
-				addfonts="${addfonts},/usr/X/lib/X11/fonts/Type1"
-		;;
-		*-linux-gnu)
-			use prefix && [[ -d /usr/share/fonts ]] && \
-				addfonts=",/usr/share/fonts"
-		;;
-	esac
-
-	local myeconfargs=(
-		$(use_enable doc docbook)
-		$(use_enable static-libs static)
-		--enable-docs
-		--localstatedir="${EPREFIX}"/var
-		--with-default-fonts="${EPREFIX}"/usr/share/fonts
-		--with-add-fonts="${EPREFIX}/usr/local/share/fonts${addfonts}"
-		--with-templatedir="${EPREFIX}"/etc/fonts/conf.avail
-	)
-
-	ECONF_SOURCE="${S}" \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	default
-
-	# avoid calling this multiple times, bug #459210
-	if multilib_is_native_abi; then
-		# stuff installed from build-dir
-		emake -C doc DESTDIR="${D}" install-man
-
-		insinto /etc/fonts
-		doins fonts.conf
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name "*.la" -delete || die
-
-	# fc-lang directory contains language coverage datafiles
-	# which are needed to test the coverage of fonts.
-	insinto /usr/share/fc-lang
-	doins fc-lang/*.orth
-
-	dodoc doc/fontconfig-user.{txt,pdf}
-
-	if [[ -e ${ED}usr/share/doc/fontconfig/ ]];  then
-		mv "${ED}"usr/share/doc/fontconfig/* "${ED}"/usr/share/doc/${P} || die
-		rm -rf "${ED}"usr/share/doc/fontconfig
-	fi
-
-	# Changes should be made to /etc/fonts/local.conf, and as we had
-	# too much problems with broken fonts.conf we force update it ...
-	echo 'CONFIG_PROTECT_MASK="/etc/fonts/fonts.conf"' > "${T}"/37fontconfig
-	doenvd "${T}"/37fontconfig
-
-	# As of fontconfig 2.7, everything sticks their noses in here.
-	dodir /etc/sandbox.d
-	echo 'SANDBOX_PREDICT="/var/cache/fontconfig"' > "${ED}"/etc/sandbox.d/37fontconfig
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# Bug #193476
-	# /etc/fonts/conf.d/ contains symlinks to ../conf.avail/ to include various
-	# config files.  If we install as-is, we'll blow away user settings.
-	ebegin "Syncing fontconfig configuration to system"
-	if [[ -e ${EROOT}/etc/fonts/conf.d ]]; then
-		for file in "${EROOT}"/etc/fonts/conf.avail/*; do
-			f=${file##*/}
-			if [[ -L ${EROOT}/etc/fonts/conf.d/${f} ]]; then
-				[[ -f ${ED}etc/fonts/conf.avail/${f} ]] \
-					&& ln -sf ../conf.avail/"${f}" "${ED}"etc/fonts/conf.d/ &>/dev/null
-			else
-				[[ -f ${ED}etc/fonts/conf.avail/${f} ]] \
-					&& rm "${ED}"etc/fonts/conf.d/"${f}" &>/dev/null
-			fi
-		done
-	fi
-	eend $?
-}
-
-pkg_postinst() {
-	einfo "Cleaning broken symlinks in "${EROOT}"etc/fonts/conf.d/"
-	find -L "${EROOT}"etc/fonts/conf.d/ -type l -delete
-
-	readme.gentoo_print_elog
-
-	if [[ ${ROOT} = / ]]; then
-		multilib_pkg_postinst() {
-			ebegin "Creating global font cache for ${ABI}"
-			"${EPREFIX}"/usr/bin/${CHOST}-fc-cache -srf
-			eend $?
-		}
-
-		multilib_parallel_foreach_abi multilib_pkg_postinst
-	fi
-}
diff --git a/media-libs/freealut/Manifest b/media-libs/freealut/Manifest
index e60e0827774a..976f866936b0 100644
--- a/media-libs/freealut/Manifest
+++ b/media-libs/freealut/Manifest
@@ -1,3 +1,3 @@
 DIST freealut-1.1.0.tar.gz 461830 BLAKE2B e19c800e2d678dd41b9e41153e0f99d84300b3f6d0226bd81e7724515597a2641fc2203e46b193dd506a1c90e968d2d951f84afa29cf375fbf5acb72999c1305 SHA512 270f74972548b4ac6b98c52c51787ed43c20cf79979063d073bbee7bd08ac4f34c2b579fbf15c09c4e606a5ed38dcd0252f5c46fb3cfe43b727b6b53cf747933
-EBUILD freealut-1.1.0-r3.ebuild 981 BLAKE2B d02e5741d1f0c7b3a66b5c39ca7b579300c665dd2f7113b54078d6dadccbbee6e447e1b853058950b32aec0749f2a3614ce7d06e70bfc0f6775363f4e0e758d6 SHA512 09aa1558e4474ca57a04754c0519f622d74866644cff6923851d0bf393737055cf59392fe269524ff3bc47368aa3486a1a420ed8c9c2e48d837433845aa05350
+EBUILD freealut-1.1.0-r3.ebuild 864 BLAKE2B b2174c2da838909072cced65c6ac4579a5d66133ad971373ef1ded748cf95b00d753647dd50efe5388b0fc79b2e17b2fe973f850dad79827c01bc04cf6619379 SHA512 2d3203579fd3b763d79960f6b94759c31c3d9889d1946639dc7b9dcf2df45e46995d94fa140e9ada387ca762c57643cb5feb8bb4fd842aaca8bcf0771f25055e
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/freealut/freealut-1.1.0-r3.ebuild b/media-libs/freealut/freealut-1.1.0-r3.ebuild
index dd3f5d75d8e2..87113136ec0c 100644
--- a/media-libs/freealut/freealut-1.1.0-r3.ebuild
+++ b/media-libs/freealut/freealut-1.1.0-r3.ebuild
@@ -14,10 +14,6 @@ KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux
 IUSE="static-libs"
 
 RDEPEND="
-	abi_x86_32? (
-		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-		!<=app-emulation/emul-linux-x86-sdl-20140406
-	)
 	>=media-libs/openal-1.15.1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 
diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest
index b464dd9ce163..87f0c3ac2414 100644
--- a/media-libs/freeglut/Manifest
+++ b/media-libs/freeglut/Manifest
@@ -1,6 +1,6 @@
 AUX freeglut-2.4.0-bsd-usb-joystick.patch 755 BLAKE2B 858a7f7b4845e75963855cd7d6191cb57c96da017faf50a78addd75a994a53f5adca66c33e8aa2564623a469596e443a24caefb3288b2e77e768ee13e8b3d287 SHA512 7aa28f277864357e9b2bb6e7fcd801bb9dd6e131fec8989aca26990cf59b60c3465030ea5068ca01cb7f46bf406c0f3fce2327affb7f288ee3026b5717717561
 DIST freeglut-2.8.1.tar.gz 1005343 BLAKE2B d830f6d19659ba6bbe60fc9c981ae16582de8d90e05d58bcaee43133b7699a5f0b2507a777c11c5fcdb730b17c394dd6fc562d5e857024d99d4feb2130ff7cde SHA512 935fddfa197c5f0ec74c5f2005fe5a0ebfd39f4a402cc79363da7cfe2e8576263130e44bd7e4f6c07ea53d3137bd7ca8ee8db85c0a09f25508fcf1b9ed07052e
 DIST freeglut-3.0.0.tar.gz 419095 BLAKE2B 6065044fb2816ddfebd363189cdb897e00fa433d79c09f5a705b80ff730e1312158ed5db8d7a2cbfc2ddac0d0a9400300c5c245d967c33c937da11303fc316de SHA512 9c45d5b203b26a7ff92331b3e080a48e806c92fbbe7c65d9262dd18c39cd6efdad8a795a80f499a2d23df84b4909dbd7c1bab20d7dd3555d3d88782ce9dd15b0
-EBUILD freeglut-2.8.1-r1.ebuild 1237 BLAKE2B 3d1d0924b158d78943f40885f8c09ba81e91c53528bf5ca4b66d21e8368f8a57a58b2eec18dc56f745b3303b97689a816d4a8ecfe5bbf933c80ea2c78f42f337 SHA512 7b2143975958c1509dfc9e5a9328c975963f40212f9e0a79662fc4148d065311e6b8ebebf296877ad137ecbec97d00d7a4c7cdd2379e56c22a382f823cd4b8ca
-EBUILD freeglut-3.0.0.ebuild 1364 BLAKE2B 45651e9564dd028b36c8b248620f7bfa1f341f175bb604fef43630e43b78e3504ec4c55b6e901b9aa34678419ce4463bea101e4e0021a7a444c8cec84c9b7cfd SHA512 35e21f624f6488a1c45c085fecdc6875f27262c6863f7dc86a64abbc824a8bd029efc726d90665a8b9ebfa35c8fce5921b08a4f123b661729824a58d4011b306
+EBUILD freeglut-2.8.1-r1.ebuild 1167 BLAKE2B b11022395c48923b0f6505a002122d76e210c621578c9097939227e667d52517bd4efc4455f9d3b5bff174d5a51d0d1f9539e593480d98cae5b7cc9f29ba8bd3 SHA512 4ea0aeaa187330b64e2e504e6eda8ceb0d4eaef0da805dce14ce89151091e26d8e6296d5186b1b53d8c7210f263cc77864913455e90d6dd93c73ad3e8a90e28e
+EBUILD freeglut-3.0.0.ebuild 1294 BLAKE2B a860734deaa359e406efe6a2c827ea35b7cb80cb28e78e6955dce29bc36e60f0aaddb9230c4a62cf704e435bb467a3a5a6a2e8bcd7363f62e92488ff60aeff6b SHA512 86ce648bb4ef4d74cc4d88cf0131ea45d6c633e8dfb1bded5f2899213a0aef521aca910cd7afd71549cb12acb1f55e2e1cabe4575a8123ff0c83546416826b63
 MISC metadata.xml 528 BLAKE2B ee8c09e46677ec77c1d6771b31ac1b28e75464d7e0e4405c41831e19446c5a442c782dbd32a79d0fe5e7ed85ecbd2404764f2121f5f4bff5483db4571fd89212 SHA512 94dc412f8f049bb88723fdba9f9b89645eb792547a768ea524a711ad9302c5cac38a7292ab09726154fc6829a05f41af05220f91d9f6eaed056e4cff8324370e
diff --git a/media-libs/freeglut/freeglut-2.8.1-r1.ebuild b/media-libs/freeglut/freeglut-2.8.1-r1.ebuild
index be1c13cc8e30..5999aa059199 100644
--- a/media-libs/freeglut/freeglut-2.8.1-r1.ebuild
+++ b/media-libs/freeglut/freeglut-2.8.1-r1.ebuild
@@ -19,8 +19,7 @@ RDEPEND=">=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
 	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+	>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	>=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]
diff --git a/media-libs/freeglut/freeglut-3.0.0.ebuild b/media-libs/freeglut/freeglut-3.0.0.ebuild
index bec2908b1a83..e1adbfa5560e 100644
--- a/media-libs/freeglut/freeglut-3.0.0.ebuild
+++ b/media-libs/freeglut/freeglut-3.0.0.ebuild
@@ -20,8 +20,7 @@ RDEPEND=">=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
 	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+	>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]"
 # gles? ( media-libs/mesa[gles1,${MULTILIB_USEDEP}] )
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 45693709d623..fc9ecb4515eb 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -9,8 +9,8 @@ DIST freetype-doc-2.9.tar.bz2 2128135 BLAKE2B a192237e9f2cd0b14cf081ba09d58d6e42
 DIST ft2demos-2.8.1.tar.bz2 228934 BLAKE2B a8ff102ec9e526791a83bed42eb5fc289b96f030ebcdbe5bdb4508676d81074ff16120664adeaf95e9d04004e2aba5c86a2b3f5410133344d1ebaf5d4c33cb46 SHA512 f3a3216448df7b9bebb875a69587f31d0548f4b7e1b1bd70b0f06b3c4a43b3f5ca99ac2fcfecb32909b16b32a466fff24d1a6407e5fd6c2145fd64d2a156429a
 DIST ft2demos-2.8.tar.bz2 225274 BLAKE2B b8b02b8b03b84709b7d274d1c8dff323051051ceb3f77762f2fad51ec7a21d34cdbc35a6e828d1755b374d05801d11b0f9968361a34efbb6a6239769b8cd730a SHA512 dffdf6a493e8145c6513be34b57734a9a99c61f758a0e1ea691ef4284cee4c274ad7c3a8120a8ec425d86e33a70cd879d9db258e9c67b6a4db79c3243d4c9fb3
 DIST ft2demos-2.9.tar.bz2 230926 BLAKE2B 8c8e02101243468d52953aeeee7ad985a5aa3fabc82c19a3404ce301348fd32e5f89aa56798613658d5d29a8c3a6c7d4a70eae038ef6095005f8c10354b3f288 SHA512 3dfaf97619d585d6e4db20002c69f9c46cb8991c4faf86d9d92884a80001235ef01010148156cb4879d7869e6121fc27ef03c13288af011df26fe85c3fb7e6a1
-EBUILD freetype-2.8.1.ebuild 5387 BLAKE2B fb2c13fc5568f95a82f44ca99a71e2c2d6c13a97cce5dfa822bb22dac93f611d213c0ca7bafca26ac0dad4993f06a6d9209119c56a0a34621f90e1001bf8afd4 SHA512 dcb6f589a27e3dc075afdff30ff13bb4dbcc2fb9da7793b9413a2875b3a4dbaa49451f15ff1cf8e650c86e6ae7f70d13b98f6b6693c263bb277b0dc6f7593403
-EBUILD freetype-2.8.ebuild 5377 BLAKE2B 32900ee9d5b0ad59350971b1d6a2ce006d57b2fc5a29b001373ad9af5132d4c45310893abe4bad9fdce6b2a95491b93f432f2944b9f650272530c08e1bbd2194 SHA512 79882b9b244d5fbdf1c3f981a2165642e3239ca4c490cfc173da6e594f08ae6bcdf60670d801ede3610c60f40eaff7e6c900e463088572161092069450717f82
-EBUILD freetype-2.9.ebuild 5389 BLAKE2B 0a61495616ce66d0fc1bbfc096eeeb723ba4c383301fdc4eb6886f9e6a758aadb60a177ded65c53fc2bb3a9d21ef10ecae0350436cb39a83d916c8a983f8a5b7 SHA512 a7e34c1f283d6df565e0ee72afe64d2a938f7ebda3553cc50cc7d311e82098e34e0332dddb7350735e13d0e69510ecdcca4337225747f2c2098d7ad590aba314
-EBUILD freetype-9999.ebuild 6514 BLAKE2B 23d06cda3bcd659f556da00bab4926bb0c6dd9b8f13203225a5781c8245bd1021d73b31db8b385ab7560f570dcd01ebf66ae8246a01cb2edc0c086b10c61b939 SHA512 974715a2cf7f260bcedf64664416bdbbc4d1e4de017a240900b5bdf9a924b042ee16d4c77fc67bf016de6a0ef0af26f2ac526c5c7aebf769b09c3f3ece23c7f2
+EBUILD freetype-2.8.1.ebuild 5286 BLAKE2B 111b52cc01d22c50ee59f12e022026420883123aa8a83ad4aff9fc88f3e9716d98f82e66308edfef966bc5f4830d2a147539b65818e65dc7816e1f38cd1b5e20 SHA512 e983b5d145fd2357b7cfaa8887fab2a6e124657f3ffb8b7358d6957c07b248ae79dce45a816cffadb2a35f5c654ff707da6dc9a92648e254f42493278b1a0793
+EBUILD freetype-2.8.ebuild 5276 BLAKE2B ab6ab026dec672db2407ace0cb9b3037cee83b2100f3432ee1ec140754f6a204449590a07dc82789d7b53fdb1ca3834852bec506763bc7dcafd852abdbb78889 SHA512 2d38568b0d55fbbb8e54600c5c1ce75088faa47009982840ed5e287b33e3cefe110e7ea3f00e22bee30b348d40af73a30f86724d6e21364aaa9aa1c476831a68
+EBUILD freetype-2.9.ebuild 5288 BLAKE2B 439147ccd14d1fa1b022c491fbc6233fa86b1f545229b3abb85d2f186f53b26fd8098d228588c843801cb343b9fa3a615f25663a432c0c96a8f1cd4c949b25bf SHA512 47904142a2fd8c80658f18a472f6838926434297d8b39f243e6fa19e9a0f7896130d2e6e7337bb7ad8ad5b71b819b5c6de3cfff7a82d5563985c4c28e0c21b26
+EBUILD freetype-9999.ebuild 6493 BLAKE2B 1c7aac501a5527fcdfb1e02947affa657f26bcb5e5fae2d51af2dc0c82059d76c22f7e9cb198758ea7075b87ec0bc1c7db86592c082731f634f1eeaeb4e06196 SHA512 83a558d45129dec28baa26192e03c2b156a17baa60ddb857cee8973505c7ecfd4c938fa1c50b047bdb3a805d39dfd7f2b5feb427972bc9e958b768c8ba1d7fe5
 MISC metadata.xml 1363 BLAKE2B 2cadaca7ada476301e4fa15dabaf7e823a9bcf6e59fb018876e3d2ca61c528c7096cb65ac44d8311a8e9a5eada744f41db3ca2960622980a8f5438d2f003202c SHA512 a9272c439ffb4c9ca6597b2ef26e86e99830ff298940abf38fdecf5c8d794ffdb96a212c67e2e23526a0e2686deff48664da4a5af01d2977256038846e7221f8
diff --git a/media-libs/freetype/freetype-2.8.1.ebuild b/media-libs/freetype/freetype-2.8.1.ebuild
index baa5cd66018c..03294bc1c4ef 100644
--- a/media-libs/freetype/freetype-2.8.1.ebuild
+++ b/media-libs/freetype/freetype-2.8.1.ebuild
@@ -23,7 +23,7 @@ IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug doc fontforge harfbuzz
 	infinality png static-libs utils"
 RESTRICT="!bindist? ( bindist )" # bug 541408
 
-CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+RDEPEND=">=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}] )
@@ -34,10 +34,8 @@ CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 			>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
 		)
 	)"
-DEPEND="${CDEPEND}
+DEPEND="${RDEPEND}
 	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )"
 PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
 
 PATCHES=(
diff --git a/media-libs/freetype/freetype-2.8.ebuild b/media-libs/freetype/freetype-2.8.ebuild
index 20b26eccba27..4dfd2a7b4962 100644
--- a/media-libs/freetype/freetype-2.8.ebuild
+++ b/media-libs/freetype/freetype-2.8.ebuild
@@ -23,7 +23,7 @@ IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug doc fontforge harfbuzz
 	infinality png static-libs utils"
 RESTRICT="!bindist? ( bindist )" # bug 541408
 
-CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+RDEPEND=">=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}] )
@@ -34,10 +34,8 @@ CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 			>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
 		)
 	)"
-DEPEND="${CDEPEND}
+DEPEND="${RDEPEND}
 	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )"
 PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
 
 PATCHES=(
diff --git a/media-libs/freetype/freetype-2.9.ebuild b/media-libs/freetype/freetype-2.9.ebuild
index cd02458948fa..4d9867d2f4f4 100644
--- a/media-libs/freetype/freetype-2.9.ebuild
+++ b/media-libs/freetype/freetype-2.9.ebuild
@@ -23,7 +23,7 @@ IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug doc fontforge harfbuzz
 	infinality png static-libs utils"
 RESTRICT="!bindist? ( bindist )" # bug 541408
 
-CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+RDEPEND=">=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}] )
@@ -34,10 +34,8 @@ CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 			>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
 		)
 	)"
-DEPEND="${CDEPEND}
+DEPEND="${RDEPEND}
 	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )"
 PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
 
 PATCHES=(
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index 4288d7cd6397..4fa091f67693 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -30,7 +30,7 @@ LICENSE="|| ( FTL GPL-2+ )"
 SLOT="2"
 RESTRICT="!bindist? ( bindist )" # bug 541408
 
-CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+RDEPEND=">=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:0=[${MULTILIB_USEDEP}] )
@@ -41,9 +41,8 @@ CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 			>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
 		)
 	)"
-DEPEND="${CDEPEND}
+DEPEND="${RDEPEND}
 	virtual/pkgconfig"
-RDEPEND="${CDEPEND}"
 PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
 
 PATCHES=(
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index b77a5575f864..844abd1d6ba5 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -1,5 +1,5 @@
 DIST libgd-2.2.4.tar.xz 2478528 BLAKE2B bec49fd50465549d13a403e6f2d487ef83633842ff313a44f45ea9bf50c66e70186f314da5a943cc4199185b992f8178334bfb14fb039fe51cdb296e80648cdc SHA512 07903f322c4f6ab392508b0f60c38ca133699111ea92995dc6cd9379210d598bcb24a46c19657884d9e252f8663d0ee8c89c600e3a382a5ae598198c190f39b5
 DIST libgd-2.2.5.tar.xz 2594092 BLAKE2B 222a7e012fbf9924ac391ee96c7cd3dec96afd78c6d43dfb680b33e7143e7df87fe6be75bbfe8fb93e916302d7daf08271214c84da28712e93a36465566cb2bd SHA512 e4598e17a277a75e02255402182cab139cb3f2cffcd68ec05cc10bbeaf6bc7aa39162c3445cd4a7efc1a26b72b9152bbedb187351e3ed099ea51767319997a6b
 EBUILD gd-2.2.4.ebuild 2072 BLAKE2B 1acf2722c761a805ce0fa14a6301d04c7fb00bc4cfd2e9b21d8b92d7521154382cfcd56c7a0be3daadfe8420f38457038228bd88a8b4fba257eba720d5a6bd11 SHA512 016b8b4c88a5f50b931e903b1dab5f029da8892269eb3e2e16623936c0764b0ae0360a73b6ddc0cec5ed2587784bdf621e54a2d830a4efa866b14d551623fa54
-EBUILD gd-2.2.5.ebuild 2040 BLAKE2B b7255feaa54283f177be21e00a94bba8000ef597c606144fdace3b08df649f7dbc9560a313bf17aca1f11cc937e6966d0969a9fd3e421829c7c90fd7813c2542 SHA512 db7f002aed5ecfae3cbe0197c2d197de3eb840cfacae5d1c575f2c9093374e6621e625bcf1c5a79010e4cf36df8e40cbae7d6b44d84841c6d5f3fd523ce7df29
+EBUILD gd-2.2.5.ebuild 2039 BLAKE2B 0911449ea28fbde0fab2922c00f2d3a261a9e6e4d85bb9c1663c7a73465c89d3e025387aed73768f3c698b4015577c4777e9cde18ff325c5a0421e9dcc066f13 SHA512 7cf184be25b5cacea9d61162d12d1c38a309593ab525cf735fbaebb366ff6302b583eb46aed1944d5fc300dc03c8246e919023596d366519f081c114c3ef501c
 MISC metadata.xml 1507 BLAKE2B 34dbcbc70165ebe74ea14e6394e2691bda7523e4c848b13a512de8f0707c194a7da3de41a8fe483d7a8b2aa1af8f0d164ea210605ae76480dbf22b976b53d2f5 SHA512 0ac3c1ca25c190333e7f97dbb05e197e62e76abeaa045966fa3024dbeb22d541d78794df08d450e887591909a25dfb6a4fef861ed62f7f055b129e17b1329919
diff --git a/media-libs/gd/gd-2.2.5.ebuild b/media-libs/gd/gd-2.2.5.ebuild
index 89c3ac20a857..998ab0713c39 100644
--- a/media-libs/gd/gd-2.2.5.ebuild
+++ b/media-libs/gd/gd-2.2.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz"
 
 LICENSE="gd IJG HPND BSD"
 SLOT="2/3"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="fontconfig jpeg png static-libs tiff truetype webp xpm zlib"
 
 # fontconfig has prefixed font paths, details see bug #518970
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index e8745207896c..6325593cdd08 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -10,23 +10,25 @@ AUX gegl-0.2.0-underlinking.patch 1638 BLAKE2B c8118a47b9d83d9737a2ec1deb25d23b9
 AUX gegl-0.3.12-failing-tests.patch 888 BLAKE2B 548933991347ac397b98ac044d5524d0ae8e5307d52e8b48eb0168d30eda8b73350cec57bc5233abde708184c152ee94ec5c2b3213161ffff93b2a6494a2d36f SHA512 a7b8f58ff9057e086412ec5b12694ffc4e30e2a7b3a8bfa72ef34bc230d0d91c80aa45de94f8e48496844c96e257cee6d3791db0e520abc7cbcc2691d1a5ce84
 DIST gegl-0.2.0.tar.bz2 7502040 BLAKE2B 29b33bf6aa878b74461e929a96570fca9a56e52931ee66356ca9c3c4cec7cdc0668330aa25756d0baf531d0b90c4830c1f244e8327b238a63d68cb74d486e961 SHA512 16ef3f6852fd8efef2b6468a754342a2d003f2c2bef468d9465a448e6c89dedb8e791570f073a9faed05218a7c94c6c418eaa0f3abeadfb3e6b88d766ab792c8
 DIST gegl-0.3.0.tar.bz2 5463571 BLAKE2B 7ac52fb22bab3b84068e10610d8681a5bcf56f6cdf39dae4374d2749823f3a1af62995382a1247427dde1921e0b11304adb800a2157ca6e7e773fdd97fee47f5 SHA512 ff758df4689b0fa8f5e16ebcea32a7fe77bccfef70efc20d10669ce5139a70ec3533e78227fd4798812b31ac1ca5081b9d1d701a7449bf75356f879ece5fadd6
-DIST gegl-0.3.20.tar.bz2 5816967 BLAKE2B 4d1dea5b479dc56599d884c43dd8042f6c1c836fe3b5acdadc9b1a909ab4c4be549322767293cfbc065a5f9386b22a579c9c9d78fbad58a4eb6771eccf3a3b45 SHA512 9067467e3d4bbfe00594a8459c9ea15047c1331764dd3aa2331da7d842a77c98894e3a0e19a7c0b1cb59189ffe03561e9bd12f92bdb8fdf1799afc6a575962f7
+DIST gegl-0.3.20.tar.bz2 5816967 BLAKE2B dceb6fab65e121e7d01f89e8ca44ed057590fe07892cf1a5a498d8b83fdb3eb9bded512942a3fb13363adbfa3a2f1c1620351e322901bee4d886d854e67b2984 SHA512 d49142972b3b685b46f451f6ec5fb85b40023e82b0016c8309dc0b35cea66489b9f43740e8c8bb31fa76530c8f655028d36e8b3dc7273c8816d5f007fa546057
 DIST gegl-0.3.24.tar.bz2 6519831 BLAKE2B b6f9375de34b17270b92b7aeb0199f9c842813bc74175845ee8e8de8b48bc4d81d973282a1e398a39432c73c485cfb158b368989ecb40361f61f22620d53659a SHA512 c84950a4d2fddcb0fdcce77030841f862b1eeda72b31f115fb3604a52553414873923a321c48ed11a135113f40d026cf65425742663f23af79bfca2392eba9c5
 DIST gegl-0.3.26.tar.bz2 6530788 BLAKE2B 1cd1a61737ec94cb30fdf16ca8dcb5667ebaa481d0e234f89b7e8bd9b05b3e515454bf768a66e64c88f61a57c83d51eecad9aab4450502dd3e02ce4f012df7a5 SHA512 1fafd6bb70b539bd31c052d2acfcb332fac92caf2a67e07a8c827db31b877aa373a184475952b6fc4dae455dcceccfd3943d782e9fe50f166323f698faf60957
 DIST gegl-0.3.28.tar.bz2 6530569 BLAKE2B ac802c312a0fa44bec8ec4c41454fc9aabebdb1d968a8f532be7dfcff58480f778e3d21cb6557c221e1206860818618fcfe06f2bb25bfb2e08a76f013ea4f256 SHA512 a515108ea4a65fa1ecc60ed18cd288a85877a5b69e573b8c3de04a2c11a3b2b50cdb5897df3f28c84842e6bd553adbd81053502a1ac8ed1d356332a56c58ce1b
 DIST gegl-0.3.30.tar.bz2 6675564 BLAKE2B 177db85f8225f9cbb04774d270e0d71db598099be814157ad46ca7a9ceee2d60efde2e02ec2f81ef5c8bcc14e06c5d1d03718f6cc0005c576aa47a1f233a07c2 SHA512 4506eed9980e2a455b43b643d50b3a89d12b605ee4584fc7dd5c63be60acae64eda88f580ecb82891a4b0d69af10730a0d1525de7cc468afccdf2cf78f85b2eb
+DIST gegl-0.3.34.tar.bz2 6707964 BLAKE2B 4424a2c218067bd0a77d79c2334528da393350db3062019f3889b8cdb8d222f6e436ccfc845b61fdf425a1634698a7a6963702a29bb1666f515b1395c50dc99f SHA512 a7a394dcce4137d5224163ca324f1585e64d1cc797e77d452ba444afe2bff39aa2e2d5d040d07b394697b75162bc310bc51490a5af80240b26aac14b6e7abe02
 DIST gegl-0.3.8.tar.bz2 5876259 BLAKE2B 24199148ffbef6454ea460d126c29f1cc8581e5430bc3e341a8ab48fff701a0d63c4cf8864d04219455feaeb7e03808e8de06cc8ae0a500eb4154f2ec9ba25fe SHA512 13207e7ab4723be1e31bdba5e30e5725e93c1adc61bad1413502128730391dbe7eb35419d243c8d0a1d8794341a58188790adacbb10d2a8e68db861c18d21bfb
 EBUILD gegl-0.2.0-r2.ebuild 4787 BLAKE2B 0ff214b8275e0cfb2c7cfe1aa5b9b8d663006cf858e3ba856a2b057c7268f15888082f3fe8363a47655435bce6583b9e701a1729dbc25ff617410c5d1f26e1e2 SHA512 7f0f22ae44c2a3529e22f9ffd09bfdd047486c8241c0a051997a8e2f674014d64a25fa763744a9092551fcda9721a92e430fb470ef364209de628368f6cecd83
-EBUILD gegl-0.2.0-r4.ebuild 4938 BLAKE2B 02651ef3a8c02bf2ab5e60d57890c0e8eb552817991e5a9be36341623dce836a5f8d85a736042624db3205a93ebf68a8559a4374e033cffddd968d81b28a9617 SHA512 e84ca9a32cb7e2c55537e9a094ea7eff0e714a8399b0b3d3d55ff5c29692a7bf82ed4fc07ba33e00432fbc2e1601f4b991b397f8283311f04ea8638636548eb8
-EBUILD gegl-0.2.0-r5.ebuild 5049 BLAKE2B 867da1d3b4cb0511bb7c03246d8aead3cd9099c707bf87220d7fd6d245780cf2978e7e6629ede8fb419a68146076695dc1825ba2396a68e02fa15bcbff4d751f SHA512 84e07dd2b5161ca4b24b5058abaac7979ae49898b2012a4f6a9a1cbac0272097f420073a3ac359db5083a63788a3b8fc6e76411e72a01369380e93bc5133c6cb
+EBUILD gegl-0.2.0-r4.ebuild 4890 BLAKE2B be5910d450489b3e83d88b578cc79b7bb091bd11afe44bfe38267b74ef93320332a2e360965a4d856cb7305bc68afb4553904ecbc6461f1b7c3d7b379890fa5a SHA512 f21c8c77daf4dbb6315fe45d69b98dc75c0c678fdca7ff46c1e5f6ec4fc594ff4ae1040738175e8207d0c9948718a60dd6b9db46870b5f2391b9976deb0f71e5
+EBUILD gegl-0.2.0-r5.ebuild 4995 BLAKE2B 20da1cb203ef3ede096fb3a945bf563278dceb0192dae4870556d593e8e00ed02e8d146a0a5c10943376b9e00f7737d1ff465388bb536fd6076ca4be52dfc9c1 SHA512 54409f06ece1431191c2c6ecb77d8d536e8d87e78da3324e201796efa0f6dcd24ce7e0f4288f5ed419559ede5d2f8a35f4cb84b7f3bdbea36c59ca67d5e0d215
 EBUILD gegl-0.3.0-r1.ebuild 5379 BLAKE2B 5bf00dfd8c77e110bd708267604b187d1997046fe9f70a1590caaee8e98e09086480136ebb3ab1bd901489585ade5222e661acbca12139d86a3355529bc73cc2 SHA512 c0dc2b5848b79c1eebcf067f37baddc0f4f7bdbe3b10ec4a97981e5392b4200fb2d5f4a3cb6b347fe881113f3e6ce3b0cd7198b61bc3c5a5ff1789d43d064efb
 EBUILD gegl-0.3.0.ebuild 5297 BLAKE2B 6f6ebfcee8dc76a7d9b5b9e7cf22b4f3e8ebee1cf2f2683d6960d6632ff7ed21b60dc9a92b6052c2cd89f2ebfa0d979aeee9d432c35ba532afa6825694d2b571 SHA512 17b071d9f98be37c8bb33cf5de11a64dd0d6a13bcf067172c6517b25b8ae633f94c3d5f116c68dec36c6e1340ad5a777cb3da21243b5eb59a2c9ed70b5a88c06
-EBUILD gegl-0.3.20.ebuild 5189 BLAKE2B 5b0a80a0f3ce5a202275eceb7362449dc546f8dc14c502c385151bdf124088e527c7a3220dc7b925988d16daa3ae2698180d9c3475cde09f8fc8de2a399d714e SHA512 32bec067a123ddac0780abac33cf78f9713e9dc9a8a614da43d4d32a8616fef90f83113a3f1090e81ce553a607fe7cfa88207fde27b56f583b8dc950448bc1b0
-EBUILD gegl-0.3.24.ebuild 5234 BLAKE2B 6b8993fb540777446151d6e2c97adaa9b2835dd4c202d8ea22e4762ff41d528b644d6fb6cffb789f6d1fcbc823317b42549e3610bc326ea7d54427f1c07f5f20 SHA512 fbe0d19a04a6ac627e6cc9d7c68962f46b8f98a5ea19ef41f4a49d34d03c59bc0ede2c94e9ac124315d3f48959e7b478afd4285d182c128102b265bb2aed8460
-EBUILD gegl-0.3.26.ebuild 5228 BLAKE2B 9dac0b022aee1a76cc5fbaed866a63f7b80fe997a0f9a8fb5c16d2074acf3f67cbd1406a76c14fd2a9d823ed40d114e7ec02bba4664f24b8e15566ec23a9e888 SHA512 d151ad57e962e5db68f964c17d838d38102532360e5ad5442026e94e8ac34f04bd520817bd321e8a357a55c3ddbf697e5d095dc7c10aed1e83a654b1754a4081
-EBUILD gegl-0.3.28.ebuild 5234 BLAKE2B e28749d83e522aeb521c67f94cb1bc42dcff3c0c2a9d0297635443cc6e1558f7d89f2cc03a8ce23b62f7b90cc58e5ade73a2bfa54578b3998b48efb4f4af87fa SHA512 08d25f2872c3e5672dfcb621d3d07900134164f86103ee54c8d824326db1ad1bc454f9f6ae8d7eef3affcf386b7d573bf4586f0635bab6e4bc9ca089b45d9314
-EBUILD gegl-0.3.30.ebuild 5234 BLAKE2B 1d7937f2791fb0ae1379cfe93aecda7cb9ad2cc61371fad81d127521dd9aafedc3cbfdaf8efa58acb199e1de66caff9b0a1dbc5b3d8f775a0146432127a4f96b SHA512 f6a0869bc2528d5327d8f6203137ce0140ee7d33e2bbfb8b7c42ab462e31e4fc838e274ef6110c9ce4ec40fbfdfbe485157569cde8f007c33a35bca1ef6beba6
+EBUILD gegl-0.3.20.ebuild 5194 BLAKE2B 88e5e24c14cc51c816a404b7318db36251935d208f717a0b740bb749cd4fb6d0182dcd77f5168b41a307b9c39e3829b1558c56e635bc14dc9e74d61bc5958ef2 SHA512 7fb5b122ee1d641b195ab404af094987bdb5f1d5606bbc2d4ec9628eff57effae4c5820927723bc2ab5dfbb60069c926b79348e3c46998a3df83ada4d501ee1f
+EBUILD gegl-0.3.24.ebuild 5239 BLAKE2B c0eea83e35236fbefbc5ac4973a2802a5d1638a6e2ec8f56e248a7c6c0c8d5c98b1d02f79dd502d7174f1846e181b13ce793ae73f0359c39a3e5423b04d2b3e3 SHA512 f244159bb57ed4ce1e8104b57efe8a569e69f7c704e92bf0074fc222a22787612dde2c8718f4d843d429f80510ecc47b7870fd758c97184430ccdc842c951ca5
+EBUILD gegl-0.3.26.ebuild 5233 BLAKE2B 75a2a7992767c1d4c21603b18155d2f1612b93d5c5e97a71ad805fce20db32e2669dafde41c2a39a969227a574f576c6b724e3bb7a4edd49384104dc6104a960 SHA512 de35606c5f30e3f1ea6a9e6dd7dd96cb55e3ce9a83eced15c1ba8866a7f6ab6ee489b5413dc50a659e7459d0cd3ba6d8e06da7ce2ea165c4863afcd36e228c2a
+EBUILD gegl-0.3.28.ebuild 5239 BLAKE2B f8fb97390c5b35d87be213add1ad80ccd274dc8cb6acfd98c9ee51def29ef94986b24499a520f1e489b459ccb5bc44d5e7950e0af98940adaaa5b348364dfdca SHA512 9750369edcc711f799890881c1a08e574c5c8ad4df92f447c90fbbee88a2aebfb8d78fe9d87d04a916c2387d0d29347eb68b6e7f4ce660609b12e2a5ec2d8784
+EBUILD gegl-0.3.30.ebuild 5239 BLAKE2B 3a5ae4a26db21d974fb17b9697ec0b114d63ac3a6d25623c14a7360d2804613f7b9d139916e0defbc9e2403a4215a53f49c80b757bc862e4e0f9d86c4235012d SHA512 40cb4123594f2ecef227c72324332f76b267d8b9ed2c57fb121cfb1538ad79c38b776c977a7720c2cfdd182575f2b75a7f6aaffb7fdd771f5182915a3f2f4339
+EBUILD gegl-0.3.34.ebuild 5239 BLAKE2B 5ac20b0e841256591bb38f6b4a2e03f3f37525b4c716e5a14f1315d03a66484732c13bac74f1731f4c2d46bdd99536c4b55d779e1535de18303c14ac4eaaf6c6 SHA512 5422d262f5da7f66b5bea47cd3f32a7bcee63c89cf67a5cbc05da070f03648564e542a4352fd8f30a2fdda95c29353ea1bd322a15542679aa795b7de0959983c
 EBUILD gegl-0.3.8-r1.ebuild 5299 BLAKE2B 413dfe970b595bef38e51dd2e749b10b014952ff00d609587c23f61135864e4640e2ccefc7d2faba02cfa8769c00d46cdd48bf5b9197ff79be89a6f34d86fbe9 SHA512 9a53f0b3633c4374c696a6be3d69226ae6e2116eb5d7f3c1a5362353e840e6507aa189aeae89c178b2b8ba896fdbfb1a929d3e478060a0fd906e27db65a48501
-EBUILD gegl-0.3.8.ebuild 5219 BLAKE2B bdb69e806b1baa77fa605cd96f1805e93eefb066930a529e10baa5991456939bd398265cc2a96419f18a1901d526c3cf273193b8a5f3c1f513c17227118476f9 SHA512 5ad6972332c41cd232a868c930588240077663a4ec8cbd0f19a05852509c284a95b7fa78b6ccd5fa132b137ebeb6247ad7314ed87c617e804238a7b58ea81f2a
+EBUILD gegl-0.3.8.ebuild 5216 BLAKE2B eb91252d7d87e0102817b756d8b16c7839ba68ac9b104d2d683e1a59c24d1a183520f0d40ee62767aa0601dc2d636eae37a20a0075ffcc809ea9e2732d96be12 SHA512 a6407382b1cfe1b27922f0b77887353e5649d3203caea9a04bf685b0be66d5a4cba8fb582fc8d62555bec9ff583f6d4067983ff6ead816d27105370382094f30
 EBUILD gegl-9999.ebuild 4921 BLAKE2B c5e2f1513eb418db2b725759bee29b5c97cd3be89b020d7b86eac4edf56b295d93b3dfbc8b7d2766411b3dcd4fb3c618ed44e9ed5a27ed38b844e530465b6acf SHA512 c6acfcfa7e2c50aa64b1ad31dda9c52d530a886e4ef477f06c56d32eab809215bc018ccf0180175abd81745b4432b8f9563e51ec6e1df72cf0a6125c95635478
 MISC metadata.xml 472 BLAKE2B e5dbc6beb699846057be74ff6c05e1273bdc2f19910be0ff73c1397b48173526e0c6eda649e7178a9858aaf055628df0285792107cfd49bf5ba4dc9c56f8c835 SHA512 3d4b87f67a5665c0520996c36297afbbbaa1410bfbe244db215286b044a57c030b2a24d4dd9370fba6a7bd148a71b0bf8e2ff85c49ca321441da831ce47b9faf
diff --git a/media-libs/gegl/gegl-0.2.0-r4.ebuild b/media-libs/gegl/gegl-0.2.0-r4.ebuild
index ddb70a4e401d..2268786841ab 100644
--- a/media-libs/gegl/gegl-0.2.0-r4.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r4.ebuild
@@ -54,15 +54,26 @@ DEPEND="${RDEPEND}
 
 DOCS=( ChangeLog INSTALL README NEWS )
 
-src_prepare() {
+PATCHES=(
 	# https://bugs.gentoo.org/show_bug.cgi?id=442016
-	epatch "${FILESDIR}/${P}-cve-2012-4433-1e92e523.patch"
-	epatch "${FILESDIR}/${P}-cve-2012-4433-4757cdf7.patch"
+	"${FILESDIR}/${P}-cve-2012-4433-1e92e523.patch"
+	"${FILESDIR}/${P}-cve-2012-4433-4757cdf7.patch"
 
 	# https://bugs.gentoo.org/show_bug.cgi?id=416587
-	epatch "${FILESDIR}/${P}-introspection-version.patch"
+	"${FILESDIR}/${P}-introspection-version.patch"
+
+	"${FILESDIR}/${P}-ffmpeg-0.11.diff"
+	"${FILESDIR}"/${P}-g_log_domain.patch
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=605216
+	# https://bugs.gentoo.org/show_bug.cgi?id=617430
+	"${FILESDIR}"/${P}-underlinking.patch
+	"${FILESDIR}"/${P}-libopenraw-0.1.patch  # bug 639834
+	"${FILESDIR}"/${P}-fix-without-exiv2.patch  # bug 641872
+)
 
-	epatch "${FILESDIR}/${P}-ffmpeg-0.11.diff"
+src_prepare() {
+	default
 	# fix OSX loadable module filename extension
 	sed -i -e 's/\.dylib/.bundle/' configure.ac || die
 	# don't require Apple's OpenCL on versions of OSX that don't have it
@@ -70,15 +81,6 @@ src_prepare() {
 		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
 	fi
 
-	epatch "${FILESDIR}"/${P}-g_log_domain.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=605216
-	# https://bugs.gentoo.org/show_bug.cgi?id=617430
-	epatch "${FILESDIR}"/${P}-underlinking.patch
-	epatch "${FILESDIR}"/${P}-libopenraw-0.1.patch  # bug 639834
-	epatch "${FILESDIR}"/${P}-fix-without-exiv2.patch  # bug 641872
-
-	eapply_user
 	eautoreconf
 
 	# https://bugs.gentoo.org/show_bug.cgi?id=468248
diff --git a/media-libs/gegl/gegl-0.2.0-r5.ebuild b/media-libs/gegl/gegl-0.2.0-r5.ebuild
index 717ad1841b63..cd6b1554809a 100644
--- a/media-libs/gegl/gegl-0.2.0-r5.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r5.ebuild
@@ -54,18 +54,30 @@ DEPEND="${RDEPEND}
 
 DOCS=( ChangeLog INSTALL README NEWS )
 
-src_prepare() {
+PATCHES=(
 	# https://bugs.gentoo.org/show_bug.cgi?id=636780
-	epatch "${FILESDIR}/${P}-ffmpeg-av_frame_alloc.patch"
+	"${FILESDIR}/${P}-ffmpeg-av_frame_alloc.patch"
 
 	# https://bugs.gentoo.org/show_bug.cgi?id=442016
-	epatch "${FILESDIR}/${P}-cve-2012-4433-1e92e523.patch"
-	epatch "${FILESDIR}/${P}-cve-2012-4433-4757cdf7.patch"
+	"${FILESDIR}/${P}-cve-2012-4433-1e92e523.patch"
+	"${FILESDIR}/${P}-cve-2012-4433-4757cdf7.patch"
 
 	# https://bugs.gentoo.org/show_bug.cgi?id=416587
-	epatch "${FILESDIR}/${P}-introspection-version.patch"
+	"${FILESDIR}/${P}-introspection-version.patch"
+
+	"${FILESDIR}/${P}-ffmpeg-0.11.diff"
+	"${FILESDIR}"/${P}-g_log_domain.patch
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=605216
+	# https://bugs.gentoo.org/show_bug.cgi?id=617430
+	"${FILESDIR}"/${P}-underlinking.patch
+	"${FILESDIR}"/${P}-libopenraw-0.1.patch  # bug 639834
+	"${FILESDIR}"/${P}-fix-without-exiv2.patch  # bug 641872
+
+)
 
-	epatch "${FILESDIR}/${P}-ffmpeg-0.11.diff"
+src_prepare() {
+	default
 	# fix OSX loadable module filename extension
 	sed -i -e 's/\.dylib/.bundle/' configure.ac || die
 	# don't require Apple's OpenCL on versions of OSX that don't have it
@@ -73,15 +85,6 @@ src_prepare() {
 		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
 	fi
 
-	epatch "${FILESDIR}"/${P}-g_log_domain.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=605216
-	# https://bugs.gentoo.org/show_bug.cgi?id=617430
-	epatch "${FILESDIR}"/${P}-underlinking.patch
-	epatch "${FILESDIR}"/${P}-libopenraw-0.1.patch  # bug 639834
-	epatch "${FILESDIR}"/${P}-fix-without-exiv2.patch  # bug 641872
-
-	eapply_user
 	eautoreconf
 
 	# https://bugs.gentoo.org/show_bug.cgi?id=468248
diff --git a/media-libs/gegl/gegl-0.3.20.ebuild b/media-libs/gegl/gegl-0.3.20.ebuild
index 6afa0cc4600d..ca8af3a92928 100644
--- a/media-libs/gegl/gegl-0.3.20.ebuild
+++ b/media-libs/gegl/gegl-0.3.20.ebuild
@@ -75,6 +75,10 @@ pkg_setup() {
 	use test && use introspection && python-any-r1_pkg_setup
 }
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
+)
+
 src_prepare() {
 	default
 
@@ -91,8 +95,6 @@ src_prepare() {
 		-e '/composite-transform.xml/d' \
 		-i tests/compositions/Makefile.am || die
 
-	epatch "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
-
 	eautoreconf
 
 	gnome2_environment_reset
diff --git a/media-libs/gegl/gegl-0.3.24.ebuild b/media-libs/gegl/gegl-0.3.24.ebuild
index 4dc1c3610076..725be5c3b377 100644
--- a/media-libs/gegl/gegl-0.3.24.ebuild
+++ b/media-libs/gegl/gegl-0.3.24.ebuild
@@ -75,6 +75,10 @@ pkg_setup() {
 	use test && use introspection && python-any-r1_pkg_setup
 }
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
+)
+
 src_prepare() {
 	default
 
@@ -91,8 +95,6 @@ src_prepare() {
 		-e '/composite-transform.xml/d' \
 		-i tests/compositions/Makefile.am || die
 
-	epatch "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
-
 	eautoreconf
 
 	gnome2_environment_reset
diff --git a/media-libs/gegl/gegl-0.3.26.ebuild b/media-libs/gegl/gegl-0.3.26.ebuild
index 7aa01eab364d..aaf6fcd179ba 100644
--- a/media-libs/gegl/gegl-0.3.26.ebuild
+++ b/media-libs/gegl/gegl-0.3.26.ebuild
@@ -75,6 +75,10 @@ pkg_setup() {
 	use test && use introspection && python-any-r1_pkg_setup
 }
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
+)
+
 src_prepare() {
 	default
 
@@ -91,8 +95,6 @@ src_prepare() {
 		-e '/composite-transform.xml/d' \
 		-i tests/compositions/Makefile.am || die
 
-	epatch "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
-
 	eautoreconf
 
 	gnome2_environment_reset
diff --git a/media-libs/gegl/gegl-0.3.28.ebuild b/media-libs/gegl/gegl-0.3.28.ebuild
index 863f2e51ff1d..7ca15acd39e0 100644
--- a/media-libs/gegl/gegl-0.3.28.ebuild
+++ b/media-libs/gegl/gegl-0.3.28.ebuild
@@ -75,6 +75,10 @@ pkg_setup() {
 	use test && use introspection && python-any-r1_pkg_setup
 }
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
+)
+
 src_prepare() {
 	default
 
@@ -91,8 +95,6 @@ src_prepare() {
 		-e '/composite-transform.xml/d' \
 		-i tests/compositions/Makefile.am || die
 
-	epatch "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
-
 	eautoreconf
 
 	gnome2_environment_reset
diff --git a/media-libs/gegl/gegl-0.3.30.ebuild b/media-libs/gegl/gegl-0.3.30.ebuild
index 7ea4b3acef94..6ca6a617b173 100644
--- a/media-libs/gegl/gegl-0.3.30.ebuild
+++ b/media-libs/gegl/gegl-0.3.30.ebuild
@@ -75,6 +75,10 @@ pkg_setup() {
 	use test && use introspection && python-any-r1_pkg_setup
 }
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
+)
+
 src_prepare() {
 	default
 
@@ -91,8 +95,6 @@ src_prepare() {
 		-e '/composite-transform.xml/d' \
 		-i tests/compositions/Makefile.am || die
 
-	epatch "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
-
 	eautoreconf
 
 	gnome2_environment_reset
diff --git a/media-libs/gegl/gegl-0.3.34.ebuild b/media-libs/gegl/gegl-0.3.34.ebuild
new file mode 100644
index 000000000000..075874901a6d
--- /dev/null
+++ b/media-libs/gegl/gegl-0.3.34.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+# vala and introspection support is broken, bug #468208
+VALA_USE_DEPEND=vapigen
+
+inherit versionator gnome2-utils eutils autotools python-any-r1 vala
+
+if [[ ${PV} == *9999* ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="git://git.gnome.org/gegl"
+	SRC_URI=""
+else
+	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A graph based image processing framework"
+HOMEPAGE="http://www.gegl.org/"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+SLOT="0.3"
+
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp"
+REQUIRED_USE="
+	svg? ( cairo )
+	vala? ( introspection )
+"
+
+# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
+#       so there is no chance to support libav right now (Gentoo bug #567638)
+#       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	dev-libs/json-glib
+	>=media-libs/babl-0.1.46
+	sys-libs/zlib
+	>=x11-libs/gdk-pixbuf-2.32:2
+	x11-libs/pango
+
+	cairo? ( >=x11-libs/cairo-1.12.2 )
+	ffmpeg? (
+		>=media-video/ffmpeg-2.8:0=
+	)
+	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+	virtual/jpeg:0=
+	jpeg2k? ( >=media-libs/jasper-1.900.1:= )
+	lcms? ( >=media-libs/lcms-2.8:2 )
+	lensfun? ( >=media-libs/lensfun-0.2.5 )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
+	>=media-libs/libpng-1.6.0:0=
+	raw? ( >=media-libs/libraw-0.15.4:0= )
+	sdl? ( >=media-libs/libsdl-1.2.0 )
+	svg? ( >=gnome-base/librsvg-2.40.6:2 )
+	tiff? ( >=media-libs/tiff-4:0 )
+	umfpack? ( sci-libs/umfpack )
+	v4l? ( >=media-libs/libv4l-1.0.1 )
+	webp? ( >=media-libs/libwebp-0.5.0:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1
+	>=sys-devel/gettext-0.19.8
+	dev-lang/perl
+	virtual/pkgconfig
+	>=sys-devel/libtool-2.2
+	test? ( introspection? (
+		$(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]') ) )
+	vala? ( $(vala_depend) )
+"
+
+pkg_setup() {
+	use test && use introspection && python-any-r1_pkg_setup
+}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
+)
+
+src_prepare() {
+	default
+
+	# FIXME: the following should be proper patch sent to upstream
+	# fix OSX loadable module filename extension
+	sed -i -e 's/\.dylib/.bundle/' configure.ac || die
+	# don't require Apple's OpenCL on versions of OSX that don't have it
+	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
+		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
+	fi
+
+	# commit 7c78497b : tests that use gegl.png are broken on non-amd64
+	sed -e '/clones.xml/d' \
+		-e '/composite-transform.xml/d' \
+		-i tests/compositions/Makefile.am || die
+
+	eautoreconf
+
+	gnome2_environment_reset
+
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	# never enable altering of CFLAGS via profile option
+	# libspiro: not in portage main tree
+	# disable documentation as the generating is bit automagic
+	#    if anyone wants to work on it just create bug with patch
+
+	# Also please note that:
+	#
+	#  - Some auto-detections are not patched away since the docs are
+	#    not built (--disable-docs, lack of --enable-gtk-doc) and these
+	#    tools affect re-generation of docs, only
+	#    (e.g. ruby, asciidoc, dot (of graphviz), enscript)
+	#
+	#  - Parameter --with-exiv2 compiles a noinst-app only, no use
+	#
+	#  - Parameter --disable-workshop disables any use of Lua, effectivly
+	#
+	#  - v4l support does not work with our media-libs/libv4l-0.8.9,
+	#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
+	#
+	#  - There are two checks for dot, one controllable by --with(out)-graphviz
+	#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
+	#
+	#  - mrg is not in tree and gexiv2 support only has effect when mrg support
+	#    is enabled
+	#
+	# So that's why USE="exif graphviz lua v4l" got resolved.  More at:
+	# https://bugs.gentoo.org/show_bug.cgi?id=451136
+	#
+	econf \
+		--disable-docs \
+		--disable-profile \
+		--disable-silent-rules \
+		--disable-workshop \
+		--program-suffix=-${SLOT} \
+		--with-gdk-pixbuf \
+		--with-pango \
+		--without-libspiro \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable debug) \
+		$(use_with cairo) \
+		$(use_with cairo pangocairo) \
+		--without-exiv2 \
+		$(use_with ffmpeg libavformat) \
+		--without-gexiv2 \
+		--without-graphviz \
+		$(use_with jpeg2k jasper) \
+		$(use_with lcms) \
+		$(use_with lensfun) \
+		--without-lua \
+		--without-mrg \
+		$(use_with openexr) \
+		$(use_with raw libraw) \
+		$(use_with sdl) \
+		$(use_with svg librsvg) \
+		$(use_with tiff libtiff) \
+		$(use_with umfpack) \
+		$(use_with v4l libv4l) \
+		$(use_with v4l libv4l2) \
+		$(use_enable introspection) \
+		$(use_with vala) \
+		$(use_with webp)
+}
+
+src_compile() {
+	default
+
+	[[ ${PV} == *9999* ]] && emake ./ChangeLog  # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped."
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/media-libs/gegl/gegl-0.3.8.ebuild b/media-libs/gegl/gegl-0.3.8.ebuild
index 92e02f5f4eb8..519fc7305637 100644
--- a/media-libs/gegl/gegl-0.3.8.ebuild
+++ b/media-libs/gegl/gegl-0.3.8.ebuild
@@ -75,6 +75,11 @@ pkg_setup() {
 	use test && use introspection && python-any-r1_pkg_setup
 }
 
+PATCHES=(
+	#"${FILESDIR}"/${P}-g_log_domain.patch
+	"${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
+)
+
 src_prepare() {
 	default
 
@@ -86,15 +91,11 @@ src_prepare() {
 		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
 	fi
 
-	#epatch "${FILESDIR}"/${P}-g_log_domain.patch
-
 	# commit 7c78497b : tests that use gegl.png are broken on non-amd64
 	sed -e '/clones.xml/d' \
 		-e '/composite-transform.xml/d' \
 		-i tests/compositions/Makefile.am || die
 
-	epatch "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
-
 	eautoreconf
 
 	gnome2_environment_reset
diff --git a/media-libs/giblib/Manifest b/media-libs/giblib/Manifest
index 61150a6afc12..6d9b1ab4f71e 100644
--- a/media-libs/giblib/Manifest
+++ b/media-libs/giblib/Manifest
@@ -1,4 +1,4 @@
 DIST giblib-1.2.4.tar.gz 287653 BLAKE2B 0b936fe3b56b933a5038751428ec56a872911d3c4ae972e9670cb1ce2496de6a8e21cb4718e7bab4eb1d547eb67ca71b25d77405ff04ebcb1ca0dc03fafea7ef SHA512 4866df223e6d219a5c9a327874bcd67260c83fba8f99862222df41ef86fb31efa0172a777bf46c853ca380dc2a64bbd41bf4fd658fcb84a924cab4e0f525dcfd
-EBUILD giblib-1.2.4-r1.ebuild 897 BLAKE2B 391740d19ac3f18e6f5c3ce062878ef39cf8818ea0feaa0565d585c65c688239ce932fd2ddd460842b86cac2442e4e704c7900996fa0c0f3ad9e91c0e1967017 SHA512 5f9ffddaf2b50c688db11075f43f9a71596e31fb02b23dd4a42a684bf06838a278d4cae339e04996a67d745e19ff98edf3fdfa99259be977eaa51c2fe66fc84e
+EBUILD giblib-1.2.4-r1.ebuild 895 BLAKE2B ae292f6ea1c0688a20d4fd63172e469fed0a3cd42fa2be8c3583404166139a15a28e9d965b51ba3102dbe335aee30e939e8902f21244c727f0c65e316dbb4f1d SHA512 d79eac983c0c9bb85d11951eb672672cbb70934aef5ef9d470aef929e318acd9b20ae72118e22fa37a2253a75d6472ed43132011b94463ec5a7a0bd754b43da0
 EBUILD giblib-1.2.4.ebuild 681 BLAKE2B bdaf9b49e82de1e24c8e7ea7a6068693694347a7b91e0b8d7448bd5695633a4a73836d0d6353efaeae6174e024bd40d789b1987a37ed49b5e705e83e2775971d SHA512 4cefd326bdb2a4074c076f91de822fbe254790bcf90138a208ddc5307df9d8ec74db22e14f1962e59970d436922e0d366055545a3eceef83c33100578663290b
 MISC metadata.xml 750 BLAKE2B d02c2f96076c9be5a95d8701e935ed802f3b8759d2c1cc220e6235e6a310773a05dcd5e77398ee3f32f7a55822c407c5d18c3cb79b674ba5124043934b04539b SHA512 4827fa23f4b181c3e0a76eb422bd05b1504f6982edd7b8de4ac0464043b9cb8339939629162ec0f2ca1a663940e3a52f8c95ca890ad1eb9aed6d9df4c6580c34
diff --git a/media-libs/giblib/giblib-1.2.4-r1.ebuild b/media-libs/giblib/giblib-1.2.4-r1.ebuild
index 5b084bd72808..4217dce14038 100644
--- a/media-libs/giblib/giblib-1.2.4-r1.ebuild
+++ b/media-libs/giblib/giblib-1.2.4-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
 
 LICENSE="feh"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~mips ~ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static-libs"
 
 RDEPEND=">=media-libs/imlib2-1.0.3[X]
diff --git a/media-libs/giflib/Manifest b/media-libs/giflib/Manifest
index 1c1774504f3f..2192062a5471 100644
--- a/media-libs/giflib/Manifest
+++ b/media-libs/giflib/Manifest
@@ -4,9 +4,9 @@ AUX giflib-5.1.4-reallocarray-export.patch 5668 BLAKE2B c2dc8b1f9ffa5ba5e3f50bd7
 DIST giflib-4.1.6.tar.bz2 506050 BLAKE2B 154c95425a570a822447d1fc5bddbecf31fd81473e18d49fdeb93e72ade7541197fc6147b2d4cdf6857b3326b2f4c40e01f026041369242f4e9fbe892cc8e150 SHA512 f47954218ed7d3415cc195a1031a688fcb7dd2bc2b394491830e6b5f5332903ed7c4433b795cd3da9ac53bfc969fe94bec2a4e66b15c0385c732c01b1b7e5057
 DIST giflib-5.0.6.tar.bz2 621073 BLAKE2B ae162c281755cae4d00bcbd07273f7c7488ae67c42fef819abae1011eddf801bc4525e326417d3e8a036b18b75d7064de59ceda370e5ded956b22d319c67d3a9 SHA512 117e20319f2df32bdf094678cdececad2b6f33a40baff172d4df68ade86547825ebca81186071bff51e60126692df84dbd7bb5cc4877ba68448f7c47a2cc2491
 DIST giflib-5.1.4.tar.bz2 639703 BLAKE2B 5176fbd94c37a86a7f7a3964b6b5f2637d76ba5d40e594a0db52a3a09e22b915a0388fc9bd2f1446dcf66b3b9c0d76741583e4d5d3f7362fa3997e8b26503fc4 SHA512 32b5e342056c210e6478e9cb3b6ceec9594dcfaf34feea1eb4dad633a081ed4465bceee578c19165907cb47cb83912ac359ceea666a8e07dbbb5420f9928f96d
-EBUILD giflib-4.1.6-r2.ebuild 1381 BLAKE2B 53da805ac9c0e6641536fb57b772c9921c4e41441fddfd0e53a6b2d00e76eac38e0f6a53fbfa3a8b13058c5ae8885b5212d62b8a7eec5afef6c13b2c40048803 SHA512 51e54c7163c24477b664add2201347df4e41dc819f8e2b444810dc7c0b5cc6766f3e0176bd073188fc5ec953fd09b55b5066082ca307ac7552df164905dcecdd
-EBUILD giflib-4.1.6-r3.ebuild 1609 BLAKE2B fa19054072551719fc111d0ba1c8df029d5f47649500fd9859c328915a5335e36c098075c2d2c9954bd3f2a1c9435d0dee7308fc36499963d09d255170b40e54 SHA512 e138e276d2504904e3bed4e478cf492fdf663805a50fd4ae510b90c6160a6d3a591214eb738cc7ec545818fb88b7f36f7699ee0b6c5464af199e3a699b805fed
-EBUILD giflib-5.0.6.ebuild 1219 BLAKE2B b4fd9c6b45c9cba3b5ffbcacc4a378ce73dbb6d5bc15d7de8c43248ec997463bb8ee9637edc48f98ac541c9e7b152f40bfecbdeaded007f80c5acf1d88972546 SHA512 b46fd57c3ec565cb8f39c885d0f0eb7e4a3fd6a64779f1abea9be3dc8f56feb554b3546c5564081169d91ce8a1e18ef4ad644837df90085629d149866f1870b1
-EBUILD giflib-5.1.4-r2.ebuild 1609 BLAKE2B da2fe5ae5983d27cd42fb1ded6b2ded6715f78d9ee42c1502aaa0380078c1d40abf372c720c40b3c72b1395282ec6016722616838edccf6f7c59be2c0dc64948 SHA512 beded9c6943664b953fc05e934024b72d530c75f53097636a2be1d1ab2d0d8e1e62d32be98b4ea12a6e7c1671a44f1d2ba56795b7f98b42af123f85224975a4f
-EBUILD giflib-5.1.4.ebuild 1540 BLAKE2B deed4fe240a56b1cda63361947e3d1bead633d5ff7738e2fc5140e72d14cf86cd6c6fee119f221524779b2f7d771e8c8ac564c5cf4d6a27db9d2282188f2843f SHA512 84cde254f5de12d2d3b64d7f450490e32391d6f8c3d233c09ca14da8155ab606d28b4a1cdf6e2f98345d148ec500a16cc25bad0d47d4e02cf32182075a9f3d77
+EBUILD giflib-4.1.6-r2.ebuild 1383 BLAKE2B 564dfc8776afe92c076aa5bec6c8f58b985bd8b8c3b14621c9946aa8984047a6cf4ffe776a803199ac0417615dc2df270ec8b4b35683f3a657d92f4ccbd415a2 SHA512 71a6621273dd6341e25de0150aa7b194a1143b6e344ba2a77317fd72394f585fe232d9eee5dbd28242773ebaf26072119d5ebe93ae540d4054d7e1d64410059c
+EBUILD giflib-4.1.6-r3.ebuild 1482 BLAKE2B 98f35d4ceb7bafcc67b9d66d273ca0362a49e0be0e804c4665c9c723d7e04689429362611b35cf37bd2c9d5df29f422be541ef796f4cda58ec0e6877aa23f5c3 SHA512 752ba45f1c9650a9268c5c9e555f239ec8302549573f508d5c9ce0ba9a1461b8497cde8dfabf180cc6ad8aaca420931b9025188d4743c526c3bdceaa93c1c1ae
+EBUILD giflib-5.0.6.ebuild 1060 BLAKE2B 9ee4bc54795eeef8850a5a94129dfb8c73b979d8b1e2f827fe434bf5c9966b5580e4ff0d7946fab757bfcfc18bce87368c2f8ca903e4dfe6c927281c3535041f SHA512 7c0abe0f1450dbdb2b72239e7876f3d2b3e13292c0883c92af6f85a764dd4a14f3391d55b2a21313041f07eebcb086f3fb28141093794b9fbb501c650a59f5a0
+EBUILD giflib-5.1.4-r2.ebuild 1459 BLAKE2B 9dc4b8937828f98398d36bd7dffa73022aef360cb94eddbceb9b891074711e70cb2882f5844e25ad4ed775a7a9dfe47a3b37ca440e086f5612aa52b3151beeed SHA512 89fa505d094fdddc84da9b8a9d1ea7635a294911940c04bc82cc80c46a0e1936b54f9430bb7f412e840bb915013380f695b144fc7f12bd001555d4eeb74b5358
+EBUILD giflib-5.1.4.ebuild 1390 BLAKE2B 5e1719539fb2ee35bfc86c64c651534bf72057080c2f7d38e15df4ed4f6d5b7c91cea3ba55a47054455f9953a25c110733bb05e5b75da793c005d779a5dd3373 SHA512 f86b46958b2e977c56dfbd8df548d540a4b1873254abf4c6e1a69c24e696b4928a8f3d56145a545be3528497965e3e4898ab56fbdaf6b9d1c88d8066c170774d
 MISC metadata.xml 444 BLAKE2B 50913e89623c9855de9b3344c4f7a9f6266b42d99ab88cd4c6be63b8fb00a984dc05b89efbac92ed2b5980e9bed163473925a88384a61b3887ef86473f89b216 SHA512 10f7b2069a73ae9d488fba9febb6b8edcab5f278e1d68ef5b998037f02de5de81d07983b66f3c4ac8a59fa9a4836b92a909c66a4c1188a97aa03174cf4f546cf
diff --git a/media-libs/giflib/giflib-4.1.6-r2.ebuild b/media-libs/giflib/giflib-4.1.6-r2.ebuild
index 5886c855d548..e6dd91121a28 100644
--- a/media-libs/giflib/giflib-4.1.6-r2.ebuild
+++ b/media-libs/giflib/giflib-4.1.6-r2.ebuild
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="rle static-libs X"
 
-DEPEND="X? (
+DEPEND="
+	X? (
 		x11-libs/libXt
 		x11-libs/libX11
 		x11-libs/libICE
diff --git a/media-libs/giflib/giflib-4.1.6-r3.ebuild b/media-libs/giflib/giflib-4.1.6-r3.ebuild
index 4376d54abfba..0d7822692362 100644
--- a/media-libs/giflib/giflib-4.1.6-r3.ebuild
+++ b/media-libs/giflib/giflib-4.1.6-r3.ebuild
@@ -16,11 +16,7 @@ IUSE="rle static-libs X"
 
 RDEPEND="
 	rle? ( media-libs/urt )
-	X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140406-r1
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
-	)"
+	X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
diff --git a/media-libs/giflib/giflib-5.0.6.ebuild b/media-libs/giflib/giflib-5.0.6.ebuild
index e666ee52225b..604b886a47a4 100644
--- a/media-libs/giflib/giflib-5.0.6.ebuild
+++ b/media-libs/giflib/giflib-5.0.6.ebuild
@@ -15,13 +15,6 @@ SLOT="0/6"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
-RDEPEND="
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140406-r1
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
-	)"
-DEPEND="${RDEPEND}"
-
 src_prepare() {
 	elibtoolize
 }
diff --git a/media-libs/giflib/giflib-5.1.4-r2.ebuild b/media-libs/giflib/giflib-5.1.4-r2.ebuild
index a5fce8fa5fee..d18bb1590833 100644
--- a/media-libs/giflib/giflib-5.1.4-r2.ebuild
+++ b/media-libs/giflib/giflib-5.1.4-r2.ebuild
@@ -14,13 +14,7 @@ SLOT="0/7"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
-RDEPEND="
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140406-r1
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
-	)"
-DEPEND="${RDEPEND}
-	doc? ( app-text/xmlto )"
+DEPEND="doc? ( app-text/xmlto )"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-reallocarray-export.patch
diff --git a/media-libs/giflib/giflib-5.1.4.ebuild b/media-libs/giflib/giflib-5.1.4.ebuild
index e19d5ef53089..b92da179a4f9 100644
--- a/media-libs/giflib/giflib-5.1.4.ebuild
+++ b/media-libs/giflib/giflib-5.1.4.ebuild
@@ -14,13 +14,7 @@ SLOT="0/7"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
-RDEPEND="
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140406-r1
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
-	)"
-DEPEND="${RDEPEND}
-	doc? ( app-text/xmlto )"
+DEPEND="doc? ( app-text/xmlto )"
 
 src_prepare() {
 	default
diff --git a/media-libs/glew/Manifest b/media-libs/glew/Manifest
index e81dc276c260..12b0fa670cb8 100644
--- a/media-libs/glew/Manifest
+++ b/media-libs/glew/Manifest
@@ -5,9 +5,9 @@ DIST glew-1.6.0.tgz 494713 BLAKE2B 17e47092e2eefcad79220232b3aeaf856541f5024bdaa
 DIST glew-2.0.0.tgz 667340 BLAKE2B e44fc13a222d613e2cad4717dce24a86941e7ef60331a4c18ac6aeeea09dd51fd3d1f40ec3a77341158911c26ff2c45eaf2df8e002fafda145ae6e89fae6c440 SHA512 e9bcd5f19a4495ce6511dfd76e64b4e4d958603c513ee9063eb9fe24fc6e0413f168620661230f1baef558f2f907cef7fe7ab2bdf957a6f7bda5fe96e9319c6a
 DIST glew-2.1.0.tgz 764073 BLAKE2B 081fb49ef286681657409f950fa03b97210dac3f90197b792d9128a2b9fa271181c9e64422a867b531683ab23010cfeb2f519adc32355839b67bf41934578fb3 SHA512 9a9b4d81482ccaac4b476c34ed537585ae754a82ebb51c3efa16d953c25cc3931be46ed2e49e79c730cd8afc6a1b78c97d52cd714044a339c3bc29734cd4d2ab
 EBUILD glew-1.10.0-r100.ebuild 1945 BLAKE2B 84795d7933d564a70c9cd21d21c4e0661d670098f4956042f6efa9b645f9cfd4d82cfc8facc0fae8e6741a68a4aa2761050801a9979d3692ab81b4b5fd110a4e SHA512 b39c123fd4c5fb4e986ad05ad85c2ec23f3172b8402a85f521529f63c12742320aaf760a073d928198619a7a17ac3bcf8024ec7ca5b3cf970f7b8e30965eb9f6
-EBUILD glew-1.10.0-r2.ebuild 2383 BLAKE2B bcee911ca94615c4f78e2108210b2451b6ee3c5f1c8f586cac6facde21d76fa4db567bd4986c2be9c521db3877505834f9b420299c1ca003850f524e039cbef6 SHA512 96c8bca286ba2c026151e4836616c7cfd07ba192c46913f318150b63d1b477a6731e8859db6e270a88528728e524be1a0c65e50c0597fae57ab6219c6c9ad4ef
-EBUILD glew-1.13.0.ebuild 2434 BLAKE2B f032991fe90dac59e789cd2fba1f08a42308c8e9230f7ec253b755ee8a7621e1a18634ff3324c3a08f9ea239404bee3ba176b750c3adca3cdd09433aa90d57e1 SHA512 e001a5bbc743a291292e22d588bdf754753dc258b32a7ae9e8bcdd9ae0d49055b6f6e2bd189f5c722c98e6d53ec009872e8eb56a9da88a1f29bb44a9b9f3cccc
+EBUILD glew-1.10.0-r2.ebuild 2315 BLAKE2B 403bf435c4c4ac04b2004771d7693e0798c1b9883d9841c0c334f6c88b57c566c3ad5fb4fd809cff3cabc647544587d2a6e23406dfdf661b8b0abcfbe31d3402 SHA512 45bfd975303ce4874f013ce5a68689dc9bfb9a03208025ea8b5057c689c4ed1c3ff08d0341dfeb05d65f16ced9115513c8b043bb88a44adbcefb5867aa85b151
+EBUILD glew-1.13.0.ebuild 2363 BLAKE2B 7697beed6e91c72651668f22a99fd4056d767a41d49e97bd4b19a2eb62a065d8e12073e3a16ce47afee199d05f0b672a9f6c72e37ff2b942aad8373c08ca2e71 SHA512 2cb6bc63987555d2318beee186cd1067637540e0f9743248cfcb9355dcc65d1c5bd58bdcd31994a42c2d3a20cf25acc7c40bc27399b1d6daf32dd194072882db
 EBUILD glew-1.6.0-r100.ebuild 1918 BLAKE2B f4e0743ba9f5e76e6a9b1a19411b59a6fd08f71a01443c61e819bd4d2ba4528a1f635826ce5c7359ea31d0a1f6045888b36f4833c15b88ab0c5265ad9839ff25 SHA512 2b862eac1583f939d416570776e48675aa307762c7a437c44dd07d212c60fee33cc7671b4a3b659d9d86e5fa7938ab8d9a09fc340d412c10080827378c598bbb
-EBUILD glew-2.0.0.ebuild 2552 BLAKE2B 2b9e63c2b52f21ad3997345dc8293aadbec6993c611cdedb74f00026f182a3347ad4d68f695085dd0c0a5dfd18eb3756a0c82776873843de85719756c2efd8b4 SHA512 f22c0fac87d9b64fc8a2eb0e5228d9c8598d02ca04c054d3b1a65f3295e94e697c3db2c6ee25dac07d9f6fc767ecbc0ad846681aac2ccdc80ed3986338011c5a
-EBUILD glew-2.1.0.ebuild 2515 BLAKE2B a587394825a1f293438b9fe6717c6615c1660e90a3de5557fd55d69a8f55f1f0f996ae067286af28046929c1c03e1a1fc184205e1c3f190c1752de71408c9106 SHA512 dfac5f4981415696b7bedd9fe190c6617d6e99d04af2d3d04ea5d13438f1b869dbb6c09e8640a52c8d1256a55604cf75078eb67bd350c88f55ba70ac1b82a1c8
+EBUILD glew-2.0.0.ebuild 2481 BLAKE2B b5bd5d5548b813dd8a7d3417def5b59d94c51cba7288ece7f54caa7427598afc0671378091f867c5923b95a7dc2965eb615d23ddea1ad3bc9fa07aec715506f4 SHA512 892f40d7db982d74e528570479add88b60b8552339a5762973dab1412061bfa4fe963e2d0c19b7c504f66d966086d4cd23d64244ed62c19c99177602b2c01a50
+EBUILD glew-2.1.0.ebuild 2514 BLAKE2B 3405ce81a1f6e8c8b1ddb50e0698d9cabf3606c08303fc2a2b184f1a90733a17cbf972836f1d5b92f9e3b3171e6b216f0a62d414faee1548f84303e38963980e SHA512 db8380ca88da0d1214979e2c12520bcefae9d5d5804b5242a8abe145910eb54ca75333bc35b93a51a0dacfd1d4f7536d5678e460d1a9520824f42beac43cb5cd
 MISC metadata.xml 296 BLAKE2B 14e5921f53872e45c3b43dbe5d95fbb36162ce327eadfc41b34cbee17c11d1de02562152920026592f3dc508faf080e4e8b4150490a815cf7629b1ecfccda758 SHA512 60f31ba192f23a74365955e122ab54aae36c45b9158a2a5201bac68c46c07195025a9978fec01fa6e9804bc731bf1f7b495445bafb9e53d94f895c128075aa3d
diff --git a/media-libs/glew/glew-1.10.0-r2.ebuild b/media-libs/glew/glew-1.10.0-r2.ebuild
index 65172a985830..187ff99392be 100644
--- a/media-libs/glew/glew-1.10.0-r2.ebuild
+++ b/media-libs/glew/glew-1.10.0-r2.ebuild
@@ -18,9 +18,8 @@ RDEPEND=">=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
-DEPEND=${RDEPEND}
+	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
 	sed -i \
diff --git a/media-libs/glew/glew-1.13.0.ebuild b/media-libs/glew/glew-1.13.0.ebuild
index 4725492f80f2..ef65901cb773 100644
--- a/media-libs/glew/glew-1.13.0.ebuild
+++ b/media-libs/glew/glew-1.13.0.ebuild
@@ -22,9 +22,7 @@ DEPEND="
 	>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
 "
-RDEPEND="${DEPEND}
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	sed -i \
diff --git a/media-libs/glew/glew-2.0.0.ebuild b/media-libs/glew/glew-2.0.0.ebuild
index 173817c6fa2c..cff2091e2d37 100644
--- a/media-libs/glew/glew-2.0.0.ebuild
+++ b/media-libs/glew/glew-2.0.0.ebuild
@@ -22,9 +22,7 @@ DEPEND="
 	>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
 "
-RDEPEND="${DEPEND}
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	local PATCHES=( "${FILESDIR}"/${P}-install-headers.patch )
diff --git a/media-libs/glew/glew-2.1.0.ebuild b/media-libs/glew/glew-2.1.0.ebuild
index 41fba1f27dd5..cf43bf32b3c4 100644
--- a/media-libs/glew/glew-2.1.0.ebuild
+++ b/media-libs/glew/glew-2.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="BSD MIT"
 SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 DEPEND="
diff --git a/media-libs/glu/Manifest b/media-libs/glu/Manifest
index 0960079fff99..aab9ebae3d94 100644
--- a/media-libs/glu/Manifest
+++ b/media-libs/glu/Manifest
@@ -1,4 +1,4 @@
 DIST glu-9.0.0.tar.bz2 493206 BLAKE2B 9c8c27bf8b415f4962079f200f64d4ecadaabecc7cddf832ccc75146b30260bb386ddb87cee26d911f6b7c2451ed0484e0fe8bfa39ac27e33b87a2b5d025ca81 SHA512 ff920e3fbca739794e1432a92fdd8517aa732110fea71ed724185425042f83ce18e9866c16f95c6e10f6993f0814a90fac9636e2b3d8ca2084d1ac0a860f61c8
-EBUILD glu-9.0.0-r1.ebuild 1004 BLAKE2B f55099c0b41021f2b643a0fc884cf5c603f83ad7fa2b080c9c5a5400fdb18257e85e2aea0116b84626bea657b22f1a130010475378a3249ccf8913bd66d0ed00 SHA512 736fa07f882843e89c047d8df29eb06e8c16e29a587ee9db73f6497be1e3598ac544c1fd20462ecc4cf78906b916a04284c46f23aa66fc9ac69ee7e5da6e885a
-EBUILD glu-9999.ebuild 1027 BLAKE2B 9a3cdea04473df6ae3111cdbc9edaac65dd9f99eb32752a2a01595cdca5d37900882267cbbefb04167119a4e9bacac19296185a19e5b41f611eafc5f0d613f4b SHA512 baebed88d2f50c7fe76feac1713c2e3d42851f154b915e36518327ab051a40079d8c8dcaa3fde36f57f95b0dd939613d0b854838c3015755698687a08e56e4be
+EBUILD glu-9.0.0-r1.ebuild 934 BLAKE2B 7db1fe47fe9529f5131da6492f6bac37e7ac8135cf683975b5c623e43589e9f97247926a0c25efcc31ca945b51dec1b735da6c41f59ed4ffc041ce55f3564930 SHA512 0d446a7710e976d497a0b9e48134d86cbd9d902cff92b3e97c9522ffbef29aa2c2a71bea8cf89bdc57ded88af7b3e6b28e635769829538573de5ef86399feba2
+EBUILD glu-9999.ebuild 957 BLAKE2B 6d291485eb4d029da1d5a078fc490c11abc2c7acdf630e062275ea50e52831dda3dc80b510d7becf954e59e7562522ba726ef5f64341207dff2b7c927503cee2 SHA512 5dc2c93e480e2ad4f7d59fb248396b2130716ebcbb8cd6e26b9ce9be06a487f9710013c98acdf1a438aab749d62dd0c7f3d8c4edaf9b16f31d61e027007feeb9
 MISC metadata.xml 240 BLAKE2B 7361e68ba9e9d62530d9e45896fa3473e5606d67f87f78f4be394145abb8ee5851fff417cbd973c913a05ce60530eca628c3864cfeef75bf7b5f69b3e8e87da8 SHA512 e23d56b08b47406b57f50a1028febb4c4e1809ce967715b2a46aed1124dfaf306a85a3b2398c4ce058df4305bfc8645b79e8ef3569e6cfe8ec467f63e967b5d1
diff --git a/media-libs/glu/glu-9.0.0-r1.ebuild b/media-libs/glu/glu-9.0.0-r1.ebuild
index 9069395176c6..3f4f63eaf043 100644
--- a/media-libs/glu/glu-9.0.0-r1.ebuild
+++ b/media-libs/glu/glu-9.0.0-r1.ebuild
@@ -29,8 +29,7 @@ IUSE="static-libs"
 
 DEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}
-	!<media-libs/mesa-9
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+	!<media-libs/mesa-9"
 
 src_unpack() {
 	default
diff --git a/media-libs/glu/glu-9999.ebuild b/media-libs/glu/glu-9999.ebuild
index 8f475014bbfa..684f3b54380a 100644
--- a/media-libs/glu/glu-9999.ebuild
+++ b/media-libs/glu/glu-9999.ebuild
@@ -30,8 +30,7 @@ IUSE="static-libs"
 
 DEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}
-	!<media-libs/mesa-9
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+	!<media-libs/mesa-9"
 
 src_unpack() {
 	default
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index b02a716948c8..a8a288666e9e 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -3,7 +3,7 @@ AUX gst-plugins-base-0.10.36-resync-ringbuffer.patch 530 BLAKE2B cbf4d51313e94df
 DIST gst-plugins-base-0.10.36.tar.xz 2364108 BLAKE2B a71ef5d5c7462d60937602681c060e85ed086a753b7ef354dad48354d6c3741d809f2c0c6a321ef9ac60fb12d24ec65e1baa63e51211134d2a5e03aae16f73d2 SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8
 DIST gst-plugins-base-1.12.3.tar.xz 3117364 BLAKE2B c5c16f1b46b10cfc5b9731ea990638238b82eb7f312345fece3826deed20992aff1c5a48e031060dc175b5ab5ad8ee21bb3e1e950fc0681ee4b596e65f5f92fe SHA512 d32f71836e25081b00040709a2184da85489e5af90902a0b27b820a478f5805bde93a04cefaeabf36dde53c16ad12f2816777cc195f1e027f19d1883e088e2b2
 DIST gst-plugins-base-1.12.4.tar.xz 3119468 BLAKE2B d5ac157618a25c8f0323d1922d5b26b0b5c49f56cb75df3ceeadd0566f873be1a06c863a1da6afff40901fbbbeb1ec6cd6ef4614309ca7f7ff988c0fa9040a10 SHA512 89a6e92cd294612cf1406eb156416ab4606643f6b43637e64a18f6f28ab789ca8d4cf1308434ed85e5fc679c79cc3ca115db48f37e0065a6ab3cdfdbaaad9f53
-EBUILD gst-plugins-base-0.10.36-r2.ebuild 2274 BLAKE2B 58f8930c8694880b5ca270637cf0f46be89e19e30c670fee61e3a04680008e2e80536676ebc91f7fc9250fe14f13a093d6e4156b0af57f4e0eff613c030828d7 SHA512 2455419d70993b01fd436a2954df6c811384338a0d4a2ca3a2c04e83a2602c0d6aefd2bef29d64d7535ee2a767390d5910300f0d2a8351435c360f32c83869f2
-EBUILD gst-plugins-base-1.12.3.ebuild 2719 BLAKE2B a94595ce1544795bbf62c3c489255e30d53d404220f0d132ebdfcb19547eb35e6f217c7363a88e875022f3df4ace7f0270f2ad99543ebb962134eed07a1708c7 SHA512 9aef3d6262351f76b623ac6df278980ae8962ff7f35cdd3e6e59f3ec83d3dfdcc4899f38841cf02710fe8e6cf0e8db0aec1d0e77fbe908992dbbc89e057195ae
-EBUILD gst-plugins-base-1.12.4.ebuild 2797 BLAKE2B 18b42fbe9e8a7e2bcea798c9c91ed7e135e24af22a171273d28e90be7b2ae10507b8d6c44743aaed677b9b1c6bff83151cc9573367a7ab4b2e7d2fb68099d8f6 SHA512 10ae314837e65e1f72faeb8144d1bd9d414be351d8ff3564dfa1a2236b7ca471d015f1e36f1a9ab5b1ce0abcf7187f7179f41990422a57aedf9ed430c5be4dfe
+EBUILD gst-plugins-base-0.10.36-r2.ebuild 2120 BLAKE2B 5e670a72e651af6a8ef1e4992fc42a7a444e9a77e708b86cdf5d373d96cc549c2953df5da5b001479938f77498eb09de861e89e705ce555618cd45227209a769 SHA512 bc9f491322b473f7ae2a55a7fab8315584b1ef3f71f94ec4968705fb1063d72e6dd2dd80342bd85b7abb29315abb26adbe3002c94c7a7ec27517c8edcf32eafb
+EBUILD gst-plugins-base-1.12.3.ebuild 2694 BLAKE2B 05e7a5b9b4d4f6401c2c896897f975841807970529463729e20022d2339174db355588ce34ef6b2874ed18b9de63f7ee7d093ced6dceb13c878805c695fd6d3c SHA512 e3bac4b68020c749671cc95937e289cf92c05591556cb275cee018ada983234c4ba9a50b2792ca878c52d9cf5a9f2c53b6761e38f528ea3091384e3776e179f4
+EBUILD gst-plugins-base-1.12.4.ebuild 2772 BLAKE2B 59ae3c2e796b7fff58f33fdaee9a5fcd0f7d5b69ae428da6207a2b4f849460408740469eee83857a1813d614051f262224b7372ef924d0c94ac2f2ef83126503 SHA512 f610d842340bdeec3c8d438aba92efbee13aa8e0dea36d1c3e09e6c6280be4c02eccc71d22db3e613c661d735bd978f05e0754137f4abf94033093b72b9f9fde
 MISC metadata.xml 397 BLAKE2B 4bb000c5586a8912669b1584356b30d8483b6f15180e7acfdb03d0c4e169c3cc703487a9f1f96867c23ba6b5114903b92bb2b2fda4deb9b979ccf610f8151b8e SHA512 89c4bdb8f7a5da325255b43be4017510c4a5b4a3f8f650dc625b513d0cd2260267f840fc52926fe9ca262d9f3f2c16bcf0aff9c22dd0c8b577e632155910b568
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-0.10.36-r2.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-0.10.36-r2.ebuild
index 85ad256b24d9..a8dd28044648 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-0.10.36-r2.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-0.10.36-r2.ebuild
@@ -19,17 +19,11 @@ RDEPEND=">=media-libs/gstreamer-${PV}:0.10[introspection?,${MULTILIB_USEDEP}]
 	app-text/iso-codes
 	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
 	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+	!<media-libs/gst-plugins-bad-0.10.10:0.10
 "
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.3
 "
-RDEPEND="${RDEPEND}
-	!<media-libs/gst-plugins-bad-0.10.10:0.10
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-medialibs-20140508-r5
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-	)
-"
 
 src_prepare() {
 	# The AC_PATH_XTRA macro unnecessarily pulls in libSM and libICE even
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.12.3.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.12.3.ebuild
index f001ed06e67f..16339238ba98 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.12.3.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.12.3.ebuild
@@ -35,7 +35,9 @@ RDEPEND="
 	X? (
 		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] )
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+	)
+	!<media-libs/gst-plugins-bad-1.11.90:1.0
 "
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.12
@@ -44,7 +46,6 @@ DEPEND="${RDEPEND}
 		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
 		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
 "
-RDEPEND+="!<media-libs/gst-plugins-bad-1.11.90:1.0" # rawparse move
 
 multilib_src_configure() {
 	gstreamer_multilib_src_configure \
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.12.4.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.12.4.ebuild
index 216f0c323167..7d3e5f7618e5 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.12.4.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.12.4.ebuild
@@ -35,7 +35,9 @@ RDEPEND="
 	X? (
 		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] )
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+	)
+	!<media-libs/gst-plugins-bad-1.11.90:1.0
 "
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.12
@@ -44,7 +46,6 @@ DEPEND="${RDEPEND}
 		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
 		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
 "
-RDEPEND+="!<media-libs/gst-plugins-bad-1.11.90:1.0" # rawparse move
 
 multilib_src_configure() {
 	filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index f809d715a05c..4df3cd385059 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -3,7 +3,7 @@ AUX gstreamer-make-grammar.y-work-with-bison-3.patch 820 BLAKE2B 1809d190e37fde6
 DIST gstreamer-0.10.36.tar.xz 3025876 BLAKE2B f0f70f483e8ccb2a294fb3bc8b51aac089f5e76522249b64e3e60e7b488a9e03b9300617e2c137bdcc0e3e61668b7b203e899f270f004e2dfcee0927fa7dfc3c SHA512 7468abb578398681d2adb0e9bbc9ee8ae25aaef72369d45a66ada6c67d1759afdce606cb32e68d9e30ae813196bdfef3d4d33202bc77839cc1fbf5fc436c1bd8
 DIST gstreamer-1.12.3.tar.xz 3175480 BLAKE2B e42b908b6fef2be5d4a0ad435cab5760a5e73e6f09afa0fd0993dd84d01f956b6437beb367082002e875307970f3b4b3fcb8735f7f69836da0ba76ed186e42db SHA512 fceeeca4314aead7ff358db3474bd6fe1eef70f745a6ba20505da6c0caaea6ea6317246dc66c23edab396ca811a610c52fa930f8f99c701241ae7f15857aa2b0
 DIST gstreamer-1.12.4.tar.xz 3177208 BLAKE2B cb859503edbe09cebbbfa70cb4edc5d433bbaa5b299e05921d30e6096f8765e17d449c45bd7d5ea3e4603ae46d337d4e3291b1d0456c7b72a7ebb41faad9e73a SHA512 849aa4ddf8ef465f2915e05d36fc0c31c2e31ae28be2fa38f8069a64a91b7347020fac5b881b7f3ee54c2198c3596138d49f27b09f258303834164a5d68b38a2
-EBUILD gstreamer-0.10.36-r2.ebuild 3975 BLAKE2B fd2155ec778c09848da944eaaeeef191050fa98be5fe3463cbfe9acf75233e2d1f5571a28c7e0f14891005bcd8678664ed4d0ccb37b6773fe359285e265780f3 SHA512 b3e544ebed44ab38c1fa3dea0dc776abac7920a3674d12ad09b82ace577d5ee2cc367647165da15d227e0a12670248557fb7431eb9b764468feac8040c6f2623
+EBUILD gstreamer-0.10.36-r2.ebuild 3843 BLAKE2B 5755f04502e3fd6bb5eafbba0710009fd0dba7f402c4a28c20c768ad6290201a900200a33f21b2d97bf6aa7596df06a0001530f001164eb2777a9f3b5cb0adfb SHA512 3a9be6924cb416b173297ff022edffb6a8c496607a4b5f88c1b81fb8489ec045e9f611a88a736fb67a84418d472e37fbdb078e9e9d8593a03418cb6658de6c67
 EBUILD gstreamer-1.12.3.ebuild 3309 BLAKE2B f2dae365901d455f952bcb9a568a4aafaa46ac2da6e90307108ebc1f28d89adec2e96c3c0aae0811ce20f6dd7559d5cf90e4c8e8022a65c3ac26b06a9ece3997 SHA512 4fd05a9b129e65dff3420defc93b5dd7b3f2573c3c587f410c301732b879e12b904dbaafcab98aa7f8aef0b9cb897488e62fde387d40c199a42929172a9c7119
 EBUILD gstreamer-1.12.4.ebuild 3312 BLAKE2B 1df850530140f38f72c02878e0253e5ba2dfd4ce9de936419e118961d0beb602b16b11f3684861f0104ef5651abba3ce56c060f5944e5d3ef0c5de3a34f3b0fa SHA512 6bf27b7d96ce6589c3b3fb32f10f4255848ebf19f0b08aaca083f3984e2ed8d8e96a915db9b5209c737b19ff7503cf794389153c0306393cc7dc235f4cfe72b1
 MISC metadata.xml 586 BLAKE2B 319df0c2c013f3018bdb31afddcd80b298f9b74d0a581981f30d483b0773339befe4dc62eb78a267b3a0f5a63a7e6462bd0ece4d4285c0ca91a1329c12ba1b93 SHA512 f7de0325f671119a5b787dcba9572d06d58375ba9d815854beffd668da55e4d4695f586365b3455e63cd56f4469fb8e1a92ab6de4e05847668f56c076dfdaf57
diff --git a/media-libs/gstreamer/gstreamer-0.10.36-r2.ebuild b/media-libs/gstreamer/gstreamer-0.10.36-r2.ebuild
index 9164c7e059e0..f701dad72642 100644
--- a/media-libs/gstreamer/gstreamer-0.10.36-r2.ebuild
+++ b/media-libs/gstreamer/gstreamer-0.10.36-r2.ebuild
@@ -26,10 +26,6 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 # gtk-doc-am to install API docs
 RDEPEND="${RDEPEND}
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-medialibs-20140508-r5
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-	)
 	!<media-libs/gst-plugins-base-0.10.26"
 	# ^^ queue2 move, mustn't have both libgstcoreleements.so and libgstqueue2.so at runtime providing the element at once
 
diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index b154b864f730..eaef1d51b466 100644
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -5,8 +5,8 @@ DIST jpegsrc.v6b.tar.gz 613261 BLAKE2B d08406bebcbec9aa0197ef7854f163dc12d916e7e
 DIST jpegsrc.v8d.tar.gz 991456 BLAKE2B 6644af7dd47a3b1cbcbc8f6bc111c882ed1790eaad6bee06e9b95b803bf756beb6ad61abc76c889d53dfcd05139286ec870372d50d2b79bf28b32d0e8d50a2ab SHA512 7a8b4cff5b1caf6a7281c5dce4e1efa1b68360bd64dd2e619b60c9e1d49f22624bc8780b681bfab073e7b1d4b7f41008a464a58f0eeeacb0a40ff996d7eb5753
 DIST jpegsrc.v9c.tar.gz 1028200 BLAKE2B 621ef910f3fa397da0d19da1e1771b13ae1e524ba541f7f2562de1da27a8a3b26abc63d01218ae56ddbf480ba5d6ea6a778a23693304f7b4364edb1bcd4839e7 SHA512 c95aacb0f1972a2271953ee17b5c6a6c3662d5f4fbc4d1e9aef59dece42a169b0f34d3fa1d385b88580ad11cefd194250094ee72843f4e0028204df6741cb611
 DIST libjpeg8_8d-1.debian.tar.gz 13676 BLAKE2B ac6fab3e52f91c9ece95ed809fc972afc92c55754a59358f7dacb056917b1878f6f9be85a20ccb34eb13489a9963a00659fe25c27e8b18b44961c6ba5f3214cd SHA512 7def4f13524f0af3b9adf35a370027a18f43b9a635f56a17d5bb7883370db8b18b8a12737d0f0cb4b0287ccf8fb474eb5f754de6b398ffe7d522c54e5bf68040
-EBUILD jpeg-6b-r12.ebuild 1253 BLAKE2B a9bfd0f21ae1f3f1b96b9effce1f731620f1b0da53138ac897c8cc67c2c5ac1d868a093cbc5624c58d7226813269457987a0dc01a9d6eb13d5c464ab87d37965 SHA512 cb3ec5945863b4bab44d32dbb14aaced20e3960ab64cfaf220cec225685d57ca617e01502364887d9f6925b60950bfd8f7e8dbe89e29d931aeb44ac918fa055b
-EBUILD jpeg-8d-r1.ebuild 2069 BLAKE2B 83224207c0bd3fb14947a3c7bc506fcd5c9d20f9c17fcbc89cdccadaf40318cd3f6e0f2da72fb21faa206640d76538a185f6a3a29d1bd662b877de083c049f31 SHA512 dea7fd89d094be0cb90e9b99d3f0e9353bca3045a2ca8a110b6eafdbdc27fd2fe5a01c3911697f065e474c1d7b58cdcd39a82552281200b8ed3870a914f549fe
-EBUILD jpeg-8d-r2.ebuild 1532 BLAKE2B 7cb616d69fbad57a538c50f08ecce6a4c76c455724b280d51bbff2dc6707329e8db15e040a1c7ca2bf607dabd1690045cc7ad5cacd66185b01da3abda9386e04 SHA512 66faaee06b6243bfaf5ac512ebc14042b6b41a5c24de53ea376f0fb8b8959ec135bf7789dba6935d96e367059e8d04abb8198a229a47892f4c7df0f94ed677b7
+EBUILD jpeg-6b-r12.ebuild 1126 BLAKE2B 8a161ddc45d213b874815518bbaf5d3b5f5053658153e60bdbf6c376c29d0964aff0f220e41135935d1276641fad69fd8f4ce042023a9d6e4460ca07c7929694 SHA512 97aa4b853ca53728cebf56da61468b0cba0c35f78ac37add53c403489c7c13df2530194f2876f0c49f13dd3ff2fe162c9472eca8ab87266c0b6aec38f6c9ff25
+EBUILD jpeg-8d-r1.ebuild 1942 BLAKE2B 05938a73c8013d923e450b189b9c7f746a928237810ec41a017ecad5924d92a61d6b6c887f4aa3f26231604b94526905b83e8e5215bb714a432d1402a7a2f5e4 SHA512 f4aab4bda823dc772d309cb96156ae60bdf4d8528a8117540e7b7d82e116cc11cd45bcf0abc0dfc4767cc782e24905792cae6f96b1a24eae4de40a338dc124cf
+EBUILD jpeg-8d-r2.ebuild 1405 BLAKE2B 5bea27ef13659ebfc7f4e3aa9605da42b49ba478f15abe9cf0aca65206641a89692f6b764d99df40e977299e4c233da8a481285768369dc5aefc03a472950afe SHA512 809b128963ac2a257d8eaf58e2df54c34fd42a7f1a8756552dd88758f572eb30edfa2378f49b765276fd0d83eda4bbf9682efcf6b739d34164687c0b0f9ed2cf
 EBUILD jpeg-9c.ebuild 2001 BLAKE2B ceef32043af8ff6f786033bddedcd6d7bd5d585b14592dc2c70def0eed0a643d81fdea2b446a9d82105f7046e7fd7cf06b98e01b1d4284b0dd14aeab68547de9 SHA512 c0e11739e642b72a6c8b5708cd3a149272b3776226a0fb05fbed4050770b8a233be301eb0c2844a1afac4812c156cb84e9d7bf9a19ad1819802c67cd28cfa810
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-libs/jpeg/jpeg-6b-r12.ebuild b/media-libs/jpeg/jpeg-6b-r12.ebuild
index 3555b6c14cf5..1bd42de6f2c7 100644
--- a/media-libs/jpeg/jpeg-6b-r12.ebuild
+++ b/media-libs/jpeg/jpeg-6b-r12.ebuild
@@ -20,9 +20,7 @@ IUSE=""
 
 DOCS=""
 
-RDEPEND="!>=media-libs/libjpeg-turbo-1.3.0-r2:0
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+RDEPEND="!>=media-libs/libjpeg-turbo-1.3.0-r2:0"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
diff --git a/media-libs/jpeg/jpeg-8d-r1.ebuild b/media-libs/jpeg/jpeg-8d-r1.ebuild
index 6c3a792a6132..2c7155f00bd5 100644
--- a/media-libs/jpeg/jpeg-8d-r1.ebuild
+++ b/media-libs/jpeg/jpeg-8d-r1.ebuild
@@ -14,9 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
-RDEPEND="!media-libs/libjpeg-turbo:0
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+RDEPEND="!media-libs/libjpeg-turbo:0"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
diff --git a/media-libs/jpeg/jpeg-8d-r2.ebuild b/media-libs/jpeg/jpeg-8d-r2.ebuild
index 445113902da4..410e55d3088d 100644
--- a/media-libs/jpeg/jpeg-8d-r2.ebuild
+++ b/media-libs/jpeg/jpeg-8d-r2.ebuild
@@ -17,9 +17,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 IUSE=""
 
 RDEPEND="!=media-libs/jpeg-8*:0
-	!<media-libs/libjpeg-turbo-1.3.0-r2
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+	!<media-libs/libjpeg-turbo-1.3.0-r2"
 DEPEND="${RDEPEND}"
 
 DOCS=""
diff --git a/media-libs/ladspa-sdk/Manifest b/media-libs/ladspa-sdk/Manifest
index a43f425f1b05..d681d8ac4778 100644
--- a/media-libs/ladspa-sdk/Manifest
+++ b/media-libs/ladspa-sdk/Manifest
@@ -3,5 +3,5 @@ AUX ladspa-sdk-1.13-fbsd.patch 440 BLAKE2B 687df7bcd5ea20d7f8827e8639177c47731e5
 AUX ladspa-sdk-1.13-no-LD.patch 730 BLAKE2B be0edb600bc1e8834b10d55ec04294c40681900edd87564b36d6f1a3354f8b8f6899e3516d3137c16cf5c431118d79e2c4668045c6183bf99dcfb5eb83a106f7 SHA512 215aa1ce1338532e6a8f4ab90b29bd823030f6544d66a9954e476d4b9d5d8f9304b8dd39e386aa2e93565970878bb3174537b7315dcde9bc4eeba9ceb1cc01c8
 AUX ladspa-sdk-1.13-properbuild.patch 3020 BLAKE2B 4fc412986b9912ec0bee326b111f558b806811f12d430fe39b84a8751529afc96534c78c2e753aca8ba089074aa4e38c0c201237c63020c8cd2d3d5c2a6aac17 SHA512 6e86f309f8029d0de50cc505d7924965bc00d89489d689a7babab55f447ef43fbdf26807bc6f206e331c367a2bb1e5c75867268ac601991e3b7edbb9bf8046b7
 DIST ladspa_sdk_1.13.tgz 70540 BLAKE2B cfc5dce5b02107f361cfff3881173d04ea0ff5856cb7e9fb0cf5e23ca62c7f61b8b3b1573b95f67d82eb039cda874a3ba66856b6408e5e6785823c9d53c8cd2e SHA512 a1dab807fda58e08869d3f519be5fa91c394690eb13006fbe7f20b332548e4676b32b01273f5695bf36c8da72190c07618662a76d50f991b3f05068ac2b346ef
-EBUILD ladspa-sdk-1.13-r2.ebuild 1703 BLAKE2B db39ac73a8ba537cf190906669edda7c5b97d6790ffda6d81ef0f40b6d49ade8fb8b99713dfaadc7a97623df0d871f041db3141a7fc1fe1d205d1194f853d8f7 SHA512 ead0b72b4391004762a04593932bde11939fb509196e1a075fbb851894763534e5a8cdea363112854014cb68bb3652fddf2ea38819f2b33956d957dfc675e77d
+EBUILD ladspa-sdk-1.13-r2.ebuild 1484 BLAKE2B 80d1b2089f70f847cd5af8354dab3e59e15d98b9a2d521ccb0b16601a22c90e1c5b7ec8b9dc4e347946ea1b81e155c9cd956f03d622b66548e67b74ac265db35 SHA512 3df65f3c46a559021284ef4d8dbf261e2a6ee2ae17687a498f156d94d66b574b7359014b2ee2eab0205cc9e18623334f80f188561fc8e9012272155e1f89b6ae
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/ladspa-sdk/ladspa-sdk-1.13-r2.ebuild b/media-libs/ladspa-sdk/ladspa-sdk-1.13-r2.ebuild
index cefa883934a2..f9be1eb2b8a0 100644
--- a/media-libs/ladspa-sdk/ladspa-sdk-1.13-r2.ebuild
+++ b/media-libs/ladspa-sdk/ladspa-sdk-1.13-r2.ebuild
@@ -17,8 +17,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2
-	!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+RDEPEND=""
 DEPEND=">=sys-apps/sed-4"
 
 S="${WORKDIR}/${MY_PN}"
@@ -63,8 +62,6 @@ multilib_src_install_all() {
 	dohtml doc/*.html
 
 	# Needed for apps like rezound
-	# emul-linux-soundlibs doesnt seem to install this, so keep it only for the
-	# default abi.
 	dodir /etc/env.d
 	echo "LADSPA_PATH=${EPREFIX}/usr/$(get_libdir)/ladspa" > "${ED}/etc/env.d/60ladspa"
 }
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index ca131480239b..9c8568ac3f9f 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -2,7 +2,7 @@ AUX lcms-2.8-CVE-2016-10165.patch 772 BLAKE2B 3f0f47fd8a12ca0a8171090cf6ccec0be7
 AUX lcms-2.9-BE-test.patch 1367 BLAKE2B 5888ef7f7466c8a76c0b9ba1c87383e274fcfc0570ccc45f2a04c3409421415e7b466b93d9f3acb358ec16481c15cf2d466d0b5d9986f37f48d6fddf0e0be616 SHA512 17d4e612f4aeb6e62ac918aa5438e6ada16f456e4c740b4a13f4560956ff8ee7b6223360420c41de1d7284524460ebb1ba89784782671e258df19fc5a768f1e1
 DIST lcms2-2.8.tar.gz 6687005 BLAKE2B fb187eeb5ffbd5bc9c836fa75c26111605c582281edcdf27c91175248b8b71c69017b9bcd632b5a51360173777c87dff58cab51d209c0e8dda9f329f0d2e3eaf SHA512 a9478885b4892c79314a2ef9ab560e6655ac8f2d17abae0805e8b871138bb190e21f0e5c805398449f9dad528dc50baaf9e3cce8b8158eb8ff74179be5733f8f
 DIST lcms2-2.9.tar.gz 10953949 BLAKE2B 6f22a0a8901562e8a84a82c077f31b0155bf81d2b5023211059fa157061e78ebe170bd4744f6d15ab76c96ff9dae521a7560e9665a230337d149e1f0c9018788 SHA512 d91e320a97ef9d64cce31585b7df7c85accb52a0c46a10ed0f45a0ba46cc2ad6687de5151e59ac62170ea878ab48595c1493125f4afb1872824afe1c3f3c459b
-EBUILD lcms-2.8-r1.ebuild 1409 BLAKE2B c899180d962e69b7b42cd1cb1e18d543e2f85c2ce4c808663ddcd812ae3565a8a75cff800ea4739bc68a9b66b23a8a55ae96e6b7033d620abe40de4dfafca0a9 SHA512 bbda4f4ba381a4c689bc6b7eff42772807c48c5e310a2ab26ccb85cdfa409a262be8d6e724a3032c03099a152c2ba1caeb83927c2109df03c953f58a6cad3364
+EBUILD lcms-2.8-r1.ebuild 1278 BLAKE2B 0f0fc25defe0d0780edd98f41d9e52b01f37be57dbba65bdf9f1523bc49cc558952f97b7526e2fdea5c92f84ec84827eed4f24f9d1efcb80d7979612b1fbb5bc SHA512 e1a041d1c0dee93fd43534ef224058fb12f9ecc686a61414992a67a1cee439da7fb26872ce8b016e69cee8928e23f52e57629edeb8b8ab79ebddc0b3eea9fdad
 EBUILD lcms-2.8-r2.ebuild 1266 BLAKE2B 952439d7206db82cb2116a8bf8eb58e1bc690613131c714d8ebbe6f5293d8edf06f1fa6cb5dfb67c2e0cde947d6d0b10a69c0ab3a9b327c3938d2791f76bea4d SHA512 594167911967ab6a7a388f930cf043a0eda9f544847ed1521a6c8d5be44d4ff6e3af5c42d3109d448b4f94233bfdd71368858eafa7ecd637daa4a45936284273
 EBUILD lcms-2.9.ebuild 1247 BLAKE2B a382a8d7af3e9f20f6f5133788844f3f74b9d258a1e555b9359b76d4c4b2157f920de8b180b60f80ff4bd49e1639b993efb600ba4cbd1ad629ec2350256ef2bb SHA512 9a5f2fdd1a959a27afe3d69f0d8d208feafe4f7f18d2da6e8214c424ad2031b29e112086bdccc3c281622092fda1c975ff5125b7e4145a373f86631f00ca0726
 MISC metadata.xml 333 BLAKE2B f6b3984af87fe88ac29f5728eb0b45a5e96e99e3647969adf3de68f8754dc85a23c6bc4eff61132c78f168db7e19694d94c087dc81f7bac6009d253a8bb0daa6 SHA512 d8fb0a9e8fb4073583431d2a9668c01fa87230e1f27672a66955c21c842701109d6ad75c50f9f88334849be3809339a4562a745549d79fdf7aad9c7cd1b0485e
diff --git a/media-libs/lcms/lcms-2.8-r1.ebuild b/media-libs/lcms/lcms-2.8-r1.ebuild
index 02f88a95ee16..2e1fd225c4e1 100644
--- a/media-libs/lcms/lcms-2.8-r1.ebuild
+++ b/media-libs/lcms/lcms-2.8-r1.ebuild
@@ -16,11 +16,7 @@ IUSE="doc jpeg static-libs +threads test tiff zlib"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
 	tiff? ( >=media-libs/tiff-4.0.3-r6:0=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r10
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+	zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/lcms2-${PV}
diff --git a/media-libs/libao/Manifest b/media-libs/libao/Manifest
index 9be46868b91e..e01f9f0f58d4 100644
--- a/media-libs/libao/Manifest
+++ b/media-libs/libao/Manifest
@@ -1,5 +1,5 @@
 DIST libao-1.2.0.tar.gz 464596 BLAKE2B 6f6c09b5236711fccc1000292338fdebf24262b12f8d97394cdc4b66ba4a56ad4e794c107137e79ed2ec603fed506896f1ba1c4444923e566fdeed311bb5b75a SHA512 9456953826c188d67129ad78366bb86d6243499f2cd340d20d61366f7e40a33f3f8ab601c7f18ce9e24aa22f898093b482b2415b7e428c1486ef7e5ac27b3ee4
 DIST libao-1.2.2.tar.gz 96134 BLAKE2B e5b5d87c4357ee113769732cb6a7e0afa28b2bc4923be8dacd1fa39ac5fb96d8a5e19bc45137ffc8ec63eef0382130ab9b311aad3a66be4566e0cb9761417b23 SHA512 d2736d25b60862e7d7469611ce31b1df40a4366ab160e2ff1b46919ae91692d1596c8468e4f016303b306fc3ac1bddc7b727f535a362f403c3fe7c6532e9045a
-EBUILD libao-1.2.0.ebuild 1430 BLAKE2B 0fc8c2d1818fafe781f9861d92554c2e95909dd2fefc88010ac8626834bd78fdd90394bd525d351e8a7ab3eef67027d5eb957665c9edbd5bf311e3a56030338d SHA512 388a1eb632b88f51890183c0d7b13bde53afb5f19a8bda45c346ba101d543cd86ca1e247bd6af4276c7a6852b6d043019ae20a1ba2c93256afcda0aed862aad6
+EBUILD libao-1.2.0.ebuild 1301 BLAKE2B bea3a085840c6b3f69dd2c7a601bd2d28f85a8a1534ac390771c6bce104a5f279733e7a71122808b72c702dc969a8c28e5e03e7addec87b28f00168010990cf0 SHA512 ebe5b0b6e3be5e6e1269ceef27f07da47bcb557bf157a5dbab903b766228c6fbd48392ef09924aed332862d1298bc2ba601f27fc823100302d9f3cd8121e1e84
 EBUILD libao-1.2.2.ebuild 1525 BLAKE2B f7dcee1beda528e767eebee017e59b204aed95d35aa5b2cd99a187cf84afdea1cfa798f78b10efb2a524c02ebede530f49582c709a522aa32b3fc520fad29ae8 SHA512 f673ee3b094929765e7f53891e2757de8a0dc4825f0b3ae3873d7c7f767b4bcf11995427614bb63dbb421c3cc7cf0e951d9e05bd3451586cc5efb4a78ecfdc5d
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libao/libao-1.2.0.ebuild b/media-libs/libao/libao-1.2.0.ebuild
index 9895efed9faa..8997776bba3e 100644
--- a/media-libs/libao/libao-1.2.0.ebuild
+++ b/media-libs/libao/libao-1.2.0.ebuild
@@ -16,9 +16,7 @@ IUSE="alsa nas mmap pulseaudio static-libs"
 
 RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
 	nas? ( >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20131008-r1
-		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 561f6245ad6b..fcc0363bca31 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -1,4 +1,6 @@
 AUX libdirpc.patch 1877 BLAKE2B e8df5b7b5a662d68d3386e348964b17b15bfed49b8cafed55b9893878ead75e00a1ceac92e63f5dc446b03faf09af26e732c508c83e851a7e3664471c8dd8521 SHA512 ead273addda6b39b6f10b7636465cf313b1dfeb344457227acb1d8c03bdab8f78ba0e44ec90b1044359ae445e1e1ce1a87a06df91c86a406b6fd4ce41713df0a
 AUX pthread_lib.patch 561 BLAKE2B 7d1a68f9c8a9f250aee9ca44a2cb787a802195708f0dc156d22073f21f83772167c5c57d953551a55385edb13ea8c5e8c28cd1379814175ff915d03ad8bf2860 SHA512 7a7060aa7a7062d85ba9ec3e0bdacdd552c5f2b7ee5c326da1d0d4a48b28693651703deccddcbc31b6e3190fcc6ac6e665bf09621b0ad278638d0812f557be85
-EBUILD libaom-9999.ebuild 2166 BLAKE2B 1aacc17636fac78328fddec4fb26f8fa6b8ceb9a78da48176dd1590f4cf1c5f14d5f03146b1ac47db730207a6bc5b4f234db5d3c677cae242aa97d95b018179a SHA512 378a53fc8896ba82996a0a0293da437086e6c273c2c8c1dac8c6a24d12858a49af461ad8e5275642860c60bd95b5dbf9bc79ad4d3eb3c40376b1fafeab5437fa
+DIST libaom-0_pre20180421.tar.xz 1927112 BLAKE2B 3e70917e58ea4871c640f9df1da17f50dd7b1b1c41b99a2411bc68f11ae4acd76f358d1aaab17ba240dfa104fca1d5ebea057a0ba5666741658943dad10601ef SHA512 169872495a210192ae4f97d4d630b00d2219aa085999d9d90136274ec2dcf60d5001c91b5d920ee5b14b76cf02a9a067a3bf57a152bee9e9bc5a524c9205642b
+EBUILD libaom-0_pre20180421.ebuild 2187 BLAKE2B 3583402ac68a21e83ab2f6c6ee8682fc72b481774c6bd55913830690c1c1c0bb261d4d12ac0a2dd07dbac6702d2fc3a5ed5b78d847933bab2441a3bc8d4d3672 SHA512 b2daceaaa5bf2d9189ffbd8b76d2cae8bb145ad5698b020f487fd3a64cffe99b7d394ebaebee2a875728725d44e30133206b9ccd011fd16deb28c2ca8863b812
+EBUILD libaom-9999.ebuild 2187 BLAKE2B 3583402ac68a21e83ab2f6c6ee8682fc72b481774c6bd55913830690c1c1c0bb261d4d12ac0a2dd07dbac6702d2fc3a5ed5b78d847933bab2441a3bc8d4d3672 SHA512 b2daceaaa5bf2d9189ffbd8b76d2cae8bb145ad5698b020f487fd3a64cffe99b7d394ebaebee2a875728725d44e30133206b9ccd011fd16deb28c2ca8863b812
 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-libs/libaom/libaom-0_pre20180421.ebuild b/media-libs/libaom/libaom-0_pre20180421.ebuild
new file mode 100644
index 000000000000..6261a1ce7e7f
--- /dev/null
+++ b/media-libs/libaom/libaom-0_pre20180421.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-multilib
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
+elif [[ ${PV} == *pre* ]]; then
+	SRC_URI="mirror://gentoo/${P}.tar.xz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}"
+fi
+
+DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
+HOMEPAGE="http://aomedia.org"
+
+LICENSE="BSD-2"
+SLOT="0/0"
+IUSE="doc examples"
+IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_avx cpu_flags_x86_avx2"
+IUSE="${IUSE} cpu_flags_arm_neon"
+
+RDEPEND=""
+DEPEND="abi_x86_32? ( dev-lang/yasm )
+	abi_x86_64? ( dev-lang/yasm )
+	abi_x86_x32? ( dev-lang/yasm )
+	x86-fbsd? ( dev-lang/yasm )
+	amd64-fbsd? ( dev-lang/yasm )
+	doc? ( app-doc/doxygen )
+"
+
+REQUIRED_USE="
+	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
+	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
+"
+
+PATCHES=( "${FILESDIR}/libdirpc.patch" "${FILESDIR}/pthread_lib.patch" )
+
+src_prepare() {
+	sed -e 's/lib"/lib${LIB_SUFFIX}"/' -i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DOCS=$(multilib_native_usex doc ON OFF)
+		-DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF)
+		-DENABLE_NASM=OFF
+		-DENABLE_TOOLS=ON
+		-DENABLE_WERROR=OFF
+
+		-DENABLE_NEON=$(usex cpu_flags_arm_neon ON OFF)
+		-DENABLE_NEON_ASM=$(usex cpu_flags_arm_neon ON OFF)
+		# ENABLE_DSPR2 / ENABLE_MSA for mips
+		-DENABLE_MMX=$(usex cpu_flags_x86_mmx ON OFF)
+		-DENABLE_SSE=$(usex cpu_flags_x86_sse ON OFF)
+		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)
+		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)
+		-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)
+		-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF)
+		-DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF)
+		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
+
+		-DBUILD_SHARED_LIBS=ON
+	)
+	cmake-utils_src_configure
+	rm aom.pc # ensure it is rebuilt with proper libdir
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+	if multilib_is_native_abi && use doc ; then
+		docinto html
+		dodoc docs/html/*
+	fi
+}
diff --git a/media-libs/libaom/libaom-9999.ebuild b/media-libs/libaom/libaom-9999.ebuild
index 9b472bd99def..6261a1ce7e7f 100644
--- a/media-libs/libaom/libaom-9999.ebuild
+++ b/media-libs/libaom/libaom-9999.ebuild
@@ -8,8 +8,9 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
 elif [[ ${PV} == *pre* ]]; then
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	SRC_URI="mirror://gentoo/${P}.tar.xz"
 	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}"
 fi
 
 DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
diff --git a/media-libs/libcuefile/Manifest b/media-libs/libcuefile/Manifest
index 0f74c69c303f..99f7894f470b 100644
--- a/media-libs/libcuefile/Manifest
+++ b/media-libs/libcuefile/Manifest
@@ -1,3 +1,3 @@
 DIST libcuefile-477.tar.xz 41676 BLAKE2B 01232ed507386809cd7960f06251139fd5c11a251f68e59513b6b5e482b9b7977e5d3fd8d6147a47e4a74b8e5e320019383a4d69c6c3395ead3cee0d8c5c3b43 SHA512 9cf46f9fd1b178758b2d15fa65d67d069bba41a83354a5aedf7b57ed5752bb68ad1d10208ffbb22f2aac7bd5d938e9395f67d4248441743d45e0099638d60d5e
-EBUILD libcuefile-477-r1.ebuild 833 BLAKE2B c79c26aa669688797603c7c3f05b84a921dff4331c1fa80ba76981c2d3658a880d75ddc1e028fb066c96a02cd6a926a54f68caadd0f996eac3d0a153d920626d SHA512 105cb11439eb31d454cff95f703e583f55824db33efb6414abe3d42faa56d80905ff5e462dc9406f4f4a186aba7695e16d666d8899c697d617c4ca7834495870
+EBUILD libcuefile-477-r1.ebuild 695 BLAKE2B 9096d690b2048bbf2888ae39c48538917d4480293a037570a83e0019836964b657ecf3a0f4e0f6c89c90569ae46aa0b98aabb6a9427e17e71c1af282ceea1610 SHA512 783edf882ea745056ee91cf961ff778d5ea01f73cd8cd2609d8333de286f1ed0fa198c98d3530be605394ca6b77063cec648d6d700db90ea62ab9d935084dfab
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/libcuefile/libcuefile-477-r1.ebuild b/media-libs/libcuefile/libcuefile-477-r1.ebuild
index 645c6d45c62c..a9a885574d6c 100644
--- a/media-libs/libcuefile/libcuefile-477-r1.ebuild
+++ b/media-libs/libcuefile/libcuefile-477-r1.ebuild
@@ -15,8 +15,6 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r2
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
 
 src_install() {
 	cmake-multilib_src_install
diff --git a/media-libs/libdc1394/Manifest b/media-libs/libdc1394/Manifest
index e0e4bb4f5b97..38db2eef23e6 100644
--- a/media-libs/libdc1394/Manifest
+++ b/media-libs/libdc1394/Manifest
@@ -8,5 +8,5 @@ DIST sdl.m4-20140620.tar.xz 2420 BLAKE2B 2057bd14817809fc4ce8188971e846d70deda49
 EBUILD libdc1394-2.2.1.ebuild 1391 BLAKE2B 8ee0fcbd135891415cf61abeb5902d25182b92a7ee7325a3b8437db3e01f55a3ccd221b243abeb23ffcd792eec1c133dfaf8efe7ff7d26b55381c5c31eb6506b SHA512 a04d57c24bb668d11fe99aa79f6b322701ce908a80b7ea9eea11c7b170254cea2fbd7ae73dc405fe55d2b00c93e33d8f7f68de352b19e6c327e58d8ac96855ee
 EBUILD libdc1394-2.2.3.ebuild 1369 BLAKE2B 2a33c6efabae47445584a2561956745ef73dc136cf8b20e0b25e9148e5bbd92e26fee4d96be441a056a606addf14ed458e6c81443c4932874cdf9d67568a5c20 SHA512 c8b02dc5379fbfd667c8cf55729661af6b7f5aabdd2ccc4b53975f4d90a01f129b3a4696c63e948a5b2ca0d68448b323a2612a0a9e369a5df03233b605d149e4
 EBUILD libdc1394-2.2.4.ebuild 1369 BLAKE2B 2a33c6efabae47445584a2561956745ef73dc136cf8b20e0b25e9148e5bbd92e26fee4d96be441a056a606addf14ed458e6c81443c4932874cdf9d67568a5c20 SHA512 c8b02dc5379fbfd667c8cf55729661af6b7f5aabdd2ccc4b53975f4d90a01f129b3a4696c63e948a5b2ca0d68448b323a2612a0a9e369a5df03233b605d149e4
-EBUILD libdc1394-2.2.5-r1.ebuild 1385 BLAKE2B bf6bc247e43f6f0c5e892cac7a93626b3705621ba0ac836d03d4d5d67d7903210c80db97e4b0808b0109dd5122565456fead619a83b4c6ac748e151810a6c66b SHA512 71cfc20ccb85ce238d6640f09ba5820edba17bd88d5cb063deeda5327bc8e88268435946846d4db82121b16969d88863d7fba7ddf5fa1c04aa1dc1f4913a8e90
+EBUILD libdc1394-2.2.5-r1.ebuild 1384 BLAKE2B d5fb6e7c7c45292e68e6d01465151806e6c2ab769800bd1a97ce202617beb33da478f34b1843d3127500061905da3fa89ec08d99ef869a6f206fd2bd95c3dafa SHA512 c3a4ddeefc84ea704931aa26845f9b01b3491d2e666d9bacf08ff0e9734878ec33814e67d5c22a91c8e0d630252c1e107c9c296ad681c6d30c61dc8c90ac581b
 MISC metadata.xml 310 BLAKE2B e433df9a1c48848c371f278ef408de74d5a78896a17a511cd1dd7cdf35e77a87070178f22ad55f70a200088f8f2186d970b1c5cea7eed8ca66b8bad58549667b SHA512 2fbb994fc42ad1c7e1da90b5525ddc1ee1b1abeefeed6496b3aea4df79d556e7032291c782c022ab855216ecdf1539e624f951766f19e33564fd80646bec25b1
diff --git a/media-libs/libdc1394/libdc1394-2.2.5-r1.ebuild b/media-libs/libdc1394/libdc1394-2.2.5-r1.ebuild
index 6ca904182ce9..239f100aea53 100644
--- a/media-libs/libdc1394/libdc1394-2.2.5-r1.ebuild
+++ b/media-libs/libdc1394/libdc1394-2.2.5-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ppc64 sparc x86"
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/media-libs/libdca/Manifest b/media-libs/libdca/Manifest
index b1a570a326e9..84f9bc36f500 100644
--- a/media-libs/libdca/Manifest
+++ b/media-libs/libdca/Manifest
@@ -2,5 +2,5 @@ AUX libdca-0.0.5-cflags.patch 492 BLAKE2B 3090b187518cd899b76fff017bc544ccafaac0
 AUX libdca-0.0.5-tests-optional.patch 508 BLAKE2B ed77381970c59dee10e0b32d36183b390574acb0cfec1216f83bc4f2af784bc973d303d051f6348fd4d69dcbbcbc8b1bbb2f3dc7857fdaf05c46c885a463aad5 SHA512 0998e84e4855367b4c43e27e73d87c2b12c849a80864de66805e344eb32ad8463d46602d63b92edf1dd177d4fe77aa119c07952c6c2bc5de6add13468a9082a6
 DIST libdca-0.0.5-constant.patch.bz2 3424 BLAKE2B 048d7afd856090b5f9d0db1d5894b78d037fa1c03086271342527a1bf04f41ed379b38fe6d72eb9bbf74a864c67710b5f9abe53177cdb2f4f53a8e7502d77c44 SHA512 37bd56b8c240f16a6ee86b04d44571345278f8b9dd395cbc307e9fb7e6c001487411d1b4775af19dc97f18fcaed63be97fafeb4fe504f0a76b87022ec792d23e
 DIST libdca-0.0.5.tar.bz2 393291 BLAKE2B 093e941e8cd25ca52ae43ab16607f8ff3c5ebb95ffc4b29c3cb771b6bf9ba45da4cc8ebd83cd91ccd66b0dd981c32a6c77cb3e90f46093b64b9a483dd854ffb6 SHA512 d9f0ed34efeb3f27af8424fcb3e6df56744c6735854a65b5709c02b42b4513b9c4618dcc19eb44293afa051bd95616651bda5fc3b49dfabe975d0babfb1bc287
-EBUILD libdca-0.0.5-r3.ebuild 1637 BLAKE2B 786ce17e3d0837e1ab1e141fb2ceaa01de7e88495ecef6ce5dac59c7589c3d323fff44193d30148d1022a88cec3e465854dcdb76c187e0310b8eef0c01afbf6d SHA512 f055d683fb1296c2d6a1041823b62fed47e49c76bc380907db28a063eb238fb3669c3504a0bcd3b543d4a8a0415ff9f55aa1b8d4052654a04036e9cee4899bfd
+EBUILD libdca-0.0.5-r3.ebuild 1508 BLAKE2B 4fb0529cfa895ca1f77a230c795a7fdeedda638aead83aaec1be5ea6c58bdd05c4ce820bf3c16f25b281bfd940655f67abd29287de6db73a5569082abc2f0d0c SHA512 2b07259aaf7252f8f2b81ec285015ac375c7e21d9f5bf1c1886b9ddd302b3c26adbe608f6dea7ca0229e2f6365cfd480e4b4cb86f78563c6ab6c4cd741c3f30b
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libdca/libdca-0.0.5-r3.ebuild b/media-libs/libdca/libdca-0.0.5-r3.ebuild
index 6b2282f8e196..6b12d373c533 100644
--- a/media-libs/libdca/libdca-0.0.5-r3.ebuild
+++ b/media-libs/libdca/libdca-0.0.5-r3.ebuild
@@ -14,9 +14,7 @@ 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"
 IUSE="debug oss static-libs"
 
-RDEPEND="!media-libs/libdts
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND="!media-libs/libdts"
 DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS ChangeLog NEWS README TODO doc/${PN}.txt )
diff --git a/media-libs/libdv/Manifest b/media-libs/libdv/Manifest
index e8f3a380fe74..df2af233c235 100644
--- a/media-libs/libdv/Manifest
+++ b/media-libs/libdv/Manifest
@@ -2,5 +2,5 @@ AUX libdv-0.99-2.6.patch 439 BLAKE2B f7c373b2f2a5f36e4a040e0df2bbe4eec95c00f9550
 DIST libdv-1.0.0-pic.patch.bz2 9771 BLAKE2B b8a597b5fb5facab05845dae1d08a84a17067804ef873b97b7f975a96c622a5cf3b2bbb17d3f5a364dd1aba1afbf3dbf2b18695f9ae8ccf3fcc478b3d7a17a4f SHA512 18fbc341f9a9349f2325c4cbdf2fcf60bf0b35e2efeaacb9a3e541ace4ab2ffcf64d18409b2d76fd40c6096a69ffd151c2bdc8c33411d1640f150202eef12021
 DIST libdv-1.0.0.tar.gz 574565 BLAKE2B 42d17b07501fa508630afd1cdbaee9378f657a4ee4b77666f1a147ddfcf5a9d67d90e0a6da53bfe4f2b5418984579322565c9e8c76516e8193e75bd4751a731c SHA512 19887a6f452fa7da8924901ad841f5c4a434a3bde56c932ddb43717592aa744281e3a8ad220231e11d7e6bc3b0e704952a8324e5f85d4e088675edceeeca7dc8
 EBUILD libdv-1.0.0-r2.ebuild 1041 BLAKE2B 582bc4fd5a9b52f30cba35751b58fb461e04d4b1943f0ba3fe0efe4a16e56efd6a51b6b9544f18ce13a67b2891fd6e9911e885cbb4c7782ed7e211608a536ddc SHA512 7eda2a750a40693fd5ed7eb8b82432cec0670f06969913fe6ee70f484a3166812ead87db827a42506fb1fa42d4ebb2539c64d01620913a11cb42661749d23a93
-EBUILD libdv-1.0.0-r3.ebuild 1248 BLAKE2B 3670afbc0b38da224b9cca3a90f062e7f33897a41ef7fd249f7c472b88583e07e5c6575ffd757ddd42a53502d6ebf53f4d6730a636e841e5d7fcd9105bebf57d SHA512 6392fc62e55ae5cdc569cc8cb7fcc316a41e7f8e7456fcf4ce4a91e2383483519f7f1e25e3faa74eb7591f4739a47dca7f347cb3f8f5b7f1dce0016ea43d0ced
+EBUILD libdv-1.0.0-r3.ebuild 1118 BLAKE2B 5dc3db44ea106f731a05a8c5cd334577c45188d62fc17234ea23cf9226152a6bcb5dbf466336eee7c2aafecb29adb8f9b8eee833f179b30db3c7c2b7a6d7beb4 SHA512 6997e92319032ffe047db42104175c4fda235dc7e9bbf2bdeb368918552a7efb6e18e9c509057278f24f8f523ef5b74c82148275ed1de79239d30bc766241a3b
 MISC metadata.xml 298 BLAKE2B 673bcb158cdfda64a33e7d107dfbe978badcbbd44312638f845fe3c1fe481d3060820f587d87277366955e47d65334e1365d87ae3b733ff22e1442bf399336be SHA512 7a9face79c85c9ddf6e562db5fe3c1702c20147adec5564dfb67695e5be198732c57d5592985466432ebf9201704dc848b9e8b73f9483096c942f0c5ecf87cb7
diff --git a/media-libs/libdv/libdv-1.0.0-r3.ebuild b/media-libs/libdv/libdv-1.0.0-r3.ebuild
index 719e93034b4a..4aaa15a9ac6c 100644
--- a/media-libs/libdv/libdv-1.0.0-r3.ebuild
+++ b/media-libs/libdv/libdv-1.0.0-r3.ebuild
@@ -15,9 +15,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static-libs"
 
-RDEPEND="dev-libs/popt
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r12
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND="dev-libs/popt"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/media-libs/libdvdnav/Manifest b/media-libs/libdvdnav/Manifest
index c2249cd34582..3e1046c2f8b1 100644
--- a/media-libs/libdvdnav/Manifest
+++ b/media-libs/libdvdnav/Manifest
@@ -1,6 +1,6 @@
 DIST libdvdnav-5.0.3.tar.bz2 372203 BLAKE2B 82b935157cb59c14c0dc2ce043027dca43d181b1dc24435a4876310b4edb9961da96b202c6e99b6531fce22aa05dda2352cdbcfa42ab47051e533ca3fd458158 SHA512 d6d0519f654649bd65b3029224191e7d6acc893d94e8578e435d77b75327584e9f44410a062c1fc60c6211f5bea6b3971228d84de595808733ab7356980e0123
 DIST libdvdnav-6.0.0.tar.bz2 369605 BLAKE2B 911b786f1cf37d32b0516df9f3ae3c388ad352206e67f73f758984795459ced7507f1454747a205b64c2d1f42922ee26ee9d434499ceaf05053dfbeb4d7e52c7 SHA512 89d1e976d8f1cc92692e86e793403759b4d705682ba7418dcfd7dd3c38861238cead303fe4baa2059ebd7e9b82a77bbdbf32e50b20848e78939ee9e75d1b96d4
-EBUILD libdvdnav-5.0.3.ebuild 1085 BLAKE2B f864c4c461f7be859d7efb886f4110c12c7468014427b7db51ba03cc6ade114fd9f0d1239a3da2f3394f11e778ae68bf07c68607cad1f115444aa7271ed34f8d SHA512 77c4bb2c123ab734829e764a762ae4d32ff29817140a287f8660e913a063dff21664aa57a8973b70418bafef6919db45c1db263a0a5541948eadca78d49b70c3
+EBUILD libdvdnav-5.0.3.ebuild 956 BLAKE2B d4fd80a6a3aa0116e136f516439fa6b80cfb68cbfacc5d7d04413998e31fc143f83654f29dd9d8348136086b900f0c231312a7675f93c077f4ab1732b5f09347 SHA512 bc29a20d9c78566bf4ffe0488be1996d76101cdf1736e93c13c8f6501f6e3dbf927003b2ff0b7c951af394126f3195bb997f4148d6581791a1c032e6ffb1dd28
 EBUILD libdvdnav-6.0.0.ebuild 1180 BLAKE2B 5a1f568ba55725c8a911590d14d469b76897a2c844efa800bb1e69948fd6424b44bf5f174f0bec57f3c1baa9b63913ae4233a799f203303f829317dcd91bc71a SHA512 69038fa8159f73d9a9c081571f44e04c48fa64bc7d8ce92152930c58f896a54d4a9a1bd2b6496c02dae154e99ae02ae7a49d8fd43b2eb3cfb24853604e299da2
 EBUILD libdvdnav-9999.ebuild 1186 BLAKE2B 2f6ae269963f4ffe99400737fe9bf0b9abdb7ae2d162aeeaafbd2b9afc10feef07647f7059479956a6594e032e63b4ace45ad55cf0b1f215deb16ad0038d7b13 SHA512 5e86d911f940bce20f8e3e962c953116bc306d3fc020e845b104abeab1fd1017a9e6967d17ac5cc639bf2257ff01054ed0945e995e1683df006e06513cbd96d4
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libdvdnav/libdvdnav-5.0.3.ebuild b/media-libs/libdvdnav/libdvdnav-5.0.3.ebuild
index 6a62a003f8f4..b4625bee7aba 100644
--- a/media-libs/libdvdnav/libdvdnav-5.0.3.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-5.0.3.ebuild
@@ -20,9 +20,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="static-libs"
 
-RDEPEND=">=media-libs/libdvdread-5.0.2[${MULTILIB_USEDEP}]
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r4
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND=">=media-libs/libdvdread-5.0.2[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig" # To get pkg.m4 for eautoreconf #414391
 
diff --git a/media-libs/libdvdread/Manifest b/media-libs/libdvdread/Manifest
index 24e12ae481da..b37db2aa4ca9 100644
--- a/media-libs/libdvdread/Manifest
+++ b/media-libs/libdvdread/Manifest
@@ -1,6 +1,6 @@
 DIST libdvdread-5.0.3.tar.bz2 394885 BLAKE2B dc30548b8cdf30b9c114f4314fe0a2350b31e38321f662072e81492d126050eea8a601f12c03a8aa2c10c453f3ff84064fa4768cebe9395e4314cb2a29e872ca SHA512 1ca438f0b5c406549eec62e1abef1e8745b9f932bcd30a3194ee9e37995b269ec8f1652a24cc3d2cb11ddb964e4a47a06e5405f9402e616586ff6263a1af3fc2
 DIST libdvdread-6.0.0.tar.bz2 394627 BLAKE2B 08007113d726f96d2b179aadd2e5737ab9eeee2a52864eeaab3d2633993c66ca076559c920bd291033de794f2037d7480e4ad6f704822303f5c5b29db6b8d7cd SHA512 b07179f2f665adf6ddd7bf8b7c48cd279f3f413c5719b8ca8467e53c7cd0cac02a40101f3717186dc0e4e69e5d9c7ac6bf98a76901412d74150b9fc7bfdd2479
-EBUILD libdvdread-5.0.3.ebuild 1008 BLAKE2B 4e629e1d24dda90ccedff708db1a54d73b435641c997b75805ca784ecc3d8bab106178bbbf9768196b61a962831d30c7b145bdace0bca7f87392059280f61da7 SHA512 557cf66d4d654fbf0f26f1917700209edf7a8ca67f83792224658c6c44559802f4d6da8f6cf67bcf520f9279fbb67542233575dfcf3575dd64a4a7a09bcc4c62
+EBUILD libdvdread-5.0.3.ebuild 879 BLAKE2B 0dcfb8a7057c5d4010b6a4bd618d4f3b8c036b6ddeb72a6f5a45bff44dc7c1fc1f9ba561d0c921abdf4b5bb363af101b70453a97e2dc7954e2295c6881d33e81 SHA512 a302f5c3f73aa6238b6ea2e1a8dd2dbef1d768ad08e3d35918ab45565780badaf6a0287ec5629695e6563c1ce44b297df2b077d25b517c7f85f91296ef1c2979
 EBUILD libdvdread-6.0.0.ebuild 1150 BLAKE2B c1eb9a1eb346a2cb54ef042bc57a4f726c23185f9dc49fe0bfa9b859ab2d313367b671ecbfd1116648860f68736880c72f5e07b5f06401a24fa445f75d1ad511 SHA512 99a8c1afa8ff85b604d97ebfea6ad180a6bcd7e0ada53c3b14c32ae82ccb40541bb8b5f7b87dd786652b220363051e8ab93ae2390ea48866d01d65520cb7a1ab
 EBUILD libdvdread-9999.ebuild 1156 BLAKE2B ffdc1f7a0f7fd5e2a8e17e64a18f7a6df2f93cb305b5851251ee2c494dec221dc8e50e8d6d69b8a8e7be56b042d7ba36496b7f7c05bed189256bc309d0b02008 SHA512 193e1c2ece5c75ff5e326ee789fe493a5e42ccb8f8afa311edef85196e6dd32506d1443489e6ae5b26edc86d135aa662de84bdb609fc8249b8a068bbd6a7729f
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libdvdread/libdvdread-5.0.3.ebuild b/media-libs/libdvdread/libdvdread-5.0.3.ebuild
index 5eb402370ab0..6834364ffda4 100644
--- a/media-libs/libdvdread/libdvdread-5.0.3.ebuild
+++ b/media-libs/libdvdread/libdvdread-5.0.3.ebuild
@@ -20,9 +20,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="+css static-libs"
 
-RDEPEND="css? ( >=media-libs/libdvdcss-1.3.0[${MULTILIB_USEDEP}] )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r4
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND="css? ( >=media-libs/libdvdcss-1.3.0[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS ChangeLog NEWS TODO README )
diff --git a/media-libs/libebur128/Manifest b/media-libs/libebur128/Manifest
index 61c13503c009..11e1f40ed803 100644
--- a/media-libs/libebur128/Manifest
+++ b/media-libs/libebur128/Manifest
@@ -14,5 +14,5 @@ EBUILD libebur128-1.0.3.ebuild 1159 BLAKE2B a284d1752c4c0d780c24d8c4ef6a291f824c
 EBUILD libebur128-1.1.0.ebuild 1069 BLAKE2B 44f6662374f5799fe69bc3a301b78b78f30eb02746e08395a5a4f755a1cb460989120981824a3eb9a582488a88d972604648b7a0f8767262951c588a9a8dc491 SHA512 897b218e80356300bcf6494816db7dc487591a21ca35764b34ee7237377b4f9c37b4e3c2eef522ac4469061fc2429db07a016e30ca498b3ffe92763ee85cf5d0
 EBUILD libebur128-1.2.0-r1.ebuild 953 BLAKE2B b25cb6ba208c8db3e762982e16b661e1d4ed82299065be01a59a82dfc1d149b64275290ee630b4cac80ff46173511f3c9cacea8d3f0c1cc8a92d602e16bb6d40 SHA512 a7b1ae3173dd6ce3ced5f947750b4fe223f4d468746f77df471a20753439534269ec3b8b6fc9288cffb80f60d15e84debe165a9a3f8fb7d631d3ce4e7e73889b
 EBUILD libebur128-1.2.2.ebuild 1049 BLAKE2B 077efae20cf8edcf0c1eb90ee5b3ffad097bcc3f8e7b137c52482bbec2c766ec897f2271d6f1e528ef1036368ab3383e02ed3d4ac0a35ec1c8c67ebe1457cb08 SHA512 33bb394ebf1aefd5447a38b88d9b72892ec2e8580de5691bc2f96e4c1673a01373d450587917c45d5d77b76aae9ef4137e037add82e380b57c94fb7c0d84c141
-EBUILD libebur128-1.2.3.ebuild 961 BLAKE2B 87801b3d068599ad48ff7a9f5eb37d46ce185e8d4fc56baa01e06bd4539eb22c0a70c3c46ca4c564ee9eee522f4e4b0a2732c1fbd5dfc89396ee7616e48cf3e3 SHA512 bd5a753943b3d510e42195a0340d2ba25f8a2e4ab2ef7c7369a021b50a1fefb8aab9e99705cf83fc08ca7ce61e99754366a3ce3a9b0bc78f31536a2a8078d018
+EBUILD libebur128-1.2.3.ebuild 966 BLAKE2B 882581c9744364f4fdd8c4f6ad92f73738ca6cfc965b3d8ac4e7e8f7a6667cadf6e7305a0ce6f1192b2433e1fbc3ecf3464468edb211b1f3338ce6e5496508eb SHA512 f82bb5049af5e486337bd2c36456cd05135d69ac804c521d146026b29779d0a21653aa9dfc7e8538bec8c757af99e396f90fec49c309443028a325a5fef056ae
 MISC metadata.xml 752 BLAKE2B fd4288cd3e104741b109ce1bfaa4562ec9258940a3b43d58d6a6427a6ded2a762c56907012811e2fd9de363ba87f3978aed62c0b1c9c79e1f9eac4134d1c6552 SHA512 d0117447e87d367f45438b1b2ebd3f238b8ddf97491d8d742bb0f6609e6da4cb155249f86f95a330545c89b6433badd93ff2d26b55a3417990d63612e26b6218
diff --git a/media-libs/libebur128/libebur128-1.2.3.ebuild b/media-libs/libebur128/libebur128-1.2.3.ebuild
index 2374f0aeeb32..f5f8d930ec43 100644
--- a/media-libs/libebur128/libebur128-1.2.3.ebuild
+++ b/media-libs/libebur128/libebur128-1.2.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jiixyj/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/1"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE="static-libs test"
 
 DEPEND="test? ( app-arch/unzip
diff --git a/media-libs/libid3tag/Manifest b/media-libs/libid3tag/Manifest
index 49272ececad0..f2053681d7a8 100644
--- a/media-libs/libid3tag/Manifest
+++ b/media-libs/libid3tag/Manifest
@@ -9,5 +9,5 @@ AUX 0.15.1b/libid3tag-0.15.1b-utf16.patchlibid3tag-0.15.1b-utf16.patch 583 BLAKE
 AUX id3tag.pc 222 BLAKE2B 3ad47be06f4752c8398f12a598e2955e8164bd633681995aa1aee925a335a0f8472a91288a13374ce8db6b1c554b6c1077c3ee1b6c713e455136f9ed0dc91142 SHA512 591fdff509376a3afeb43d6dc7f9063f2388d024494952d366dae2ba8ffc3d2d5e430e0ad7470951d6c740f794529994b882d12840ff06d2fffffe70c2feae84
 AUX libid3tag-0.15.1b-fix-signature.patch 424 BLAKE2B f3dce1cb1372f175758b7c48b3ee3a6f1c95c840f7103116f9ea3ef805c5aa186c2c87747f02cb67fda1e4c13c806c5a0b32b304c2f66941fddac0942761b62e SHA512 3f320d1d8719afd84aa0cf2a9e5615f3f535f84d1987f12df0a9d3f2b7c02e2c87fbc3aa41d538cdc4f8a30e629de6f3fc3a4e79f23448fd39d4c0c438c803fb
 DIST libid3tag-0.15.1b.tar.gz 338143 BLAKE2B a4e4e66177eae9aaa251c71d605034488fdd9a0a207a41a41f85793ecbb763dd4a4c8f01183eb45a5c8563c4ad120e73b29578fd4c3bb8e467e39c5427b530b5 SHA512 ade7ce2a43c3646b4c9fdc642095174b9d4938b078b205cd40906d525acd17e87ad76064054a961f391edcba6495441450af2f68be69f116549ca666b069e6d3
-EBUILD libid3tag-0.15.1b-r4.ebuild 1738 BLAKE2B babe2379621ca7835352424005211573da7a6de931eba901af0a0a9197ccb528f077a846000578c5b760a951a65387023db4f3f995e09653e7bb17715eda1cce SHA512 1bdba6946d566985b982c22cf88df16d8177206f51cfba090c7dc34f0898a8cfd2b6c97936ffab10273f325ab3cc95ba82ddb40768ee79fbc4ec6c43ca4d9e64
+EBUILD libid3tag-0.15.1b-r4.ebuild 1609 BLAKE2B 69ed0d88da6a3694027972bb47a07f771f25ad1c8e21c5efb92c62fdc61d3835dc426b254910747019019180789d8d1502a22a14cbaba3227a70066c57909a19 SHA512 5205b7d58c4a38fc74e9dc69f78c5e85ff3ff018c13ffeadcb6ee9bdaffd20d89fdc40608855b347192a962abfd3d26710e99192c42768d98aa102ccd0b3d393
 MISC metadata.xml 326 BLAKE2B a9064ce28313804fb873d3e0b4fcb96681a2fcdcf60011d629268f73ab47f6c00ff6e0d95d2d075ec6af89bbe7aea4b6346ef2500815f08a69318a8736e7201d SHA512 b6c3a0765c5d00fd44caf7266edb75a373d8d4e813ac7f68507067f57713090fdc84f95886e73401d9c912f7f64453c975117030692526a49aebd6f5276751c9
diff --git a/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild b/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
index f5b1ca4ed578..bd9dcaea9e31 100644
--- a/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
+++ b/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
@@ -14,9 +14,7 @@ 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"
 IUSE="debug static-libs"
 
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r6
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-util/gperf"
 
diff --git a/media-libs/libiec61883/Manifest b/media-libs/libiec61883/Manifest
index 6157ab532212..d825112d8308 100644
--- a/media-libs/libiec61883/Manifest
+++ b/media-libs/libiec61883/Manifest
@@ -1,3 +1,3 @@
 DIST libiec61883-1.2.0.tar.xz 233640 BLAKE2B c1fdd4d6fbfd96eea9f1c22b20a1e71e4cafbe064091ef6211d097342f8751955f2d8a68cb3e5235d733f7ecd3725144abb329331bfa3497be1911bb8773d4a9 SHA512 817177081a229c6253340e5911369aab746bd657d5b3d6a1ef3cf639cceee667bdb677fb0536163468cc9e719c4e81c6beaf42c93e5a56eb52684964b6dd1e23
-EBUILD libiec61883-1.2.0-r1.ebuild 1063 BLAKE2B d868e43246640601d11815ece5e31f7e77b8caece45b349fd0eafc4f80cc663355ea16be09f2ffff0f2b8c30871d61a00244fa768e9de3b0e810ad6bb36d1180 SHA512 da23110760cd343f7275b121a23b68011990a3bd4bfb8d4169d4ff8eca89c115bc088d7340485c6c842862a18d0384fbaf845e2cb80219d61ef634e00c621b6e
+EBUILD libiec61883-1.2.0-r1.ebuild 934 BLAKE2B 2876ac583955163318822d4320feae672f722ce807c4af9728dc65f10e85f207c8682e972ad18d0ef8688347352e973c8b7f8a4aae7b8be508b1d561966370fa SHA512 b3acbcfc0722c99463e8c75a5a837b9440f6b1732197a694dd6f1e36ad725dbb0b3d29c7d91c9309dffde6957669e73d5aa3b23dcc2ba1abfa70597aac160491
 MISC metadata.xml 531 BLAKE2B b3f4a2efce5fb0eb30e14c02ab34a58d4dd4e38b7b5a8b799816fa4ac50fec6e2656652629f351388519f6bf05275448f22fd10b4565884c12bdf054130639d1 SHA512 bbf4b45023f2a7f1ed7769fa4513cc13ec9697eeb677fde7ec882f5f787e00d0b291ef6be1c2d0ace4d35059782d85678c9ac38f8913ffd63f35a82ebfcab933
diff --git a/media-libs/libiec61883/libiec61883-1.2.0-r1.ebuild b/media-libs/libiec61883/libiec61883-1.2.0-r1.ebuild
index b1e22f1ee61a..7fd3cfc32eef 100644
--- a/media-libs/libiec61883/libiec61883-1.2.0-r1.ebuild
+++ b/media-libs/libiec61883/libiec61883-1.2.0-r1.ebuild
@@ -14,9 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86"
 IUSE="examples static-libs"
 
-RDEPEND=">=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND=">=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/media-libs/libmad/Manifest b/media-libs/libmad/Manifest
index 192795485869..2f6e05eb4c76 100644
--- a/media-libs/libmad/Manifest
+++ b/media-libs/libmad/Manifest
@@ -3,5 +3,5 @@ AUX libmad-0.15.1b-cflags.patch 4867 BLAKE2B adcfc2732f6b8b2310f50d234a695820d8f
 AUX libmad-0.15.1b-gcc44-mips-h-constraint-removal.patch 2377 BLAKE2B aff2507810157aec4062d157546b921a43cdf63a4e0684f5864ea71b36b4fa726f4ce33d558b7aaec8bb927876abe23c017ef3a1ba9b55715202887010cba3a3 SHA512 de08e0ce3c39b76c2838f940279a39c26e9c7e5b1e762c44f0db1ce3f65364e51036ad4f4ccdc160d80660c723a1bede70a4b505a9a01583de43ebc47aaeedb9
 AUX mad.pc 211 BLAKE2B 3b8678e667461caa6ddc2479687d92a8bab9e7e05be73640e63c9eaf070fcd69d9e26dac1d5e753171795236f5a461c7f59ad46e899ea3227902b9773f9bcfc3 SHA512 ec0b14bd0c6236a216107b507b92c06e295352f1657ba5e45f37fff220a73e1454b262ac36fc715d698c4ffd210d348fca71cf0198e2c49d16fe0ec5ea839f08
 DIST libmad-0.15.1b.tar.gz 502379 BLAKE2B b00de857a0634d7193f656b74cdd5c0642b674f3ee3303a642f8a6fcb64eebaf2b100c6e09d85d892880b5fc4f224c0a5d1ecf5bd95bc5caf00e959c7beac4a5 SHA512 2cad30347fb310dc605c46bacd9da117f447a5cabedd8fefdb24ab5de641429e5ec5ce8af7aefa6a75a3f545d3adfa255e3fa0a2d50971f76bc0c4fc0400cc45
-EBUILD libmad-0.15.1b-r8.ebuild 2389 BLAKE2B c93dec2816da9eb22684b218637358080aec3f056ee77b5073b09d3b9192aacb4ff9cbb219972ec50263df898d123a5b577f3fd0d6edb5ad62f97d870d34e1e5 SHA512 31c52f13e271d9e90aa3af1ce236bb3308c1f483bc39f186c95200742f5e513094d6a2b0934f56bfb97a6cc9636f875e6675bc321b2ea09fffd01ac7a5742ef6
+EBUILD libmad-0.15.1b-r8.ebuild 2262 BLAKE2B 83fc39bdfc1c0b0da64c42f3e46c2a38d627415c37ee04a587e73b5e6cbbb12bde3209dae4132a8057eba9db16439e92c190b42f2708193638d188c7ff729ff2 SHA512 bbb6344c0e0c5d6644d14d09c3c4cfaa9b8837c37e27a16232cd0d10af8776e099ca90b79939a077c7a4f8e86f17171a17ce323240c7c65a507bccaa9537b052
 MISC metadata.xml 326 BLAKE2B a9064ce28313804fb873d3e0b4fcb96681a2fcdcf60011d629268f73ab47f6c00ff6e0d95d2d075ec6af89bbe7aea4b6346ef2500815f08a69318a8736e7201d SHA512 b6c3a0765c5d00fd44caf7266edb75a373d8d4e813ac7f68507067f57713090fdc84f95886e73401d9c912f7f64453c975117030692526a49aebd6f5276751c9
diff --git a/media-libs/libmad/libmad-0.15.1b-r8.ebuild b/media-libs/libmad/libmad-0.15.1b-r8.ebuild
index 50520a655d24..910beb3d63cd 100644
--- a/media-libs/libmad/libmad-0.15.1b-r8.ebuild
+++ b/media-libs/libmad/libmad-0.15.1b-r8.ebuild
@@ -15,8 +15,7 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-ai
 IUSE="debug static-libs"
 
 DEPEND=""
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND=""
 
 DOCS=( CHANGES CREDITS README TODO VERSION )
 
diff --git a/media-libs/libmikmod/Manifest b/media-libs/libmikmod/Manifest
index 6742cc14459c..0e32dbe2c4ff 100644
--- a/media-libs/libmikmod/Manifest
+++ b/media-libs/libmikmod/Manifest
@@ -2,8 +2,8 @@ DIST libmikmod-3.3.10.tar.gz 1237413 BLAKE2B 25036cada7e9152a95151483da1b030ba2d
 DIST libmikmod-3.3.11.1.tar.gz 1240373 BLAKE2B 9de58eea739f8f7a5c4ff482093974f67a623fd0acd3b65752b0832b1376fb05ca00e7fbd09c242a25fb76d90d662afc3886808fbe6cabb15332f263adba37ad SHA512 f2439e2b691613847cd0787dd4e050116683ce7b05c215b8afecde5c6add819ea6c18e678e258c0a80786bef463f406072de15127f64368f694287a5e8e1a9de
 DIST libmikmod-3.3.11.tar.gz 1240329 BLAKE2B 7f5ceb26cae2e7e53ba5e07bd6e8f29384d9b62863b3c62e147efb1581a62d104d5abefc12eae12d97d55d672436d613679cdaef81365d34af14f240e48bd680 SHA512 61866fee68d91ff967ac2bad041e70034abbb4c095bba0475ed02cb81a467621a41a0685957cd9b5c19ec5218885ad42dc655443d67e01aa2623d91c0496dd63
 DIST libmikmod-3.3.8.tar.gz 1254702 BLAKE2B 4131dffd201061d6573cf46d78b569bbfa0e828261914bad2c278986b64aa4b9de3525e28b64eda4cebbce12a5ec512ed525b9c18e20b51166e40653f64b4e71 SHA512 033e3977d5723c42af697bf1b9ba6b1912fff1bfbef1894e2b1919d55415efa8024046579ff6a1e9ec752a3c793acc60b616c223b3cb5d79a814746c0cf55e15
-EBUILD libmikmod-3.3.10.ebuild 2179 BLAKE2B ef8cac5a4908d6728088e52c7f5b8c30bc12f15a70f7408715a0450e1c22537850f4a309878cf5a52133fbe1dd44071d8a83aadca62184c6bf31ab9647028e6b SHA512 72c7f5123b4cc1dddb6173b3c8e8307825f873debf316aa9ad31f34cca2d82e7287037113749efbcb5b83c3c516e61da60840f57648907714041a88c713a78ab
-EBUILD libmikmod-3.3.11.1.ebuild 2297 BLAKE2B 2709693f4304e680014bdd44ebb19762fbd7e07f7281ba79ac2921952812dcb732032d38ab2eb6f35f74396b1eecfac0aa7a5a0e5f2afad16bce5ad624bd481a SHA512 e23d9439d239be8009a4880b71ba59b3ec07beb457c497f6dcc678347510a92eafbd88c1186e2a9f4c2f42afa2af0fa6dd495a343cc4d1c3236ebab8626afbac
-EBUILD libmikmod-3.3.11.ebuild 2290 BLAKE2B b0c5a8a92e283bcc2431cf71891eeea26ad5f162b20b4d967060165934faf68c32dd2e963c6d7c4f9ad17355f75cbbb97692a06171a2ca427c3d86979b5ddac7 SHA512 1db040f540485242eb701935e43ef7e779f8e05ea5a74dffa7ddf4adc54583e63a839526e8e8926680e80b69faa140496ff04f52b58f4de305fc3f348c0f511d
-EBUILD libmikmod-3.3.8.ebuild 2157 BLAKE2B 533cb5ae420849ee0c243f7325e6a7257a892c5a01d890f646300d7a241fc5592afc33726d8a18b07e664b73fa1b415cc4c53edee55e0aa9fb84326d95373229 SHA512 4fd2748d5a4114ad06efb3506b09fb529367fbcf4d1cd7a6f5a530752bbfdb433af7dcbb44bbcab06607a9920cbbdb1d5e0405c0b95ee298a4f11198e4da4f38
+EBUILD libmikmod-3.3.10.ebuild 2047 BLAKE2B 94b45940812e21e9784217bf46d75b3f5997e0c7776238a8587af37fd50696cd268c081cb1525973e526302416d22eb1e586c3cc1224ec5f7a7f2de1f33c850e SHA512 36369710a60751bfa25646e83e8370b5a9d1a1972fc80714b374bb7a26ffc7fb1b2112a2f5dc86ff078e782bba8d3f2045cfccb6b663ee3855b4fe80995cb5a7
+EBUILD libmikmod-3.3.11.1.ebuild 2165 BLAKE2B c74ec37b70611249837662081e9b50a0db327158d5c7322f2f251f89b35ece6d7d72927e02c525b9f191a3ff2a9989e2a10ca2928162592f6d2a762147ba82b9 SHA512 2971ed7621ef51e91f4fc53076fe18074cf068c2e728c65834b41c1dcba0ffdcbaebebd6d8777dcd0b04dcf769467e5adb0dcebd37b41cc797bc911e36163018
+EBUILD libmikmod-3.3.11.ebuild 2158 BLAKE2B f746c9fbaf02bf7fdcbb23fc9ea76a1df5f5322784ed9c88bd3104cb07d129ce96ff3c9af26b46cf005aaaae35e436a851da5898da7c9bd23127ad4e49ca5a77 SHA512 749ed3eb424efbc6517bb3825f52d97048f8a48f194df3b668244521d1ac5647d72fa1b8ca08aecbb9941b7200c5fbee4dbd2e3bb71275e63ad5b1c2bbe9f46d
+EBUILD libmikmod-3.3.8.ebuild 2025 BLAKE2B 17652c792f297c2df7796a0701a90695cc66849a7ac4426ed3cc41657249c98d5c7b83732ac5a3d199f2ff7a5f47831db153fdeda8093408d5d96d9319c65afb SHA512 fb49e02feb167be764d6c0e0a92a5d9d847a0d7f0e1a639f28e0245bf2a8e569d2e03850b7b6f878252f5b0ebf4e3d4598c8bf6dccad73b7beef1a744652413d
 MISC metadata.xml 329 BLAKE2B f5950a51c451bd95614667a932e0799427831bed04505850b99dc77173b773cb8c158b50053b6c3a41755c8a1bb87077fb538207d56fbcf94fdce44ea0709093 SHA512 5deced2e8ecff6e1098f1ff339281cebfb8027bb052af10c9d95c7ae1eb80db0448cf5b350d40e5d5f76ed9948ffb5e4f8802f200f9b7f139a40992311eedb55
diff --git a/media-libs/libmikmod/libmikmod-3.3.10.ebuild b/media-libs/libmikmod/libmikmod-3.3.10.ebuild
index 2d3cc0eb8d64..232cef07afbb 100644
--- a/media-libs/libmikmod/libmikmod-3.3.10.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.3.10.ebuild
@@ -19,9 +19,7 @@ RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[${MULTILIB_USEDEP}] )
 	nas? ( >=media-libs/nas-1.9.4:=[${MULTILIB_USEDEP}] )
 	openal? ( >=media-libs/openal-1.15.1-r1[${MULTILIB_USEDEP}] )
 	pulseaudio? ( >=media-sound/pulseaudio-5.0[${MULTILIB_USEDEP}] )
-	!${CATEGORY}/${PN}:2
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+	!${CATEGORY}/${PN}:2"
 DEPEND="${RDEPEND}
 	sys-apps/texinfo
 	oss? ( virtual/os-headers )"
diff --git a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild b/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
index 51da30fe747a..930d2f289601 100644
--- a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
@@ -19,9 +19,7 @@ RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[${MULTILIB_USEDEP}] )
 	nas? ( >=media-libs/nas-1.9.4:=[${MULTILIB_USEDEP}] )
 	openal? ( >=media-libs/openal-1.15.1-r1[${MULTILIB_USEDEP}] )
 	pulseaudio? ( >=media-sound/pulseaudio-5.0[${MULTILIB_USEDEP}] )
-	!${CATEGORY}/${PN}:2
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+	!${CATEGORY}/${PN}:2"
 DEPEND="${RDEPEND}
 	sys-apps/texinfo
 	oss? ( virtual/os-headers )"
diff --git a/media-libs/libmikmod/libmikmod-3.3.11.ebuild b/media-libs/libmikmod/libmikmod-3.3.11.ebuild
index 7ab9e60a597e..1e5e9284220d 100644
--- a/media-libs/libmikmod/libmikmod-3.3.11.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.3.11.ebuild
@@ -19,9 +19,7 @@ RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[${MULTILIB_USEDEP}] )
 	nas? ( >=media-libs/nas-1.9.4:=[${MULTILIB_USEDEP}] )
 	openal? ( >=media-libs/openal-1.15.1-r1[${MULTILIB_USEDEP}] )
 	pulseaudio? ( >=media-sound/pulseaudio-5.0[${MULTILIB_USEDEP}] )
-	!${CATEGORY}/${PN}:2
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+	!${CATEGORY}/${PN}:2"
 DEPEND="${RDEPEND}
 	sys-apps/texinfo
 	oss? ( virtual/os-headers )"
diff --git a/media-libs/libmikmod/libmikmod-3.3.8.ebuild b/media-libs/libmikmod/libmikmod-3.3.8.ebuild
index 8311552d4fda..59cf8cf14b14 100644
--- a/media-libs/libmikmod/libmikmod-3.3.8.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.3.8.ebuild
@@ -19,9 +19,7 @@ RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[${MULTILIB_USEDEP}] )
 	nas? ( >=media-libs/nas-1.9.4:=[${MULTILIB_USEDEP}] )
 	openal? ( >=media-libs/openal-1.15.1-r1[${MULTILIB_USEDEP}] )
 	pulseaudio? ( >=media-sound/pulseaudio-5.0[${MULTILIB_USEDEP}] )
-	!${CATEGORY}/${PN}:2
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+	!${CATEGORY}/${PN}:2"
 DEPEND="${RDEPEND}
 	sys-apps/texinfo
 	oss? ( virtual/os-headers )"
diff --git a/media-libs/libmms/Manifest b/media-libs/libmms/Manifest
index 5e10f1c0d006..8cf93cfcd394 100644
--- a/media-libs/libmms/Manifest
+++ b/media-libs/libmms/Manifest
@@ -1,3 +1,3 @@
 DIST libmms-0.6.4.tar.gz 356217 BLAKE2B 2b0029cde3e985b1a0310e7d00acafb54a53606c656fee1b87a086a31ecc1e488aec31e86880959f23a077a20594a6c939efea3e08545a3d47f804ed762395a4 SHA512 9771c697515f5232eaeaff79e68fe15e34d8aa38aa5d3d68525216357223f314c544d71b5fe18d79a77682f41b1b5d9fb5e7c3c99d0cba5723d2e3de31faec96
-EBUILD libmms-0.6.4.ebuild 789 BLAKE2B 296c19c8c6b88640d9ac04e657fea72c3e0e0709b63e9cf392f3f2dd5d97bb7c19439032b585fc8cf8da4a0b0d08e2368486ef44520de6858c6f124b6d024fb5 SHA512 317e561e155863fbb65a913fe27c96665df6e550bdc401c6024691ced2b1baae29e3c066d37a669be420c2f56e42bf98b10041473725cc283a05bb5f0cbdd9a6
+EBUILD libmms-0.6.4.ebuild 659 BLAKE2B b25b19b2b47b7f0053d53439650ecaa3bb5ee2ecc4d5f264a734289090862d8e8fe848ec86a6846bcc774bcbac6c609da4283313adae4fa5110ec0687b0b75c5 SHA512 abe6bc10f702e6a5f64baea1202525556da7e474162318c993601bcefb87d8706f0a5520c7ff23a1d12b119a3f7806950ad24254e5b9488240a47a6866286091
 MISC metadata.xml 358 BLAKE2B f61ee71ee2acfcaf289a33d28efed96cae45933a0a0434f53e2fd2196722eb3c2f4d2f75a39f31bbbb630d11b67bca1f6d43c95349d3f97560f6260bbfa50082 SHA512 c9c5cc18c8b1ea6dcd96d280d74a811f19f7a93a866b95263454d46975f876791559799dd2e036b24f41e8c10d8130e2a4b200aa71f087f44044ebadd5d9aa95
diff --git a/media-libs/libmms/libmms-0.6.4.ebuild b/media-libs/libmms/libmms-0.6.4.ebuild
index ee64dd118cea..b06b1fc08425 100644
--- a/media-libs/libmms/libmms-0.6.4.ebuild
+++ b/media-libs/libmms/libmms-0.6.4.ebuild
@@ -16,10 +16,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
-RDEPEND="abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-medialibs-20130224-r8
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-	)"
+RDEPEND=""
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/media-libs/libmng/Manifest b/media-libs/libmng/Manifest
index 067b5beaa5cc..dc499197df2e 100644
--- a/media-libs/libmng/Manifest
+++ b/media-libs/libmng/Manifest
@@ -2,6 +2,6 @@ AUX libmng-2.0.2-jpeg-9a.patch 1183 BLAKE2B ef23ec070a72160a66b332ea4a834630ec45
 AUX libmng-2.0.2-stdio.patch 261 BLAKE2B c47f9bb6aaf0df89bd5514fc3cd222f920ff721ba1af42c44fefd7fc162b0665ac4347299cd4fdd4cde289b39bd901806a75e4b4aba8042cdc53323010fe2475 SHA512 44492809618df0ff3e7a41c55561703ad1331853c8872237b828f767a07236be9630bb3955b4c3c444d9fb80440697b2a52fa99fdbbe2054bc35ca6eba065c06
 DIST libmng-2.0.2.tar.xz 951844 BLAKE2B 2d0412b3243762029fd4487dafeee9cbc7a2c13e358e2d66f6a27624dff0d9398a1f7a9b9bdc4e40b7b57ead082b5fd894fcc94782e550d43371f2141996b453 SHA512 76ff107df43297837e075a4b57dac75ece501a57060884720a22518d9514ad0af64d69d22fe12a92d3bce3e50ae8ca3c8081680535743d2bde9ae9fa11e32687
 DIST libmng-2.0.3.tar.xz 951808 BLAKE2B 18f29d270d8c646da1eef41da094271acd5ce86094441f7f4d78dadab9dbc147619c4226bc642722639eb6d1a49567c517acaadea823f38c7bdd8ee3f498b927 SHA512 764efd94643c17c449abcb8f676ec2aa750a2461cf46bc961343f8d443a16ac2caa135c27d846deb2351b9f25d6170c42a500d21f63c13276905fdd743b8fec6
-EBUILD libmng-2.0.2-r1.ebuild 1305 BLAKE2B bff594f1f925ee906dc0b939377c70ed2a53badcb2b11b99172a1f25b7c96e54f8c608ded1cf40dc70e8b3d3f08e3e09f88c3b8016aaa08cff09a6e8b60a1b4d SHA512 110a9b7ae16ca61b8792f8c3bed88612fecd3b5fea6eae9b516103e22ae4dc78c129272961ac213a8feeb1e8f457aba86cc742cd464dd5169565395f4fae073e
-EBUILD libmng-2.0.3.ebuild 1266 BLAKE2B e11a31a73043e2cfc9494d41172b2492950f07068062440d0408302f8cdeb78685fddc0e41927f6a33c8ddb78e2df88ac9e36d73f3f58043549e6921d8fee06d SHA512 28a97fb863cd56e526d7e2a5c9fc2efeeec803b8563c0e14aa35c4cf352724868c3bd0f77154d66743d563f93a7515663d361aa831b5203b1edbcee49edc6b9c
+EBUILD libmng-2.0.2-r1.ebuild 1178 BLAKE2B 3773cc710c8193761d31f7899845b46a9034807b1035db4d3782baac2d79abf33bc993ad7c47e423a08cac435d965b9e6b28bbe1b8fdc3a66dfc8face76067dd SHA512 33f96e47638f83c69dae5860ad39ac889c079570b04ad0194390acd74a022bc9b6fcb6a67e7988988790bf8f91cad31496961a482b21d366d7a86da0533eba02
+EBUILD libmng-2.0.3.ebuild 1139 BLAKE2B f476e9fcdb4390016fb33616363432243cd3c5e41b2bffc78fae24277f446c546902f350e04dbd18e766662ae6817991edec50232ed26f983c218dd72f118607 SHA512 e0f6abd8ec06fec5904b41b68ee8946557fa952b7b5e2988ffb2635de556ca1bcbc9b3f76c40bfdfc38d97ebb53920e741de163e104431b8f808ec75f10fe180
 MISC metadata.xml 335 BLAKE2B d1fae8ad219bf09d9bd3588fedaaca1599c795811ea024f726dc3e37e88e5b776e05c3c40eefa6d100e393fcf439aff9d67c77d85010f6e1e8e2319067386fee SHA512 a870b439c25b0dc7d251b15c53eded27ed9a4c708dd81bb4facc7cda49b57abb4a24c013b36c11db4d8a27af2cd55ad012792fe81e8893f5c92007790c4fd8f8
diff --git a/media-libs/libmng/libmng-2.0.2-r1.ebuild b/media-libs/libmng/libmng-2.0.2-r1.ebuild
index 424dfc5b6140..d387f4f4e7e1 100644
--- a/media-libs/libmng/libmng-2.0.2-r1.ebuild
+++ b/media-libs/libmng/libmng-2.0.2-r1.ebuild
@@ -15,9 +15,7 @@ IUSE="lcms static-libs"
 
 RDEPEND=">=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r9
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+	lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
diff --git a/media-libs/libmng/libmng-2.0.3.ebuild b/media-libs/libmng/libmng-2.0.3.ebuild
index 10b866b04fb7..5f34855de15d 100644
--- a/media-libs/libmng/libmng-2.0.3.ebuild
+++ b/media-libs/libmng/libmng-2.0.3.ebuild
@@ -15,9 +15,7 @@ IUSE="lcms static-libs"
 
 RDEPEND=">=virtual/jpeg-0-r2:0[static-libs?,${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
-	lcms? ( >=media-libs/lcms-2.5:2[static-libs?,${MULTILIB_USEDEP}] )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r9
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+	lcms? ( >=media-libs/lcms-2.5:2[static-libs?,${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
diff --git a/media-libs/libmodplug/Manifest b/media-libs/libmodplug/Manifest
index aa4757aa3721..a7e76e658fbe 100644
--- a/media-libs/libmodplug/Manifest
+++ b/media-libs/libmodplug/Manifest
@@ -4,6 +4,6 @@ AUX libmodplug-0.8.8.5-psm-omf2097-fixes.patch 4294 BLAKE2B 310ba033d8c49d98eb6d
 AUX libmodplug-0.8.9.0-no-fast-math.patch 515 BLAKE2B d1068b8647b59daecbf60470d7d0f6cf6884438c3a833aefb16181b50201f33879ca0d8dd6f341c1690b5e160e0a6eb706aebd28533aa5fbf5bdde0eb47196f2 SHA512 dfcf1497343f5bb145ac41ada3e313c2eaf8b18827dd1dbb55024a945300eb9054503f20d8a60f835dce50820c99eb4edf20109056ce929e7284f247312cd9c1
 DIST libmodplug-0.8.8.5.tar.gz 546751 BLAKE2B 6a6c246537ef5123c84548f9b1f6092a3af7384f16a5cbb3d8511546d31a25818656b0904f8944a90b0164e50293047f02607f500c77c030527c7771c6519e48 SHA512 aa943b8df5e3fd41b497e55f5d2c493c28a4c90d444d041f74a58ab5f4702eab9bb36f337e4c795561e0006846a5fda0b42bcf96b33e1267b190f6005862b332
 DIST libmodplug-0.8.9.0.tar.gz 576566 BLAKE2B 534ce23f37ae60593fcbf0b8984140badcf7d868a7559ea6aef282a4d14dc6ad05847dc128a0221772e1dc2abb8c870ff8d6d46da0c04232169f905468a3ba19 SHA512 880e10154fd367ee24ace53ca7e32a5c1fee7dfff1f934e6499944c12779427da63e2f55f8d6ce25db0a42a5b4424053bf64305b31dbfc4ef6a8909924d655fd
-EBUILD libmodplug-0.8.8.5.ebuild 894 BLAKE2B 4cc27c36064a73d63e438d9f3b5bf9d137c2b37a3bba4f08fb2898c7b131cdecfe3ee6f7a18eeb65196b4f3c6e89a7557068cc28329594454b56f391d3c4f59f SHA512 45616b989320c4d10559b5a25df29e2cca91652b4310fa0e90839844c016257044a08c0fc0d0d44b8404d3a1f0311da1a60df6c21c8073d1f065090d079e8868
-EBUILD libmodplug-0.8.9.0.ebuild 859 BLAKE2B 9aeacee89d65dd6445c7bf03297e3ba155a928a4da2c2e9ecb35c107e2a26df62703e4d3c24a557fa39c01b216d73875f9abd733501a92ef1700364750629097 SHA512 9804a0c226fd262985c6766f415dcf991e789d177e8d0b28f19e35da2e490fee93c4d0acb339148ecb37bad6b84edf4068a107f681e337269c344d5ca489d142
+EBUILD libmodplug-0.8.8.5.ebuild 823 BLAKE2B 553ee8e443dad1688653717ffd7c8d91ed814ee0f7a8fc6936693651868cc8fb732240d7cc197d3a9b7b4e22b5c3cd700956dc892a34f0fc5f3690f466deb0f4 SHA512 4a29ff9bdd21e8248898c98e3d8b166aca6dcb24f4a1c5033093719fdb3a1ddaa80fd035435f4b4f12d313bea4cc1cc5b83662f3fde575829012bb7c38097a06
+EBUILD libmodplug-0.8.9.0.ebuild 788 BLAKE2B e1b36146b4dc9411732e001b52f3772875fbe4b0257912d29453a7215fbc29c25832a71a4bd81383ce44fbde53f6e7d7ab71a40927e95cdb8712dd6046046c24 SHA512 245a3f64b470a87f7f878b7b59b68e3b52c697186444ad85ccbc9a1f4f3477fed0f44a3f1a5936254d322fe9fe4ae26d3b07a96c2f0ab5021b605608d2d5fda4
 MISC metadata.xml 457 BLAKE2B 2aa3262e69e5eb85c8ee24f912b126c38554bb324652b7a2b91620236a72b1717ce0ada193193d9655883f8ce48be622e85934a8acb69f35e78bc59616d051af SHA512 6b4cb6e098ed3d743e76d98da648ef475288ec82273b7fbdd73bd60cd14e58d98f0798244bbd4432e504402655557aa0ffb5a4104261c5916261e8040430e46d
diff --git a/media-libs/libmodplug/libmodplug-0.8.8.5.ebuild b/media-libs/libmodplug/libmodplug-0.8.8.5.ebuild
index 99f6dc5b198e..b1f05b8655d3 100644
--- a/media-libs/libmodplug/libmodplug-0.8.8.5.ebuild
+++ b/media-libs/libmodplug/libmodplug-0.8.8.5.ebuild
@@ -16,7 +16,7 @@ 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"
 IUSE="static-libs"
 
-RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+RDEPEND=""
 DEPEND="virtual/pkgconfig"
 
 DOCS=( AUTHORS ChangeLog NEWS README TODO )
diff --git a/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild b/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild
index bd1229984a9b..b372dbc205b2 100644
--- a/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild
+++ b/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild
@@ -16,7 +16,7 @@ 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"
 IUSE="static-libs"
 
-RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+RDEPEND=""
 DEPEND="virtual/pkgconfig"
 
 DOCS=( AUTHORS ChangeLog NEWS README TODO )
diff --git a/media-libs/libmpeg2/Manifest b/media-libs/libmpeg2/Manifest
index dce330c87f21..5758f3716f40 100644
--- a/media-libs/libmpeg2/Manifest
+++ b/media-libs/libmpeg2/Manifest
@@ -3,5 +3,5 @@ AUX libmpeg2-0.5.1-arm-private-symbols.patch 1222 BLAKE2B d4f3102461c76167286cbf
 AUX libmpeg2-0.5.1-armv4l.patch 749 BLAKE2B 205d8f512eda9b357f0c2902aa8799d897a42a6cdcc131aa6f1d746c6af3c264dd17a2f9e86c6b1c0b9c8bd8f49599f8b99b85f761e64f328a37e9d68e02be01 SHA512 d11fb2196ba5c4a08b28693e069146b69f2a1034606b14981db9ca8d4ed09fd92ab99c9656950cc5d3a547177cd9dd7413698a50bd6b8f69080bcf10e8463e66
 AUX libmpeg2-0.5.1-global-symbol-test.patch 1931 BLAKE2B cc9ace2ef9d6b9f6fa8d0918b627a4f6dc47e5a5d1ed05d60e8a6b9a01451e33be5c5a2732a2aaf1e1ee97eb61590e1f2b0cf568919fc379ac974ec7a849ca55 SHA512 a9425f3cc3a3d6c660bd5c780906927827cdaad27a9526fa57d9026a100ba44b99aeea34c9467d1373316164cd7b36f8357c9aec2c46fa5c8b4557fab5cba2eb
 DIST libmpeg2-0.5.1.tar.gz 524776 BLAKE2B 29b71740fa601c668a8f5b0a43aa763bda2fc66587f5bff847d4bc6d03dd831abe46428616b770aaaabf2d42877daad8c305ab4dd988cc91a4c90decfcc19c9a SHA512 3648a2b3d7e2056d5adb328acd2fb983a1fa9a05ccb6f9388cc686c819445421811f42e8439418a0491a13080977f074a0d8bf8fa6bc101ff245ddea65a46fbc
-EBUILD libmpeg2-0.5.1-r2.ebuild 1624 BLAKE2B 2fb03edf3df777dc9d5174f280380c5bbb5a3f8168c0b6d6a4d447aaa05ce009d8bf85deee79b32662c7d54d483af858b4591f0fca2c9ae070520db84724ee08 SHA512 5c46fd7fa82581885b1516e271b0ffb1b3601770fe388c8a031d09629a55b7cafa8567922f207a2f1c6c14c780b90534d9399425f91a5a8a8d02d44dec01a1ad
+EBUILD libmpeg2-0.5.1-r2.ebuild 1498 BLAKE2B d19c7c6d3adde3ead86466530b9272b0411437c4a8c3a51d93ef650c0cb3244fa0f7099efd7f61bc13593d91957d910fd5b762f74cf244738077976547b10b15 SHA512 10b9bfc142231e42207520d4184f588fec6ecec8ddd2363dc71685856157cc73d4d0a3c7f58b42a20bb02382ddeae1e8f75df25eef391945eb0b595a1e9f33a2
 MISC metadata.xml 301 BLAKE2B 4d9999b8b7aa1066cb76987da82251084f2fb73a2891392a1b3686119454f7c19ef34d3f5e362bff0db40050790c819606c79fffc74cee1bb780d3edeb7afa8c SHA512 ae5643be12156110bdfe381eef32d7586350eb5d70ee8b431f34a19a1b45dfa2cd1ee28d5b0101fef05f90b5d72ed767163051ce91cc1e9107c23432a29a1b46
diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild b/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
index b38864838feb..0404b4793fc8 100644
--- a/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
+++ b/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
@@ -15,12 +15,12 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-
 IUSE="sdl static-libs X"
 
 RDEPEND="sdl? ( media-libs/libsdl )
-	X? ( x11-libs/libXv
+	X? (
+		x11-libs/libXv
 		x11-libs/libICE
 		x11-libs/libSM
-		x11-libs/libXt )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r9
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+		x11-libs/libXt
+	)"
 DEPEND="${RDEPEND}
 	X? ( x11-proto/xextproto )"
 
diff --git a/media-libs/libofa/Manifest b/media-libs/libofa/Manifest
index 2b7c10c026d4..26dabb9a3033 100644
--- a/media-libs/libofa/Manifest
+++ b/media-libs/libofa/Manifest
@@ -3,5 +3,5 @@ AUX libofa-0.9.3-gcc-4.4.patch 281 BLAKE2B a4196f7058faeb6d6887a103cc993dd476dbf
 AUX libofa-0.9.3-gcc-4.7.patch 763 BLAKE2B b43d898e508776298f0b8c6110329af4843fb508a34c3a1e2bb2adf22fae9c989bb219b90bacdd85dad4c1506a04a065c604b5e65303248a9756ac322e658091 SHA512 932c938c2fb6676f0026c23b593ecad9c54f8718ff7c544cb26ee2f991850a213c61ce87ec93814c762e148df7d87a09809fd14b5cc07be3e43304059cfaa8a7
 AUX libofa-0.9.3-gcc-4.patch 819 BLAKE2B 2aaab273794c4197dd49eeed6a7a07b60be7af74f7a5d036c25005b518c4771842126f4c1ee3910227776a0574b97e77e3ac6231d00114d22a4efd8f91bfb85a SHA512 d07a50ddf5434d28a3c3fab639232e72be756eceac50846d9ad51a00bf26bfd5b29a93e0e4298bb78e0719d0cd1a152818e71b02b270c58729a63b4fcc41d2ef
 DIST libofa-0.9.3.tar.gz 384043 BLAKE2B 1b4c89e1a26e3bec1b2bde16c5d2c86ae7a66cbe8e450b96974ffd8be434062ccf21779c0eed5a809012a419d65f9de327c6b94fe6ac5365270fe382dbfa2c08 SHA512 058fb43ea296325d2f7ad1762e1fd3f2ad772754b5d53dbaa1c5cd91ac5041ef82c7ea9ac580825e2391fa7db6803ff7fd5b24faf319280211a4641516126967
-EBUILD libofa-0.9.3-r1.ebuild 1375 BLAKE2B 84be8bd57a26960a34e1689c2e6771473a6d5c9d6b9611ccf71ebfa63bfba2f35a9f12833a0c28736c2c79a9a97737f72a1b1751ad69bed09d013e47cdb5b901 SHA512 00c9ccc940103ebf7e29dfcb3300e71820869282ff65c1df39b834e4e49f41d0083f74cbe3c05d3ec1df713a1dcb1a5543a8d7c7374e185ca7efbd48035f9f31
+EBUILD libofa-0.9.3-r1.ebuild 1225 BLAKE2B 64aa485bf1431f2998034bf693030e4340c259646fde1fb76a453f57d78bbf908197e7b6a26c9ff84314dd40cf07fcb42c9a97201d2940fc0f1cd69360e6c561 SHA512 d1fe57bcd6c8c778b4f940ccd8d8b480cdab008cb93ccd8f39ccf371e9cde85d85ee327ddb7562b72783bd3c4bb2e3e690bc2e3192f9c868abfabb19018a16b3
 MISC metadata.xml 337 BLAKE2B 3cf5fbbe6cea6c48b832cd4be4ae506a319b7d21d27b1e98c83602adf8ff4948736a7eb46e7156bb328fae2fd27886d4af194f340e06488a7f5adf266bf84e7b SHA512 ccfab3198ba95caba25340c8254d465b23aae4edff3f63a0acbc0fc7283efb45b5ad4fd250df09e1e2442b5cb2977a228375daf25ffde08004eb887f624941c8
diff --git a/media-libs/libofa/libofa-0.9.3-r1.ebuild b/media-libs/libofa/libofa-0.9.3-r1.ebuild
index c02fa8c43d00..e85125f172c6 100644
--- a/media-libs/libofa/libofa-0.9.3-r1.ebuild
+++ b/media-libs/libofa/libofa-0.9.3-r1.ebuild
@@ -19,9 +19,6 @@ RDEPEND="dev-libs/expat
 	>=sci-libs/fftw-3.3.3-r2[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r2
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc-4.patch
diff --git a/media-libs/libogg/Manifest b/media-libs/libogg/Manifest
index cf63ae4b77f6..530ae4c8f76b 100644
--- a/media-libs/libogg/Manifest
+++ b/media-libs/libogg/Manifest
@@ -1,5 +1,5 @@
 DIST libogg-1.3.2.tar.xz 407324 BLAKE2B 193bdff4d2b4dc5418ce76ba2985782e1513cfcee8fec870ec7b577eefdc8c484f5aa2a00212ccea55c317c39084f63cebdcd954b5a45c5773d6360109e04807 SHA512 dc9552b15ceccd7e12bff39a6670120ae53af74ce97254d047c28f49ba6a320f55059ed509ec1d8758a972c72514f2866634d829f3cb528c2f595cb056e9bca6
 DIST libogg-1.3.3.tar.xz 417636 BLAKE2B 2fc69580ed94be520c8e6b764e6271ec60e9d83d4265ca0408df4b2e6233a0f1d68e79400bc3871cc130034697ba97cedc453a574b9c6f618c9b819a93a2d3e8 SHA512 37d8e4329bf7a997a95d84a55c325a5a893ec84bb4d5b7ea638e5cb13201a0619e71ecd9710a8371def69f092c62dcc59ec0a607db246028ee8a62678386260b
-EBUILD libogg-1.3.2.ebuild 872 BLAKE2B b8f65fb3b7565bc251619b5ee13c37cdda48445682e51f5be83da5837f07ccfc4300c37f837d535d5062151c78150823948ce47463c10663931feb67e99ea978 SHA512 4ac4e22ac9da2644af8815a0d6977e643a4a150bb63fc4137daaca68ec4ecb618f390088e96e985e7e9ff5422d5637cf4f4bbcdf77077078fe187b141d1abd33
+EBUILD libogg-1.3.2.ebuild 799 BLAKE2B 3f07ec4c275cc93d66858c6dd2c9df90d0c209b061dbef0e40f9e400361ac7d4b7ab0aba6428cdfad39e1edf2d42591c19fe85a1c26809bdd10ce52ce3bf8384 SHA512 fdbce08fed38783173f95cfaa13d45b798aa59560b0f1c90b6af5060167a027ab62ac56717c57994349842fdf2d576d4f9baae7cc1b328a89c128a05eb7a1d6b
 EBUILD libogg-1.3.3.ebuild 896 BLAKE2B 96b69519d0d5d3256f877d60afa611ec7350d1497abda55bd8cb4fd2a3a2c208f658fbe046f8b03b5dc5eb26ba0dcb0e2724a36e2868afcf532edcf536af8152 SHA512 bf30579fed95e22c8cbe74afd5bcd2a67a6f98416ae1970fe2e72a73611696ec1d1897b0efcd63dbbf7abbea7c9afed24705cd7bad33b5e270c58c2946ae6429
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libogg/libogg-1.3.2.ebuild b/media-libs/libogg/libogg-1.3.2.ebuild
index 354f18f65a75..90ded904e115 100644
--- a/media-libs/libogg/libogg-1.3.2.ebuild
+++ b/media-libs/libogg/libogg-1.3.2.ebuild
@@ -13,8 +13,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
-RDEPEND="
-	abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+RDEPEND=""
 
 AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
 DOCS=( AUTHORS CHANGES )
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 4e5412f87917..cb0e8bd10c02 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -5,8 +5,8 @@ DIST libpng-1.6.29-apng.patch.gz 10313 BLAKE2B 856fadba345bab488fde90fd2c40c33b4
 DIST libpng-1.6.29.tar.xz 987652 BLAKE2B bf825553a385a06d060aa86686152070faf6476cfd5670e804bff00f24f9f5e9c024a8ecbe7772121bd94744fef5c6d728805c18ebdd23e6459b8be099d92f5e SHA512 070393423ec11f19e3264a0200959ae09238aa005615571586987253028b4ffb7e6b7c734a132f65180252b0259f79add03896d79fdc7dcfd8773b82c82a5ffc
 DIST libpng-1.6.34-apng.patch.gz 10411 BLAKE2B 4f6a5f7c2dcdc47e88a4687063958b18ae29c6f5168a339aa1f47abd8859126ea6d658ebc6645a8163b4127a5c0237f4b858fd0979781147fdd5fd23c0bb1098 SHA512 d4088399d2e9a2e2e40d5bd5dfb478dbd11c7065600287734aee7b3bf13a9574d17d3890e705c82705275fd0c11848155fbf960acd2e8eb890a7656b4140340c
 DIST libpng-1.6.34.tar.xz 997968 BLAKE2B 4cd0c46d11097cdeb0e419f1363cb9632ceaf56729a2d11e78361292568dce5c33f8fd24c56a5c5a007f419b8bc14fdaecff6db05ac2acea51b2374a1f57b848 SHA512 89407c5abc1623faaa3992fc1e4a62def671d9a7401108dfceee895d5f16fe7030090bea89b34a36d377d8e6a5d40046886991f663ce075d1a2d31bf9eaf3c51
-EBUILD libpng-1.2.57.ebuild 1003 BLAKE2B dc6e1f723471ced6448d0458213a9d88995efd397003de2952c4f393fa64a84990a61737b5abd81cdccea800e2efd1fa675dbe9020d1e1cb747f2db99b296b40 SHA512 3ef798d4f394e35d833a3b1ee66521186cfcaa00770141a64347e7592972f620a10321f9cfe32d8eff8e0c2b2c3c91b3b690e8ed51b5aa493410d2f253e1ca08
-EBUILD libpng-1.5.28.ebuild 1778 BLAKE2B 544221137ad9594e82f7204f09631804984015ad3db7c8eb7123bbdca95c80a55206b212e51a54521e699bf95c1bc08ec8e5704d73e58e691b0af9c8f96341cf SHA512 67fef4c1a3bd619de59515c6409b566ab8d595ef1b777bc48646fcff8acbb315719462961275b078d9a7bf70200e523b081dc2669c5338b0d7de26fb4596d190
-EBUILD libpng-1.6.29.ebuild 1460 BLAKE2B 56dfd9b28af80de44dc8806acc94cf9c880e32d4b5836c4ebb8a5e8852d63fcafdfd92b8170113d795993f6f66968a96f65ec8262b318137658275a6511a9e17 SHA512 acf6222a6f9d8d93a2921bb1d493b1668a3c9a0638dd3901cd0a5c33710e9172fe4d168fb1e61995255221731ef649187bd6758bf1a863226c4e57cec3df1f2e
-EBUILD libpng-1.6.34.ebuild 1508 BLAKE2B 2e61d65a438c7d61acb659852105a5800cde67e7e8e1495318d024e7e762ce0f0a0b08c714849304113a3b379a8953f1dbf7ea6c53381eed64b380730a1bb8d2 SHA512 d3efd2dc7e77101dfd73d6ff0f46eef35e472ebabcfbecefa4c6a9e6f90d9dd01fd8522da38aaa70b767d23edd1f95da5f420beae242ad4475e8a4069ff0b4c3
+EBUILD libpng-1.2.57.ebuild 876 BLAKE2B f0cb7b05dc3482ce809203e21cb68b6e85aaf6ca8aff492fd9d30349a0c11f927e263a2edbfad9ac615acc174338a128b3d01fcad5465b6e319ffb34b9751ad8 SHA512 3619d150972189cb9d9a3f7d72f7df74f5377f52405006b99dfa6cef66291c1eae2bb4e157180d1eaa8b2a217e6d321a5bc3f6e368f5c8efa2eade305f14a370
+EBUILD libpng-1.5.28.ebuild 1651 BLAKE2B b651d04efd3f74d50225ebe18bd06aec7e38f933e44a4913ff973a17ee4799151171dfc78ccea2921be8e9b364c68f09f2d0bbd1e3ebb377f23667438b9a9a60 SHA512 94a6c624ce02d7b03071653184ac91acf949244c1c0c1d2cc51483e3ca8bda9860e6ba76e2a77513dcf4a08d717888bebb91c1b464c5c201d3766499cd01fd9d
+EBUILD libpng-1.6.29.ebuild 1333 BLAKE2B afb45e4346f2dc5c307c3d5a1c03a8ce9202b1182475fbf2153c7c0ac8b4398227e68e9d65b5d26ad4415a0472373fdd70ac89b6f06c599b245514d4a753a481 SHA512 0fd0d8cf9b06a6fdf8276bd7f1d7656d7211b01e42180aa8d69ae79f227f669d04460e6749e04a4ab03fabf55de8449faac6db5994aaa49c56049e8351941093
+EBUILD libpng-1.6.34.ebuild 1378 BLAKE2B 07448b284d01b1b7d43b5c3aa08485e47f780b3f323f1c481ef59dc7947bb21c60296ad730f7d8d126cb7253e6bfbbc9bbd168de1bc32170394aee092719558d SHA512 5488fe8d0afa54e8467905dd3181e9572ac26361c212e94ccc08015bfa77919a6bed96d3b95abe420af032613185c453fbf42618b01a5e92653c5ed73ed1c245
 MISC metadata.xml 843 BLAKE2B e8736137db2c0e06193b3bbc9d933b1b8e2b8609d050a93a5369a8de81acf02af1d7ff6eb3c1e1967d7dbd6fec38373e389011d290cda1577203075f2f679167 SHA512 43cd4bd8981c828f2de943bb5ee90958f6a4f555d824be1325a7663219b0386ebaeb99406697affa8086b5b50f3d185e01ed12ace030557aa66a8e7b9af006b3
diff --git a/media-libs/libpng/libpng-1.2.57.ebuild b/media-libs/libpng/libpng-1.2.57.ebuild
index e94ff6442c3e..e14eecd581db 100644
--- a/media-libs/libpng/libpng-1.2.57.ebuild
+++ b/media-libs/libpng/libpng-1.2.57.ebuild
@@ -17,9 +17,7 @@ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	!=media-libs/libpng-1.2*:0
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r3
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+	!=media-libs/libpng-1.2*:0"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils"
 
diff --git a/media-libs/libpng/libpng-1.5.28.ebuild b/media-libs/libpng/libpng-1.5.28.ebuild
index 4845cc7dca5f..3253bd3c65b5 100644
--- a/media-libs/libpng/libpng-1.5.28.ebuild
+++ b/media-libs/libpng/libpng-1.5.28.ebuild
@@ -18,9 +18,7 @@ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 IUSE="apng neon"
 
 RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	!=media-libs/libpng-1.5*:0
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r4
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+	!=media-libs/libpng-1.5*:0"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils"
 
diff --git a/media-libs/libpng/libpng-1.6.29.ebuild b/media-libs/libpng/libpng-1.6.29.ebuild
index 1f2f0316889c..af03888d719f 100644
--- a/media-libs/libpng/libpng-1.6.29.ebuild
+++ b/media-libs/libpng/libpng-1.6.29.ebuild
@@ -15,9 +15,7 @@ SLOT="0/16"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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="apng cpu_flags_x86_sse neon static-libs"
 
-RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils"
 
diff --git a/media-libs/libpng/libpng-1.6.34.ebuild b/media-libs/libpng/libpng-1.6.34.ebuild
index 788fa4022637..9720f11d8ee8 100644
--- a/media-libs/libpng/libpng-1.6.34.ebuild
+++ b/media-libs/libpng/libpng-1.6.34.ebuild
@@ -12,12 +12,10 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng"
 SLOT="0/16"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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="apng cpu_flags_x86_sse neon static-libs"
 
-RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils"
 
diff --git a/media-libs/libpostproc/Manifest b/media-libs/libpostproc/Manifest
index e7e4324fbe70..f33744edb61b 100644
--- a/media-libs/libpostproc/Manifest
+++ b/media-libs/libpostproc/Manifest
@@ -2,7 +2,7 @@ AUX libpostproc-10.20140517-support-MMXEXT.patch 976 BLAKE2B 529f8770ea4424506d1
 DIST libpostproc-0.8.0.20121125.tar.xz 65376 BLAKE2B 7745fc0d495a3a6ea45f4e0b012f343d8db0838f7b26f778a646011e3ef01cdc8b7b37b1148b3ea4d838b3a51decb912a6b4328559929f6d38ab01ef8453f990 SHA512 7f1451dbe822d143793c12bb7c18fd9eeb98b5347bbfc54172f0aceb2f18cf31b2c0c888c33a9ce2e9f519b4bbb0a900b729188ce83cda9ad5499a8f6ea2d62a
 DIST libpostproc-10.20140517.tar.xz 65556 BLAKE2B 374dc84fb52f32958bcf9daeaabf2be1405d444f72d1f1ccb22e42b657489adad55199e5be27fa80cdcc21ed4480bae901925fbd833bcd30625d82720d481800 SHA512 0d6dca077c99ac569d892bc92cd08c6bf3e3a5e30e623ced20227b5bd1bd1aa3ecd150bfc900659accd77b997eb64b4d6f0538f9b6161d190ef6c69dcaf47893
 EBUILD libpostproc-0.8.0.20121125.ebuild 2331 BLAKE2B 8561815d2f54feea81ecec29b9080c3d20416ad62be0dc44d4131052095cce339a1c2590433b8d778663841aaffa4dd489a5d8f1987ec3bb57362997bd833c23 SHA512 d95e666bb622c2a60b582199eb7e2e8c33a6ff1e1a346c69a6a64b8eaf17957abe9ee01c33c32771dc9ef6a546dd1e14f0cf6d623cbd8bd0c14dc7f171fe3a96
-EBUILD libpostproc-10.20140517-r1.ebuild 2499 BLAKE2B d9a2df6ab474db47903f95b1d77bbcdff93edd5d58469ede2f48337f431eb47a8f87233aee0e5ad32f88d6c746fca71c541baed7c4945818fcab3280d66b0498 SHA512 c8284d61cab950bdac00981ca46cb6a52e02b37085c495921b04b487b4240c656c6ac8b0cb7dee51d300de97a75b32aa870c47693bb5697017a933e1bb652934
+EBUILD libpostproc-10.20140517-r1.ebuild 2369 BLAKE2B 323f6744a1e110d0cda256499eb7caff589427a8bce449a6961de6613e5e184317211835fdd2a6b6cab0a2f966396011e121d7e6f1f57edb8d9555004d98903b SHA512 54911dd231d84f2beee948084f701a86961e3cf5c9eb0dc2034d72aa15cc62783bd6ab24af2335326e5860a94f29352549c57f826b9ad227b9cddb7519564cb0
 EBUILD libpostproc-10.20140517.ebuild 2335 BLAKE2B f7f97bced80be871c8036bb3c7ec60e027c29610dadc1bd84489755201ed69e7ce1b2eb1d33ab8aa5c1cb8ef24bbb9c1e83275b0b082b5d816791871df82229b SHA512 16d3c875f4239d8f7e476031397cff007ed5cf7a254f3dc957121715c2bc2df78055fedbb18baed06dff440d629b51ea4bfca162d3a45d8673259edb10c9681a
-EBUILD libpostproc-9999.ebuild 2434 BLAKE2B cc8c37dcc0515a3d85bcd9a571f15db32beae1cebdf4965b46851f6bb1611e6e071a78108c71b775668a35c2592aac9e28d7f82ab4edef45b0a93de5ab2906cc SHA512 ff1a1855a8ade51e4a0953b57b0a172dbede3cd792ffd8cb96dd703320188ff6531b862f43926866d57d67ed3da43ea8e4a212fa65679bcaf02402228225e5bc
+EBUILD libpostproc-9999.ebuild 2304 BLAKE2B 10648a622982411f1cc1f1f8b7e65a39d58116acc8cc7b500d8c1bd4814af38d48b800d948d10273c96741598e6807f8026c5de5f309414d8a634716aa5caf5d SHA512 31565525f5c0da1585fb8318f742de382c95fa6650ec5f84fbb7129ef6f3bf3b261beff11c0cc85def19385a9b7b61a8eb0b74ffe109dea2136403ff718ac04d
 MISC metadata.xml 405 BLAKE2B 5249780527d1e7eb098411f01da236035ae3d9459da2fb7c69194a758e84a92bd02338e5d23490f310b1b59eedca9b2e7333d96d4cd18a055da40da1bcdaa2c3 SHA512 f6a4bb0b0fe497133fe3a1d4781472ccbdf30ab5e9c9aabb272b990bd7c5f048da8c430212dfb3b0f41f2a5ad5ebf3c6ae774474601e250444324ef4faf9ccab
diff --git a/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild b/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild
index 41dbc9c99acc..2327601f0746 100644
--- a/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild
+++ b/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild
@@ -37,10 +37,7 @@ done
 
 RDEPEND="
 	>=media-video/libav-0.8.2-r2:0=
-	!media-video/ffmpeg:0
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
-"
+	!media-video/ffmpeg:0"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
diff --git a/media-libs/libpostproc/libpostproc-9999.ebuild b/media-libs/libpostproc/libpostproc-9999.ebuild
index 92c4722f80b5..23a7caeab9fb 100644
--- a/media-libs/libpostproc/libpostproc-9999.ebuild
+++ b/media-libs/libpostproc/libpostproc-9999.ebuild
@@ -37,10 +37,7 @@ done
 
 RDEPEND="
 	>=media-video/libav-0.8.2-r2:0=
-	!media-video/ffmpeg:0
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
-"
+	!media-video/ffmpeg:0"
 DEPEND="${RDEPEND}"
 
 multilib_src_configure() {
diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest
index c8ded9d2a431..dcde315eb669 100644
--- a/media-libs/libquicktime/Manifest
+++ b/media-libs/libquicktime/Manifest
@@ -2,6 +2,7 @@ AUX CVE-2016-2399.patch 801 BLAKE2B 2794d13a0afa8a948f8f1335d7ee0a3d75691bbb9c61
 AUX libquicktime-1.2.4+libav-9.patch 464 BLAKE2B 0a29c9a3d1eae31731b76536a22aa23a4888b8ac55c3176c60a152330fce37e8031a4269fa28026133c7061cd769b1428bf24fe59fed574e39d52ea00b6e00a0 SHA512 691110dc18f6646e2e17f40c6a42911a6b8eaa8cea20b5595f20d218d51da11d11923a3001b7ad7c3ad6bd0d90e712b95ccee5526fa1bec176cd27813e4a775e
 AUX libquicktime-1.2.4-ffmpeg2.patch 4046 BLAKE2B 1db6a761fa94a32741a05919d12d0211964647a61ffd32ba8619530ec089c980999aa1ded534c2652eb3baf15558bcb9842a23634eeef043a6ed3eb3f8e794ff SHA512 32ddf394aad4ed80e89ec72a534e0466268ab0061b991815e905b78eae55a7d935117b0915faf6f7f51bd7e2d9fbaa4b0e07bfcef1ef1e2f4a7e2061c489122d
 AUX libquicktime-1.2.4-ffmpeg29.patch 13436 BLAKE2B 8a1e7b5df65f5297f59aa17c4a52706413c1ffd88d8645de7359ec26f7059101ab81ac135cf7ef707a8acbeb709e1a6dae03d6a7e7f70c7e88185ebb271acbe4 SHA512 2a7e06c03b0f64f02b923c1a0e7121f4e1ea735f19a6df8ce8daf18177ead132d1ae921c64f3770042db3bbf29f15a7fcceece835d475e052c4c3bb7139c9e2e
+AUX libquicktime-1.2.4-ffmpeg4.patch 14723 BLAKE2B bd1299c24b738b3752e4d8d50ed1b2fa2f208c83e577876118d115fca22293e102614ae0cdc168060115f7145d951d290bccf21154fda4aabf55329d310b6aca SHA512 1b11a82d694654976a5f79cd8feb27eec3810e09a66dc58ca576eaf1f96e4948abd4dae7955a7da6cf99ae6ffef9e183b39090d96cc6b5fe216b4c4f4faff7a8
 DIST libquicktime-1.2.4.tar.gz 1028626 BLAKE2B 6c50965be5d19fb4c57ea6b36f2581ebd575d78a34f2df7029ce2c6ee560e8135a953a2e85d91d189e2c01b97c99804d0eab602866b88a5f07c36351174680f0 SHA512 6ab6cd62ae2361bb3ad73725e9e8baa2b03361bc23e9e34b24f90c0e2bec4337de950ed7f30a6a1d2e67ab33e8f0c43538369fd07e417f54b84583a3c331f8dd
-EBUILD libquicktime-1.2.4-r2.ebuild 3792 BLAKE2B acf4b819f0e5137d0e92589d5a77c6b6bda676f5ae2023f90078750fa9badecedbe458c4cd2bd74e6581d908d2efa58428c00e13441e744fa90babb59ef12b7a SHA512 047d41d3a2a40c2ba52748a84f50b7d3ab444daf4a253947ec84698013aa4d203846cd226000573daecce3d7f40590aaa578feff08e1736e85184682fe43e769
+EBUILD libquicktime-1.2.4-r2.ebuild 3887 BLAKE2B 6ec251c76e7e19b84a86dbb42509c0f349fd4617959df59f3237d6154ea7574298eec544f5de22697f1b9f9634f5ea98445a75a759419a350a857a6fe90d1fa2 SHA512 fe087d81f5b88ad1c73688e59da72684cd313db7f807e5095ce480a9c6e0725d16a9af1f15ba609c8ab04ce46840a6e495f86c6f5e8f79855d3fcef240365a67
 MISC metadata.xml 506 BLAKE2B 2b6f16d304beace7cb71ac32cc734ec4bf0e28c2b155068f9c5f83fc9a5a8731056ec1b3743da9f2b6add73f4b82d4fb797dad913451ea255ab5752557f7b2eb SHA512 80ee7f91a4fafe6a9f9380bab5236633672484dea9389ab5b391319fbcbe010607903b21c12c37211575f4e55251f1718c2000225226fd0a63183ac903817ce1
diff --git a/media-libs/libquicktime/files/libquicktime-1.2.4-ffmpeg4.patch b/media-libs/libquicktime/files/libquicktime-1.2.4-ffmpeg4.patch
new file mode 100644
index 000000000000..eb196ea16ae5
--- /dev/null
+++ b/media-libs/libquicktime/files/libquicktime-1.2.4-ffmpeg4.patch
@@ -0,0 +1,342 @@
+Index: libquicktime-1.2.4/plugins/ffmpeg/audio.c
+===================================================================
+--- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c
++++ libquicktime-1.2.4/plugins/ffmpeg/audio.c
+@@ -545,7 +545,7 @@ static int decode_chunk_vbr(quicktime_t
+ 
+ #if DECODE_AUDIO3 || DECODE_AUDIO4
+     codec->pkt.data = codec->chunk_buffer;
+-    codec->pkt.size = packet_size + FF_INPUT_BUFFER_PADDING_SIZE;
++    codec->pkt.size = packet_size + AV_INPUT_BUFFER_PADDING_SIZE;
+ 
+ #if DECODE_AUDIO4
+     frame_bytes = avcodec_decode_audio4(codec->avctx, &f,
+@@ -583,7 +583,7 @@ static int decode_chunk_vbr(quicktime_t
+                                          (codec->sample_buffer_end - codec->sample_buffer_start)],
+                   &bytes_decoded,
+                   codec->chunk_buffer,
+-                  packet_size + FF_INPUT_BUFFER_PADDING_SIZE);
++                  packet_size + AV_INPUT_BUFFER_PADDING_SIZE);
+     if(frame_bytes < 0)
+       {
+       lqt_log(file, LQT_LOG_ERROR, LOG_DOMAIN, "avcodec_decode_audio2 error");
+@@ -645,13 +645,13 @@ static int decode_chunk(quicktime_t * fi
+         return 0;
+         }
+ 
+-      if(codec->chunk_buffer_alloc < mph.frame_bytes + FF_INPUT_BUFFER_PADDING_SIZE)
++      if(codec->chunk_buffer_alloc < mph.frame_bytes + AV_INPUT_BUFFER_PADDING_SIZE)
+         {
+-        codec->chunk_buffer_alloc = mph.frame_bytes + FF_INPUT_BUFFER_PADDING_SIZE;
++        codec->chunk_buffer_alloc = mph.frame_bytes + AV_INPUT_BUFFER_PADDING_SIZE;
+         codec->chunk_buffer = realloc(codec->chunk_buffer, codec->chunk_buffer_alloc);
+         }
+       memset(codec->chunk_buffer + codec->bytes_in_chunk_buffer, 0,
+-             mph.frame_bytes - codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE);
++             mph.frame_bytes - codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE);
+       num_samples = mph.samples_per_frame;
+       codec->bytes_in_chunk_buffer = mph.frame_bytes;
+       }
+@@ -695,7 +695,7 @@ static int decode_chunk(quicktime_t * fi
+     {
+ 
+         
+-    /* BIG NOTE: We pass extra FF_INPUT_BUFFER_PADDING_SIZE for the buffer size
++    /* BIG NOTE: We pass extra AV_INPUT_BUFFER_PADDING_SIZE for the buffer size
+        because we know, that lqt_read_audio_chunk allocates 16 extra bytes for us */
+     
+     /* Some really broken mp3 files have the header bytes split across 2 chunks */
+@@ -761,7 +761,7 @@ static int decode_chunk(quicktime_t * fi
+ 
+ #if DECODE_AUDIO3 || DECODE_AUDIO4
+     codec->pkt.data = &codec->chunk_buffer[bytes_used];
+-    codec->pkt.size = codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE;
++    codec->pkt.size = codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE;
+ 
+ #if DECODE_AUDIO4
+     
+@@ -798,7 +798,7 @@ static int decode_chunk(quicktime_t * fi
+                                                   (codec->sample_buffer_end - codec->sample_buffer_start)],
+                             &bytes_decoded,
+                             &codec->chunk_buffer[bytes_used],
+-                            codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE);
++                            codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE);
+ #endif
+     if(frame_bytes < 0)
+       {
+@@ -838,7 +838,7 @@ static int decode_chunk(quicktime_t * fi
+         }
+       }
+     
+-    /* This happens because ffmpeg adds FF_INPUT_BUFFER_PADDING_SIZE to the bytes returned */
++    /* This happens because ffmpeg adds AV_INPUT_BUFFER_PADDING_SIZE to the bytes returned */
+     
+     if(codec->bytes_in_chunk_buffer < 0)
+       codec->bytes_in_chunk_buffer = 0;
+Index: libquicktime-1.2.4/plugins/ffmpeg/params.c
+===================================================================
+--- libquicktime-1.2.4.orig/plugins/ffmpeg/params.c
++++ libquicktime-1.2.4/plugins/ffmpeg/params.c
+@@ -124,16 +124,6 @@ typedef struct
+   }
+ 
+ 
+-enum_t me_method[] =
+-  {
+-    { "Zero",  ME_ZERO },
+-    { "Phods", ME_PHODS },
+-    { "Log",   ME_LOG },
+-    { "X1",    ME_X1 },
+-    { "Epzs",  ME_EPZS },
+-    { "Full",  ME_FULL }
+-  };
+-
+ enum_t prediction_method[] =
+   {
+     { "Left",   FF_PRED_LEFT },
+@@ -163,15 +153,6 @@ enum_t mb_decision[] =
+     { "Rate distoration",     FF_MB_DECISION_RD }
+   };
+ 
+-enum_t coder_type[] =
+-  {
+-    { "VLC",                  FF_CODER_TYPE_VLC },
+-    { "Arithmetic",           FF_CODER_TYPE_AC },
+-    { "Raw",                  FF_CODER_TYPE_RAW },
+-    { "RLE",                  FF_CODER_TYPE_RLE },
+-    { "Deflate",              FF_CODER_TYPE_DEFLATE },
+-  };
+-
+ #define PARAM_ENUM(name, var, arr) \
+   if(!strcasecmp(key, name)) \
+     { \
+@@ -203,7 +184,7 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
+   PARAM_INT_SCALE("ff_bit_rate_audio",bit_rate,1000);
+   PARAM_INT_SCALE("ff_bit_rate_video",bit_rate,1000);
+   PARAM_INT_SCALE("ff_bit_rate_tolerance",bit_rate_tolerance,1000);
+-  PARAM_ENUM("ff_me_method",me_method,me_method);
++  PARAM_DICT_INT("ff_me_method","motion-est");
+   PARAM_INT("ff_gop_size",gop_size);
+   PARAM_FLOAT("ff_qcompress",qcompress);
+   PARAM_FLOAT("ff_qblur",qblur);
+@@ -227,10 +208,9 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
+   PARAM_INT("ff_rc_min_rate",rc_min_rate);
+   PARAM_INT("ff_rc_max_rate",rc_max_rate);
+   PARAM_INT_SCALE("ff_rc_buffer_size",rc_buffer_size,1000);
+-  PARAM_FLOAT("ff_rc_buffer_aggressivity",rc_buffer_aggressivity);
+   PARAM_FLOAT("ff_i_quant_factor",i_quant_factor);
+   PARAM_QP2LAMBDA("ff_i_quant_offset",i_quant_offset);
+-  PARAM_FLOAT("ff_rc_initial_cplx",rc_initial_cplx);
++  PARAM_DICT_INT("ff_rc_initial_cplx","rc_init_cplx");
+   PARAM_FLOAT("ff_lumi_masking",lumi_masking);
+   PARAM_FLOAT("ff_temporal_cplx_masking",temporal_cplx_masking);
+   PARAM_FLOAT("ff_spatial_cplx_masking",spatial_cplx_masking);
+@@ -255,8 +235,8 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
+   PARAM_INT("ff_me_range",me_range);
+   PARAM_ENUM("ff_mb_decision",mb_decision,mb_decision);
+   PARAM_INT("ff_scenechange_threshold",scenechange_threshold);
+-  PARAM_QP2LAMBDA("ff_lmin", lmin);
+-  PARAM_QP2LAMBDA("ff_lmax", lmax);
++  PARAM_DICT_INT("ff_lmin", "lmin");
++  PARAM_DICT_INT("ff_lmax", "lmax");
+   PARAM_INT("ff_noise_reduction",noise_reduction);
+   PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000);
+ 
+@@ -269,33 +249,29 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
+ #endif
+ 
+   PARAM_INT("ff_thread_count",thread_count);
+-  PARAM_INT("ff_me_threshold",me_threshold);
+-  PARAM_INT("ff_mb_threshold",mb_threshold);
+   PARAM_INT("ff_nsse_weight",nsse_weight);
+-  PARAM_FLOAT("ff_border_masking",border_masking);
++  PARAM_DICT_INT("ff_border_masking","border_mask");
+   PARAM_QP2LAMBDA("ff_mb_lmin", mb_lmin);
+   PARAM_QP2LAMBDA("ff_mb_lmax", mb_lmax);
+   PARAM_INT("ff_me_penalty_compensation",me_penalty_compensation);
+   PARAM_INT("ff_bidir_refine",bidir_refine);
+   PARAM_INT("ff_brd_scale",brd_scale);
+-  PARAM_INT("ff_scenechange_factor",scenechange_factor);
+-  PARAM_FLAG("ff_flag_qscale",CODEC_FLAG_QSCALE);
+-  PARAM_FLAG("ff_flag_4mv",CODEC_FLAG_4MV);
+-  PARAM_FLAG("ff_flag_qpel",CODEC_FLAG_QPEL);
+-  PARAM_FLAG("ff_flag_gmc",CODEC_FLAG_GMC);
+-  PARAM_FLAG("ff_flag_mv0",CODEC_FLAG_MV0);
++  PARAM_FLAG("ff_flag_qscale",AV_CODEC_FLAG_QSCALE);
++  PARAM_FLAG("ff_flag_4mv",AV_CODEC_FLAG_4MV);
++  PARAM_FLAG("ff_flag_qpel",AV_CODEC_FLAG_QPEL);
++  PARAM_DICT_FLAG("ff_flag_gmc","gmc");
++  PARAM_DICT_FLAG("ff_flag_mv0","mpv_flags");
+   //  PARAM_FLAG("ff_flag_part",CODEC_FLAG_PART); // Unused
+-  PARAM_FLAG("ff_flag_gray",CODEC_FLAG_GRAY);
+-  PARAM_FLAG("ff_flag_emu_edge",CODEC_FLAG_EMU_EDGE);
+-  PARAM_FLAG("ff_flag_normalize_aqp",CODEC_FLAG_NORMALIZE_AQP);
++  PARAM_FLAG("ff_flag_gray",AV_CODEC_FLAG_GRAY);
++  PARAM_DICT_FLAG("ff_flag_normalize_aqp","naq");
+   //  PARAM_FLAG("ff_flag_alt_scan",CODEC_FLAG_ALT_SCAN); // Unused
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+   PARAM_FLAG("ff_flag_trellis_quant",CODEC_FLAG_TRELLIS_QUANT);
+ #else
+   PARAM_INT("ff_trellis",trellis);
+ #endif
+-  PARAM_FLAG("ff_flag_bitexact",CODEC_FLAG_BITEXACT);
+-  PARAM_FLAG("ff_flag_ac_pred",CODEC_FLAG_AC_PRED);
++  PARAM_FLAG("ff_flag_bitexact",AV_CODEC_FLAG_BITEXACT);
++  PARAM_FLAG("ff_flag_ac_pred",AV_CODEC_FLAG_AC_PRED);
+   //  PARAM_FLAG("ff_flag_h263p_umv",CODEC_FLAG_H263P_UMV); // Unused
+ 
+ #if LIBAVCODEC_VERSION_MAJOR >= 55
+@@ -303,9 +279,9 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
+   PARAM_DICT_FLAG("ff_flag_qp_rd","qp_rd");
+   PARAM_DICT_FLAG("ff_flag2_strict_gop","strict_gop");
+ #else
+-  PARAM_FLAG("ff_flag_cbp_rd",CODEC_FLAG_CBP_RD);
+-  PARAM_FLAG("ff_flag_qp_rd",CODEC_FLAG_QP_RD);
+-  PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP);
++  PARAM_FLAG("ff_flag_cbp_rd",AV_CODEC_FLAG_CBP_RD);
++  PARAM_FLAG("ff_flag_qp_rd",AV_CODEC_FLAG_QP_RD);
++  PARAM_FLAG2("ff_flag2_strict_gop",AV_CODEC_FLAG2_STRICT_GOP);
+ #endif
+ 
+ #if LIBAVCODEC_VERSION_MAJOR >= 54
+@@ -313,14 +289,14 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
+   PARAM_DICT_FLAG("ff_flag_obmc","obmc");
+   PARAM_DICT_FLAG("ff_flag_h263p_slice_struct","structured_slices");
+ #else
+-  PARAM_FLAG("ff_flag_h263p_aiv",CODEC_FLAG_H263P_AIV);
+-  PARAM_FLAG("ff_flag_obmc",CODEC_FLAG_OBMC);
+-  PARAM_FLAG("ff_flag_h263p_slice_struct",CODEC_FLAG_H263P_SLICE_STRUCT);
++  PARAM_FLAG("ff_flag_h263p_aiv",AV_CODEC_FLAG_H263P_AIV);
++  PARAM_FLAG("ff_flag_obmc",AV_CODEC_FLAG_OBMC);
++  PARAM_FLAG("ff_flag_h263p_slice_struct",AV_CODEC_FLAG_H263P_SLICE_STRUCT);
+ #endif
+ 
+-  PARAM_FLAG("ff_flag_loop_filter",CODEC_FLAG_LOOP_FILTER);
+-  PARAM_FLAG("ff_flag_closed_gop",CODEC_FLAG_CLOSED_GOP);
+-  PARAM_FLAG2("ff_flag2_fast",CODEC_FLAG2_FAST);
+-  PARAM_ENUM("ff_coder_type",coder_type,coder_type);
++  PARAM_FLAG("ff_flag_loop_filter",AV_CODEC_FLAG_LOOP_FILTER);
++  PARAM_FLAG("ff_flag_closed_gop",AV_CODEC_FLAG_CLOSED_GOP);
++  PARAM_FLAG2("ff_flag2_fast",AV_CODEC_FLAG2_FAST);
++  PARAM_DICT_INT("ff_coder_type","coder");
+   
+   }
+Index: libquicktime-1.2.4/plugins/ffmpeg/params.h
+===================================================================
+--- libquicktime-1.2.4.orig/plugins/ffmpeg/params.h
++++ libquicktime-1.2.4/plugins/ffmpeg/params.h
+@@ -149,7 +149,7 @@ the reference. Unused for constant quant
+     .type =        LQT_PARAMETER_INT, \
+     .val_default = { .val_int = 0 }, \
+     .val_min =     { .val_int = 0 }, \
+-    .val_max =     { .val_int = FF_MAX_B_FRAMES }, \
++    .val_max =     { .val_int = 16 }, \
+     .help_string = TRS("Maximum number of B-frames between non B-frames") \
+   }
+ 
+Index: libquicktime-1.2.4/plugins/ffmpeg/video.c
+===================================================================
+--- libquicktime-1.2.4.orig/plugins/ffmpeg/video.c
++++ libquicktime-1.2.4/plugins/ffmpeg/video.c
+@@ -781,7 +781,7 @@ static int lqt_ffmpeg_decode_video(quick
+     if(extradata)
+       {
+       codec->extradata =
+-        calloc(1, extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
++        calloc(1, extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
+       memcpy(codec->extradata, extradata, extradata_size);
+       codec->avctx->extradata_size = extradata_size;
+       codec->avctx->extradata = codec->extradata;
+@@ -1140,8 +1140,8 @@ static int init_imx_encoder(quicktime_t
+   codec->avctx->qmin = 1;
+   codec->avctx->qmax = 3;
+   codec->avctx->rtp_payload_size = 1; // ??
+-  codec->avctx->rc_buffer_aggressivity = 0.25;
+-  codec->avctx->flags |= CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_LOW_DELAY;
++  av_dict_set(&codec->options, "rc_buf_aggressivity", "0.25", 0);
++  codec->avctx->flags |= AV_CODEC_FLAG_INTERLACED_DCT|AV_CODEC_FLAG_LOW_DELAY;
+ 
+ #if (LIBAVCODEC_VERSION_MAJOR < 54)
+   codec->avctx->flags2 |= CODEC_FLAG2_INTRA_VLC|CODEC_FLAG2_NON_LINEAR_QUANT;
+@@ -1328,7 +1328,7 @@ static int lqt_ffmpeg_encode_video(quick
+     //          codec->avctx->time_base.den = 1;
+     //          codec->avctx->time_base.num = lqt_video_time_scale(file, track);
+ 
+-    if(codec->avctx->flags & CODEC_FLAG_QSCALE)
++    if(codec->avctx->flags & AV_CODEC_FLAG_QSCALE)
+       codec->avctx->global_quality = codec->qscale;
+                               
+     codec->avctx->width = width;
+@@ -1344,7 +1344,7 @@ static int lqt_ffmpeg_encode_video(quick
+       {
+       if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML)))
+         {
+-        codec->avctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
++        codec->avctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+         codec->write_global_header = 1;
+         }
+             
+@@ -1360,7 +1360,7 @@ static int lqt_ffmpeg_encode_video(quick
+         {
+         lqt_log(file, LQT_LOG_INFO, LOG_DOMAIN, "Enabling interlaced encoding");
+         codec->avctx->flags |=
+-          (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME|CODEC_FLAG_ALT_SCAN);
++          (AV_CODEC_FLAG_INTERLACED_DCT|AV_CODEC_FLAG_INTERLACED_ME|AV_CODEC_FLAG_ALT_SCAN);
+         }
+ #endif
+       }
+@@ -1387,7 +1387,7 @@ static int lqt_ffmpeg_encode_video(quick
+       {
+       if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML)))
+         {
+-        codec->avctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
++        codec->avctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+         codec->write_global_header = 1;
+         }
+       }
+@@ -1410,7 +1410,7 @@ static int lqt_ffmpeg_encode_video(quick
+       {
+       if(vtrack->interlace_mode != LQT_INTERLACE_NONE)
+         {
+-        codec->avctx->flags |= CODEC_FLAG_INTERLACED_DCT;
++        codec->avctx->flags |= AV_CODEC_FLAG_INTERLACED_DCT;
+         }
+       }
+     else if(codec->is_imx)
+@@ -1422,7 +1422,7 @@ static int lqt_ffmpeg_encode_video(quick
+       if(codec->pass == 1)
+         {
+         codec->stats_file = fopen(codec->stats_filename, "w");
+-        codec->avctx->flags |= CODEC_FLAG_PASS1;
++        codec->avctx->flags |= AV_CODEC_FLAG_PASS1;
+         }
+       else if(codec->pass == codec->total_passes)
+         {
+@@ -1438,7 +1438,7 @@ static int lqt_ffmpeg_encode_video(quick
+         fclose(codec->stats_file);
+         codec->stats_file = (FILE*)0;
+               
+-        codec->avctx->flags |= CODEC_FLAG_PASS2;
++        codec->avctx->flags |= AV_CODEC_FLAG_PASS2;
+         }
+       }
+     /* Open codec */
+@@ -1516,7 +1516,7 @@ static int lqt_ffmpeg_encode_video(quick
+     }
+   
+   codec->frame->pts = vtrack->timestamp;
+-  if(codec->avctx->flags & CODEC_FLAG_QSCALE)
++  if(codec->avctx->flags & AV_CODEC_FLAG_QSCALE)
+     codec->frame->quality = codec->qscale;
+ #ifdef DO_INTERLACE
+   if(vtrack->interlace_mode != LQT_INTERLACE_NONE)
+@@ -1599,8 +1599,7 @@ static int lqt_ffmpeg_encode_video(quick
+     else if(codec->encoder->id == AV_CODEC_ID_MPEG4)
+       {
+       int advanced = 0;
+-      if(codec->avctx->max_b_frames ||
+-         (codec->avctx->flags & (CODEC_FLAG_QPEL|CODEC_FLAG_GMC)))
++      if(codec->avctx->max_b_frames)
+         advanced = 1;
+ 
+       setup_header_mpeg4(file, track, codec->avctx->extradata,
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
index baecbef11725..f52066263bb0 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -61,6 +61,9 @@ src_prepare() {
 		has_version '>=media-video/libav-12'; then
 		epatch "${FILESDIR}"/${P}-ffmpeg29.patch
 	fi
+	if has_version '>media-video/ffmpeg-3.5' ; then
+		epatch "${FILESDIR}/${P}-ffmpeg4.patch"
+	fi
 
 	for FILE in lqt_ffmpeg.c video.c audio.c ; do
 		sed -i -e "s:CODEC_ID_:AV_&:g" "${S}/plugins/ffmpeg/${FILE}" || die
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index febfa22e584f..b4905f7c2ae3 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -10,5 +10,5 @@ DIST LibRaw-demosaic-pack-GPL3-0.18.7.tar.gz 39229 BLAKE2B d76134c4b53a1285c31e2
 DIST LibRaw-demosaic-pack-GPL3-0.18.8.tar.gz 39002 BLAKE2B 544a1eab61c825c7f2202107d623a56e1f81ad3e5111b419bf12708e2d8a9903f192c23904ab8fb274636d9262d3d89f02fa5e05a0e70d7834782c2df8ec0548 SHA512 10e8cb6694159d04deb813a88e5c3195eed6e2e438f41533db91b17997af1b9d54f286303447ca6e3d1b377922e388f6fcc8a8370254011e11b85612c914d500
 EBUILD libraw-0.18.4.ebuild 1774 BLAKE2B b34582c011016beb415bf262bb8a5db89e9a6a2e641b0cb3bc26b93d86fd4b95616255a42fe5a6e50a76a0974875ebe151f9684b674435966265a16e97845442 SHA512 a0277cda774fc2ec3f318544655dbb3a39266828bf9bdac80a839577f4fb5a2028b34548c7aeea33a61560753ff4631ccfb0ae3fa558440cc507e23c9bc246db
 EBUILD libraw-0.18.7.ebuild 1789 BLAKE2B 40a23381efcec9f5e959981237ebacd1d4b0f550a6e3841c8dfd699017d0642e6d028b12574eccfaea145fb133289224fdd6c69aa1bb93e61af254feb76cee61 SHA512 f8a3e81a58eadfb1705380afc0bcb95b4f11281a5db2b4535237e579262de5c939e784a5d935c9c69ac001fdfd8ad3c0cac7620cce041b7eeae51a5a4e5e416f
-EBUILD libraw-0.18.8.ebuild 1724 BLAKE2B 71192a546ba2b98d24c118eb3c44ccb66983048055abb5b2df4abcaac5e7a391385c61691ae2d05c001dcbab8ed652e4ca37f3f15851c495ea7769e398e53e5f SHA512 a16620f09a15d6e291d0afd7b40fef5770de0ca0bcb853a3ed571cf466fd9b7d863bdf03fec7540f462ce470b110aeb4b050ed0145999d549b961521ffb551d3
+EBUILD libraw-0.18.8.ebuild 1723 BLAKE2B f48d3b7e4d07c1d48064a8dc16d5af25f532bde1501cc1a6714f5412c42b824b6e9c1ae936a2d548746871925df553f3f7f722aa450930f70006ffdd2e4026e8 SHA512 679c029b6628eaa141085c1a4788ddc17b927eda419a6ebdd6d398341293aec4703e00e0aef81ef7c5ee9794ccd8eb45cfcea682bee006b75621325cbf0692ed
 MISC metadata.xml 437 BLAKE2B d43c89433ab4eff6a760dce4f7fc83253cb572ab048af7fb1df5bca74db8d7fde84cf147f5941e65407776d281edc4c0297006c75f83c285a5febc37625d6265 SHA512 b06d476afa85710b25dc7d1c1567ba30469ce6d08d278aaa64413611edf95433df315a5a77670d74ca5341be3b96fa0f4451e48f544783f031178b8cf73cd388
diff --git a/media-libs/libraw/libraw-0.18.8.ebuild b/media-libs/libraw/libraw-0.18.8.ebuild
index 66f04805d643..1c3d0a2783d2 100644
--- a/media-libs/libraw/libraw-0.18.8.ebuild
+++ b/media-libs/libraw/libraw-0.18.8.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz
 
 LICENSE="LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )"
 SLOT="0/16" # subslot = libraw soname version
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 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}] )
diff --git a/media-libs/libreplaygain/Manifest b/media-libs/libreplaygain/Manifest
index b7a2e9787767..5e188bdf94ec 100644
--- a/media-libs/libreplaygain/Manifest
+++ b/media-libs/libreplaygain/Manifest
@@ -1,3 +1,3 @@
 DIST libreplaygain-477.tar.xz 8272 BLAKE2B 6382984643aad155b3e5e0dac8a7ca698320068c62fa87ac7f466e34e850f05df1e823d87f7cb477bd22f59c97f7e5ac8757e9bd6f59c2f5f1852efe9f083d72 SHA512 9e81deb237e35e63d67efabcbfe40f5a6fd34f4a6b0239a21e6ab8ba3c9ca172297cf323fbc4ada749dcfcdf0b711c354e39f12af9a9576900384c441657ff8e
-EBUILD libreplaygain-477-r1.ebuild 942 BLAKE2B 724b3606553ee2ebdb8a500e17600e944ad9e30a41efa1af3a2d5d36f95ade3dff972839e4ba13e3b1713624832b0e4942c6aedf57cb1065dbfacac9d3fef33d SHA512 977407db035ec493a039d583dae1fa1bfa5fdfa8ccb29a9fb8dcb893a503d72de2099f7e31c089238c4a74aa2e1db80b84cebd500b5dadae43fe879cf142c68a
+EBUILD libreplaygain-477-r1.ebuild 804 BLAKE2B 9e7411e0ec5bb96dbae50da4ae8248c540cfae99de6c0a93c8566e1537ea46f949125e30b777906d47424705d3a017e72171d991275b90e547351831d2fcd9d7 SHA512 6ceb71313d36ea94cb8d4c06423cc288bba25b2a234937391bf5bee04b3c9bdcbfdaf59885969e9f7f3f5e2a351ac6d8b818480e6f3a5f994525d5e865923ca1
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/libreplaygain/libreplaygain-477-r1.ebuild b/media-libs/libreplaygain/libreplaygain-477-r1.ebuild
index 1eb6a7b305a1..800279b7b37b 100644
--- a/media-libs/libreplaygain/libreplaygain-477-r1.ebuild
+++ b/media-libs/libreplaygain/libreplaygain-477-r1.ebuild
@@ -15,8 +15,6 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r2
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
 
 src_prepare() {
 	cmake-utils_src_prepare
diff --git a/media-libs/libsamplerate/Manifest b/media-libs/libsamplerate/Manifest
index 4a7faf51337d..eec6b87d428a 100644
--- a/media-libs/libsamplerate/Manifest
+++ b/media-libs/libsamplerate/Manifest
@@ -1,6 +1,6 @@
 AUX libsamplerate-0.1.3-dontbuild-tests-examples.patch 1187 BLAKE2B e6acec51e3a8dcfaa50074734e55ba64d416882334e80e9fbf5a079d236e1ed358173efd84faf568c29962dc5655b11e8cf7adeb007159f8fdd0b0e14904c457 SHA512 93fce01981c831ced0fd83c315841660a7d194a706ba8b1fb775cc327d8e526c1b65abc8556dfde808672143d51b5e70f005f569034e6921e8af53af1ad45eee
 AUX libsamplerate-0.1.8-lm.patch 215 BLAKE2B 1123b4aab36476f89505daaa0d0ddf842819d8a70930469dc35140f648d71a29f3ed84eb36016c69a0738358a03d58930acc8381cacf3c047552b1fdcb7bae60 SHA512 acc63d2b6a547d9b480c4752864b474b478a753c88bd535833a5b1ca745c54d1e323bbe985f96430158307c0f1d1d1cf1171ec00bdbb31e9e888b3ed2c55019a
 DIST libsamplerate-0.1.9.tar.gz 4336641 BLAKE2B f1cf4c669315ef6a93bfa0c5c73284187068b9b049299afbfd45da5c133372cfd6fdd00fda2dbb2a6740446219203ceda8b46385c844d9ef480e8578aa0b3928 SHA512 78596657963cbf06785e3e6e1190b093df71da52ca340e75bd8246a962cd79dd1c90fa5527c607cebcb296e2c1ee605015278b274e3b768f2f3fbeb0eadfb728
-EBUILD libsamplerate-0.1.9.ebuild 1547 BLAKE2B ae0254f5b72ed170b7a9b131e03ad535581dbd7b2de82b3d9f76872c5d7a213b2ba16bcd0cf30a7cbe6e3b7f23529cda26615c1b44091cbb3541d2e237ce6b34 SHA512 35da5b5fcb387d32ee2dbaf09fc68a4bc6cfe3561fc2f2e363cd5eca4ae640bc7f2789c9bf5ae13ca8003b1ef70ac0532ee61943fec710b55d06f31d12264d34
-EBUILD libsamplerate-9999.ebuild 1328 BLAKE2B a6cbd940836eda3f2db12b23726356f1659d454a5a5a1df5cd5a5a9f72afbc1c74d005ad11a1fd0bf3946f76ee7fbcebd610715ced979972a2e09ba802cfaf0e SHA512 e1628a69023daae1bd4a50fbc1b4b63e8438dcb56a7c2ca1a991fd5c3e0388d0d3e4ea68df3c9788f21ac2b2afa48053767810fb0098da58be832900e1be8f24
+EBUILD libsamplerate-0.1.9.ebuild 1415 BLAKE2B 239e713e8cc7b601c78887aa133c1a6ccbf9be0a3c6200e0f9d42f479a0a7cdc2ab2ee6057de42c4a909cadd85c79d160bde61d089c1e02365930270f137d748 SHA512 97955e2a094b8c114c23776a08343f9c0b85647f8f512f406e74a7189a47ed51b0f4fdf748ea31cd14a62e005e0e49f61dea859cba6513efda734ac84716d2b6
+EBUILD libsamplerate-9999.ebuild 1300 BLAKE2B 04ce2d1e21e31f24c0d653a41c912ea70f78fab450cd2438e7473100f67cde8238a81868437aa3e3e331df5a0959675682560f6b0d96526f349f6c8b50279820 SHA512 776bd88b30e5fba3383af725ab05648863c3168335706959532f456cbb7c2835513fdd144ea36fae6919f8ed99eeb13bb7e6fd5f66e4ac97c601297ff5d594d6
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild b/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild
index b69d708bec88..ec95a697c759 100644
--- a/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild
@@ -16,9 +16,7 @@ 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 ~x86-macos"
 IUSE="sndfile static-libs"
 
-RDEPEND="sndfile? ( >=media-libs/libsndfile-1.0.2 )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r6
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+RDEPEND="sndfile? ( >=media-libs/libsndfile-1.0.2 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/media-libs/libsamplerate/libsamplerate-9999.ebuild b/media-libs/libsamplerate/libsamplerate-9999.ebuild
index e92848835512..5fd3fc1ba457 100644
--- a/media-libs/libsamplerate/libsamplerate-9999.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,19 +18,15 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="sndfile static-libs test"
-REQUIRED_USE="test? ( sndfile )"
-
-RDEPEND="
-	sndfile? (
-		media-libs/libsndfile:=[${MULTILIB_USEDEP}]
-	)"
-# Alsa/FFTW are only consumed
-# by tests, not by the main library.
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+# Alsa/FFTW are only required for tests
+# libsndfile is only used by examples and tests
 DEPEND="
-	${RDEPEND}
 	test? (
 		media-libs/alsa-lib[${MULTILIB_USEDEP}]
+		media-libs/libsndfile[${MULTILIB_USEDEP}]
 		sci-libs/fftw:3.0[${MULTILIB_USEDEP}]
 	)
 	virtual/pkgconfig"
@@ -43,10 +39,10 @@ src_prepare() {
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
-		$(use_enable sndfile) \
 		$(use_enable static-libs static) \
 		$(use_enable test alsa) \
-		$(use_enable test fftw)
+		$(use_enable test fftw) \
+		$(use_enable test sndfile)
 }
 
 multilib_src_install_all() {
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index 670c413a5f1c..31380f0e3845 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -7,5 +7,5 @@ AUX libsdl-1.2.15-joystick.patch 315 BLAKE2B e1adc864e4d660ef21ce2401f29c61c380b
 AUX libsdl-1.2.15-resizing.patch 2098 BLAKE2B 6f8e7832262384b1c710f8353b0b0654b0a951a83e198ef7c8781a5d6ad20c806677f99da93f14e2731b3330662ac4506d687c594116651a148c2833d803dc0b SHA512 afa82d81e03fe974b2c1a4f3c9ed48a15472784548c8e88f988bb03ea992e8ce86bbad74f7e5980dd1476139cf82180eda72e77041e065925cb373cda47c268b
 AUX libsdl-1.2.15-sdl-config.patch 780 BLAKE2B e62be7f44481b48ea226200f382dc8c20c5110997ed26672e5dcd8798e748529826b0951e3803e3fd5f30f8c3050a5fb298e5f880ab7e495dde9c0c8fff6cf1e SHA512 c79b0b5674a2a70862425150d8b481f1a0ed0bc400bc69835e53932422583bdde061d1f72da8d3ad0aaaa4499126bc2770f11941435e6c848bd4d90d040a0d03
 DIST SDL-1.2.15.tar.gz 3920622 BLAKE2B ecd4b82d7de6e4ca0de1317ad34bcd957a5a0d319e94c5b705f8b30aa53136ac08c88a6dcd90ad0ac84e607ba9483c2366921c4b25c8c53973cee62cfe97d204 SHA512 ac392d916e6953b0925a7cbb0f232affea33339ef69b47a0a7898492afb9784b93138986df53d6da6d3e2ad79af1e9482df565ecca30f89428be0ae6851b1adc
-EBUILD libsdl-1.2.15-r9.ebuild 4386 BLAKE2B 6c141995b02d9b25b23cfc60f7f6b314387e90686559136cf1272a823eeedc3e46823cd966d4dcd06d8f83929cc4c646867fb2a1f5530a191ad6bc5b46a133b6 SHA512 94285ca796ab2bc75424ce8496ed3d200cf6af7f5edd6e0da81298feb9581266bfb468f27f557e61239ca7bb6f47d20fc6ba9a43abe89bcae8d22980c5e41602
+EBUILD libsdl-1.2.15-r9.ebuild 4269 BLAKE2B 24099aeb0213b5d58d8a729e33a939e0ae25e75d9892692ede6301c8de819d8ba56cffb4e40afae87f71b60be11081eb541408843f3382295f2943904a7aa622 SHA512 4df8c3e8df59bb42794d57cdaf53bfb30e308064da9474ac9d9419f41073ae7e8fb171afa7ca2f2f2834913e73893190ea1406a8a267ef29fc40199ddf5ff211
 MISC metadata.xml 1415 BLAKE2B e1f07f85768757045a516c548dfb8c9a014e0291ca13d32b3e6164d38de389d718dc5d7e9dc4f98bc67cc16d043f92cafc2819fd02d18d72b17472500a8245dc SHA512 52c647d06adee1c595d45caf05e1781c692d700726c9c0ce182ce74796f2480fada765a2772d1679589dd7919d30edfcf5a0668e525cd8e30f78455c525d5446
diff --git a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
index a387ccac9f87..9adcccf9a4b9 100644
--- a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
@@ -17,10 +17,6 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-
 IUSE="oss alsa nas X dga xv xinerama fbcon tslib aalib opengl libcaca +sound +video +joystick custom-cflags pulseaudio static-libs"
 
 RDEPEND="
-	abi_x86_32? (
-		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-		!<=app-emulation/emul-linux-x86-sdl-20140406
-	)
 	sound? ( >=media-libs/audiofile-0.3.5[${MULTILIB_USEDEP}] )
 	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
 	nas? (
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 73fae5a13f37..fa812fbe7f34 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -5,5 +5,5 @@ DIST SDL2-2.0.5.tar.gz 4209352 BLAKE2B c0a040e39117ac355e49950434a96b790dba2af13
 DIST SDL2-2.0.8.tar.gz 4909017 BLAKE2B f6b365a6033e10ef0c5d56ee5e17cc1caada99a97b7ccc7b0eab4f7ca5fc513b78e71960a41a20319c5de1d9eb9eaeffb06b90d090e14e8d354a9b8315ab12f1 SHA512 673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869
 EBUILD libsdl2-2.0.4.ebuild 4724 BLAKE2B 81b738d8d00280008bc2e764e07210847ed765c4867ed8b2e071c8bbe16ddc250c9600afe30b4c9c2941e56eaa81249e6e8f872f6d15c7c47cdcde81342d683f SHA512 a02673ae1dd84a173d9479ccc572470484666f429fa36a4a2c4cc39bcc21e93b1691ce51cbc012d1c06c1e9cf073e7d694b77f25b1b9a229e5ea719c1c835254
 EBUILD libsdl2-2.0.5.ebuild 4760 BLAKE2B c23874aa322c300b1f4de2e5d303bd6a60afa27c0ce194e1c3eba2c6f51d86c7aa2f13d2a87ef77de7d3845c6cfde24e6806f7dd7bbc1782669c0516fad24ede SHA512 96834e25594b9d568c261991e24f3c1a7985fde2edc9c17facc726e11790939d0ae6b122e2d80d808781ee01949bea16756a3a7e1112b30ff22c190873d58078
-EBUILD libsdl2-2.0.8-r1.ebuild 4818 BLAKE2B f2f4cf8f24359f1c1066826df0cae1a6f212cad1e5cb3cffb93b7e6a69fb903456a10f7c998820d6b56874a656c524e3365639c9aa15df144d4f5a25f9f0ecd3 SHA512 3d53fa083920b57bb312f0436cca50703dcf1cc6aab1a91606bf00ed01807ee67ce1ec3909cb3afcb319dd8dcfec5ad3c75f7ca1fee464315f92f491bab8c858
+EBUILD libsdl2-2.0.8-r1.ebuild 4817 BLAKE2B 0a648c00f9bed23760e2368aa6be0ac542bbcccb650d68ac16f24a991e4525cc0cfb71be46f9d531038de19d3acf17c3541a6e50fd9e2bd0ed334ab813bf40e9 SHA512 b99aa8c3c0fac5c35722499d1c6ed8d237528f67736f517adf2c5967a5a099b8436d1900e34b409e477535e851a77eb9931d1fba262208ce9a1363ccfb8e74a3
 MISC metadata.xml 1609 BLAKE2B 036c0f14aa213417757191a7b05d957bb24723733e2a847f6d6e3e23539674eacec37e5e569ab35c8382f0fafdd156b323f3a0468182854848ba3c944e30d9dd SHA512 5e04e0574226a2f3d0bcce5b1aa38b9c95226d9a7192beae0e77ca8769e0ad02d0c8f3b72fa699f4a6704e9ae7f543aa1e5607f3346ba1c021a30aa1b72287a6
diff --git a/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild
index 5424e85e492e..b0e5df3291cd 100644
--- a/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="cpu_flags_x86_3dnow alsa altivec custom-cflags dbus gles haptic libsamplerate +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver"
 REQUIRED_USE="
diff --git a/media-libs/libshout/Manifest b/media-libs/libshout/Manifest
index dc7d86af8dc3..6f10ddd8695a 100644
--- a/media-libs/libshout/Manifest
+++ b/media-libs/libshout/Manifest
@@ -2,8 +2,8 @@ AUX libshout-2.3.1-underlinking.patch 428 BLAKE2B 3d57e5338c4c0ef864d73f6efadf50
 AUX libshout-2.4.1-underlinking.patch 529 BLAKE2B 993ab69f011caa49b96f28ede17bbe3fe68b304521a1d7185e865f4ac254d2bd313686e0d6a59e5aa50a0fe41a0e0214980aefe1fe3dcb8a45d827d4962fb153 SHA512 4717ee913ff50e276cca9983543a046271c34385bca2525bc64f6de90a25c7becc7e780807ff2534147dc17b1f57b57e23746948ea78288addfbeca7c495f78e
 DIST libshout-2.3.1.tar.gz 464229 BLAKE2B 6266e23d34f551e4d8afacc514a4e2e7bb12753d24e1c7cbef48899f832f353e7c13dc8c91a9618326dd5b65853d8ab466103954e058bab59068f6567a14cea5 SHA512 19c1421e654310ddbc25f343d205d921b7c3f1c9c97f028207deaf1a46150b7f6c8069d52b7a3c9ed72dda276b52237cf1208292fbfa09aa7d09f85072c46a7b
 DIST libshout-2.4.1.tar.gz 516161 BLAKE2B bedea3c043018eff4675fdb8b95e0bb8ff02a98994a4afcc76537124ebf7357f012f2e9445ebd207b576fc4166fb761d65066fe166fc8b611b96f5c5482a0e92 SHA512 4d4b958947e020de3330d49d39d59220fc89315f25f653a7456b9aa24ca9566fca30bb3d65e6348e79958656096b6b864ea8885157d24e55c8d84d6604670219
-EBUILD libshout-2.3.1-r1.ebuild 1216 BLAKE2B a56149d45dcf464a465558d926ff2378685ee8ef1f99ea584bd397e455b80aeb9ac0126898ec4474a3e100eb9b4b32a58dc30eb274430121e82935b7a88dd6db SHA512 977452a7ea64d3076f968bffd73cf81f5c87e18bfa760108cf3120a77b60ef4aa528afba4b6e7913d9832c122187afbdc9c8430e8d1104f0656eba20be735d53
+EBUILD libshout-2.3.1-r1.ebuild 1087 BLAKE2B dc04384b8f5f61c90bd0daf6a60687311ad998a600bd83c5c36d16b5ba6554c1161cb4a57436e177e2620690be69f614299acffbc68de143a1c191bf14d71919 SHA512 1815449c2ee7342a8aa295fc8a3cf049b0f481cbab4393288545b18bd33439264c9550fcbaad584c6112d740fe947b05ecf346172b3d997b7209d1e14942f461
 EBUILD libshout-2.3.1.ebuild 837 BLAKE2B 06e49c76b036ebe4018cfb40df091f48cda71fe516a32a1517744e89e25c90eb177bfe90cc223255be102cf8cdf2405e8941624f62520b6ca19a4ea8e5ab6169 SHA512 f3ca40a99521c197a07dbcad9458b90243fd1ca36e45cd4c9487feee7115a6598eae6c778307dd22e8133b089c5cfdb47b3d237e9d6bf3f75cefc37d0e657913
-EBUILD libshout-2.4.1-r1.ebuild 1319 BLAKE2B 25b6bbd2c91f5d57eb4ca28cc3b886e78cf65b7a69e785d6f8bfe0bf7048fde1161734c1ea206d5e7dc7259f7409c60a0e88e724999b3534b61d95ebdcaeff8c SHA512 7d7b3dddbecc485a0b6de9b81b4dcd1a3ba27bdd6ac6f320768767f63f07afbbe6ac0c205ad8ec6c67f90187c89a6700484b6aaf270e968433d7c06670740015
-EBUILD libshout-2.4.1.ebuild 1340 BLAKE2B 654727adb05205043c5aeeb33b285373a7275a4211f894ec5ae64ac801d98cbfbac84423c7287286e22e12d7e79877a735ee24a21a8485ab274d24210e24e129 SHA512 344835f4c72a272295da03a4a3d9df82049504d8056396b793523965652820b12527d1de9eb2f279a21caf636277d035977c60a4c0b8023c8eafc6d8759ed672
+EBUILD libshout-2.4.1-r1.ebuild 1318 BLAKE2B 25522e7bcb883202c43066ea842347bd542fb401c0a7f2bd331bb33eaacea2bddceae05409732fd3764b3353359b1b3e1a46c6d26c92a36fb544bfa23f57f97b SHA512 22b9404502ebcffb61b3818a9fc29bed0b9baec50ad6c1de3a6b94f16c6e908b74294952b54000d62085ecbc6b03e2cbbf476beed09c541d383b23f8cca35b23
+EBUILD libshout-2.4.1.ebuild 1211 BLAKE2B f0fba59b7fe490e3d0caafccab41647ac37a26a427652cbc7a49a7156d0630165cdf3f01d735021a8f6ae606b26b87db1bdfa437815f001bf0d047954e5b4f59 SHA512 d107c34d50564aea4281cca3bab02e4977932c21f715d20e2e01ad839290ceb6546c55e469685eb3c0115693d2255779ed4e9cbc7d911ffd9b35173a6ecee158
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libshout/libshout-2.3.1-r1.ebuild b/media-libs/libshout/libshout-2.3.1-r1.ebuild
index 0e79e4b9732a..0824142aa4a8 100644
--- a/media-libs/libshout/libshout-2.3.1-r1.ebuild
+++ b/media-libs/libshout/libshout-2.3.1-r1.ebuild
@@ -16,9 +16,7 @@ IUSE="speex static-libs theora"
 RDEPEND=">=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
 	>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
 	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	theora? ( >=media-libs/libtheora-1.1.1[${MULTILIB_USEDEP}] )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r6
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+	theora? ( >=media-libs/libtheora-1.1.1[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/media-libs/libshout/libshout-2.4.1-r1.ebuild b/media-libs/libshout/libshout-2.4.1-r1.ebuild
index f4ed55146663..5d5ef8a159d5 100644
--- a/media-libs/libshout/libshout-2.4.1-r1.ebuild
+++ b/media-libs/libshout/libshout-2.4.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="libressl speex static-libs theora"
 
 RDEPEND="
diff --git a/media-libs/libshout/libshout-2.4.1.ebuild b/media-libs/libshout/libshout-2.4.1.ebuild
index d91491a7d46f..05d218d13638 100644
--- a/media-libs/libshout/libshout-2.4.1.ebuild
+++ b/media-libs/libshout/libshout-2.4.1.ebuild
@@ -18,9 +18,7 @@ RDEPEND=">=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl )
 	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	theora? ( >=media-libs/libtheora-1.1.1[${MULTILIB_USEDEP}] )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r6
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+	theora? ( >=media-libs/libtheora-1.1.1[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/media-libs/libsidplay/Manifest b/media-libs/libsidplay/Manifest
index 381da8d06b38..fb8164a9c137 100644
--- a/media-libs/libsidplay/Manifest
+++ b/media-libs/libsidplay/Manifest
@@ -7,7 +7,7 @@ AUX libsidplay-2.1.1-gcc43.patch 2057 BLAKE2B b66469b17702fa74fffc6ec55469689876
 AUX libsidplay-2.1.1-no_libtool_reference.patch 558 BLAKE2B 7f115c941dc0f9dd8201fd42368d55ee247032ecc4b70c20b89253593e7f6259d533ac724aed22e2229c0c0168f465ac41cb49f3a634e8c9bd618100a5d98dc0 SHA512 826531798593a0e597d2a8a310da584e0097256fe580f7858aa84d9be70f77e1a0b0f9af7e6c94a91602e73f9aff6197f10f2a22ecf1f6fce85ce1f408e04b86
 DIST libsidplay-1.36.59.tgz 390097 BLAKE2B bcb7e9eab4884270c8047af7f61e0afb2cf6ba24465b4859ac404f34cacec9a8c67ad42f3adf0c5f109cedecaa7710919296e30401c2dc0ca6f337186c9a329a SHA512 e7b0859e1389683d3e6aad7040b78ba37bb0a393c85f68ddb8a064371f978b34cc2e951ec564fa1117d12885cd976d10b02937e132d9a11badecd8652cf4d410
 DIST sidplay-libs-2.1.1.tar.gz 1900252 BLAKE2B f04e34f4cfc641a8222e5d53575108bd52deb2de2dc0b0d58e91581ade7128ac87f320f16e044baa23b54de6b5b6b833e9f6c0d37a1885341a329e778c0a0228 SHA512 754cd41f3d2d76754049522c395022bc090f99ea838e6d1ffb8d7689f3aedad9b3879be0312d0af49ba108563296c1176d1e533d1151d5b33368bfda0a1910e3
-EBUILD libsidplay-1.36.59-r1.ebuild 828 BLAKE2B 5b12c8f42573463ce0144c6cacf7479f6b137b8e84c93e763084477d927768bd80cd344b533431d92aae3b56bbd7e6b053a890d88683a1208b52192100c97d25 SHA512 c26f2a40f0de6918e22c90682484cac1e08c03b764859596f4d05fb0df63eeb7c6a1e9415d70e7fe219cbe43ecbc2d50374741292c290852caaa626f32dae315
+EBUILD libsidplay-1.36.59-r1.ebuild 690 BLAKE2B 4547e74b21f7c3b8a807845ba73505690dfaa7ce05e43d790286fe5d338fb8448c57bd48936e65d2922ae4ee655e6d43fba29d41750c7681abbf2f83be81066a SHA512 ed747cd2eb72f8c1bd967c8ccf49bf8e92e905b8fadfead3bb2b51a41ac848c55b0cc11d0a8f0efbb56f1837fb1f5bf295475fded42aded57a44094f4f9efb70
 EBUILD libsidplay-1.36.59-r2.ebuild 769 BLAKE2B 958c67f849ad398c6f4ea6d685a0b33f924884859a32e199d6dff19d1fb4819403eb3e9455bfaa350864335bc12f51a4a71c748684bf80ff6c4f51dfefad947a SHA512 eb762f63d10c9e4c67b6a51523d8e36bce10a5ee837da7a6841536c9b249a371cb4b1488c9041dbddfa0d04d9adc6508276e8890f57b369eed73ccd3e1d0244e
-EBUILD libsidplay-2.1.1-r4.ebuild 1306 BLAKE2B 989a5d2d63dd582ecb11699327a959bc696ae62bb6600bbc7e5cc1fecf94fe45dfc752649a16b60b61a83e90fe5d18ba3378a9b610a4cafdc8adc6b8bb76d4ca SHA512 c6eda0b230c217b3dc300810f974cb12804f6dc2785243dad68993b2e2ea094c0cf329f7be70d8abf3af6f2d6d493b1b2d6404095382480ab1f9a38fa8b43478
+EBUILD libsidplay-2.1.1-r4.ebuild 1168 BLAKE2B 8b69bec5f74b52932a64ee8ebaa8195afe5ab5cac8fe899c465f32b125fbaeac0f2d8dc03203e3225aa6ed94cc841124aab4613a71f90e71f95a04f3a35f8db3 SHA512 ee3ef694f09cccc476bf1003441afddadc8f085a311889f6cc6be21414581c833bfad9d898aaf8f92380787e7949899fa07907258ace1d902c1131f70d53a8ad
 MISC metadata.xml 294 BLAKE2B 8fcfebdeea5012bebd45c78bf374aadf8092aa88fe731a66e0ec56e642745d613139b6c2cc080f49394d87ff3d04c2e6f84dcf4538e22cbb4299e0decfa83fa7 SHA512 f2ca3b91c3f0f046bc5fd9eafb91a8acfa5a7987d0db24a6e1e6b79bb54a4a466f660953699ca4a84d500a42542e403e12523220e881a466d54b4ea6a4508998
diff --git a/media-libs/libsidplay/libsidplay-1.36.59-r1.ebuild b/media-libs/libsidplay/libsidplay-1.36.59-r1.ebuild
index ed384559ae11..0ef1eeaf0373 100644
--- a/media-libs/libsidplay/libsidplay-1.36.59-r1.ebuild
+++ b/media-libs/libsidplay/libsidplay-1.36.59-r1.ebuild
@@ -12,8 +12,6 @@ LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="static-libs"
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r6
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
 
 DOCS=( AUTHORS DEVELOPER )
 
diff --git a/media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild b/media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild
index 202222f47504..2bb0d5a474fd 100644
--- a/media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild
+++ b/media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild
@@ -14,8 +14,6 @@ LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static-libs"
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r6
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/media-libs/libtheora/Manifest b/media-libs/libtheora/Manifest
index dde0adaf7f1a..c146f62f1c3b 100644
--- a/media-libs/libtheora/Manifest
+++ b/media-libs/libtheora/Manifest
@@ -2,5 +2,5 @@ AUX libtheora-1.0_beta2-flags.patch 763 BLAKE2B 69058f8babeeacd7d382d173376af709
 AUX libtheora-1.1.1-libpng16.patch 512 BLAKE2B 95b35dbdfce9352e63deacef7dcaa5b6e462e90257eac78e5bb43235aea2ab2b2a8365dcb70309b4427c6ed0693f2ccbef4c92dfe0229b495162542b47ff6d47 SHA512 856da5da7788863c59c9cb6c4fa102d250e60d6b302a5c118799169bcbc5350ab0bf6798f2ae2586f1d361ff9030d1d715214d8df900d7e1aa4a4e1d58f44276
 AUX libtheora-1.1.1-underlinking.patch 477 BLAKE2B 253ec0f7195abd532ebf3f0ec8e0009cbfe19ff6a27391cb4b899215e8a6b38cc9d4c49814de8ee487a4599edf95b9ed74afdf541da52730e35f634940517fc1 SHA512 00d02a773d5c95361d2d582d0147d4469ac4c882e62e25452908329b536261e9f09de82db8280fdc42985d0d8d5cdfa2f4866c76da03aca8f29237799b70a080
 DIST libtheora-1.1.1.tar.bz2 1903175 BLAKE2B 261655cfdb8ba38a462e4701d69a074c6d8d81fb801359059b1c2c11592fd5ab1b724652e667aa5c1f117dbbc198b7794d22a7b1c9782e2b6dabe5fb62524be8 SHA512 9ab9b3af1c35d16a7d6d84f61f59ef3180132e30c27bdd7c0fa2683e0d00e2c791accbc7fd2c90718cc947d8bd10ee4a5940fb55f90f1fd7b0ed30583a47dbbd
-EBUILD libtheora-1.1.1-r1.ebuild 2422 BLAKE2B 5d06029cab4ba5ec10f0317e630d03b8edc64083e69d04944b18e24e8019995db91828f81dd9ed62a5e03f088250e9002f40b07af32d3ca5f464bb848b88d536 SHA512 f4c5f83ab26034aaa28f6fad169294c6825635222cc0cb668b3787aa53803edac41576d21c1de92b83e82ac778793570157258adee8c82281aeb378ab67b1532
+EBUILD libtheora-1.1.1-r1.ebuild 2292 BLAKE2B 57e73b870d1829426e253490071b196c9ab10325760fa70db76e948da7f847823de4376b24b6bdb8d383e7933837c9b1dd096a4bc3ae0d97e01b12142cc1d3c4 SHA512 ce3ba04f1326ec806e852a4a3eb14f38fefb7ed76b09107bb2a2618be80f6b79f9c9682c89f8c34c4a2a4c1fede97d77db49b9ccc74678577710c00f51e802e4
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libtheora/libtheora-1.1.1-r1.ebuild b/media-libs/libtheora/libtheora-1.1.1-r1.ebuild
index 5a1eaab83065..431bf0cc0545 100644
--- a/media-libs/libtheora/libtheora-1.1.1-r1.ebuild
+++ b/media-libs/libtheora/libtheora-1.1.1-r1.ebuild
@@ -19,9 +19,7 @@ RDEPEND=">=media-libs/libogg-1.3.0:=[${MULTILIB_USEDEP}]
 		media-libs/libpng:0=
 		>=media-libs/libsdl-0.11.0
 		media-libs/libvorbis:=
-		)
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r1
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+	)"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	virtual/pkgconfig"
diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index 8677fc02fbfc..f2c0da75e588 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -11,5 +11,5 @@ EBUILD libv4l-1.10.1.ebuild 1398 BLAKE2B 0da4472606ac09cb6101835663157e07be64b89
 EBUILD libv4l-1.12.3.ebuild 1321 BLAKE2B ab3ff5aaaba94331523ca23db44a3103864a5b6014a025fabc1aa59c593217760bf2d3dbd65840113a4b8fec1c7b8be123193a72a64b03b7a07f7a28287eb0d4 SHA512 c08dc4720cd7fb7a3713c62b0cfd083e379cb015473f1b0455dbe2c63a2005523edc445aa925f42160e2dbba52f13442f3b7c8e59d648f5b4c78267abbf06788
 EBUILD libv4l-1.12.5.ebuild 1370 BLAKE2B b122ee457e5e0879d2d1e584b4165e2a9b49cdded83229d60b7a89f18f5ae5721158c698027672f7b7cd294e8f41a05aa7fce3cff9b40930412bf68853a09b2d SHA512 beb1632e4619a33c3c02f370bcc0c94ac53ea666fb8782da769379d541088f23b2034248f8f5c089fa1a8b1d5cc0a834871090ff3358c5bbb8519cccb993477e
 EBUILD libv4l-1.14.1.ebuild 1434 BLAKE2B 3fc61c41c012477e5b736b6ee488c99f5fc73c466b87228625ecd1822fd9d60f0999354a16eeae28394c5d9939c83a6cde15b14b9afd9ce6fe582d9f7661b504 SHA512 8d9bc01f3a6c3d27a8a896db01471d30dd0f56b65c5c6f60dd992171e4ba746089e9c6983646424fc3e449d6e1f725bcc7bfa8185dbdea8ba6075e496f10f209
-EBUILD libv4l-1.6.2.ebuild 1498 BLAKE2B ef70dd87b249c185fbb64ab82754bb51aa5915880dfd7c3516962796bcead440b5fea62e58c601266adb138cfdd98923eb1851d3679c9f6f9390de10a79f529a SHA512 5181a3fd3b3405f3809315cf922f0850b5c36cf0668fdbc774ca712c661b98a3d0555dbd75c34792317ec1775b019ca8b75d955e652f8018664cbdc2b8a528a7
+EBUILD libv4l-1.6.2.ebuild 1366 BLAKE2B 4b4d13e9e8723e0a846cde04627ea6a4af400633146b3e424b794264f9b6eaa8fec10d0e2d1d12b6572de3e96caaaa80368242cf59d33131c0afda86127e9f37 SHA512 24ae9e13eb1efc7a7e071c8a8102c065f1e9feadf8e02f4477c004403d5b94eeaba13510970bdfe48852e723619ce0579f82dc25b9c2975104fef97d1d3ba8f6
 MISC metadata.xml 1125 BLAKE2B 3404da3f65f90eb87682c99c24feacf97f03616c55caf36c71538fb2f2da424be0ba5cd36b017872268d0efa34441440bcba95a482c0723c0b79ccf6a96a6e65 SHA512 5594f9030eb7da8b32c90e1710ebe6370339ef4fbb3a1b23a99024e9c0ef5bbbde31e421e3c9e23edf5e44709970fa1a60523c8fa615b90ce16437b28d5714c7
diff --git a/media-libs/libv4l/libv4l-1.6.2.ebuild b/media-libs/libv4l/libv4l-1.6.2.ebuild
index c58d02811537..0b1dc2d6f1bc 100644
--- a/media-libs/libv4l/libv4l-1.6.2.ebuild
+++ b/media-libs/libv4l/libv4l-1.6.2.ebuild
@@ -18,11 +18,7 @@ IUSE="jpeg"
 # The libraries only link to -ljpeg, therefore multilib depend only for virtual/jpeg.
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
 	!media-tv/v4l2-ctl
-	!<media-tv/ivtv-utils-1.4.0-r2
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-medialibs-20130224-r5
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-	)"
+	!<media-tv/ivtv-utils-1.4.0-r2"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/os-headers
diff --git a/media-libs/libvisual/Manifest b/media-libs/libvisual/Manifest
index 1318a5b99e08..913a7930f6d2 100644
--- a/media-libs/libvisual/Manifest
+++ b/media-libs/libvisual/Manifest
@@ -4,5 +4,5 @@ AUX libvisual-0.4.0-conditions.patch 889 BLAKE2B 6c197b4d47249d341efa434165c9681
 AUX libvisual-0.4.0-detect_amd64.patch 431 BLAKE2B 2be06d4606c73867b44c62c154bd0a309e76545469fee02e2840f41be9271b17b1edd26717e16f74cc63af7d4627d7792270c5cf75e89f9a8f146fe318952b72 SHA512 b102f61acf60a7faa1495087c96c8cba893c250454ea1b5ed60c14ba0578d2fb794d2722f24e9d6b5bf37369fcf83bb2bba3929fcd49e24c4078f2a9fde317f3
 AUX libvisual-0.4.0-inlinedefineconflict.patch 1870 BLAKE2B 3c20d445a0f94d81361cd12429e2572a17656cb9049bb83a25f1fb12e17606a94c1a005582c08a90bf8cd10cf25adcf9f9420e48a561bdbcb84eeb3b15399957 SHA512 2951ca778e732685409911c05f24e8e85492e5af4d8eceb0558636b4ace53b8967250250712c5995239bc5f7af01d20774042f3ccc9f90b370ca3cff673bb0b7
 DIST libvisual-0.4.0.tar.gz 583386 BLAKE2B 277348dacae1382da7e9212f7338a9cbc8aa867637d7db10ee22551c5e33b2d09870e94437958379245acf609dd70d3fa85f9ac14b40413424a7a14ca09e7360 SHA512 ab2286de30d33582a92f16e46436fcbc44b74649952df6e94d96aedc2cabb18d3361496c0b8ab6f52f7178214bf735673c8f1820c3d149304787ba8407201b95
-EBUILD libvisual-0.4.0-r3.ebuild 1426 BLAKE2B 4eb30e0029625068d3a87e30cae6a60ffef1c0268b8c340bd8c067af5c327e5d79f1f400e8af33a520b3f9a1a754a7c78d991348da76f469855c1393a42d9452 SHA512 6a8b470bd4e28f61f631a10b5df9939e01d1f5814bbb9359a94321e4bc0058a95ef2ae3bd503ac90bae8b8993b5241a069fd09a9883f0b5f6dd8aa57b40d0b3a
+EBUILD libvisual-0.4.0-r3.ebuild 1278 BLAKE2B 2915bde921c021f3428ac535d9bcd7d06d9c020ec9b11b2bf706f81c03c4f8e2fba9ef0039c0b7a267729fdbde14007bc9dfb9674811eb4a4d2e73e8c8c929e4 SHA512 949cab8efc8fd8516899472f0b0fe8c6094487142c28491e56c42012d2d81a4cd08a5e80bcc466883a9eadb2833446a1520c9b8c037e66154710627bbbad4152
 MISC metadata.xml 332 BLAKE2B c29c386b29c500e0f8a7827985e0c26ee50f9f0465b92c42feed113b3b1fdceae581a6b8d7089ba2d304428f604b531d8e8833da12f2d44e8a1643d952b11445 SHA512 62db2eb31068dc2c0adf100ff0a9782bf9f92118fb2c2322fbde5fff6a22dfe16ff826b22218b44a86b7350ffbbc3e9fc6f0135f0a43feff8f83e3e6365b7288
diff --git a/media-libs/libvisual/libvisual-0.4.0-r3.ebuild b/media-libs/libvisual/libvisual-0.4.0-r3.ebuild
index d56d2ace6d3a..f5253190906d 100644
--- a/media-libs/libvisual/libvisual-0.4.0-r3.ebuild
+++ b/media-libs/libvisual/libvisual-0.4.0-r3.ebuild
@@ -17,9 +17,7 @@ SLOT="0.4"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug nls static-libs threads"
 
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r9
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
+DEPEND="
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig"
 
diff --git a/media-libs/libvorbis/Manifest b/media-libs/libvorbis/Manifest
index 84376c0810e2..d6f4411c6738 100644
--- a/media-libs/libvorbis/Manifest
+++ b/media-libs/libvorbis/Manifest
@@ -1,5 +1,5 @@
 DIST libvorbis-1.3.5.tar.xz 1193144 BLAKE2B 8f1b7dc9e25147fdb6304e2630a0f90a8766338b4566e9ad2f288f8e6cbcfa98b9d471dbd33e98882711319c74d5ebe78728b4c7376e07b2ab5b08a3b67c74a1 SHA512 f18f32edc43f65fea2dd4133e2828a0ced9e5b0797c4569bd26989fc1409ad599359e7c796bffc082ad36189f9722c7b38837384cea66d217beac8b425299ef8
 DIST libvorbis-1.3.6.tar.xz 1195388 BLAKE2B 9fc1dd125fdecb95687ea159b75cd66eed21329ec0795a3050e52e6cc58e1aac7b084ca25c4e52ca6f251ff474f6d71a716c0fbb2367beda8eb6a51a8fa9049a SHA512 a5d990bb88db2501b16f8eaee9f2ecb599cefd7dab2134d16538d8905263a972157c7671867848c2a8a358bf5e5dbc7721205ece001032482f168be7bda4f132
-EBUILD libvorbis-1.3.5.ebuild 1142 BLAKE2B 2740755716c6975599af41c8038cf11eebe2d83e1ebe3733acecea604849cf538a68728fe21efd85b1c690e62c0c003f51840b2a500e34c5beb01e1baa9335bd SHA512 e3b701b9ca57bb7600791721b06af1586614416011ba8bcefd55f2b556eda41e936ab8991f904f98190e9972dbd1bf897a20243dada0e0fb341bb9c7d205ba40
-EBUILD libvorbis-1.3.6.ebuild 1144 BLAKE2B 4a09d1df379c5dac5b3dadca5a64ff4951ab66da304a4cdc54bff75c5510b1b2fe832c80e4f6d40b06a8f93f6664204b4acdd7b2cf6b97b4897cb94fec64178a SHA512 2a8387823a638fdbae09d173545cb1c8532a604bc071345f2fb953d3b05093dc6cf6f3e72f60fef4515bacea86b3abee27e0b3a874f84bbdc90f68b0061e0995
+EBUILD libvorbis-1.3.5.ebuild 1069 BLAKE2B 2906bd9b09e366ccff6437c0bbe766dec5d23c47e0248047f702a3710c5be6b393ec82309f6e87be629b2a9185eb0cd9271eb2d79c8e66c2c137b3f3af03f4a1 SHA512 11394b3e512ccf4e732d398f82fae9b02f594f93ae70c09c4bc5cd0e4d7a1a1e67497b1e5830b976821e560e04e951a976350c32be2a7e833c215bdfdc72d11b
+EBUILD libvorbis-1.3.6.ebuild 1070 BLAKE2B 467866613f980295d02581fcfd17fee52e5a75685eb33d5cfd248c71aea4b305220a2fcdd20ea7d60d7114b0626f9de16b9b9a8c8a2f8796945f7e9d942a5f54 SHA512 e45a830f9bf48d6b4ace010524646687d6765829ab7a2c277a328dd152b4eb69bc9325317cac35414747572fc02e5663210438555ae6921c2481ca61f505a237
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libvorbis/libvorbis-1.3.5.ebuild b/media-libs/libvorbis/libvorbis-1.3.5.ebuild
index 447efabfe35a..a5b03de83831 100644
--- a/media-libs/libvorbis/libvorbis-1.3.5.ebuild
+++ b/media-libs/libvorbis/libvorbis-1.3.5.ebuild
@@ -14,8 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
-RDEPEND=">=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+RDEPEND=">=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
 	virtual/pkgconfig"
diff --git a/media-libs/libvorbis/libvorbis-1.3.6.ebuild b/media-libs/libvorbis/libvorbis-1.3.6.ebuild
index 6f1334ceae93..61b6d8e505a9 100644
--- a/media-libs/libvorbis/libvorbis-1.3.6.ebuild
+++ b/media-libs/libvorbis/libvorbis-1.3.6.ebuild
@@ -11,11 +11,10 @@ SRC_URI="https://downloads.xiph.org/releases/vorbis/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
-RDEPEND=">=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+RDEPEND=">=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
 	virtual/pkgconfig"
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index 45112e33ed31..3668a3556bd8 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -7,8 +7,8 @@ DIST libvpx-testdata-1.5.0.tar.bz2 117022525 BLAKE2B d0b5e96694d84d825b874df208d
 DIST libvpx-testdata-1.6.0.tar.bz2 121020858 BLAKE2B 93bbaa4514e46b762fbf86d66394b228d62c19906dc79c5c661feedf088d09d4b6c2ac908dc8b1ac4236a801047d5d608b17a8bc0fa5bd5ca0c992cd0729fc7a SHA512 639e229bd97e7a92a29e636f548234a87dbe63673d968cdfbec1faf9ccb0ee2087ad00b0a5bfb1581bea6b17e70bb449e9a046da4d9891f59ec79773ece4294e
 DIST libvpx-testdata-1.6.1.tar.bz2 158774682 BLAKE2B 0ba1897e015c69cbf98b645cc634f98fdaf58aa814ad2cf93ee1812a38d279a570b856017822db0b21215c0e6d2d069c3f40692317c885ffbc3b59c236a754ba SHA512 9038774a6955cb6664ea664b4d8e08b0e7a2acba85429da9fd84f522bc7a03d57f6d9f1302481136a718507113babbe4786ff7a648130298ad2c0b3cbe8e82ab
 DIST libvpx-testdata-1.7.0.tar.xz 238790100 BLAKE2B 1d14e794341d35402eaf54d398ebed56b0983908e397ae677737e0f313ea0bfc9c4a39be91765b02a07a8eb9b55529d5f998efcc87b1b493b0e326e02193d982 SHA512 1556345e41674f0846a7419828972ec27c3c37fe270fa1deb45e03665f60ec088d79134aee0d2e27003b130636eeed4a15ea3f701c9d7014f3ca2785467767a8
-EBUILD libvpx-1.5.0.ebuild 4016 BLAKE2B 0a3aca166cb06bbffdcf982fdcdbde1d272b4382589fdda9e93444edb4bd5ff72f40ac7112ff53fb2c78b051ef5d8554aa86ae977161b965fd03490ad79d552b SHA512 1eda896a677035c2fd910285fa16700c5f7a45ddecc830a24e485e1ad2d960b765ea749f002f407429405e64ba553ccf0e8447ddf416ff30a894248d352f1f7a
-EBUILD libvpx-1.6.0-r1.ebuild 3632 BLAKE2B d4f74805b41f2a26659956ac82136db944c3536203e09d7dc2113fd0a42a445c1b251e48b79e37565263daefd146f83a87dbac6d345b6ef12e0e59a88500c31c SHA512 5e9891fe658f7c72f82561bdd5bc89466ede4d015af7ad6f30c9f799ffefb3843c8331ed8929a41c445afaee4b3f5b5bfdd0b6a25468c21e33ab033138915627
-EBUILD libvpx-1.6.1.ebuild 3986 BLAKE2B 5a9699efac1f72bbb251d8102801f3cc05b1c23b0384d73b72ef1b878d51db0b144a8e747f0bc17e2451b2136f95506d1de7a6d2c0c9aa7be3cb700dd6791dc4 SHA512 bd03ad543362fd58ef23250c306547578d91615b2d7632f884fcbc2434057b3ec9e4c0370f9bea705727aec03eaca0fabe3623eb67d4564335a3118b89e48352
-EBUILD libvpx-1.7.0.ebuild 3951 BLAKE2B 6d5e3aaeb878ca2edc30df9d8af3047d3def2a12d767c3d0a16e5cbba6f243ae6c43e0e93b007d5c2992ac70ad7ba656065d6ccf91b8530149db3c6e9974789b SHA512 54820f8ff382b750b86114a1bba7671dc5afb9b6302ea08911127612e38a778504decf2d5c146c0d2083061ab4be29c3d557a78ed2c98872c1e85ca4aede7ef7
+EBUILD libvpx-1.5.0.ebuild 3945 BLAKE2B 27946d19f0b447eda7bfe11fd7c4e88f6fc0a9716047f97cf52eec0bc1143abce5f15241b428942bcc3574ce5f463dd6425a41eb6b87ebe60f2422ed39032849 SHA512 7487893dc7efdafa43ef2d2413118a87a5a378603fbfc9a67122c794b6638ee2a322a4d04cbf71fc5a6efa311222e626e127b13697692b9c53fba8c4d4a9737c
+EBUILD libvpx-1.6.0-r1.ebuild 3561 BLAKE2B a0c88796bd2bd8e85c209e9d97b21a15836365bf449028c0ed66840336d1de3bf4bd4fcde14d370d70b06a90b1d7595b4af7e90bb4a0198496b1fea4e826ce3f SHA512 a06e4ce706d0c1ca5769480d939d3c199caf9dc9c181c37b21a243aa48ea6d01dba33e14af54e0ec053442334fbb9162d5ec0cb1cbc33d0008a5971c721169c0
+EBUILD libvpx-1.6.1.ebuild 3915 BLAKE2B 7e38fd6c01f92326c636f1f97d8ca4d0ac81c18175f889d2ff2a32ae322aa742ff022dc1bd4aa54ccf5fbdb47bc3b860e791cf14c7579c648a8eb9e177eac0ac SHA512 43f18dadcd60bd272f8408dd009da9169c2088b7ca8e5d917ce486f794aa9f87a5c0dbb9cb9c24fdcb380c7eabac1d86aecef2853bff6babf03fc5a6ed1f4b77
+EBUILD libvpx-1.7.0.ebuild 3880 BLAKE2B ce0383c2e06b24f46e040c14cafbf6f94492de2c10b28df482088ebd4681f7bc745c80f1bce8487b87579f02782ed18b097e0140c8d6080f8d25ccabc8e8226c SHA512 6f8fa6dd744dcdd54ee8ad2493fc06dce9fe0c87c8cdbc9c4f8f967f2642d159b3b3df1bda5d8084442b58772ae50ffc62c3a2417b6ebe56a629704f5db0483e
 MISC metadata.xml 575 BLAKE2B f8e5f9a2663a651155da3bde8284ace9c5c9394842c279a83b58e61f5bbdbcb279b71609b1129c7e1ebd61b02ca6d6f7374313815ea33d98d60affda0144c54f SHA512 748b5a315632723c78b1db5eaa0f62e331d28874a9dbc42ebc66089eee1e2e54fc19f33c7188c4b84977b35762c94c2319787cb7528f7c22382bccd715b247a5
diff --git a/media-libs/libvpx/libvpx-1.5.0.ebuild b/media-libs/libvpx/libvpx-1.5.0.ebuild
index cccd48adc00f..1cfa682061a4 100644
--- a/media-libs/libvpx/libvpx-1.5.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.5.0.ebuild
@@ -28,7 +28,7 @@ LICENSE="BSD"
 SLOT="0/3"
 IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 static-libs svc test +threads"
 
-RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND=""
 DEPEND="abi_x86_32? ( dev-lang/yasm )
 	abi_x86_64? ( dev-lang/yasm )
 	abi_x86_x32? ( dev-lang/yasm )
diff --git a/media-libs/libvpx/libvpx-1.6.0-r1.ebuild b/media-libs/libvpx/libvpx-1.6.0-r1.ebuild
index f4d97726b8bc..55c20e8d6aa9 100644
--- a/media-libs/libvpx/libvpx-1.6.0-r1.ebuild
+++ b/media-libs/libvpx/libvpx-1.6.0-r1.ebuild
@@ -16,7 +16,7 @@ SLOT="0/4"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 +highbitdepth static-libs svc test +threads"
 
-RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND=""
 DEPEND="abi_x86_32? ( dev-lang/yasm )
 	abi_x86_64? ( dev-lang/yasm )
 	abi_x86_x32? ( dev-lang/yasm )
diff --git a/media-libs/libvpx/libvpx-1.6.1.ebuild b/media-libs/libvpx/libvpx-1.6.1.ebuild
index ba0fcd602664..f556462fb05f 100644
--- a/media-libs/libvpx/libvpx-1.6.1.ebuild
+++ b/media-libs/libvpx/libvpx-1.6.1.ebuild
@@ -32,7 +32,7 @@ REQUIRED_USE="
 # Disable test phase when USE="-test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND=""
 DEPEND="abi_x86_32? ( dev-lang/yasm )
 	abi_x86_64? ( dev-lang/yasm )
 	abi_x86_x32? ( dev-lang/yasm )
diff --git a/media-libs/libvpx/libvpx-1.7.0.ebuild b/media-libs/libvpx/libvpx-1.7.0.ebuild
index edd1717a2230..d391dc81190c 100644
--- a/media-libs/libvpx/libvpx-1.7.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.7.0.ebuild
@@ -32,7 +32,7 @@ REQUIRED_USE="
 # Disable test phase when USE="-test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND=""
 DEPEND="abi_x86_32? ( dev-lang/yasm )
 	abi_x86_64? ( dev-lang/yasm )
 	abi_x86_x32? ( dev-lang/yasm )
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 2843e583b10a..7987b19fbd54 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,13 +1,17 @@
 AUX eselect-mesa.conf.9.2 1630 BLAKE2B 6c67ef9b5dc94f2f26378c004a459680b05084900a9199107a23f9c55514b59438265bce9ca207b05e2d20c3aa43e475d3f228c283dc965402c962a4cd0b6ebf SHA512 0fa9a23b4fba10599268266a82c7fa8dc5bfa1a0d565732875064c381dc4ff40c23faddb02b5849b1522eb9b7fd2ec2a0fac14406442a4aa0afa44bf760b42b5
 DIST mesa-17.1.10.tar.xz 9872168 BLAKE2B 205ece7b016fcc1de5bb72711775cd8f4b90f5d6c26db77d1576752fcd4a99a36cbcd902bb6ad1041d476d1c3b32479baceb4087c902ce598ede3d57851c6b9d SHA512 728dbd41f5d3a7a1c33fc18c08a8b8eb1f6d236c5f00781209f46b144dd66a27ecd723ab1635868b7ad77de3a18ad53f1a88c932f17c0be97605a2775e3b3a9b
 DIST mesa-17.2.8.tar.xz 10393304 BLAKE2B 558321eefc6d599aaedfe468f03c2f1f99b5c96c253637db00b7da3265ec38e031d15f77623db1f4408f15912c93347e0f5769b01d92329be7f55e45f6f6bf75 SHA512 ce05ad2d3e1b55ffe9c8ef65023a840c04b29014c7876b23182a6a6dd0b768f248ec21bc5b738d21b846f59f4b73501a9fe834d6a87e7dba16c6f821008e0f01
-DIST mesa-17.3.7.tar.xz 10654684 BLAKE2B 520b045f7ab4b60ab372960ca933e60229dc38075d28c9e0f144d0a2dc222d6c2830e4739962008319bed27fe9a83bae7c38609d0135c3d5918d35dff6c0381d SHA512 ec48565556aa4281056cee5dbef140553651fdfbb76ce32397de048db1cf65f5e18787c72b998de7da2de795d27e7040bde84651ade4726fc3a69a23b166ba4e
 DIST mesa-17.3.8.tar.xz 10660896 BLAKE2B 432deefad4b0a42914efc24c558d5c766443f55ff8324317980a4f91a5e560207c3c142d9547868c6cd480ad751c2b11a76da06dea891a044016868b3dcdaaa2 SHA512 4a63b760d5c64425e2d4dddf6ab8167c1845020f173bd56ec1d2e483e3bf2afb9ca483fcf329d37cc0bce82ab5134ee43ea82a2e3a4ee9463de16a9f75bc6e16
+DIST mesa-17.3.9.tar.xz 10660456 BLAKE2B 54f4a75f9040e50e9eea8f5c52a276578379d25d2a01ac4767ab12bee85fe5dae1492d5bb1df06b6e8c6b0fe960bbd5ea38691c75d08a6b4302c64377ce58e54 SHA512 83deffbc6b9823b8e93cccf57d7952106f3d55fea881e3924f9f9586f0e9347a6e3a1a36cc19c24af819f2fde3af9496652a6ff56132511a5618d5774404f63f
 DIST mesa-18.0.0.tar.xz 11056544 BLAKE2B 467c100bcbc0a60e3868e718331192255fd16394c21b08c128a054e066740cd071e0b272aba011873fe239821f53442e9a07ae860d94b425275bd68c3db3b7fc SHA512 1494bb09357896a2505b3dcfec772268e28c765804f21e144948a314f1d79d99ff9f21062ef5860eb5a5a568b305a9c954585924a7ac8890fe1ebd8df3bcc396
-EBUILD mesa-17.1.10.ebuild 13300 BLAKE2B 68b30d3052f8f80d928542f3c8a30f82b2696a834e0e731a16d64ed2bbc19c55b382c4c4064fc74b458fbf1cf4e23aacefdaab53e6359d24c924ab81a4d522e8 SHA512 27d5256505853b4c209cb454589454f53d16dbdae32046c7e4d71a504d21879af8fef22c5d134081f0d23869c6cd75a42c33d3305702693c050f7bf1d932f215
-EBUILD mesa-17.2.8.ebuild 15022 BLAKE2B 8de43727d00f3ffb6136c59f42ee268a8f2b20cfa6a8784efda04e37ad606510f0f3b32e00ae24533f070f4a1d7a9cbc0a3986b7b1c646d8ccec8b38fc7fa50a SHA512 518068373eddd00746a67a832592cc61cd6faa24f79475722bf6edde13f2ff7f17a292294162985064feeb26ada07801f44385f35b209a725a41ee315980b94c
-EBUILD mesa-17.3.7.ebuild 14916 BLAKE2B 6a0e29ec0ca3a10713c58d28c8c8b44c55ae254254dae1ee0e9d2b4495367af2fc464cc1e69d7e1a1c8596deb92d6c3331e0c0b107896155b6d456a2d7a0514e SHA512 fd75796a17acf72ddbe5c82a21eeb9a2c8ee301296ad0787aa0a56b857a6d7d02de4a6acb8cee20a597cc1fb8c7b87e861905f8f5549ef9f18b70d36664f218f
-EBUILD mesa-17.3.8.ebuild 14909 BLAKE2B ab043d7666b10ea22c0afed6b8ad0fde15136e66567127693579e1416233f5d6538fa9d922ab6c3f6506ab17f1861b26da1dcbcef82f22f9edd020a02efc4657 SHA512 ca0f40177b16de261482712aa65bb3341402f361b6d70006a2bc875162f613fcbb5a771dead4cd870a3529c725797a6268fb29382254a816f790d3b4eded2b46
-EBUILD mesa-18.0.0.ebuild 14959 BLAKE2B 568dc3b028ba4ff14aee9f01d70c176fa2ed87421a1810caf6cd89c12e48a53d418b9db1b6b38c9b3094e611b7a2ec32a360a92aef3e579b72fab59edef5187c SHA512 c2326f1f714aad3888a901f40dd11028782a3c1cbc6d0a6a2172d542b3488a8da7b80240812284e2ea79b5cbb07489e7ac718106f2943e3016b36311b1897980
-EBUILD mesa-9999.ebuild 14997 BLAKE2B 16608004e2e4b89869537586d93b392b64f512b1408ec5b4837181dd42c722da6f7d85d9a7b05adfd1ea529ca7311b8484fa93711033878981e76479ff1dc4d2 SHA512 8e0faa63d96b23bb1d513792d353de24e58d584980a7d023b8ce947f4d02864ec225067eb0146b2ce53d0e2904f18583f4ed3668c8052a955616eafe540dbe6a
+DIST mesa-18.0.1.tar.xz 10945308 BLAKE2B 03dad0961aafeb954a50f1db305288682e6b0dc58631b66de2f331dc95756b881bf7f73b5e2fa4ec04640054c27aab236acdf6b89bd7cd89ca1dbe9134a6a2d0 SHA512 b0d610904b6f179a27b42aee5f479339e341926915cdc6adb08ac999a4a12539abc3776577e86af83e10381d9703ef1bca70bab81b43daf2c000622c9c3612d2
+DIST mesa-18.1.0-rc1.tar.xz 11118324 BLAKE2B e5a89c8469b6716463c9efb0e7059022bc986da83d55a020156a3466cb44c283828bacb340ef4dceda9e14a82f737b6809f742b49a8b38d7e871ff1864e8bb3e SHA512 5b179b4ece6fd0e04ef00744d975607b6678c4c333c47fdd7442768ac15b375c7faeb8472b0dba19c0b8755067effd6243803ce17739a50c17efc8e69e6ae401
+EBUILD mesa-17.1.10.ebuild 13230 BLAKE2B d134695fc6a88f4097d8a96591ce4841aca0eb5b66a56f67d327aec0e43fc165e12e66d231805ebb0d76964046425091fc0096ddcd2cd6713cef87a6140c31bc SHA512 195b4fcf00384ca5f6566cbf94aa41da7341144dca77c03ffea2759f2930f5e20ab44d10dc19f1561e175ac083bb13befeae1135878195a4a6ebf509161c8157
+EBUILD mesa-17.2.8.ebuild 14952 BLAKE2B 1404da9b183b733ecc767a65413c674a7574aed54d7c18f8991c2a8287bf4ab0875d55c6863edaabe5b95a2c0e7625296df6b7ee1430137263aff17e2bbe485a SHA512 1b3a5c2b52f3ece48ae7954c21644e75dad7c44503fca4b82764e89dcb9c4ef8870e6f6f32a29abb5702cb9705ba176bdc9a336897103593700c8aab66f499e0
+EBUILD mesa-17.3.8.ebuild 14839 BLAKE2B ca1ff53b722b9c3ba406e2e2e759e785a3389bd6b8f63dd1cf8f2355aea1bebf38a750bbf8767c8316590c160e976fff74e8dab8764b6d9dc2ca5956ad5416aa SHA512 7c5a50570e4b6bd9598b36eeb4fe74ccf9e8c6b1b318760aec825d71d8c892bdf3275f30d975398b373d6b4d5d30c5b6035a86eb41f328e871e46f71886d5e0b
+EBUILD mesa-17.3.9.ebuild 14846 BLAKE2B a2f5c078392845a9078952c30bba2b9254b708de62101026f33542215081cb0114c7e466140cd9c59d29dc3ddd0809632374917feaf36b28684a7471637ad4c8 SHA512 b6789f7d6d9810f12b9ed7edc640e1864688ea0fbb75036834b13c0105270a05f267a560353f8cbfcff15e343dce55dc4c0956fdc84e3c674b6f59b0e574e565
+EBUILD mesa-18.0.0.ebuild 14889 BLAKE2B 6451b69e15a9d5b92bcd2eb9137fdc41ec3c6206c77c7cf1bd9b00849b2a625114e593f74117a950a028b6a8baf96e3c32966f362ae8073ddcdf1a385f9822db SHA512 191befc6f75488eac2f94404fd6fe87f1dd6f12dd51c562a02f7a29fa54c47bfe242cadb200393c384cdf50c7d781f7c9ea886a68cf5dc56ca940b2f51f8f764
+EBUILD mesa-18.0.1.ebuild 14889 BLAKE2B 6451b69e15a9d5b92bcd2eb9137fdc41ec3c6206c77c7cf1bd9b00849b2a625114e593f74117a950a028b6a8baf96e3c32966f362ae8073ddcdf1a385f9822db SHA512 191befc6f75488eac2f94404fd6fe87f1dd6f12dd51c562a02f7a29fa54c47bfe242cadb200393c384cdf50c7d781f7c9ea886a68cf5dc56ca940b2f51f8f764
+EBUILD mesa-18.1.0_rc1.ebuild 14927 BLAKE2B a539af1a34ff27d0729e65a79ffe7c87e1e3d86e0cde2efdcae3f59fe97fc23a87f4216459749d576b6d1ba9febb9c1009186c092365f69322c51cda0778aee8 SHA512 5af9c71bc73d22585942325e7ab9cf637695d2b572b7dd0d819f12c1df6c2c10981e1248600eb3bbbf623884128a6c8ef4e6a3abc00b0a6eb9eef63c90dcd366
+EBUILD mesa-9999.ebuild 14927 BLAKE2B a539af1a34ff27d0729e65a79ffe7c87e1e3d86e0cde2efdcae3f59fe97fc23a87f4216459749d576b6d1ba9febb9c1009186c092365f69322c51cda0778aee8 SHA512 5af9c71bc73d22585942325e7ab9cf637695d2b572b7dd0d819f12c1df6c2c10981e1248600eb3bbbf623884128a6c8ef4e6a3abc00b0a6eb9eef63c90dcd366
 MISC metadata.xml 2095 BLAKE2B c1c858a478bbb1c7e38a45dbf00e380a3d26c56920db1897521a7e9f4eb005157e535207ae2274d744e3ce5514a57654eb0effb2cfc773263a0f417874cdc742 SHA512 c3db8aeb4f4ae7ea27c8b48cb26ee9348d84e6fb4b99df815b177e62e78cd980a7834c152e2c10c6fdbe2b91a032861a0c0503625874bfb6df58ccc3bf54e705
diff --git a/media-libs/mesa/mesa-17.1.10.ebuild b/media-libs/mesa/mesa-17.1.10.ebuild
index f2627965e4f6..ed0e205a3b4c 100644
--- a/media-libs/mesa/mesa-17.1.10.ebuild
+++ b/media-libs/mesa/mesa-17.1.10.ebuild
@@ -81,7 +81,6 @@ LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.77"
 RDEPEND="
 	!<x11-base/xorg-server-1.7
 	!<=x11-proto/xf86driproto-2.0.3
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
 	classic? ( app-eselect/eselect-mesa )
 	gallium? ( app-eselect/eselect-mesa )
 	>=app-eselect/eselect-opengl-1.3.0
diff --git a/media-libs/mesa/mesa-17.2.8.ebuild b/media-libs/mesa/mesa-17.2.8.ebuild
index 448fc06f3f8f..b009828a1ad2 100644
--- a/media-libs/mesa/mesa-17.2.8.ebuild
+++ b/media-libs/mesa/mesa-17.2.8.ebuild
@@ -81,7 +81,6 @@ LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.82"
 RDEPEND="
 	!<x11-base/xorg-server-1.7
 	!<=x11-proto/xf86driproto-2.0.3
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
 	classic? ( app-eselect/eselect-mesa )
 	gallium? ( app-eselect/eselect-mesa )
 	>=app-eselect/eselect-opengl-1.3.0
diff --git a/media-libs/mesa/mesa-17.3.8.ebuild b/media-libs/mesa/mesa-17.3.8.ebuild
index 242caedf58d2..6b9e44398fcf 100644
--- a/media-libs/mesa/mesa-17.3.8.ebuild
+++ b/media-libs/mesa/mesa-17.3.8.ebuild
@@ -81,7 +81,6 @@ LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.89"
 RDEPEND="
 	!<x11-base/xorg-server-1.7
 	!<=x11-proto/xf86driproto-2.0.3
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
 	classic? ( app-eselect/eselect-mesa )
 	gallium? ( app-eselect/eselect-mesa )
 	>=app-eselect/eselect-opengl-1.3.0
diff --git a/media-libs/mesa/mesa-17.3.7.ebuild b/media-libs/mesa/mesa-17.3.9.ebuild
index 71590c387fcc..f35082d0d6bf 100644
--- a/media-libs/mesa/mesa-17.3.7.ebuild
+++ b/media-libs/mesa/mesa-17.3.9.ebuild
@@ -81,7 +81,6 @@ LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.89"
 RDEPEND="
 	!<x11-base/xorg-server-1.7
 	!<=x11-proto/xf86driproto-2.0.3
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
 	classic? ( app-eselect/eselect-mesa )
 	gallium? ( app-eselect/eselect-mesa )
 	>=app-eselect/eselect-opengl-1.3.0
diff --git a/media-libs/mesa/mesa-18.0.0.ebuild b/media-libs/mesa/mesa-18.0.0.ebuild
index 4fb4344b03a6..6cdc82a5cc3e 100644
--- a/media-libs/mesa/mesa-18.0.0.ebuild
+++ b/media-libs/mesa/mesa-18.0.0.ebuild
@@ -81,7 +81,6 @@ LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.89"
 RDEPEND="
 	!<x11-base/xorg-server-1.7
 	!<=x11-proto/xf86driproto-2.0.3
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
 	classic? ( app-eselect/eselect-mesa )
 	gallium? ( app-eselect/eselect-mesa )
 	>=app-eselect/eselect-opengl-1.3.0
diff --git a/media-libs/mesa/mesa-18.0.1.ebuild b/media-libs/mesa/mesa-18.0.1.ebuild
new file mode 100644
index 000000000000..6cdc82a5cc3e
--- /dev/null
+++ b/media-libs/mesa/mesa-18.0.1.ebuild
@@ -0,0 +1,583 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git"
+
+if [[ ${PV} = 9999 ]]; then
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="!bindist? ( bindist )"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
+	+llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind
+	vdpau vulkan wayland xvmc xa"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 gallium )
+	llvm?   ( gallium )
+	opencl? ( gallium llvm )
+	openmax? ( gallium )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vaapi? ( gallium )
+	vdpau? ( gallium )
+	vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
+			  video_cards_radeonsi? ( llvm ) )
+	wayland? ( egl gbm )
+	xa?  ( gallium )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_imx?    ( gallium video_cards_vivante )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.89"
+# keep correct libdrm and dri2proto dep
+# keep blocks in rdepend for binpkg
+RDEPEND="
+	!<x11-base/xorg-server-1.7
+	!<=x11-proto/xf86driproto-2.0.3
+	classic? ( app-eselect/eselect-mesa )
+	gallium? ( app-eselect/eselect-mesa )
+	>=app-eselect/eselect-opengl-1.3.0
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	llvm? (
+		video_cards_radeonsi? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_r600? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_radeon? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	opencl? (
+				app-eselect/eselect-opencl
+				dev-libs/libclc
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+	openmax? (
+		>=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}]
+		x11-misc/xdg-utils
+	)
+	vaapi? (
+		>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+		video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+	)
+	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 7.
+# 3. Specify LLVM_MAX_SLOT, e.g. 6.
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:6[${MULTILIB_USEDEP}]
+		sys-devel/llvm:5[${MULTILIB_USEDEP}]
+		sys-devel/llvm:4[${MULTILIB_USEDEP}]
+		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
+	)
+	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	llvm? (
+		opencl? (
+			video_cards_r600? (
+				${CLANG_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${CLANG_DEPSTR}
+					)
+				)
+			)
+		)
+		!opencl? (
+			video_cards_r600? (
+				${LLVM_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${LLVM_DEPSTR}
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/gettext
+	virtual/pkgconfig
+	valgrind? ( dev-util/valgrind )
+	>=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
+	dri3? (
+		>=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
+		>=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
+	)
+	>=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
+	vulkan? (
+		$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
+	)
+"
+[[ ${PV} == 9999 ]] && DEPEND+="
+	sys-devel/bison
+	sys-devel/flex
+	$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	!pic? (
+		usr/lib*/libglapi.so.0.0.0
+		usr/lib*/libGLESv1_CM.so.1.1.0
+		usr/lib*/libGLESv2.so.2.0.0
+		usr/lib*/libGL.so.1.2.0
+		usr/lib*/libOSMesa.so.8.0.0
+	)
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm[${flags}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	[[ ${PV} == 9999 ]] && eautoreconf
+	eapply_user
+}
+
+multilib_src_configure() {
+	local myconf
+
+	if use classic; then
+		# Configurable DRI drivers
+		driver_enable swrast
+
+		# Intel code
+		driver_enable video_cards_i915 i915
+		driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		driver_enable video_cards_r100 radeon
+		driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+				! use video_cards_r200; then
+			driver_enable video_cards_radeon radeon r200
+		fi
+	fi
+
+	if use egl; then
+		myconf+=" --with-platforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
+	fi
+
+	if use gallium; then
+		myconf+="
+			$(use_enable d3d9 nine)
+			$(use_enable llvm)
+			$(use_enable openmax omx-bellagio)
+			$(use_enable vaapi va)
+			$(use_enable vdpau)
+			$(use_enable xa)
+			$(use_enable xvmc)
+		"
+		use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
+
+		gallium_enable swrast
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable video_cards_i915 i915
+		gallium_enable video_cards_imx imx
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			gallium_enable video_cards_intel i915
+		fi
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+				! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		# opencl stuff
+		if use opencl; then
+			myconf+="
+				$(use_enable opencl)
+				--with-clang-libdir="${EPREFIX}/usr/lib"
+				"
+		fi
+
+		gallium_enable video_cards_virgl virgl
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_radeonsi radeon
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		myconf+=" $(use_enable pax_kernel glx-read-only-text)"
+	fi
+
+	# on abi_x86_32 hardened we need to have asm disable
+	if [[ ${ABI} == x86* ]] && use pic; then
+		myconf+=" --disable-asm"
+	fi
+
+	if use gallium; then
+		myconf+=" $(use_enable osmesa gallium-osmesa)"
+	else
+		myconf+=" $(use_enable osmesa)"
+	fi
+
+	# build fails with BSD indent, bug #428112
+	use userland_GNU || export INDENT=cat
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--enable-dri \
+		--enable-glx \
+		--enable-shared-glapi \
+		$(use_enable !bindist texture-float) \
+		$(use_enable d3d9 nine) \
+		$(use_enable debug) \
+		$(use_enable dri3) \
+		$(use_enable egl) \
+		$(use_enable gbm) \
+		$(use_enable gles1) \
+		$(use_enable gles2) \
+		$(use_enable nptl glx-tls) \
+		$(use_enable unwind libunwind) \
+		--enable-valgrind=$(usex valgrind auto no) \
+		--enable-llvm-shared-libs \
+		--disable-opencl-icd \
+		--with-dri-drivers=${DRI_DRIVERS} \
+		--with-gallium-drivers=${GALLIUM_DRIVERS} \
+		--with-vulkan-drivers=${VULKAN_DRIVERS} \
+		PYTHON2="${PYTHON}" \
+		${myconf}
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+
+	if use classic || use gallium; then
+			ebegin "Moving DRI/Gallium drivers for dynamic switching"
+			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
+			keepdir /usr/$(get_libdir)/dri
+			dodir /usr/$(get_libdir)/mesa
+			for x in ${gallium_drivers[@]}; do
+				if [ -f "$(get_libdir)/gallium/${x}" ]; then
+					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
+						|| die "Failed to move ${x}"
+				fi
+			done
+			if use classic; then
+				emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
+			fi
+			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
+				if [ -f ${x} -o -L ${x} ]; then
+					mv -f "${x}" "${x/dri/mesa}" \
+						|| die "Failed to move ${x}"
+				fi
+			done
+			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
+			ln -s ../mesa/*.so . || die "Creating symlink failed"
+			# remove symlinks to drivers known to eselect
+			for x in ${gallium_drivers[@]}; do
+				if [ -f ${x} -o -L ${x} ]; then
+					rm "${x}" || die "Failed to remove ${x}"
+				fi
+			done
+			popd
+		eend $?
+	fi
+	if use opencl; then
+		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
+		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
+		dodir ${cl_dir}/{lib,include}
+		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
+			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
+			"${ED}"${cl_dir}
+		fi
+		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
+			mv -f "${ED}"/usr/include/CL \
+			"${ED}"${cl_dir}/include
+		fi
+		eend $?
+	fi
+
+	if use openmax; then
+		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
+		doenvd "${T}"/99mesaxdgomx
+		keepdir /usr/share/mesa/xdg
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete
+	einstalldocs
+
+	if use !bindist; then
+		dodoc docs/patents.txt
+	fi
+
+	# Install config file for eselect mesa
+	insinto /usr/share/mesa
+	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
+}
+
+multilib_src_test() {
+	if use llvm; then
+		local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
+		pushd src/gallium/drivers/llvmpipe >/dev/null || die
+		emake ${llvm_tests}
+		pax-mark m ${llvm_tests}
+		popd >/dev/null || die
+	fi
+	emake check
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+
+	# Select classic/gallium drivers
+	if use classic || use gallium; then
+		eselect mesa set --auto
+	fi
+
+	# Switch to mesa opencl
+	if use opencl; then
+		eselect opencl set --use-old ${PN}
+	fi
+
+	# run omxregister-bellagio to make the OpenMAX drivers known system-wide
+	if use openmax; then
+		ebegin "Registering OpenMAX drivers"
+		BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
+			OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
+			omxregister-bellagio
+		eend $?
+	fi
+
+	# warn about patent encumbered texture-float
+	if use !bindist; then
+		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
+		elog "enabled. Please see /usr/share/doc/${P}/patents.txt.bz2 for an"
+		elog "explanation."
+	fi
+}
+
+pkg_prerm() {
+	if use openmax; then
+		rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
+	fi
+}
+
+# $1 - VIDEO_CARDS flag
+# other args - names of DRI drivers to enable
+# TODO: avoid code duplication for a more elegant implementation
+driver_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			DRI_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					DRI_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
+
+gallium_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			GALLIUM_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					GALLIUM_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
+
+vulkan_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			VULKAN_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					VULKAN_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
diff --git a/media-libs/mesa/mesa-18.1.0_rc1.ebuild b/media-libs/mesa/mesa-18.1.0_rc1.ebuild
new file mode 100644
index 000000000000..161933dd9309
--- /dev/null
+++ b/media-libs/mesa/mesa-18.1.0_rc1.ebuild
@@ -0,0 +1,584 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git"
+
+if [[ ${PV} = 9999 ]]; then
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="!bindist? ( bindist )"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
+	+llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind
+	vdpau vulkan wayland xvmc xa"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 gallium )
+	llvm?   ( gallium )
+	opencl? ( gallium llvm )
+	openmax? ( gallium )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vaapi? ( gallium )
+	vdpau? ( gallium )
+	vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
+			  video_cards_radeonsi? ( llvm ) )
+	wayland? ( egl gbm )
+	xa?  ( gallium )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_imx?    ( gallium video_cards_vivante )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.91"
+# keep correct libdrm and dri2proto dep
+# keep blocks in rdepend for binpkg
+RDEPEND="
+	!<x11-base/xorg-server-1.7
+	!<=x11-proto/xf86driproto-2.0.3
+	classic? ( app-eselect/eselect-mesa )
+	gallium? ( app-eselect/eselect-mesa )
+	>=app-eselect/eselect-opengl-1.3.0
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	llvm? (
+		video_cards_radeonsi? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_r600? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_radeon? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	opencl? (
+				app-eselect/eselect-opencl
+				dev-libs/libclc
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+	openmax? (
+		>=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}]
+		x11-misc/xdg-utils
+	)
+	vaapi? (
+		>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+		video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+	)
+	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 7.
+# 3. Specify LLVM_MAX_SLOT, e.g. 6.
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:7[${MULTILIB_USEDEP}]
+		sys-devel/llvm:6[${MULTILIB_USEDEP}]
+		sys-devel/llvm:5[${MULTILIB_USEDEP}]
+		sys-devel/llvm:4[${MULTILIB_USEDEP}]
+		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
+	)
+	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	llvm? (
+		opencl? (
+			video_cards_r600? (
+				${CLANG_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${CLANG_DEPSTR}
+					)
+				)
+			)
+		)
+		!opencl? (
+			video_cards_r600? (
+				${LLVM_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${LLVM_DEPSTR}
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/gettext
+	virtual/pkgconfig
+	valgrind? ( dev-util/valgrind )
+	>=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
+	dri3? (
+		>=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
+		>=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
+	)
+	>=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
+	vulkan? (
+		$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
+	)
+"
+[[ ${PV} == 9999 ]] && DEPEND+="
+	sys-devel/bison
+	sys-devel/flex
+	$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	!pic? (
+		usr/lib*/libglapi.so.0.0.0
+		usr/lib*/libGLESv1_CM.so.1.1.0
+		usr/lib*/libGLESv2.so.2.0.0
+		usr/lib*/libGL.so.1.2.0
+		usr/lib*/libOSMesa.so.8.0.0
+	)
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm[${flags}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply_user
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf
+
+	if use classic; then
+		# Configurable DRI drivers
+		driver_enable swrast
+
+		# Intel code
+		driver_enable video_cards_i915 i915
+		driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		driver_enable video_cards_r100 radeon
+		driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+				! use video_cards_r200; then
+			driver_enable video_cards_radeon radeon r200
+		fi
+	fi
+
+	if use egl; then
+		myconf+=" --with-platforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
+	fi
+
+	if use gallium; then
+		myconf+="
+			$(use_enable d3d9 nine)
+			$(use_enable llvm)
+			$(use_enable openmax omx-bellagio)
+			$(use_enable vaapi va)
+			$(use_enable vdpau)
+			$(use_enable xa)
+			$(use_enable xvmc)
+		"
+		use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
+
+		gallium_enable swrast
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable video_cards_i915 i915
+		gallium_enable video_cards_imx imx
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			gallium_enable video_cards_intel i915
+		fi
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+				! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		# opencl stuff
+		if use opencl; then
+			myconf+="
+				$(use_enable opencl)
+				--with-clang-libdir="${EPREFIX}/usr/lib"
+				"
+		fi
+
+		gallium_enable video_cards_virgl virgl
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_radeonsi radeon
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		myconf+=" $(use_enable pax_kernel glx-read-only-text)"
+	fi
+
+	# on abi_x86_32 hardened we need to have asm disable
+	if [[ ${ABI} == x86* ]] && use pic; then
+		myconf+=" --disable-asm"
+	fi
+
+	if use gallium; then
+		myconf+=" $(use_enable osmesa gallium-osmesa)"
+	else
+		myconf+=" $(use_enable osmesa)"
+	fi
+
+	# build fails with BSD indent, bug #428112
+	use userland_GNU || export INDENT=cat
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--enable-dri \
+		--enable-glx \
+		--enable-shared-glapi \
+		$(use_enable !bindist texture-float) \
+		$(use_enable d3d9 nine) \
+		$(use_enable debug) \
+		$(use_enable dri3) \
+		$(use_enable egl) \
+		$(use_enable gbm) \
+		$(use_enable gles1) \
+		$(use_enable gles2) \
+		$(use_enable nptl glx-tls) \
+		$(use_enable unwind libunwind) \
+		--enable-valgrind=$(usex valgrind auto no) \
+		--enable-llvm-shared-libs \
+		--disable-opencl-icd \
+		--with-dri-drivers=${DRI_DRIVERS} \
+		--with-gallium-drivers=${GALLIUM_DRIVERS} \
+		--with-vulkan-drivers=${VULKAN_DRIVERS} \
+		PYTHON2="${PYTHON}" \
+		${myconf}
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+
+	if use classic || use gallium; then
+			ebegin "Moving DRI/Gallium drivers for dynamic switching"
+			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
+			keepdir /usr/$(get_libdir)/dri
+			dodir /usr/$(get_libdir)/mesa
+			for x in ${gallium_drivers[@]}; do
+				if [ -f "$(get_libdir)/gallium/${x}" ]; then
+					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
+						|| die "Failed to move ${x}"
+				fi
+			done
+			if use classic; then
+				emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
+			fi
+			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
+				if [ -f ${x} -o -L ${x} ]; then
+					mv -f "${x}" "${x/dri/mesa}" \
+						|| die "Failed to move ${x}"
+				fi
+			done
+			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
+			ln -s ../mesa/*.so . || die "Creating symlink failed"
+			# remove symlinks to drivers known to eselect
+			for x in ${gallium_drivers[@]}; do
+				if [ -f ${x} -o -L ${x} ]; then
+					rm "${x}" || die "Failed to remove ${x}"
+				fi
+			done
+			popd
+		eend $?
+	fi
+	if use opencl; then
+		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
+		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
+		dodir ${cl_dir}/{lib,include}
+		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
+			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
+			"${ED}"${cl_dir}
+		fi
+		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
+			mv -f "${ED}"/usr/include/CL \
+			"${ED}"${cl_dir}/include
+		fi
+		eend $?
+	fi
+
+	if use openmax; then
+		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
+		doenvd "${T}"/99mesaxdgomx
+		keepdir /usr/share/mesa/xdg
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete
+	einstalldocs
+
+	if use !bindist; then
+		dodoc docs/patents.txt
+	fi
+
+	# Install config file for eselect mesa
+	insinto /usr/share/mesa
+	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
+}
+
+multilib_src_test() {
+	if use llvm; then
+		local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
+		pushd src/gallium/drivers/llvmpipe >/dev/null || die
+		emake ${llvm_tests}
+		pax-mark m ${llvm_tests}
+		popd >/dev/null || die
+	fi
+	emake check
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+
+	# Select classic/gallium drivers
+	if use classic || use gallium; then
+		eselect mesa set --auto
+	fi
+
+	# Switch to mesa opencl
+	if use opencl; then
+		eselect opencl set --use-old ${PN}
+	fi
+
+	# run omxregister-bellagio to make the OpenMAX drivers known system-wide
+	if use openmax; then
+		ebegin "Registering OpenMAX drivers"
+		BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
+			OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
+			omxregister-bellagio
+		eend $?
+	fi
+
+	# warn about patent encumbered texture-float
+	if use !bindist; then
+		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
+		elog "enabled. Please see /usr/share/doc/${P}/patents.txt.bz2 for an"
+		elog "explanation."
+	fi
+}
+
+pkg_prerm() {
+	if use openmax; then
+		rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
+	fi
+}
+
+# $1 - VIDEO_CARDS flag
+# other args - names of DRI drivers to enable
+# TODO: avoid code duplication for a more elegant implementation
+driver_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			DRI_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					DRI_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
+
+gallium_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			GALLIUM_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					GALLIUM_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
+
+vulkan_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			VULKAN_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					VULKAN_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 8c2973875bbf..161933dd9309 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -81,7 +81,6 @@ LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.91"
 RDEPEND="
 	!<x11-base/xorg-server-1.7
 	!<=x11-proto/xf86driproto-2.0.3
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
 	classic? ( app-eselect/eselect-mesa )
 	gallium? ( app-eselect/eselect-mesa )
 	>=app-eselect/eselect-opengl-1.3.0
diff --git a/media-libs/mutagen/Manifest b/media-libs/mutagen/Manifest
index dfa3eb9fff02..98ba2a13752a 100644
--- a/media-libs/mutagen/Manifest
+++ b/media-libs/mutagen/Manifest
@@ -2,8 +2,8 @@ DIST mutagen-1.35.1.tar.gz 883772 BLAKE2B 933c689bf4e578c1acb6c16af4071e879db4e0
 DIST mutagen-1.38.tar.gz 913243 BLAKE2B 08281ed0ea9307a6caa64cc5f66dbea43d09ab6dffba49bab3bea8d3878ae1062b0b7dcb772f0880848adbbd3c3c89a73e0d59b496fb635f7308c66869aa2531 SHA512 1430901539cddc7f58978f59125b793228c611cee9cc19535142e3095a7caaeee7a2431c244054affa33fb6518123b46cd187715d8353fd1b165496bd358a995
 DIST mutagen-1.39.tar.gz 916084 BLAKE2B e67de0f0c2b33283ea276511f5537f5f12a35d336927dff662a5044a05163c7dc5677dc2e5b2696fc62ac3888a9602a566b43ffb511d3eee1c8f07f17bc08302 SHA512 0508c3dfa31a4af29845204664819bc8af8121a785b8e5cc307a12bdf7c151acf4cd72e0820fb9d284c859dd6d63d7d7a6c7ebad8e3ca19db52f0c496ce74736
 DIST mutagen-1.40.0.tar.gz 917874 BLAKE2B 69405942af849a8c82d14424a242e77cd9d554155494976402c3eb5d95dcccbf14de5fd3268cb9cf12e0035dcbf88c3724d1684c21612b2f0b0a87cb48de1ec8 SHA512 ad4accccc3457d1ff7238c2941b20aeb532e9b41bf2bf1cb130e428f9af9a7dd18a0e81a4d45fbc98783d8cf90cd105de09d703c70beea7cba5eca58dab1bb69
-EBUILD mutagen-1.35.1.ebuild 1169 BLAKE2B 4fae41f97f74468c9c0a9c4cb60df6dd923bf13baa68036695557dbdc8b5b726c197b11a254cf185a553401af509d86a1d62bf73ea33ace1e2b5a908a3a344a6 SHA512 6e17ca9217129138a702ac0c72eb02b3dbe103325944d33fc199f5b445e42f9429ff2881eb5acbbf3533b6eef3d6630a605893f6e6475a4f6842f6e6c3a1f37f
-EBUILD mutagen-1.38.ebuild 1041 BLAKE2B 8a5fba2d542cd2096744ec697ba3b55c27ef23de38c5b77ee58f3baa8751dd2e2c04b99959968cea8c4fbad00a7e7bbdfb0b4566e8354ec89389f4cb3ef9a92a SHA512 fd560403332ede11271182f1673a702117adc2281500644cd125b77360974739051da704149fcd325a231768856d524914d1a9397d4302c407a7bc6898d8ea52
-EBUILD mutagen-1.39.ebuild 1086 BLAKE2B 7e2f9e90671bd7ad5602afabb1972420ef1a57526e26545d6ca838349552fae90d4df0de5c735ad70e643031dcb6c4074e89787a609381575288bb4dc87ebc24 SHA512 00209e06095163abdeb2a930f4f0cb396d8fabfbd750f7223012364eb82e7924515439b9f716773a854d57a940234da7df38a309f29463cf3780294c2b6dca2a
-EBUILD mutagen-1.40.0.ebuild 1099 BLAKE2B 2d65edd258083acd1382491c0d9fb9fd0d27fb92a7d627445459f11247fe2adf131a4e49c65abc345dff77170d6d666a1d2d02dc81e9416721a8edae3a9afcd1 SHA512 3f816751b4cc03a2dc08e580307ef67229388346db91c7fee83b44c46e1e00d36b2cabefefa50bcd65e672bf547aa7e585c3ef949bc59bd4de58466fe23e959d
+EBUILD mutagen-1.35.1.ebuild 1165 BLAKE2B 9d27287c664b5932c64a20ba4127e73c6d3b7bc5c172ed53b5885355e8f24902321d0d7d1125671676e695e9a193d06ed233cbb63f5f4d10c3cf272fb7034d06 SHA512 f78fbd1311e058b704da406f0015782218551881e743a089ba8108ea96ce895da68792fac24bec8070e6543f17164e36dbd3ac81d3498366ed54b6312d0c3769
+EBUILD mutagen-1.38.ebuild 1037 BLAKE2B 58e036918dca047ec5fe2518e44adf8a93949f72a1e33d8295d136b917f808891833771a51d954ccf210745584a25ac3225b2a0ae56631cbe449232e6d55ed77 SHA512 f87e626b2de17e6e8da46f7f3ef07078a0050212d9c3c59eeb3fe318c0a8063970f1486bd9e511c7c7067fce40db7d815a66cbed1ab22a8a5dc6e17e0ad17305
+EBUILD mutagen-1.39.ebuild 1082 BLAKE2B aec4bebf1340691d9d6f92e01ce7ddbee3fa7b1ab7b15f44610e13ff42513f789d323e0a0ef6f8417bcf3a38a3b7c694ffee75942336e66ad8856b211be7fe7e SHA512 83836de0d5156008f44639129bc8ec464457176c67dea893bc69e7dfd250dba1f66acd21e58979d59f2c96789fec1a936445dea50a5827abb726e16d0da17721
+EBUILD mutagen-1.40.0.ebuild 1095 BLAKE2B d59306f96a67fa12bb5d21814f5af1369d407bf4935cc8ab93341334061aff02a8e960673a585ce932d4e90ad296f427b2a6ca472a2213516b8f0273e35673ea SHA512 ba041ad0c0d31a338d202b0fca64bb59474c2c5562cb9a4fa234ab5df87b805601601a771feecdd64fca27aa37f38b364e5cabc28b95552a3c2d6cb084d7ed87
 MISC metadata.xml 380 BLAKE2B 9fd70ca6ca6e8d17b66ea703f65885b87714ed0560ffe7502d85da3ee8fdf1d62545c1166b64d99f2bd2bfa6105f8f8865bc28769069c1ae3da4b1c3c174fd69 SHA512 87ce1f85bd6aff7c159fd22a412eb9ea95ac4f58fb2cc70fd4c4f470bfe9f6366b906bc9cef833ae5c10b7a3601c15edab9e8418cf78d7d9e993191873f41d59
diff --git a/media-libs/mutagen/mutagen-1.35.1.ebuild b/media-libs/mutagen/mutagen-1.35.1.ebuild
index 51c48ea629dc..c67b83d227b9 100644
--- a/media-libs/mutagen/mutagen-1.35.1.ebuild
+++ b/media-libs/mutagen/mutagen-1.35.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="Audio metadata tag reader and writer implemented in pure Python"
-HOMEPAGE="https://bitbucket.org/lazka/mutagen https://pypi.python.org/pypi/mutagen"
+HOMEPAGE="https://bitbucket.org/lazka/mutagen https://pypi.org/project/mutagen"
 SRC_URI="https://bitbucket.org/lazka/${PN}/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/media-libs/mutagen/mutagen-1.38.ebuild b/media-libs/mutagen/mutagen-1.38.ebuild
index 3c860b85d743..c582be7c718e 100644
--- a/media-libs/mutagen/mutagen-1.38.ebuild
+++ b/media-libs/mutagen/mutagen-1.38.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Audio metadata tag reader and writer implemented in pure Python"
-HOMEPAGE="https://github.com/quodlibet/mutagen https://pypi.python.org/pypi/mutagen"
+HOMEPAGE="https://github.com/quodlibet/mutagen https://pypi.org/project/mutagen"
 SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/media-libs/mutagen/mutagen-1.39.ebuild b/media-libs/mutagen/mutagen-1.39.ebuild
index 18bc2ef6e699..02874c5e466c 100644
--- a/media-libs/mutagen/mutagen-1.39.ebuild
+++ b/media-libs/mutagen/mutagen-1.39.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Audio metadata tag reader and writer implemented in pure Python"
-HOMEPAGE="https://github.com/quodlibet/mutagen https://pypi.python.org/pypi/mutagen"
+HOMEPAGE="https://github.com/quodlibet/mutagen https://pypi.org/project/mutagen"
 SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/media-libs/mutagen/mutagen-1.40.0.ebuild b/media-libs/mutagen/mutagen-1.40.0.ebuild
index ab059849894f..ef45a7517694 100644
--- a/media-libs/mutagen/mutagen-1.40.0.ebuild
+++ b/media-libs/mutagen/mutagen-1.40.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Audio metadata tag reader and writer implemented in pure Python"
-HOMEPAGE="https://github.com/quodlibet/mutagen https://pypi.python.org/pypi/mutagen"
+HOMEPAGE="https://github.com/quodlibet/mutagen https://pypi.org/project/mutagen"
 SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/media-libs/nv-codec-headers/Manifest b/media-libs/nv-codec-headers/Manifest
new file mode 100644
index 000000000000..47cc27d30e47
--- /dev/null
+++ b/media-libs/nv-codec-headers/Manifest
@@ -0,0 +1,3 @@
+DIST nv-codec-headers-8.1.24.1.tar.xz 44672 BLAKE2B 52bd3d7abe6887b270c3c04c5416fb481f77c4b4516527e0439681460e69e3a5a288ddad8e752a111b3109fbde4dae78c0660892a8ee8b284d1b06b32eb92ea8 SHA512 aa63141d234c0bd5f9cb7f568c54a10119e3f0270f7c344030c684865ef0f33106f1a45ce59dd8189c3b7493ee1522f9ba558a667d75bea68b738522e7dc1d11
+EBUILD nv-codec-headers-8.1.24.1.ebuild 848 BLAKE2B 985aaaebd8ef70f9dbb5b10f123d6b48d434ca70c1d9bfd119b53ea14428cf8589fa1f20e91596213d6b436e4d5a69503e47884845c00eb3be688843e94ec133 SHA512 b86f9b51222b5ff3c1374cdf1034d58c65f065961b133419843e1b2fd8da8a58d6790f13c8c5fc967d0d3f02215d7183e1e384cc3130bd9828ad93a70364908b
+MISC metadata.xml 227 BLAKE2B 129a977f3a470f0774cb25c7d9d67968f807b5bbba6b1d1b1d0155e288555355796826ce187abf95a06ee0a448e08e9c5ec34ee79d9895bf2718b47ff0d9bfe8 SHA512 d39fc0676c06bf09884fa817e0d5dc386a536d5626a9c2cf34ddb8b7e29d612ecb2c617214788ffe729c5118c632c119e03ce6d38f17114c48c090c82a2ec2e5
diff --git a/media-libs/nv-codec-headers/metadata.xml b/media-libs/nv-codec-headers/metadata.xml
new file mode 100644
index 000000000000..106575f01e53
--- /dev/null
+++ b/media-libs/nv-codec-headers/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/media-libs/nv-codec-headers/nv-codec-headers-8.1.24.1.ebuild b/media-libs/nv-codec-headers/nv-codec-headers-8.1.24.1.ebuild
new file mode 100644
index 000000000000..94eab8fa1623
--- /dev/null
+++ b/media-libs/nv-codec-headers/nv-codec-headers-8.1.24.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal
+
+DESCRIPTION="FFmpeg version of headers required to interface with Nvidias codec APIs"
+HOMEPAGE="https://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	>=x11-drivers/nvidia-drivers-390.25[${MULTILIB_USEDEP}]
+"
+
+# Snapshot from:
+# EGIT_REPO_URI="https://git.videolan.org/git/ffmpeg/nv-codec-headers.git"
+# EGIT_COMMIT="n${PV}"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	multilib_copy_sources
+	default
+}
+
+multilib_src_compile() {
+	emake PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)"
+}
+
+multilib_src_install() {
+	emake PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)" DESTDIR="${D}" install
+}
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index ad10b86a5322..eb84bb673a56 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1,5 +1,5 @@
 DIST openal-soft-1.15.1.tar.bz2 253006 BLAKE2B 0023eed2e98d07190aa4301a84e6818224feb6459303681276525237c5de9c145cdaab3437cae6b7998307a2294aafebedf3852cbebe8c12232d1e39ba6e15e8 SHA512 ca6dafdd503d06892dff08763bc00b974ec6e7c4bf3dcebb4cb41a486b4ea777c278299a198db182fee888a19a5716bd57d91a2859b764a532138a79f2bd672f
 DIST openal-soft-1.18.2.tar.bz2 639420 BLAKE2B 8e31db9d3c6eb49fe4833a6449603dc6284e39810942536594fb5e96d0bc2b867b69bd90e64d40cf99f9a279f3809509cf1c9af3114a4887057e78962a5463e8 SHA512 752e2fb0a5a014caa6d6bac1590d3df46140b463fbaa13378fb5de89f1c97ee8b62bec74f68484d4ec02ee8755c1a2d0c9394cdb477db1b7401deae2fb9eeb4d
-EBUILD openal-1.15.1-r2.ebuild 1461 BLAKE2B 96c339461509d21beccecef1f52a60f2181d1dc87b31d2cc05aad10dc3e8a4e47cc5be6721dcbaae07ad401650f38092bd20d501302137354ca668b0c631186a SHA512 0f4ce8cfdeb34c1ab3ef16cb7fdb72fd6d2e53ff306ac241c472f161f298fe9eec4b64603bda566e2fd45ed8fc89f8a4ad60f3043594e53568711b728af1a098
+EBUILD openal-1.15.1-r2.ebuild 1342 BLAKE2B adbc8ee9113bea4825d835115a465cee66e1e65b0e2ca2def69080f627e807bf874a75e8f5d7edb18a7e97ec1d7025b35eaabdffbe813c989d599883e5739c07 SHA512 14f344fe9392d911428800d7208cb75cd0011f63c5559714db478acac6dd7286da20a4975dde23e670a28ffe1c35a9879ad856380b5a8f6c37992a1c023d834c
 EBUILD openal-1.18.2-r1.ebuild 2021 BLAKE2B 44489eef1d525bcd7a2e7c46f3cf356d922497fa3d07edd2854e4a0e00288db938373e9a6dbf86782b3327579cf248d6c071a60bf3d053b79fa672b5f8452231 SHA512 fb5f6f3895c9c73733604e3d5331825323e11a9a5aa966efcd59da5497b41b86af2b35b0e712ee34b3e1a05bb53455d6efa6b4b68e5fb2b87e196b296411e04e
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/openal/openal-1.15.1-r2.ebuild b/media-libs/openal/openal-1.15.1-r2.ebuild
index 8a13e6ee93a7..62795074b203 100644
--- a/media-libs/openal/openal-1.15.1-r2.ebuild
+++ b/media-libs/openal/openal-1.15.1-r2.ebuild
@@ -17,11 +17,7 @@ IUSE="alsa coreaudio debug neon oss portaudio pulseaudio cpu_flags_x86_sse"
 
 RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
 	portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!<app-emulation/emul-linux-x86-sdl-20131008-r1
-		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-	)"
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	oss? ( virtual/os-headers )"
 
diff --git a/media-libs/portaudio/Manifest b/media-libs/portaudio/Manifest
index 6c5dfbd53fe7..4cf6ae9e4712 100644
--- a/media-libs/portaudio/Manifest
+++ b/media-libs/portaudio/Manifest
@@ -1,6 +1,6 @@
 DIST pa_stable_v190600_20161030.tgz 1450572 BLAKE2B 3cd63cca55ff222f452d306a1ab9035739545f48dbc9bc58196052cb51e518d86568059c7528533a6932c39c68d1a5210e06470a16343b92c7e4132b71cc552e SHA512 7ec692cbd8c23878b029fad9d9fd63a021f57e60c4921f602995a2fca070c29f17a280c7f2da5966c4aad29d28434538452f4c822eacf3a60af59a6dc8e9704c
 DIST pa_stable_v19_20140130.tgz 1504620 BLAKE2B a07ad305255db982dd719cec8b5c63b2e483c319acc7a9f316162f83f481cdce469ba17f549bbe68d4fc49378a612f22606e6e5369c043e907c504cd0e5f8920 SHA512 078adfdc2cec7fbd4019837eee65f8411b873b51064dfd7334e1c55118c26ea1fb68cb22e46ee69adb69c78d026b00a7ed973c40632e7d79703e12669a62ee3e
 EBUILD portaudio-19.06.00-r1.ebuild 1312 BLAKE2B 15e3e1ae14ea30847473371bd48c978bd92b65d527d22e4a23b898758ac8c0acbf69b9cfa55915b89a251dc2df455e85880a2bdcbf6c74bf1ae18a8195be34b0 SHA512 e16feff275f43859c97f5379c712e66475805f41fb849387a356322d1544f4e79bfec8ee791f8d8b8db3c1dd9a8d967dec513b19e5dc29112b8231e93dd2025a
-EBUILD portaudio-19.06.00.ebuild 1191 BLAKE2B 98bc11ccf7c25d7b3103968308670a037c4d1855b0ba2759d186e05d7f53003d6585a5d8035612987884a40a0b6c82614a0b509e2ceb40e4f75af1bcbfc03b2a SHA512 a252c2a7b6f92a48681b80816b9b67d152186b8d237a617f12574d5ec824a8ca4e6e6bfffdfd72745cbbb96b74315226cf1334afa4aaea3e27dd4dfc3fddb861
-EBUILD portaudio-19_pre20140130.ebuild 1183 BLAKE2B dd8c6a7306c295e06f2f22e88ff15743c4ddda5e5d5c17dcf4de61654c7aa6cbc619907dc00d708a817bca191a690dd8b47c04a11b66c8384c8ae066d268f956 SHA512 5e52b78f0e447db07a9544fe84eb6debdd01c91a54f6ee297c647fbda72353fcb1d16348e050c1e38dc4ea8fa08531a9e9e28d0dae06fd6e938a15f10f851113
+EBUILD portaudio-19.06.00.ebuild 1059 BLAKE2B 913d11a1fc53502c023cd778eb4a67329db966151554ca53d1bc90f73ca0ec542d2675a129c090d7256449d53acb7f727276da4a1e6822791f08b6ae4e52d49a SHA512 981838c717c379157021bbaabc2d5a857b75afac928fc96f838a7b306499f6d6b615da736d878046a0aa80ccd647317b47be16d3bca2e87cebf007a9c2d55623
+EBUILD portaudio-19_pre20140130.ebuild 1051 BLAKE2B 598277907c68df2b8ca379ed1105fbfd42890e98af7c0294bf9c8e088abc9a2fb48bdead5fded33a5bb87bba0864fd9388d97338f9f5d9a5ee039cddced1566f SHA512 7be06963fdc78ecbbc04e1438904733d1b5a1a19ea3681fd1538c805a0fbc00090b0878143eaae1a79c480062177eef52791dca4444d68a8bf677dabd4c77e34
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/portaudio/portaudio-19.06.00.ebuild b/media-libs/portaudio/portaudio-19.06.00.ebuild
index 816e5e2e390a..7030a2c59e2c 100644
--- a/media-libs/portaudio/portaudio-19.06.00.ebuild
+++ b/media-libs/portaudio/portaudio-19.06.00.ebuild
@@ -15,9 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x8
 IUSE="alsa +cxx debug jack oss static-libs"
 
 RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r8
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/media-libs/portaudio/portaudio-19_pre20140130.ebuild b/media-libs/portaudio/portaudio-19_pre20140130.ebuild
index ee2c287d9dbb..15fe80c459f2 100644
--- a/media-libs/portaudio/portaudio-19_pre20140130.ebuild
+++ b/media-libs/portaudio/portaudio-19_pre20140130.ebuild
@@ -17,9 +17,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~a
 IUSE="alsa +cxx debug jack oss static-libs"
 
 RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r8
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/media-libs/sdl-image/Manifest b/media-libs/sdl-image/Manifest
index eed47aa32ab1..6eda90d96692 100644
--- a/media-libs/sdl-image/Manifest
+++ b/media-libs/sdl-image/Manifest
@@ -1,3 +1,3 @@
 DIST SDL_image-1.2.12.tar.gz 2231074 BLAKE2B 0d63e0b2207d1d347ec882e610eb37a625811febc215f089eb00dddec92b1a9fe026d2ab7823677c46e595585f3b5e176c35f9ac1f9ec2debf430ecc3ea950a6 SHA512 0e71b280abc2a7f15755e4480a3c1b52d41f9f8b0c9216a6f5bd9fc0e939456fb5d6c10419e1d1904785783f9a1891ead278c03e88b0466fecc6871c3ca40136
-EBUILD sdl-image-1.2.12-r1.ebuild 1686 BLAKE2B 52f3d2e572b39fab9d879da70dc031f790da231c3d4353018c7e23a03ad6891787b7ba0a238ec01b1935ad327046c2fbecddc0434df3fa8815021ccfe66fdbb1 SHA512 5aa636493dca6e0fcaf4cdba0744dfc1b763a18194c8b935c57a401c7847189ac352cc92787c7bcd0f3fd4e09139737206c65080abae3f82d2f1f12adad0dd67
+EBUILD sdl-image-1.2.12-r1.ebuild 1569 BLAKE2B 76dc30f060229a2a690ccfc9c8050cfbdb9f0ba9750315b14f20f4e5aac90a1f989c3c49064c830cbea14767b1c54015150bc5e35d1b6121431742fb0cf07fa9 SHA512 34e27b683b2a6c582370eab5ebd062c86eee9d296aa70a7ef63da294d8e02742405eac7d9558cad58bdcead92d11f05c4d673cb2cc546459669d088ac6331830
 MISC metadata.xml 323 BLAKE2B 7d9dc08cddd37155dbaada0cf585700675350e874677346366807037987e1329fa141585f64101bd844d2ffb7bb6e80d0f53793af223f7a9a716f2e2b80bd245 SHA512 5502470417abb179d755e9d913a30e654bc961aeadcf91747b72b0be3823137ea0f344454744b7e3c450ef4923bce844f8281c85b6019f8decd63a50ea307089
diff --git a/media-libs/sdl-image/sdl-image-1.2.12-r1.ebuild b/media-libs/sdl-image/sdl-image-1.2.12-r1.ebuild
index fac4a3ed7d38..540b0e286e8a 100644
--- a/media-libs/sdl-image/sdl-image-1.2.12-r1.ebuild
+++ b/media-libs/sdl-image/sdl-image-1.2.12-r1.ebuild
@@ -15,10 +15,6 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
 IUSE="gif jpeg png static-libs tiff webp"
 
 RDEPEND="
-	abi_x86_32? (
-		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-		!<=app-emulation/emul-linux-x86-sdl-20140406
-	)
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	>=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
 	png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index a622e79886a6..6f4867c3d1b1 100644
--- a/media-libs/sdl-mixer/Manifest
+++ b/media-libs/sdl-mixer/Manifest
@@ -4,5 +4,5 @@ AUX sdl-mixer-1.2.12-mikmod-r587.patch 1416 BLAKE2B b353de5432714f3968c5f69ff439
 AUX sdl-mixer-1.2.12-mikmod-r588.patch 1128 BLAKE2B cc6ff884b3e157064a583d64adf978a091c7786a3c5417c5efd911f80407d30c866c527400122866bcffea25ab645533ae8e972834a2085a4bd8563ef5e8607b SHA512 36bbc5d10a63a73b7860a6f381a88849cc465dcabbfe3db21d6bd156110eb01e03e8369f0ed234f72f0227566919f5f823d0350d431575f0ae0f2a4b244cf704
 AUX sdl-mixer-1.2.12-wav.patch 796 BLAKE2B a0b310db2b789d24fd60927d23859582a8ab1449ba0934e10abdd1361a0d92fb5925625d9c3a0885f812dde12af9931cbae06c652b51e76d18759db03cacfc2a SHA512 9fed330d6bcae546752434a0ea29168e2a8fa432c8670d7290e70905f3431746b15126e5ce05820e4dd4dd09c982c880a6ce901ab9b3cff298e7f2c8d6a8b491
 DIST SDL_mixer-1.2.12.tar.gz 3707781 BLAKE2B b2fa822204fdaad860ff30307120bff7badbcc042d0b891563973794f715099aa961983e0dbf7e3d936179cbc615517c268f01f4619fcdcd48f18ff66dc49bd1 SHA512 230f6c5a73f4bea364f8aa3d75f76694305571dea45f357def742b2b50849b2d896af71e08689981207edc99a9836088bee2d0bd98d92c7f4ca52b12b3d8cf96
-EBUILD sdl-mixer-1.2.12-r4.ebuild 3376 BLAKE2B 461b23f396ff0ac235563261956b042a6a98499198856117467ef10b62d4273cd379762c2445a6a7eba1a7bd677e4045641f794c74f678ace91ced5c53658b07 SHA512 ab1d30553805a5f4bbfebba9aaf4cc50c425e55f204d1e3508ca7b0661cba3e6dd2a81a3291d4be696a9479e282069c4ba6463a70f28267df5a82e6becf74c10
+EBUILD sdl-mixer-1.2.12-r4.ebuild 3257 BLAKE2B c66ef6ffe483e5f697a923f05ce2e27ad42dcd4233b6f6842320618c16cd51886b11084fe715554559589d44ada6dacac6cd877dbf2c4899e728313e119bb935 SHA512 e48bea845e6efb6aa61d2cf7182dd53c78d9df22a65a90e223065e6b2317f1aa326e4de251c4171f6413e4ce8c4567dbc5e96af3e60b5a0f0b207fc6a89bad19
 MISC metadata.xml 663 BLAKE2B 5d86fe5c016f831f870da2f9b3d0192b6719bc6a98c0101c06c382d62e6100af314f46980ad5c246c8bea9db8ea99e9cd47afe2e5aee5b7887f5f6d529dddee2 SHA512 16a16403ac93fe964330da05038a0e904d0c6e895413994db9ef587170eaf7161f3cc2ce7fb0fe13ded675306b489837d96e837c1002f216b8ffe72d6fd49591
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
index b92e2977d366..722f378c122a 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
@@ -41,10 +41,7 @@ RDEPEND=">=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
 	)
 	vorbis? (
 		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-sdl-20140406-r1
-		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
 	)"
 DEPEND=${RDEPEND}
 
diff --git a/media-libs/sdl-net/Manifest b/media-libs/sdl-net/Manifest
index 2fdffee02274..f5cd99f4548f 100644
--- a/media-libs/sdl-net/Manifest
+++ b/media-libs/sdl-net/Manifest
@@ -1,3 +1,3 @@
 DIST SDL_net-1.2.8.tar.gz 360958 BLAKE2B 656fb9c86949bc962656edc7b950e64eee9b9b1ce1b257e6c4974c2d9be99714128c5556d3a3b7ea92cc6d294846af7a51a1925d17418afc8409e44a7b71099a SHA512 2766ca55343127c619958ab3a3ae3052a27a676839f10a158f7dfc071b8db38c2f1fc853e8add32b9fef94ab07eaa986f46a68e264e8087b57c990af30ea9a0b
-EBUILD sdl-net-1.2.8-r1.ebuild 1122 BLAKE2B ec417c781327187150886fbeedbd9857d472161d1a6f454941dd9aa42bab842b8dca7caaac9b268dd936231b97b3f4b4ae040367f4f8c3ceffb5335ec8dcabfb SHA512 73d3e6541bbbd377aaf5ec865b75b24236b94f142e3b11cd4c2251436ac51d036706455214f6ab3bcea23cadfdbda52000a96dbabf2ac255094e05eafabe40a3
+EBUILD sdl-net-1.2.8-r1.ebuild 1005 BLAKE2B 268687766a8da0bcfae2e3f4f45af3a6884bcbfed6311147be3ea1cd8d17e3a52b87606e1ec9631b6264a5382cbfa41b0d1338fc8f3e5951a7df782ec45986ee SHA512 b5b77320d3e5e31d91f578b83615122cdd0847653bc623a27f2dd8732e796d1bc12f1a7ff4afea9406a2ae1ade88b0cf92e823b1f6125c711612d75dff832c66
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild b/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild
index e921907da071..126aa18d9a2a 100644
--- a/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild
+++ b/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild
@@ -15,10 +15,6 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~
 IUSE="static-libs"
 
 RDEPEND="
-	abi_x86_32? (
-		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-		!<=app-emulation/emul-linux-x86-sdl-20140406
-	)
 	>=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 
diff --git a/media-libs/sdl-sound/Manifest b/media-libs/sdl-sound/Manifest
index 2c520cd597ac..8491c5791273 100644
--- a/media-libs/sdl-sound/Manifest
+++ b/media-libs/sdl-sound/Manifest
@@ -1,5 +1,5 @@
 AUX sdl-sound-1.0.3-automake-1.13.patch 231 BLAKE2B cc17a9d7a9f8ea42f84b6a65505d497c0f895d883692508a3ce366a6742533bf4d29b8eff4f09df1753b77819b71dec119950e3ff8a2059e3fb960bb63848be1 SHA512 aba96ba3d3027604d6fcb2f184db37c7ffd2e6204236cf114393e9f5e26acf4040856eb7e4354981f650875d5f991b3cf59c42ff723d75cf7a7e1dd5649f0845
 AUX sdl-sound-1.0.3-underlinking.patch 413 BLAKE2B 594339dae9a0230ddc1b821ca90d1650800610b0a7904fc00e33f1e3ff183ece1c8715b1d27b0c80cecbf5bda9e7b15255fba00fdc293f5e0841452efde447ef SHA512 1f67d72313abc44080a47b70c210bd6c03b2a204e85e2f5d1eb95f40367470bab4f14956f0404c5025fb4af7d72731dd1df3196ee316a2c5d9bb775e27d58a8c
 DIST SDL_sound-1.0.3.tar.gz 1127100 BLAKE2B 6fff5ea22ae82f9692a51910d5415288d5a1ebc1c463b2c741f9ee9fabeabb385de12f781d4f40aaf0628598824758376c51b442f434d77d96d0376379908ff6 SHA512 3e60671777d804e6104d7d441f4a29866492c9412040eea3fd2283c0914a0a1ebc550260631c2bf500e7d982e05a6f9feeda81e9eeef8257303750c1be582824
-EBUILD sdl-sound-1.0.3-r1.ebuild 1976 BLAKE2B 142354763182158d6a75ba4dd85cabc883d16b400dfaefb3f676e61fa10ab53bcbd04abe45f9c5348d4f3efc6e934059f48c3ed44ed9dbef347c0d9e36e2dfb6 SHA512 39cc97900ee82ccc249a13dd5e2a5e78e6ab30509e04160828690ab612e440abf8f3722a99975fb2a1696fcdcbd48228f810d945da5fc25f99e6dacaa23e2165
+EBUILD sdl-sound-1.0.3-r1.ebuild 1859 BLAKE2B 34700a6ec4e72aaa5da68fcf7b6cfaf8be86e3d2d03b6efdd92f09243776972ecdf074b163bb5a84a41959ab850af6e567676915c1bb13d54e62ae8d559019a2 SHA512 65da9213c7657a44ebc0b8d2e54cc095b0338c2e8b9b53071f51cce4dbca096eee15267d5ab5c1377eafb7b7ab7226fb8be2090fed4364d1fbdb6221321a82e5
 MISC metadata.xml 329 BLAKE2B 48629ddb61e6a0f89abf5682da954f242d1215a10c7f65c2df2a39a99a55654772e204d09731df371a6fe1c10f97250da3da80470e402f8e8d5cef598fd107c3 SHA512 684d7fca1ea67c78831e6fbe416af3beb64eabcaec4772ac3ea72a48321b10b2090b73ef1ee9e914b903d8ff1fb2275bb9efee41d8bee1cefb7fcbeb57f85549
diff --git a/media-libs/sdl-sound/sdl-sound-1.0.3-r1.ebuild b/media-libs/sdl-sound/sdl-sound-1.0.3-r1.ebuild
index a4f350cfee9a..ac7df0c6202b 100644
--- a/media-libs/sdl-sound/sdl-sound-1.0.3-r1.ebuild
+++ b/media-libs/sdl-sound/sdl-sound-1.0.3-r1.ebuild
@@ -15,10 +15,6 @@ KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~x86-fbsd ~x64-macos"
 IUSE="flac mikmod modplug mp3 mpeg physfs speex static-libs vorbis"
 
 RDEPEND="
-	abi_x86_32? (
-		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-		!<=app-emulation/emul-linux-x86-sdl-20140406
-	)
 	>=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
 	flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
 	mikmod? ( >=media-libs/libmikmod-3.2.0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/sdl-ttf/Manifest b/media-libs/sdl-ttf/Manifest
index a1e9d392da37..25222db745fb 100644
--- a/media-libs/sdl-ttf/Manifest
+++ b/media-libs/sdl-ttf/Manifest
@@ -1,4 +1,4 @@
 AUX sdl-ttf-2.0.11-underlink.patch 316 BLAKE2B 51bc3af2b6e21855a31d227ea2a43d1dc1253e261cfca097ce64d2fc648dba20e775d830196d918481973efa12e0548e905b326a5444e1754c59492b8231fae1 SHA512 9421cd6ce0502400bab1a87404a2378b79cdd8ce15644aea0978b85395693a422596175feccc119b0de8d83df2095a5accb74c80ad7b0dfee62d0536b8787030
 DIST SDL_ttf-2.0.11.tar.gz 4053686 BLAKE2B 3a78eeec91d7f6983b851cdd52925890c168cdf85dd34c7722183cc5a8848dab530c0c2d76493e0a380aa7e4f81967eeefd7cb34dc74faafc40497ffcb0e577b SHA512 64e04d1cd77e525e0f2413ad928841e5d3d09d551c030fc577b50777116580e430cb272b2aeb6191dfcc464669cf2f7a5a50d10e7c75637a3b1e8c8fca7fc78b
-EBUILD sdl-ttf-2.0.11-r1.ebuild 1260 BLAKE2B e10c811905d00a5b1bdd9ccd05b6708759b6e6de8865e982ce4e5ba78c55681d3b2920c2a4085985f8ddd66f2f9fbede8ae3acc8c97e463a9b068d959c81c134 SHA512 21f6c243d0e676b7763130442585613690617a08692a7d170d938bfa551ff8f78b25e149ba05f97584c4dfcace66300d613fb91f35d534d982a26b9ed5bd063f
+EBUILD sdl-ttf-2.0.11-r1.ebuild 1143 BLAKE2B 0fa50efde52beb4811468e1987f7d0b6b536cb0aa213e7b7b9e4b730ac9c8fd039a0cd4b761414e15f1528829e0baf986dbe2aaf62f106f8674fc63137a809ff SHA512 f4337f15d96fb7a7a5605707f43ab336576bf170da910700889e64f6079a155d8e16bb3c6b8db69b635b92d5f5d6934c23e333b35bb4c8cc86d0ce503335bfd7
 MISC metadata.xml 487 BLAKE2B 95ce74adcba0d3325dbcbf132d27ec7e09a56bb5043d44ced349f0a8318f7a7ba6a3f77cf164292af4f789c4c058b6825a733338245d9434f689ce3c84060565 SHA512 8da59a1be8aa7ca22c2f8b14e4c4fd288a9bc4b508157bb38b0cbb8f1f5f7dce3904861e419b8a6b40a0b895e8866c53b677c1467c0531b9615d70806bdee360
diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
index 6099641223d3..2f74af334950 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
@@ -15,10 +15,6 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~
 IUSE="static-libs X"
 
 RDEPEND="
-	abi_x86_32? (
-		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-		!<=app-emulation/emul-linux-x86-sdl-20140406
-	)
 	X? ( >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
 	>=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
 	>=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]"
diff --git a/media-libs/smpeg/Manifest b/media-libs/smpeg/Manifest
index c779d14930e1..95208f96097a 100644
--- a/media-libs/smpeg/Manifest
+++ b/media-libs/smpeg/Manifest
@@ -12,5 +12,5 @@ AUX smpeg-0.4.4-missing-init.patch 266 BLAKE2B 6476eed877a31ff26ff83936e137da8d9
 AUX smpeg-0.4.4-mmx.patch 352 BLAKE2B 02e060104c7fa0a817a9929c8a9911b24dd1ae131b26939edc7a1ac752a181e1db3cd0539d33d1548d1766f0a9ca2ecac31f6d0408711f54f04e6ed9ca5a35c5 SHA512 f83a04a6a8edb008dee9b76d96ad45b76e8ffcbb3086e6d97b64ee05ad400778bab97890811548274521504f502a904bc2f13598dfca33a872e6fb8800c0d974
 DIST smpeg-0.4.4-gtkm4.patch.bz2 3894 BLAKE2B 0ea9258a057108a462d9c4b9d9bcb21cdff71714507a3d09538f56817b206ec54681b3d2546b64c07f239ea3381f3644d26234853a239a2fe49353ba1c9b2759 SHA512 30370e0edd41767ce260d10de515be0087f47b479ec0085ec186506c93be0b2a404c1bcb1626f9a6a1f575160d9c382708d2769dddfe6dca6236fe0eaa58602d
 DIST smpeg-0.4.4.tar.gz 315054 BLAKE2B 16a7b87a207874deaaad64b5233964d4b0e244d35cc475cf0ed37302529ca4eb044393777fc98c202b5965de420f75bc5fb398ecc3eb0f97992d90e365f8a039 SHA512 d566bb68b0caacecdf61cd766b26e003fd4e153c243d873f7aae33ab69919202bd121bb9c10f494bd9530267ddec2a9e018eb46ee8bb9d502a29cd2de2f1bbfb
-EBUILD smpeg-0.4.4-r10.ebuild 2190 BLAKE2B df4d7b763755edf4ceb9269298e131516a1ad076a583fa90a637a8fd5ad1c1a7ed572abd85137012604541ce8a18505adac514ec87bb6603fb44579a5e277a8a SHA512 41e6253c993cbdef2e2345ec759aa9431317014bf83ca4f7b85d2fd45ac51ba6f287362ecdeff6c4cf829c64e420789ff05eceb9ec667832efb7af6a2a92cab4
+EBUILD smpeg-0.4.4-r10.ebuild 2073 BLAKE2B cfec05cca840ced4285b7da7e56edc980431bcebb0064eb542b6f2917819b0f2b708b62f720dd7b0d3288f5d00ee9763f1b3ac65d8dd4312ed652604a3fabc36 SHA512 48c7ab70cddab6e17a1f2158a0606bb482f2848432ea55f15555d6164532ca5bba23721c3cc9e7ed7cdbc88ab956a7c35c3c58bee2d4381b019355a27ecf6722
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/media-libs/smpeg/smpeg-0.4.4-r10.ebuild b/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
index 3a969315b252..b564a43ad5f9 100644
--- a/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
+++ b/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
@@ -15,10 +15,6 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbs
 IUSE="X debug cpu_flags_x86_mmx opengl static-libs"
 
 RDEPEND="
-	abi_x86_32? (
-		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-		!<=app-emulation/emul-linux-x86-sdl-20140406
-	)
 	>=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
 	opengl? (
 		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
diff --git a/media-libs/speex/Manifest b/media-libs/speex/Manifest
index fb6c371a3e48..32eec5898b52 100644
--- a/media-libs/speex/Manifest
+++ b/media-libs/speex/Manifest
@@ -3,5 +3,5 @@ AUX speex-1.2_rc1-r1-configure.patch 1153 BLAKE2B ef6e7e227b19b532a89c819481050a
 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 1669 BLAKE2B 0eac76163de2289f185762e74a1150fa4929ef52d92373c6de543a35a1ddb5eab28a6ff04614e6f8518b88c08a595d50c01fb5b3580f514317afb9eec3d15827 SHA512 82dac11fb230cb3f397ced068a7ef8d8d2f2bbdf913814e524a793c0a53cdc8523c7192a5bd61523f5123e7aea5036b5e1a64def6e938c79e511a1760dddb894
-EBUILD speex-1.2_rc1-r2.ebuild 1585 BLAKE2B a0f2e029fac58e02469d8fc71c201052311e6a6de7a3b500ba832491f3c3fd389a7459a592e837e971f16c64240255e839ad06bae5ac062ad8d190a1f71d2d5e SHA512 16920e4bd2a50e933b9a288e0f4a91fee1e2bcfd62adac3f2a438e8f0896a72eef7e35e644c795605caaacb92d3bd880eed8618014d1df53136400818038b1ab
+EBUILD speex-1.2_rc1-r2.ebuild 1456 BLAKE2B 144cf7de23552039016e3291a131879eb77397980f4fec3b6a147a36d65a814792bdd8269ebcc28b37741166b3149841887ea702a7db71a4cd974e8ddbf4b53a SHA512 339cca1f7dbc70d898c10442a9c62ef9148d7d39e76616a7597195e2185ee3bddb90c7f39af955c16dd235aa3bbb7b47860bcabae805fae462afe69806bdfaf9
 MISC metadata.xml 495 BLAKE2B a93e81b5e5b7c39cd680dbd8294451e3b034f1506e0c48d36d2a6e7525638bfc7dee964541b0e03847e43a344689d97de94e245dc4bc8099674a24b12a0a4115 SHA512 6b6a16e69139c71477c76a96c2aec025992a28079a15db234bc624619dc6ee5b3d20025418a49a0119d75b9964dd91fb38459c642c53a98b6bb444c6698beeb8
diff --git a/media-libs/speex/speex-1.2_rc1-r2.ebuild b/media-libs/speex/speex-1.2_rc1-r2.ebuild
index b142744da55e..17a135656516 100644
--- a/media-libs/speex/speex-1.2_rc1-r2.ebuild
+++ b/media-libs/speex/speex-1.2_rc1-r2.ebuild
@@ -15,9 +15,7 @@ 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"
 IUSE="ogg cpu_flags_x86_sse static-libs"
 
-RDEPEND="ogg? ( media-libs/libogg:= )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND="ogg? ( media-libs/libogg:= )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 799c8103ae7f..3595499c267a 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -17,9 +17,9 @@ AUX tiff-4.0.9-CVE-2018-5784.patch 4251 BLAKE2B defd555ebc53e178439331cd04f3099c
 DIST tiff-3.9.7.tar.gz 1468097 BLAKE2B 303339acf9bb48558695b13fcc2b41acacbbf2ce6d2ec497067761895cb2de7674108e8ca2f35f845dcd2e45801777fe25d234af1c308acf59846c2f5617ab53 SHA512 ca89584a9ffa33b4986e4bc2165043cec239896f1f0ab73db00818d0442b570efaa6345b2ed422e884202324d359713df849bf14782bb0cf3b959655febddd77
 DIST tiff-4.0.8.tar.gz 2065574 BLAKE2B b9ece26d3549836d2cbbce1b90ce724a6eae51adae0abbd6193942ced8be965df63d1aa8e774b83d9ae689e5d08033705ef62b77276b40c34913cd535caa72b9 SHA512 5d010ec4ce37aca733f7ab7db9f432987b0cd21664bd9d99452a146833c40f0d1e7309d1870b0395e947964134d5cfeb1366181e761fe353ad585803ff3d6be6
 DIST tiff-4.0.9.tar.gz 2305681 BLAKE2B 3de03408d2974b9f9f5f2444029cc3018ef43beb67e9fd21be68ee400cdcc6deca1247f055d880841a18b92284ce81f112682c8b5f083ddc61e5255d73a7de3f SHA512 04f3d5eefccf9c1a0393659fe27f3dddd31108c401ba0dc587bca152a1c1f6bc844ba41622ff5572da8cc278593eff8c402b44e7af0a0090e91d326c2d79f6cd
-EBUILD tiff-3.9.7-r1.ebuild 2072 BLAKE2B 1a1fbd60077b9d98c591041006443f2074d78d86dc6e165b9ca0e8d8b1578ec7b4a610046a1bb3a5860dac17f7dcfc7da142ae7a4f15ea2ca388ded15e4c9d6e SHA512 735b3fc6b18d754463f0b3b7e8c4ce31c9bf66a89bc5f761dcf1a8cdad28e494107784dd1a49a496095e0eec3dfca792bb62632190a95c9cb9e5c4ced03e3336
-EBUILD tiff-4.0.8.ebuild 2615 BLAKE2B 7cbfe610a0a6120946bcfcbbbbfdcd3de00d3355478900efe4206e95db378d60772f2e553a55719557d087669af653c7b151da93efc0afe0a287bf5d512a1bb3 SHA512 100bda64fb5f70919467585eac5d717d4cf7dfb6059c9a87482c370a3013eb566b73ad01160c0a9b5cab48e6b442182edbbe70d593293ce8984650032981c339
-EBUILD tiff-4.0.9-r1.ebuild 2260 BLAKE2B 4bf6af1f52b2990ffe3ec4a6169ee8ac774f3bdb52bdfe46450a6b724b4ca0ac04d4d7f849e390125403e0aa8555465b32ce5a824d8344403688321a6708f2de SHA512 1b47e588d6578cc2d6d3c0b1264f896854f2279ee8f9dd07b377ed4f78d680306eefa3cd462e27e460af18289d8734fa69128b55d5d0352a0199ba93a4377e09
-EBUILD tiff-4.0.9-r2.ebuild 2359 BLAKE2B 65b2f2e66992a1d926aacd94439afc0f1fa48e568473fb750bacfa30048c618b1bb4e75555d18f434a13ec0736be7292e8c00921a6e7c605082fba7f8f2432f5 SHA512 5fea44e4882feffea242270d23a464348aa086dec354349f09ed4be0ae26664e8522fbec177820fe8e1c9d94764746a493fb0b7e38b249300bf316243a3625f7
-EBUILD tiff-4.0.9-r3.ebuild 2398 BLAKE2B dfeb19ce762e82f323cd6d3f838e0bf342ccd599a7d760ab04fbb29a320f62d9d46ae71ddee2c95b2aea9a466847a8a08fceba6e7dd2cecdfc3ac9415c9e1ad2 SHA512 3dbe75bc5c068ce166a0a4057776ab8a97d71471fa515f662e86cc8bd6a197d6e46271c6cefffaae0e7c781e92cc37a9f88048060c267f5d2ecc7e6f27849af8
+EBUILD tiff-3.9.7-r1.ebuild 1941 BLAKE2B 38e7fc7b06adec30d32dce66390c5174fa8ca514d8fdc12d6486ed3b8a78b95ea2efb3e083c959892ea65e46853b4c5b7236508c9812736ff0bebce26961d64f SHA512 659c879ae594501bb3a88dde00797d67fd004cbbefbb4403a2374876a6c909cb38f4a7d56256325c5d53fd7ed107849e7c2862f9de777ab6b6d996ec279fe997
+EBUILD tiff-4.0.8.ebuild 2485 BLAKE2B de7917ea6c510b4da138abc7c8c46c108d93385845f37922c0043e619ecce744212ce0da78d3cd32c7ab6d07c667037432ff5203271ac357019260b2b2426120 SHA512 6b36c1575467420df401fa1268a93d51ad7e58c0e2ea1f43f79a98fbaced66f8f8d248f6f38531e731b384e1c4ea4d36416ba1545724cea7ad6d99e8fbfe1235
+EBUILD tiff-4.0.9-r1.ebuild 2130 BLAKE2B 09892b7bd37c8dfc6660bcb4ef5369457bf8e0929a2863fd62bc2a02c235c893fbc1880f0267683b115381980cade0f8412ec3bb63c2cae247263f7a3677b23b SHA512 fb2797ff15a7b1d3eb1ebf6be90a76c219f8cfb088ec1608b45f696e797fe1a74669152e89cee385d2c38758a737e4f4eba574701f02c27f2a791b8b394f90bd
+EBUILD tiff-4.0.9-r2.ebuild 2229 BLAKE2B 53aa8befbe2c445bec2276190fd1c7282b46881b8a8ea14cc5b71e9df65de8199c8b4f9d155f6d47b8d727bc91b31be7ec975720c27e597c737fd6e6fc388d8d SHA512 789642b417be56603c2acd94c6e472780944022f138b19ad1f41d72381a876a9212107c5dc39c96fa650f8632055ffabafb6c543a26331f8f7e3c754e44a9001
+EBUILD tiff-4.0.9-r3.ebuild 2268 BLAKE2B 89e3ba540d05f2141f55c3da530a62185466e23f76b4588f8f3e35bb7e72bf33bd4c1aa06dcabfb8ab1c2d30d9bd13179efa9e93b7bb8bd738bf36f6b5c311ed SHA512 c6cf933a65a8e2d8f9a49d02735e2c88bd965cea448de0a6f4c4cca763765a44126abf9765ad1d6afc8df0cb73135f21c3f009b5a391f578f73ff755897a508e
 MISC metadata.xml 565 BLAKE2B 3d487835599974795ba6007439bf1d08756ab1c5dbe191509832b302f3199e4ffc05be64df3e26b4d4a1c11d1292c48cbb59ffa6e412831d16d7415e076f1062 SHA512 289043206dbb512c97e4bb703b32549ac4a77f40e212548b80ea865052b80fed9d4562f9fc94638fda54da9bc3e0c19ba303c027e66e7b75c772aeec91aebe6f
diff --git a/media-libs/tiff/tiff-3.9.7-r1.ebuild b/media-libs/tiff/tiff-3.9.7-r1.ebuild
index a691fbf8fd05..467c3bb64906 100644
--- a/media-libs/tiff/tiff-3.9.7-r1.ebuild
+++ b/media-libs/tiff/tiff-3.9.7-r1.ebuild
@@ -20,11 +20,7 @@ RDEPEND="jpeg? ( >=virtual/jpeg-0-r2[${MULTILIB_USEDEP}] )
 	jbig? ( >=media-libs/jbigkit-2.1[${MULTILIB_USEDEP}] )
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 	!media-libs/tiff-compat
-	!=media-libs/tiff-3*:0
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r10
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+	!=media-libs/tiff-3*:0"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
diff --git a/media-libs/tiff/tiff-4.0.8.ebuild b/media-libs/tiff/tiff-4.0.8.ebuild
index f184c546851f..23aa7a1c6be3 100644
--- a/media-libs/tiff/tiff-4.0.8.ebuild
+++ b/media-libs/tiff/tiff-4.0.8.ebuild
@@ -17,11 +17,7 @@ IUSE="+cxx jbig jpeg lzma static-libs test zlib"
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
 	jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] )
 	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+	zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 
 REQUIRED_USE="test? ( jpeg )" #483132
diff --git a/media-libs/tiff/tiff-4.0.9-r1.ebuild b/media-libs/tiff/tiff-4.0.9-r1.ebuild
index fbb216176cdd..72494681d30c 100644
--- a/media-libs/tiff/tiff-4.0.9-r1.ebuild
+++ b/media-libs/tiff/tiff-4.0.9-r1.ebuild
@@ -17,11 +17,7 @@ IUSE="+cxx jbig jpeg lzma static-libs test zlib"
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
 	jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] )
 	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+	zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 
 REQUIRED_USE="test? ( jpeg )" #483132
diff --git a/media-libs/tiff/tiff-4.0.9-r2.ebuild b/media-libs/tiff/tiff-4.0.9-r2.ebuild
index 26a1889a21c7..3bd50a67341e 100644
--- a/media-libs/tiff/tiff-4.0.9-r2.ebuild
+++ b/media-libs/tiff/tiff-4.0.9-r2.ebuild
@@ -18,11 +18,7 @@ IUSE="+cxx jbig jpeg lzma static-libs test zlib"
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
 	jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] )
 	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+	zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 
 REQUIRED_USE="test? ( jpeg )" #483132
diff --git a/media-libs/tiff/tiff-4.0.9-r3.ebuild b/media-libs/tiff/tiff-4.0.9-r3.ebuild
index 8d7408182415..a3fc4bf56e68 100644
--- a/media-libs/tiff/tiff-4.0.9-r3.ebuild
+++ b/media-libs/tiff/tiff-4.0.9-r3.ebuild
@@ -18,11 +18,7 @@ IUSE="+cxx jbig jpeg lzma static-libs test zlib"
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
 	jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] )
 	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+	zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 
 REQUIRED_USE="test? ( jpeg )" #483132
diff --git a/media-libs/webrtc-audio-processing/Manifest b/media-libs/webrtc-audio-processing/Manifest
index c4067d1ad28e..7a44a8a92484 100644
--- a/media-libs/webrtc-audio-processing/Manifest
+++ b/media-libs/webrtc-audio-processing/Manifest
@@ -2,7 +2,7 @@ AUX webrtc-audio-processing-0.3-proper_detection_cxxabi_execinfo.patch 2251 BLAK
 DIST webrtc-audio-processing-0.1.tar.xz 392540 BLAKE2B 9b280cc88fce2bb62ac516af871add417743386378432dd1fd5e62ef5dbefd05a21982b26479d7efed00cd7f5f6b09887ec12f88a512ede9f4ece2d49ea069d8 SHA512 7626897a1f3d21e78896ed45074fbfbf0752918f7240ad9651390a39eabcb41b8aa2e31624a9cb62dc2e78debdafc0400159c0c2f3e7fc0838ff08004054bcd0
 DIST webrtc-audio-processing-0.2.tar.xz 687484 BLAKE2B 2c739109dffe4faac47b3e2c417002441f9f99bb054df62e990c88876e37c8c15e5b05cd90120805609f17441d385b979d625ed2caaf1b1c84ff3a65c44c9b79 SHA512 d93a988b1fcf7ca399258a22f84048f0fa13819faf01854b3548012a58e706fd6fbd8675ac8e8bf87bfedb6c81658812c523a42bb11a4dd40066ccdb63443a38
 DIST webrtc-audio-processing-0.3.tar.xz 688096 BLAKE2B 063e50ad6690c7b96e577d4a9c378328aafad6fd904ab18283ff2d7f10cc26f4b57f9b6293e880bffc105f7a6c91ec5c7ed9cf7c1aa422c40e64eb0b76dd0541 SHA512 fac99ae0c28290afedce8745bb159af1d375bf17e448a4e020b3b04f4ade24929d1d110923c4363c06a963675a201135621f0d20e57edff42bbcfbaedf91b4d0
-EBUILD webrtc-audio-processing-0.1-r1.ebuild 651 BLAKE2B 58b576466e1706025c3f492d0bdd57c8c4b6e421e67cab34152823eb28e9e0c66bb5c42e5337d9a8e3cef0f91c81483f16efb0e7870acc6af22b06d974b39ca2 SHA512 5f746278420a97ef80ff66823eca9843230acef21687c56987e7f89818bddae5b119a38faec2d5ae413ea95a0ab5e7eb056da840c340757f93d383e99c207d68
+EBUILD webrtc-audio-processing-0.1-r1.ebuild 521 BLAKE2B fed13e7e3079de493069ec9a956fca9dea9df02a879169439f732a5a84ce0ab0aad80d55f5b1577ccc91055e2486aacde876123cf6effce231975f6ebceabf22 SHA512 5115ee43e16c4353b806079b198af0eb16303a25bc5738f4de084fa5e923b4c2b9fb4fa888c4048a8c89401a55e598eca26d3a9b2b8d853a6f414d8caa8bd57b
 EBUILD webrtc-audio-processing-0.2.ebuild 647 BLAKE2B fed892b321389b8fc5965e0708044a45b738bfcf60b262297385b6fae258c6bbe6365de4a8f1f547a81a13bf11b3a9e6890756bde1359b56c4047ef22914e1ac SHA512 492026020fa9ff0e8c69df62837d3b9ba9d6b668e251fcba44a7b4ba02cc4e9494e18532398a1e30b1a123f62afba686c900524d20058974bba38d31d782782b
 EBUILD webrtc-audio-processing-0.3.ebuild 773 BLAKE2B 2c3abcadaf4fddf4f02d226c16d6e0fc89f2556e03f9c37a6491bd696150cd6384a417aea7b9d5323fdf465681165a61d7f64ad7d303985f6a8a761b04fe539a SHA512 ef4f4b71b366f6dc9bf352c618bb1dc33f9b041205bfa0d7356c1da74b196f840837905f06125b988e62916e669c771eb5b18cfe87852ae8461c0d926988929f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.1-r1.ebuild b/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.1-r1.ebuild
index 669b496ef207..1a98e36cfd54 100644
--- a/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.1-r1.ebuild
+++ b/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.1-r1.ebuild
@@ -15,7 +15,6 @@ SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE="static-libs"
 
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+RDEPEND=""
 
 DOCS=( AUTHORS NEWS README )
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index c733ca354088..c554383ba073 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -1,6 +1,6 @@
 DIST x264-snapshot-20160712-2245.tar.bz2 730644 BLAKE2B 3d80d831c5a13ab95f9a4ba269f959e36aa35f4f2914d435b9e9817fcbe40105f44881b0dbb92cad4b9c41e25536194ff2b7c35925bff9016ebca5e38b16c54e SHA512 ac97730611e6194701a891a7e73c739696664de2411a7937ab0c36a3ce843f22bf2bd2defe053c2506d95652842b99a905b6f16a2f016a9d73059c2c75b71963
 DIST x264-snapshot-20170701-2245.tar.bz2 750527 BLAKE2B ccf276da31383ab4b4a1ac48866bc49b4b2bc5913361c933fa2359de4d6e90cca091dd4aba781f3735a5b28d6ce006aa9d4e149ba48745b80cb971c2952ca867 SHA512 28fc9850c36ac385fced6dec9a0f68a5605a68805e1ef7b8cedcd78917eaa1ad6e47e57fe5a74fee0a6e482f3a33de6011f675e6c77b5db94c8fe01d5c5f3e9f
-EBUILD x264-0.0.20160712.ebuild 1996 BLAKE2B 57431a358195c6c3a061603ceef6dac39c5e74f1ce6c71505a4e670a6f4ca1daa2a43234184d4721cc03142a86d462616fd43f5ba9d4aa7340c5a01767749d6f SHA512 086681d299da2130bd4362d20af2d7085297616a28b8b12bf540bb60bd8032dc934597d39437b5c12805d6e48bef6c6afc2cefd569291325ef597ae6c11d2599
-EBUILD x264-0.0.20170701.ebuild 1909 BLAKE2B 6eb72230f695deaa28fcd12d6fe1ce12fcee3baa64c1e8da2d978703fd1e59b84cdf5986adf10fa4c0e7ea2ad726bf64ea6f0fc9b5afd3cc424122641368d30d SHA512 2c9eb26ab00db320ab064a3897281083a8bee24f40d4d6cc35100d6f7a2ad5fe14a8e8ef3fb50c52d8c61fdfb26d92d839261f9aa704d23bf0c5320009dac649
+EBUILD x264-0.0.20160712.ebuild 1867 BLAKE2B 0e6e39ea67915bd900ed83b7a485a6c25f94fd957b221b49bc09caadc1e9825abe6802c8047b29d1f2cb3b96e5aeaeaef9857dcf632e75c3a6719cb482023374 SHA512 a57efb57054082cd64dfa163915393e5833c83874b5710202bd1b5e6d1f63f33ff804301d237f6ca4d8d8584df0b38e9173d40068adadde6d244a940366544d8
+EBUILD x264-0.0.20170701.ebuild 1908 BLAKE2B 0d707b757a65ca4436f04d5cbdbd11682f61496dfe9e19a73079476452e397928313e1ae030db6cb68d0c8fa857ce925a9b7a9b69846fe6147b659ade30e6469 SHA512 4d6505deffec4108071dbbdb0788a0eb59695703890d168bc641e361af2b6c4d05606b415f0bb8a6dd3e6dd629dd2eb8390d3a2f2847369bf7c5d567dff9b105
 EBUILD x264-9999.ebuild 1872 BLAKE2B 8910e4673e48bd4cd6c503436d28ca1f3f00bf96fa61193fa06761cffd928213c96f8bd21151669784083b29d80604eab4bf57fb9c0740f18d4f57684e7de247 SHA512 89201b028151be9f7758f317cae3bbf81d1f8a3f82dd8e3e20c01abfa97b27a836ec95d4855ec93d208ee4381f17da3bd94c1ec9291ca980ebed210b930119c2
 MISC metadata.xml 589 BLAKE2B c7ee19e724c9c449efda7bf1733193d71c547bc3a80efb51d6b562a8d0134bb618d1daad542cc61fc5d0026467a4336ec0754f238e441cad8cfe72296c4eae07 SHA512 7a4acc6f2cf54f66efee1fedb379ea155559ddca1ff8bae88b5a8638b23555515e9cc31dff7ae6bb16e6d716e616dcb4b508870ad78ab1fe461ba8b7056f524e
diff --git a/media-libs/x264/x264-0.0.20160712.ebuild b/media-libs/x264/x264-0.0.20160712.ebuild
index 853a84945eb7..f8d0fea657fc 100644
--- a/media-libs/x264/x264-0.0.20160712.ebuild
+++ b/media-libs/x264/x264-0.0.20160712.ebuild
@@ -28,9 +28,7 @@ ASM_DEP=">=dev-lang/yasm-1.2.0"
 DEPEND="abi_x86_32? ( ${ASM_DEP} )
 	abi_x86_64? ( ${ASM_DEP} )
 	opencl? ( dev-lang/perl )"
-RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )"
 
 DOCS="AUTHORS doc/*.txt"
 
diff --git a/media-libs/x264/x264-0.0.20170701.ebuild b/media-libs/x264/x264-0.0.20170701.ebuild
index b956be635d77..64b8d68e5bbb 100644
--- a/media-libs/x264/x264-0.0.20170701.ebuild
+++ b/media-libs/x264/x264-0.0.20170701.ebuild
@@ -14,7 +14,7 @@ else
 	inherit versionator
 	MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
 	SRC_URI="https://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-	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"
+	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"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index 4e14a570487a..ea4e809a5daf 100644
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -1,7 +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
+EBUILD xvid-1.3.3.ebuild 1755 BLAKE2B 310eba6d21c2615e55b526bd6d04e0986287e4c8c4300922b3152ce0b445fb04f951d97ae155b9e846925e5722e8d21856d395e8ea0a111f3f753b41a546696c SHA512 94898b6568624ce14930265aa87c79086935f22bea93676fb2c25ce668f5f92ef09badf16d057555f224a6a19e599e2cb2d14af5cf84022515032732385eb854
+EBUILD xvid-1.3.4.ebuild 1771 BLAKE2B 191824e91e62bfbd6dc32f590e37480dd32190a674cf4b8838e00ef94719ce42190427e688e9bd4da58dd211a80b2d21e8bc63b899a24e6dffc264138d627efd SHA512 9a86873ef5f01bd0373882b28ab352f8a03d364a534030a0a12ca76b1a97038844cfcbf09e3297d997cbaf97c5895f53fd9a4f7ba7fcc724d5132be21c352d2d
+EBUILD xvid-1.3.5.ebuild 1730 BLAKE2B 36f60ac49724293d3faf37057db1f4332688a9a66416be0375bac906f94c4d2b1a2b404aa3790d69b58a0938c17e95ae5b761caaae0b6cab03eff599f6c94870 SHA512 b131583566577d33f515a016c8392785f3c0991c092a07770b773d12d1c922fab0c88456e8dd1f10972a16a48fffa77ff2ddb65568b05d97d315f19e01a6b6ca
 MISC metadata.xml 321 BLAKE2B cb6de1ddc565513350b010042d99dd2cb34c0cfa80d26d1324266b6621bea5fe50f4e9233348d0c5d9b9c214d48b9c94e8fc4b08f9c0b43c779b238a65559c03 SHA512 640a21ce70c9b74f86e27bca3153b920ad7ad8313f3f5d6032e41791ab99f7463718f99bfc7fd15613e682769be6fe322c15d3bc841f674bc0322afa130c8b98
diff --git a/media-libs/xvid/xvid-1.3.3.ebuild b/media-libs/xvid/xvid-1.3.3.ebuild
index 9b80581a9ffa..c042d207346f 100644
--- a/media-libs/xvid/xvid-1.3.3.ebuild
+++ b/media-libs/xvid/xvid-1.3.3.ebuild
@@ -26,7 +26,7 @@ DEPEND="sys-apps/grep
 	x86-fbsd? ( ${NASM} )
 	x86-macos? ( ${NASM} )
 	x64-macos? ( ${NASM} )"
-RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND=""
 
 S=${WORKDIR}/${MY_PN}/build/generic
 
diff --git a/media-libs/xvid/xvid-1.3.4.ebuild b/media-libs/xvid/xvid-1.3.4.ebuild
index 8271e8428309..2611b93fb187 100644
--- a/media-libs/xvid/xvid-1.3.4.ebuild
+++ b/media-libs/xvid/xvid-1.3.4.ebuild
@@ -26,7 +26,7 @@ DEPEND="sys-apps/grep
 	x86-fbsd? ( ${NASM} )
 	x86-macos? ( ${NASM} )
 	x64-macos? ( ${NASM} )"
-RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND=""
 
 S=${WORKDIR}/${MY_PN}/build/generic
 
diff --git a/media-libs/xvid/xvid-1.3.5.ebuild b/media-libs/xvid/xvid-1.3.5.ebuild
index f0ddb60833ec..e3d48368da4a 100644
--- a/media-libs/xvid/xvid-1.3.5.ebuild
+++ b/media-libs/xvid/xvid-1.3.5.ebuild
@@ -26,7 +26,7 @@ DEPEND="sys-apps/grep
 	x86-fbsd? ( ${NASM} )
 	x86-macos? ( ${NASM} )
 	x64-macos? ( ${NASM} )"
-RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND=""
 
 S="${WORKDIR}/${MY_PN}/build/generic"
author	V3n3RiX <venerix@redcorelinux.org>	2018-04-22 14:25:03 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-04-22 14:25:03 +0100
commit	5e8702bcbbed438e6c6cce023e7ef0cc9baa3e02 (patch)
tree	b041acef19bb9ae66c228d5c9d34d1e00aeb2b95 /media-libs
parent	5cfef3c94cd7e82136c69a0322f5ba21f7e64632 (diff)