gentoo resync : 19.07.2019

48 files changed, 203 insertions, 281 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 269efb2f0fe9..1a905f029ffa 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index 4f1850c44f16..2f49bd66b90a 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -9,4 +9,4 @@ EBUILD babl-0.1.62.ebuild 1536 BLAKE2B 727d7fcbbd1805d9db269ea3066a0491f631ced1a
 EBUILD babl-0.1.64.ebuild 1545 BLAKE2B ffa68e0a1d0994f176767e2a5d4ffd30f4632685199a6a29de1aee57fec7cb16266805fadd190f2fe9f27c84bd96890b1be18cc7d9914ce6ba736c1e18cf2db8 SHA512 b3c6cb1abdfe65e7d86f1505c5d00ad0b2aef84dbbe5156a63913951452af30be13c8b339edefe831cdbd6eddd4ecb766c17cae2af75f1067d8f49bebe3ba506
 EBUILD babl-0.1.66.ebuild 1545 BLAKE2B ffa68e0a1d0994f176767e2a5d4ffd30f4632685199a6a29de1aee57fec7cb16266805fadd190f2fe9f27c84bd96890b1be18cc7d9914ce6ba736c1e18cf2db8 SHA512 b3c6cb1abdfe65e7d86f1505c5d00ad0b2aef84dbbe5156a63913951452af30be13c8b339edefe831cdbd6eddd4ecb766c17cae2af75f1067d8f49bebe3ba506
 EBUILD babl-9999.ebuild 1545 BLAKE2B ffa68e0a1d0994f176767e2a5d4ffd30f4632685199a6a29de1aee57fec7cb16266805fadd190f2fe9f27c84bd96890b1be18cc7d9914ce6ba736c1e18cf2db8 SHA512 b3c6cb1abdfe65e7d86f1505c5d00ad0b2aef84dbbe5156a63913951452af30be13c8b339edefe831cdbd6eddd4ecb766c17cae2af75f1067d8f49bebe3ba506
-MISC metadata.xml 307 BLAKE2B 95a78257a39aec8fdf8c1c1c1fa0a6f2d911f6c7f22021021f3d1457d7beffad0a47b0f0131926e988340fccc4ca8ef49d086940e0e17acb89d4f3c6845b79f4 SHA512 a86588c27e62fec9d8474d9ba5edd9d235a6ffd1251d5ba729593ba7bdffdb272020567a7db2d596f17bba9c2a39a75eed9ac5eee5e0ba73af081a05fcb1af9e
+MISC metadata.xml 216 BLAKE2B a7f17874d9514cafd0bbab739d143a00ac66ad8446bce8e05932d122c1631d29ad8077c2bcda021bc92b7e89b77c03d55e8997cf250f3bb55f8a1aca046bb2a7 SHA512 1de1c9f4b223876125a0321126f2d7b1b564a113d24ae86b380c4d67bdf58ed4f2ae1a1f5d686211ccf4851eea8e970c20109977abbc79d0cd855164b6474e23
diff --git a/media-libs/babl/metadata.xml b/media-libs/babl/metadata.xml
index c86b23d9da68..82b7b7953794 100644
--- a/media-libs/babl/metadata.xml
+++ b/media-libs/babl/metadata.xml
@@ -4,7 +4,4 @@
 	<maintainer type="person">
 		<email>sping@gentoo.org</email>
 	</maintainer>
-	<use>
-		<flag name='cpu_flags_x86_f16c'>Take advantage of CPU feature f16c</flag>
-	</use>
 </pkgmetadata>
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 469a4a44838d..1e1752311d31 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,13 +1,7 @@
-DIST Image-ExifTool-11.41.tar.gz 4547105 BLAKE2B 8bb2d2c2815b59aa744866790f2c46e7096d74f093bee9fd9c6615162c8be8b6716fe2ca967485fef4bff53ed56af1f0e8aafef162ab5504075fff133e21e84a SHA512 fff6806c30cea6d38ed30c3d736664af2e0021d29ad2798036407af6edc928e52a72e0b37e6cbe12e3511077b041bce9c251414d5b6e87328fcd08bfd3fe12a1
-DIST Image-ExifTool-11.49.tar.gz 4566133 BLAKE2B f4b74a7ee20fd0cb44943eb3ddeaa04d3dccbc00722aa37e101ac54901ccc86f52bc4b3bf7bb34286ce8c110c690e5c20d0e76d7edda5d445d32a38f55c21983 SHA512 f90efbf35cd78f2def0f7dfbc4154812ab71f197765c078f64d23521a16eebb75afd0af4cd9184f07a04240bab227a13f02d0ca2db4ed9205e39ff158118ee1c
 DIST Image-ExifTool-11.51.tar.gz 4573052 BLAKE2B 9b38550127e9d21471ce11d25fa267a13e21deb65da3e0f1fbee7f7970f65b82e9e3a1b30ba6340739a2fc402fa8aac874a1813edf5e71634e5f23268a3fff96 SHA512 e6f48d803714a3fb8e12f869d3f9d3957db9aa330cf4e910a6eaadde759aa4ec0fc4873576d46bcbe40462d87bac341e6a546813f4753ba0bf61cf36dde7deeb
-DIST Image-ExifTool-11.52.tar.gz 4574091 BLAKE2B 898d7e79ef3d5fe0b284c1c7099731ee3dec5544ff2e48b0830a69b094299e49954ecd43c2ae25e91734402eef419083f8927e5c80a7ce24001cb1e33cb39d52 SHA512 de8ed55144cde96efddac1d83416bf0252763dbb53ccc428ac2d4f6b4ea87605c3f85b22bb07339e3b460adf5662738adc4150c4000078d06da80ef33fa739f5
-DIST Image-ExifTool-11.53.tar.gz 4577849 BLAKE2B aae1b13fe37f8a3f5428cac71c7c37b0e2a77cab3ff6e3442f4453ada7a702193906d7de8a42309d636e697fee80ff48be30dfaf171198ac0a13ef41d26f2580 SHA512 3c404d00606b46febc9fb09149e47ea80c36bba4df6f9d4717c5bee8893e99dbadc47bbf0aad4b87e0d5d55cb5ad3b5c2b06b36a7c4d5b3d5d0a1ee255ad9ec0
 DIST Image-ExifTool-11.54.tar.gz 4598312 BLAKE2B 2543f56a9d7b59d085bf147a51f90be3764093853a66f522cc8ea96caefa0389a64cc1c2ae18d9eb1d79dd97f406c13a561c495a249c025b5cb6bd3af3acd5c6 SHA512 3d21ac6208b2410b9e39afc21738da14528fa891a4115472b66a489345bcc9580c922924c6060c413cef30671a7508bc5ec1ce9ec6c3645838210f025059d37f
-EBUILD exiftool-11.41.ebuild 605 BLAKE2B 321361a04e5d97128b6d1bfcb845150b287b4a47e57b8a512d7fda58684b67393a1455f6a40eee426c5240dd1160bbd656783c1c4b02966a7808be9b73d40c78 SHA512 88d9ba9249f429d2d36c516298b9461f36bfea90f6025b770fc9012ee4d182f83ffcce76e0010f19eaa1b8bfe5b80de1c7c07d76ff127a044f78e42accc1768a
-EBUILD exiftool-11.49.ebuild 610 BLAKE2B e3d631967c3970948f44d2fb65d4bd49e5520cf2bad7e2113db9d9ee699d676eb4e7c7f26fce256169aac4be26eb4d4c7e1ef6d07ce9d7f500a7f1a4d8317e8b SHA512 2f03d0599dc67f567878cdec992a41fa27fb6e137b0ead6efe41b411338d9dd4b6aca397ccdf0a9553f7315f2fbe68e50ece85d0e705fef7c1857b56b3c9f026
-EBUILD exiftool-11.51.ebuild 610 BLAKE2B e3d631967c3970948f44d2fb65d4bd49e5520cf2bad7e2113db9d9ee699d676eb4e7c7f26fce256169aac4be26eb4d4c7e1ef6d07ce9d7f500a7f1a4d8317e8b SHA512 2f03d0599dc67f567878cdec992a41fa27fb6e137b0ead6efe41b411338d9dd4b6aca397ccdf0a9553f7315f2fbe68e50ece85d0e705fef7c1857b56b3c9f026
-EBUILD exiftool-11.52.ebuild 610 BLAKE2B e3d631967c3970948f44d2fb65d4bd49e5520cf2bad7e2113db9d9ee699d676eb4e7c7f26fce256169aac4be26eb4d4c7e1ef6d07ce9d7f500a7f1a4d8317e8b SHA512 2f03d0599dc67f567878cdec992a41fa27fb6e137b0ead6efe41b411338d9dd4b6aca397ccdf0a9553f7315f2fbe68e50ece85d0e705fef7c1857b56b3c9f026
-EBUILD exiftool-11.53.ebuild 610 BLAKE2B e3d631967c3970948f44d2fb65d4bd49e5520cf2bad7e2113db9d9ee699d676eb4e7c7f26fce256169aac4be26eb4d4c7e1ef6d07ce9d7f500a7f1a4d8317e8b SHA512 2f03d0599dc67f567878cdec992a41fa27fb6e137b0ead6efe41b411338d9dd4b6aca397ccdf0a9553f7315f2fbe68e50ece85d0e705fef7c1857b56b3c9f026
+DIST Image-ExifTool-11.55.tar.gz 4608120 BLAKE2B d5f18ad336913ab43e6ec1916987f425398f7ed2f5a1ee0a1a7912968e0ca99985b5773d1dc1fcbcb29c3fbb8767c3664eec7bac78d4fce4873fe67e21286ce8 SHA512 175aa7cc9bb2f85554964466092bf289e16dd5dee514edac12ebf8beabce59ad559ef8eec78ef515bfd9b404e3cbb3131476d3c5357128368d4f3ca426cc4740
+EBUILD exiftool-11.51.ebuild 605 BLAKE2B 321361a04e5d97128b6d1bfcb845150b287b4a47e57b8a512d7fda58684b67393a1455f6a40eee426c5240dd1160bbd656783c1c4b02966a7808be9b73d40c78 SHA512 88d9ba9249f429d2d36c516298b9461f36bfea90f6025b770fc9012ee4d182f83ffcce76e0010f19eaa1b8bfe5b80de1c7c07d76ff127a044f78e42accc1768a
 EBUILD exiftool-11.54.ebuild 610 BLAKE2B e3d631967c3970948f44d2fb65d4bd49e5520cf2bad7e2113db9d9ee699d676eb4e7c7f26fce256169aac4be26eb4d4c7e1ef6d07ce9d7f500a7f1a4d8317e8b SHA512 2f03d0599dc67f567878cdec992a41fa27fb6e137b0ead6efe41b411338d9dd4b6aca397ccdf0a9553f7315f2fbe68e50ece85d0e705fef7c1857b56b3c9f026
+EBUILD exiftool-11.55.ebuild 610 BLAKE2B e3d631967c3970948f44d2fb65d4bd49e5520cf2bad7e2113db9d9ee699d676eb4e7c7f26fce256169aac4be26eb4d4c7e1ef6d07ce9d7f500a7f1a4d8317e8b SHA512 2f03d0599dc67f567878cdec992a41fa27fb6e137b0ead6efe41b411338d9dd4b6aca397ccdf0a9553f7315f2fbe68e50ece85d0e705fef7c1857b56b3c9f026
 MISC metadata.xml 10159 BLAKE2B 3b879f3679b07864e8e32d0223d1512919d56ede4b51bc5a550a83694c8c956c6e6e60a92309ceafef61ed738ccd0b5a6817094b4132be013560d3d7830f6349 SHA512 88662e634877bf2b67144fd37a862626e247f7df5daa82ed8d7a91a00611290d3976687221b5f58b78111a8894d45d55c8999966436f621baebf1bc7b3561484
diff --git a/media-libs/exiftool/exiftool-11.41.ebuild b/media-libs/exiftool/exiftool-11.41.ebuild
deleted file mode 100644
index 3afc7ec316dc..000000000000
--- a/media-libs/exiftool/exiftool-11.41.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_NAME=Image-ExifTool
-inherit perl-module
-
-DESCRIPTION="Read and write meta information in image, audio and video files"
-HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
-SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc ppc64 x86 ~x64-macos"
-IUSE="doc"
-
-SRC_TEST="do"
-
-src_install() {
-	perl-module_src_install
-	use doc && dodoc -r html/
-
-	insinto /usr/share/${PN}
-	doins -r fmt_files config_files arg_files
-}
diff --git a/media-libs/exiftool/exiftool-11.51.ebuild b/media-libs/exiftool/exiftool-11.51.ebuild
index d65975820b77..3afc7ec316dc 100644
--- a/media-libs/exiftool/exiftool-11.51.ebuild
+++ b/media-libs/exiftool/exiftool-11.51.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
 SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 arm64 ppc ppc64 x86 ~x64-macos"
 IUSE="doc"
 
 SRC_TEST="do"
diff --git a/media-libs/exiftool/exiftool-11.52.ebuild b/media-libs/exiftool/exiftool-11.52.ebuild
deleted file mode 100644
index d65975820b77..000000000000
--- a/media-libs/exiftool/exiftool-11.52.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_NAME=Image-ExifTool
-inherit perl-module
-
-DESCRIPTION="Read and write meta information in image, audio and video files"
-HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
-SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
-IUSE="doc"
-
-SRC_TEST="do"
-
-src_install() {
-	perl-module_src_install
-	use doc && dodoc -r html/
-
-	insinto /usr/share/${PN}
-	doins -r fmt_files config_files arg_files
-}
diff --git a/media-libs/exiftool/exiftool-11.53.ebuild b/media-libs/exiftool/exiftool-11.53.ebuild
deleted file mode 100644
index d65975820b77..000000000000
--- a/media-libs/exiftool/exiftool-11.53.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_NAME=Image-ExifTool
-inherit perl-module
-
-DESCRIPTION="Read and write meta information in image, audio and video files"
-HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
-SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
-IUSE="doc"
-
-SRC_TEST="do"
-
-src_install() {
-	perl-module_src_install
-	use doc && dodoc -r html/
-
-	insinto /usr/share/${PN}
-	doins -r fmt_files config_files arg_files
-}
diff --git a/media-libs/exiftool/exiftool-11.49.ebuild b/media-libs/exiftool/exiftool-11.55.ebuild
index d65975820b77..d65975820b77 100644
--- a/media-libs/exiftool/exiftool-11.49.ebuild
+++ b/media-libs/exiftool/exiftool-11.55.ebuild
diff --git a/media-libs/fdk-aac/Manifest b/media-libs/fdk-aac/Manifest
index 8f5109a8d2de..8c4b5aca422c 100644
--- a/media-libs/fdk-aac/Manifest
+++ b/media-libs/fdk-aac/Manifest
@@ -3,5 +3,5 @@ DIST fdk-aac-0.1.6.tar.gz 2091618 BLAKE2B e3036879e21677ea0ba6d6a030aff0568572e4
 DIST fdk-aac-2.0.0.tar.gz 2864593 BLAKE2B beaefd5186a6253496a656ccea514e764e6c6515b46ea0fa324f66985af8374f3813afddb29018da12d28d1672ebe10821f5e4e98d131ad4fb77a3d01ffab234 SHA512 40b02a9e42e17015fa6531c7b7eb51098ab43224c11c1c85e981d950642ffc6884146367cb423062b1da11679020ee5c5779dce5f4dc62175c8bf471831ed918
 EBUILD fdk-aac-0.1.5.ebuild 1329 BLAKE2B 4b253218fe7f3792205f1f4a49f825cb2e3659256309189cbac4176744957a9739c365eac282a45f43f0294bdef2204844ad064c7aa0d4dc0980f103574b212b SHA512 4d1cf29c86faf68d62604d324cc68132a386486fb7c88b5c54b893019fa59c9b14438a0011c701e1286ec5a6f1078313acf0eb8df17d27e741762d00807ae49b
 EBUILD fdk-aac-0.1.6.ebuild 1360 BLAKE2B 140c2622a15b32a10e6c79f249c15a591d5ae2b68f2e695662d84a221ae031b8fbb460258aaf823b5efec4fc318b312d1e77fc6795599c26c2a79a092df42344 SHA512 aaa3428c0840753488d2019a8d58524868d237a3d0c0324fd5ce77e7500e2bf0be8520ee0dfeda7d44963a2fba5280009ab5e3c40b6a607b3bc3cf480f1bcb0f
-EBUILD fdk-aac-2.0.0.ebuild 1353 BLAKE2B b7282259460d1fdb064c698d123ed02596ed09aff52b17e32d03c007b90ddaf2c2c54d3339aaf58ef1d95934db163e2df227caeeee7cfea0e3884e17c6bbe0b9 SHA512 17ee2236f02fcce87731e41ffb07afcc9fe315f45ee096ff138406a87227012f70c288ead8016add4369da4b66c2927f396c69fba6870199e7b83bc95ae8a680
+EBUILD fdk-aac-2.0.0.ebuild 1351 BLAKE2B 3d1f1b88f94038c60d7d011f649e78e00a86459f173c0877c17072a99366d89ad4010d9a3dad92cdbc80231f99b899c2b4cc181df2f05a36e81068c1bd256303 SHA512 1b149961afda806bb0926819218fc1e2e2ed8dae0566f4f6c7d3bc0f332480515229f63e9cf393d92d91f92443167828538fb60f67e15fef7dca1224bd3405cb
 MISC metadata.xml 426 BLAKE2B 701e014c8a2fb5649fc546c205d705e8c13e0b3acf2bd445c4058ffc96e607743c5e6c8c21e3c0f0941421064a169b18b3736bf5f34b979f36fedabdf0fe318d SHA512 217c0f757ba4c8bd4e649aab097900eebaa9097d6f56ea373e78de2f3a392d25401c8dbb654b80219bceaea7db7ff616f532174f4a5119bd1b3c093e9fc89da1
diff --git a/media-libs/fdk-aac/fdk-aac-2.0.0.ebuild b/media-libs/fdk-aac/fdk-aac-2.0.0.ebuild
index 651662d96d8c..3bb86d429f6e 100644
--- a/media-libs/fdk-aac/fdk-aac-2.0.0.ebuild
+++ b/media-libs/fdk-aac/fdk-aac-2.0.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
 	inherit autotools git-r3
 else
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 	if [[ ${PV%_p*} != ${PV} ]]; then # Gentoo snapshot
 		SRC_URI="mirror://gentoo/${P}.tar.xz"
 	else # Official release
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index 262b4e7d6a54..95ab047908a1 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -1,5 +1,5 @@
 DIST libepoxy-1.5.3.tar.gz 326768 BLAKE2B 053665429a249adca4c9b3d57797949e3a0ffd0ed3f1c66cb8becfb884431e44a4cccb6b2fd3788a86ee01268ebad3cc36e67e391d2aa5cdea28837a162be9ad SHA512 e831f4f918f08fd5f799501efc0e23b8d404478651634f5e7b35f8ebcc29d91abc447ab20da062dde5be75e18cb39ffea708688e6534f7ab257b949f9c53ddc8
-EBUILD libepoxy-1.5.3-r1.ebuild 1275 BLAKE2B 7b8d18ae1303e6969d98bac57a2e5b512a900fac25854d5bf57b9139e06499e2cdaf785d3394850c013e986b0d47ba8ee377e62e4f56beee0d4adad29123fd53 SHA512 5b14b21ae3336813a2a568f165117cd048f050e52b18eb40010c773879c358f0fc5409e18b8bab2f64a5e7f1db150207b177e2ed60445628ee71e06302f3eb41
+EBUILD libepoxy-1.5.3-r1.ebuild 1269 BLAKE2B bcd4d0286a99217e964a2651cabddd66fcfe32f1af18a1e6cc5dab2dca99bcdd29c7265560bdf7aa494e66b05be3acafbf8fc6cdb25037bbff5d0a90939128ac SHA512 e58dd80dddf5bdd0b789277b7fd1bade6d600b471815c32b929ac129cb7cc55beb7e56ac3330213f8e4c16a7ae44e956b0133edc575670d982e7d88e120eca5a
 EBUILD libepoxy-1.5.3.ebuild 1245 BLAKE2B 6de1b1561df3842b3cd90ff06703ec51e5eb61a0e2e89768eeaa790f6cf71711d4760cafc4d1d75a24746281e800f71945d76424494c10aa231b57dd62f756d5 SHA512 8d22a6fc0c8ff21f70aa998c6fde33a0dc810fed00c7afe301bd19e87e80fcd3abfb4bb9ed39a51c10b758f49b718f2eb1b232de6c42ef6175ac64426b41e163
 EBUILD libepoxy-9999.ebuild 1272 BLAKE2B ba91a63b33a5cbb320353e066749210509e6401d503ec3990ea1fed6e43753ab6a3f008ea87f0518cec65106a1524db90a013b9d24e6efacb01a9ed6bff56518 SHA512 bb1139c5457aa1a6ef9680883e19e45ab0206d7a6a5b4092b2a88240d0a9c39ba2d7d0d487a031610036bf7f9594c95ec797cce08d94a273060174503cf699d4
 MISC metadata.xml 375 BLAKE2B 09993b726e54558d32b0dfb2a221bdd8928b85f55bdaaeb2faf30a0711ed58b05022a9fb669ec43806aff223860e47db53226a0f8f34d7b35edf0a842ab45923 SHA512 fec0ce8c99534083afc197c156a7fbaf2e83b2e22887ef134984ea7a4e6226f2714db399a118cd96f22b20012e7b7572156fc13aa72516e2557880c716140ad6
diff --git a/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild b/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild
index 7176ab355235..340f201c37bf 100644
--- a/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/anholt/libepoxy"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd"
+	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
 	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest
index 3419c4f52b7e..f62f4b4f98c8 100644
--- a/media-libs/libextractor/Manifest
+++ b/media-libs/libextractor/Manifest
@@ -3,4 +3,4 @@ AUX libextractor-1.8-CVE-2018-20431.patch 998 BLAKE2B 44e77c7f53c8ea2b134af14aa0
 AUX libextractor-1.8-exiv2-0.27.patch 3364 BLAKE2B da55735ccab9a3cf868f274b82951cf548a2f1340ee24c180244f8ba2bbd85c7002c963d06257aac0b0457c2afeda755d0aaacb501280b995001f7bbd49d6de9 SHA512 6411df1498fd3594088b3488e490b25009e9243684b777d35fa26189c20f410b42496b5fb42f762c468df746a9bdcd6a310f645db5ab0bbe3bd121e82aa9d48c
 DIST libextractor-1.8.tar.gz 8315688 BLAKE2B 2c617cfa667f79faef33e5f445f8d1f38dac61a7d1abd064165f0171b2fcdd812b42f1a5ee78def075383ab74b686f5de6864ce9b9a1983262a3d251ea271dc0 SHA512 770a0f1711964657ffb570c0509996b0a109886bfa0652c3a9ca63aa645f495fe5919215cf17da68e8a81a09de54bc937b61c82ec03c9e3998149c780f93451a
 EBUILD libextractor-1.8-r1.ebuild 2838 BLAKE2B c3d9688ded6bb3803d3e06d1ba82959e9965b2ff488cebd0c7314428bb042514bddb88c1911170c31faef4e1b7434903e891d57692d7a80af1b92aa1739785de SHA512 fd100d837c2f31f3e87607d9216a05537edaf1f095f83b3948b980bea18e0b80b4bbc4b2477231fa6c012280b0ce6a2e4655dd2ad8be1c5c67de4bb08a93e3b2
-MISC metadata.xml 615 BLAKE2B eac56c7364e331eb2a0f0955318cfb0cf7c6fe4a95493899b489f755d18b4c4b1ced0e7f7ea0a7716c996ac7640d04a326cbd2230313e123c4b2de4fefbaccba SHA512 b4a4403dfccc02e61fa15f60a19ed23ce43374cc41d616ebbe385865618ae9392bd663fbdbdf01013f4203de2ee51dcbe1caf0974d720dac1be1f4ea029b4fc0
+MISC metadata.xml 642 BLAKE2B ca8c76e74d895ac221a98f0c8641c7a4d33a3cb299188da86afc4eb16f0e86994a8d4b5c0d5a825127561fc97a4f05ea0d0a55f08afb2ea161e45c7d63222dc3 SHA512 1dee41e58396433f7031afd2916c8cf1d107d453ebbffff2990843baa05e3abc23569ba535b849173f78ac5608977a2b8d5ade0604999292d515deac401a1b20
diff --git a/media-libs/libextractor/metadata.xml b/media-libs/libextractor/metadata.xml
index 63d0717ca8c8..110fdbd61259 100644
--- a/media-libs/libextractor/metadata.xml
+++ b/media-libs/libextractor/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <!--maintainer-needed-->
   <use>
     <flag name="apparmor">Enable apparmor support using <pkg>sys-libs/libapparmor</pkg></flag>
     <flag name="archive">Enable archive support using <pkg>app-arch/libarchive</pkg></flag>
diff --git a/media-libs/libicns/Manifest b/media-libs/libicns/Manifest
index d59e26d89b6e..022f8ed88e9b 100644
--- a/media-libs/libicns/Manifest
+++ b/media-libs/libicns/Manifest
@@ -3,5 +3,4 @@ AUX libicns-0.8.1-fix-gcc-warnings.patch 1406 BLAKE2B e16cf880e1b73809169f04163d
 AUX libicns-0.8.1-support-libopenjp2.patch 11807 BLAKE2B ed074caa669d755e5a19fe2a1a079ce9c6bd2e4627902ffbd024160af2b74bc379d8ae7c1c8bd7c41c5182950ee94603cf9cf5ed89f3150b50db4e6006bf09d7 SHA512 be6e1c83c4f580438ac7aad362bc79b33e08b6682841a8aa5ad3cfbab516c4c0a5ff9d273b250494f9aaf6c6f18c10cb56ec23217e186ff163ba2f0d5b813cad
 DIST libicns-0.8.1.tar.gz 460819 BLAKE2B bc8989d2e58bff343cdf9538ca2d14600e1bee25697e767dfd51dd69b533995c76f83d3076b63c6604c18a2e08bbfd489408f0dd28847ac6b354210b7732b87a SHA512 e9a6da6d639c4e7aa85e21cf0201ec2e8fcad5c8542ef55375dee7628eff6e0136974ebae93f6c7d95447f879d3d001e8f5d480f6590061c8e0ad0e06b52742c
 EBUILD libicns-0.8.1-r1.ebuild 816 BLAKE2B 8121da975e1996885eecaa64422992fd403351ab2a36f63eb51879898985aba1a5d866a11860e893ee3549dd17e63a55172ad5a2e13ce3156e0eaaa05aec0ccd SHA512 f975624417f52f2b8ea27870924b2dac7e0c54bdb40bc0fd943aadf6b40c274af58fbefea858fe3c044541d340504310298cc6ba2e2c0de46dc9a0fb61a499f3
-EBUILD libicns-0.8.1.ebuild 599 BLAKE2B 8fbd8bfeaa0ccd7144cabad071ee5261f234aa6746faa4a046b63f64f9da32a7af4d054de29fbc968caa4d798fdb670cbffc8fcf0ef622fe53c401ea79649626 SHA512 083e230b61da5b0449f8fa0addbec32a4136485fdc63de0ae72e0718d4a81da507cebc43e2a141bf82bdcabfa1ab23650369ef6a6677fcbdf02b7806ec350f09
 MISC metadata.xml 333 BLAKE2B 7e301b02d958a41b5f991e4db560fbe37f78e051ef1166c3721f1ea65f34fdd48f6f56f6718ea9d0f8936f45921b061f9c6d7bf5c8d5e67bd8c1b8af1981b2da SHA512 398c15324aff5d97d6cc431f8b4455f37879c5afa0bc3e41e994e65e052c8c3fd07e3d2c473b4bf42c14d7fe203a91ee6cef28dd149612a289333e8ce7a7d9f6
diff --git a/media-libs/libicns/libicns-0.8.1.ebuild b/media-libs/libicns/libicns-0.8.1.ebuild
deleted file mode 100644
index 994e22d566a0..000000000000
--- a/media-libs/libicns/libicns-0.8.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="A library for manipulating MacOS X .icns icon format"
-HOMEPAGE="https://sourceforge.net/projects/icns/"
-SRC_URI="mirror://sourceforge/icns/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static-libs"
-
-RDEPEND=">=media-libs/libpng-1.2:0
-	media-libs/jasper"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog DEVNOTES README TODO"
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	rm -f "${ED}"usr/lib*/lib*.la
-}
diff --git a/media-libs/libmatroska/Manifest b/media-libs/libmatroska/Manifest
index d7064d6d4de5..d2680e8eecde 100644
--- a/media-libs/libmatroska/Manifest
+++ b/media-libs/libmatroska/Manifest
@@ -3,5 +3,5 @@ DIST libmatroska-1.5.0.tar.xz 64596 BLAKE2B a14f3f1aef87e2bc05989d3166b562edf852
 DIST libmatroska-1.5.2.tar.xz 64996 BLAKE2B 6af202b9817ed54feca76c0a9ed60a0eca0431ffc4ebc9aeae2df191066501c16fb7bb8dc37cb6353eb22c87dfe9fa22420cbbf18d3a6a6edeec4900a59bc0cf SHA512 122b71b91ae89e2a7cc89db17655a006248d58f18d913b4f9ffc885aef7e39681a3a16eed43cd8ecd949c570a939007797c79829f5ee87d08562aee3f0224ba2
 EBUILD libmatroska-1.4.9.ebuild 661 BLAKE2B ae2a926e737b0cc32a9c8c0976e2d66c6a9c58eb0ed4ed23d970c626408736cc757944aade2ac03b3182d745f2ead53e67e12995f1aae82087a2a9b4ef47b7c4 SHA512 be7d2508b8ef0ce98f23330b7192a64cbd50ca62d26c4fc8e4865e76a048d2f08e2aeb1af4b056f066a8b58bb02da6fbfd3275155e17f401fc23fbcc1b15a2b6
 EBUILD libmatroska-1.5.0.ebuild 670 BLAKE2B e78268605d9dbe15a367f23354efb9e284b3fefc092892c4de2956edb3ba158b12340894f4a375351aaab639a09999a54dfdc76ebcf653668e0bbd9eab6545fe SHA512 1138fb82839cbcee9a9b0438d937ff047012e88151615cfa5027b1f12adb4d4a76cea3b41cad591ed1c247479a5c269d93fbacb9bd5638a5036b771d6ac0cb5d
-EBUILD libmatroska-1.5.2.ebuild 670 BLAKE2B 41d4cd17e41f40f0e9536815b8c82e623a4fdbad0e67a73e5b02fb9ebfb50e3dc67fb23f876231f10751253d666f9ba643f5c68ad03eeb245df472c9bea6f956 SHA512 95ebbb12061d78f61260829d6ad66d6fd598f7023d6f582a94b861fad1060dec2f61a6b1220ab5bd212a3e6e8b76ab8a72a11c467da144ab9d4284f9fad26041
+EBUILD libmatroska-1.5.2.ebuild 666 BLAKE2B 262d6c7bded3af018b70ff9d392abf21029d5b50dcf1a5af2e04f9d6343b8e7a6fdaa60384f93b346a993e27a42ff70036806dc9be316cae2fd045ec86537d3c SHA512 d56df76b7c9a4ff576777bbbbd6421a92871451355a80c04dca4b055bab051d6bd4d76f8dd8529f3df1beba0bf1df8ebc73a59cf967630a5eee9a7dc9755178a
 MISC metadata.xml 320 BLAKE2B edd6b2e35a7833d3510edec80f3771a319cbb257cbb203e0f71f33636431496c620cb3307b2bebb44360d6932a7e4376b0d134f3f42d26fc9271423c2eed11f6 SHA512 5c1dad06e1fef24b1ec68fb6b12d0d17b4bd05f22b1953f713c25a513340cb08540eebaec32fbe7c6607ba2142a057b8e6e5743a929b7368665d91bc014f35a9
diff --git a/media-libs/libmatroska/libmatroska-1.5.2.ebuild b/media-libs/libmatroska/libmatroska-1.5.2.ebuild
index 6013ab8c473d..55b853f488c1 100644
--- a/media-libs/libmatroska/libmatroska-1.5.2.ebuild
+++ b/media-libs/libmatroska/libmatroska-1.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/6" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/libebml-1.3.9:="
diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest
index 5c321ec70b91..9b54025fb198 100644
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@@ -1,4 +1,6 @@
 AUX libmediainfo-0.7.63-pkgconfig.patch 291 BLAKE2B b13ee095a9f1f322222bb10013ffda778eef68dd2f161553b96bdd24f0c0ba81281185604547c355c14190580fd36cbb019778674e8c72a02ef3e3fda9229f76 SHA512 4cc11f6219a68ad59971a3d85f3184c16ec25e60b96ac56ac73796493c516575e0ccccee814610d5c248ba4c8a0a2a590041464d2aa1ac3f8a717839127c91fb
 DIST libmediainfo_19.04.tar.xz 1684320 BLAKE2B 04c468b74fe0f886ed0a1bd5d0d1ff4b430d5a2fbb8e17ff23bd6bf53143e99cb811220a76c6741b17dbab8917219211c87bff6b20285c5375a6f67cc3dc5bc0 SHA512 7fdacc206f1db57605fc41b717740e6c6ce245d432faef15abb48e646bc05743ce72ee117519464d0341d83e0b306ddab79c9d34fd348897d4b0d15cb2f7db04
+DIST libmediainfo_19.07.tar.xz 1685616 BLAKE2B 15f2663557735f50537fbf69d974cd6a21af337540c87de67f03276eb14f14ab72bd235d9f289bb6431792d08a8c7b7063ae37453c83ea043376fa6a4a370d73 SHA512 b16a161be548ae86e5e1fe54f86614f6f3b151b86afb657cf0ea96aa0278b0158309e0382dac0dd0ada5e5af7a2f58369e6fa97bfc7306a3bbc82792c0a29ecc
 EBUILD libmediainfo-19.04.ebuild 1844 BLAKE2B 4e560ddc0e84ed20bccbae4471f713533839e810e66d1ff1f320cd9a2c5694121c2b261ee58d144f47899354b69f89f3306d6c3d5f3817592040c10b86603911 SHA512 47771d8b21dad97f726e4de800d0608d6e55d06958c5255e36e6fb0bbf02d9d71a5a7851996aeaa21bee999dae9007b4347413e697273605a1275389a0c430ae
+EBUILD libmediainfo-19.07.ebuild 1846 BLAKE2B 6fc56ff465cc0fdedba9114959d9b5facabfd4b70bc1c8098724419e04758cd30a3783658a9fd4b843d6038537a5c5363173db1364a4d74c4e4ff8acb96f5cb5 SHA512 6fb8aff87af0f0df3c546feca2cb72840483661cf5b81055837860dc923987a0c3da70f870cfcd4b7d936b7037d3bda4dde5f05d30e8a400910b91d095ceea57
 MISC metadata.xml 346 BLAKE2B ace7bcc20d5e1a949db03a632f4f181353c530a0aad6b6839ea4d682bcdde0f3184c1886fd3015ba73f6ad63ace53e07f21bcf7f8383f12bf6ad73374d895c7c SHA512 bc66ca588f3042de05db14d4036fba4637f5dd0d03d3cbdbdf7118b90f5a6f8ad0e86a30d9263e7d283d94f61e54da6c92ff03acf1cf83db376366c0c4f76c93
diff --git a/media-libs/libmediainfo/libmediainfo-19.07.ebuild b/media-libs/libmediainfo/libmediainfo-19.07.ebuild
new file mode 100644
index 000000000000..66497326e1f1
--- /dev/null
+++ b/media-libs/libmediainfo/libmediainfo-19.07.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+MY_PN="MediaInfo"
+DESCRIPTION="MediaInfo libraries"
+HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfoLib"
+SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl doc mms static-libs"
+
+RDEPEND="sys-libs/zlib
+	dev-libs/tinyxml2:=
+	>=media-libs/libzen-0.4.37[static-libs=]
+	curl? ( net-misc/curl )
+	mms? ( >=media-libs/libmms-0.6.1[static-libs=] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+# tests try to fetch data from online sources
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_PN}Lib/Project/GNU/Library
+
+src_prepare() {
+	eapply -p4 "${FILESDIR}"/${PN}-0.7.63-pkgconfig.patch
+	eapply_user
+
+	sed -i 's:-O2::' configure.ac || die
+	append-cppflags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		--with-libtinyxml2 \
+		$(use_with curl libcurl) \
+		$(use_with mms libmms) \
+		$(use_enable static-libs static) \
+		$(use_enable static-libs staticlibs)
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		cd "${WORKDIR}"/${MY_PN}Lib/Source/Doc
+		doxygen Doxyfile || die
+	fi
+}
+
+src_install() {
+	if use doc; then
+		local HTML_DOCS=( "${WORKDIR}"/${MY_PN}Lib/Doc/*.html )
+	fi
+
+	default
+
+	edos2unix ${PN}.pc #414545
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+
+	for x in ./ Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do
+		insinto /usr/include/${MY_PN}/${x}
+		doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}/${x}/*.h
+	done
+
+	insinto /usr/include/${MY_PN}DLL
+	doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}DLL/*.h
+
+	dodoc "${WORKDIR}"/${MY_PN}Lib/*.txt
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index 03c683750c91..93d4c5cb7070 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -5,5 +5,5 @@ DIST LibRaw-demosaic-pack-GPL2-0.18.8.tar.gz 30868 BLAKE2B 30cef85c49e066fa4b1d8
 DIST LibRaw-demosaic-pack-GPL3-0.18.8.tar.gz 39002 BLAKE2B 544a1eab61c825c7f2202107d623a56e1f81ad3e5111b419bf12708e2d8a9903f192c23904ab8fb274636d9262d3d89f02fa5e05a0e70d7834782c2df8ec0548 SHA512 10e8cb6694159d04deb813a88e5c3195eed6e2e438f41533db91b17997af1b9d54f286303447ca6e3d1b377922e388f6fcc8a8370254011e11b85612c914d500
 EBUILD libraw-0.18.13.ebuild 1840 BLAKE2B 7b86c52d8ae048f2287455ab34ed05a69192ceded8f8a68b97fda2647517afd90983b5b45991809d87cd7d219e11087bc6a506f00749d0a4719d2451ab85b562 SHA512 9681595927e116f9b97815745b097219c3dfac4fa3020ddaf2ff320a9315327d3e02fa2964b468dde2f981035516e2ad49e8e6cdd69221841011f54764dfa90c
 EBUILD libraw-0.19.2.ebuild 1495 BLAKE2B 8d447b1613e72790cf2e3c556741b3eec0f331ebbf140416cad2595125f757d4c5ce32131b54f954e5dfba3758ab5ca4d41719e2be6bf23cc0b64d039edbc858 SHA512 658dbcdecfed69773dea274a272afa0232a080ce4e21921a528efd2de6bb43ff26a1e2b0010acfa113f3c2b631ba1800bb6ef8ed0a6e1bb4c7ee7858cfbaf28e
-EBUILD libraw-0.19.3.ebuild 1495 BLAKE2B fcace1449b3e08bb85fcab1b01c2b37fc2b78baaaed3de8c5eb339e90ff527e4c4fd585cd3e2e675c01f3f93f20de7f8a761f92ee6eca547e7b889f56b9cd0c4 SHA512 db80112346ec662667b011079a501c74fb77f8bc919e02167b3406bdee3ffd444ab5fd705bd5d0da76d81b7311c08734617493234261b724e2182d744b01f79f
+EBUILD libraw-0.19.3.ebuild 1490 BLAKE2B 054b70c3f99ef69baad79df141cb6e43136f6c52b5d00ecc5502692fba8f7562683e96e31c7a5b57512de1ae1f879dae6c63cb6370a1cb3fc68652e2b54b7ca6 SHA512 cf8e92dcc205e05ebfd09eacc9d249ef872ecf89fd39a7f1e34df94c3807f8e5aaa02408647db2ddcd343d8d7238abcf7666110e03e4a963b59928654818480d
 MISC metadata.xml 437 BLAKE2B d43c89433ab4eff6a760dce4f7fc83253cb572ab048af7fb1df5bca74db8d7fde84cf147f5941e65407776d281edc4c0297006c75f83c285a5febc37625d6265 SHA512 b06d476afa85710b25dc7d1c1567ba30469ce6d08d278aaa64413611edf95433df315a5a77670d74ca5341be3b96fa0f4451e48f544783f031178b8cf73cd388
diff --git a/media-libs/libraw/libraw-0.19.3.ebuild b/media-libs/libraw/libraw-0.19.3.ebuild
index 3654272e5912..36fc208c4875 100644
--- a/media-libs/libraw/libraw-0.19.3.ebuild
+++ b/media-libs/libraw/libraw-0.19.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1 CDDL"
 SLOT="0/19" # 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="examples jpeg jpeg2k +lcms openmp"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 5c295e6494b7..70b656785166 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -3,8 +3,8 @@ DIST mesa-19.0.8.tar.xz 11967592 BLAKE2B 91a46b67bdb8cb3ab4c7337be7c2b0dc6ab5ec8
 DIST mesa-19.1.1.tar.xz 10927620 BLAKE2B 503d7fb37144868c4e71e22fd310b7049265a6babf3b7ccd4f8d5a4db6a3b2e309e9e20006c913e02a0015750eaa9ca303165818b0b3542cdaa59e016817149c SHA512 73b190eeb0b5809217c04f39d90edc0844dac476d8284543013a4a8889a4be805bc15b43c91bbf0d3a36f35dc576e7085255f7012d207c74466e81cee7f67922
 DIST mesa-19.1.2.tar.xz 10930748 BLAKE2B 2f4882837902f02104db0198ecb8f24a48803fb9ff442c49b6b5055967c9f60662e3d65c92bb40391ee1824ac48ff1ef0c9db96adc0830bb11a3a83eb69ce1b5 SHA512 cab30694a409a5037996dd50cef1567eb9e0b83ed69cdb4fbc893a844ed35434fcd05023d48fce2831219866fa420500b53650c791bea286233f4cd6c2703e19
 EBUILD mesa-18.3.6.ebuild 13714 BLAKE2B f380e34556fe72952161527a13c4ce2d0380239e5d32d8b83018fdb6a204976ca9a43979749568862ca3c9a3498ddede5a978430946e812d5da4c7065df70f44 SHA512 b1ad91b975099bb51efe3ee0dbb15c7839834f593151a9f7c42cd85a1e9a84fae2af2073c2bd3cdda6ce5076ad16baec52919d7ea6d4a436e731ccc9a15afc57
-EBUILD mesa-19.0.8.ebuild 13860 BLAKE2B d25ccdb2bfaceff35836d17141ffefe32d728d89ef6c2e0fad8801c58c6646c64ac28e1201a9fcb1d41d31679fda2627e5943bbfc7b7dfaf25fc6a8141203432 SHA512 27d586e55f24e8a78c57b01c37e21b642b485307dc10e51cfab629fff365b905850f6f1b97fc25ce8160326920c7aca9c70c5326f22aa690e0bf942f7026d732
+EBUILD mesa-19.0.8.ebuild 13854 BLAKE2B 01cc202cae0228e3bb1035a05473c37cddc06ba627c53a554bebbd7b64808d1f9f50e97e0b7c2d96e8cf6b6d6f52222e991c5ad56dd5f3c7ebc66a9adbcef7d6 SHA512 f07dc5bbe5f947013508e7190f7325c511d37f761ea3526b4b3caf63ff6d93f770bf437be9c813cca0f3d2afb7889742bade4bc68b13c318d3a97277d1f1cb84
 EBUILD mesa-19.1.1.ebuild 14274 BLAKE2B 91ba79babe477a14635dfe5213ff303d5afdb5aa1263df7b6ec22b16aa27aa57c71d85a84a77a080a7d4cbcf2be558b28ac315636b7949624fb34fc3743c1b7d SHA512 7cfde1a84760a5ba9ba906b61fbc8aedd9433a744485526331cf7bf3bb0e8ba5f5a32acaae03e8b3a07cdb70586e782391492f594748ec039a9896ab702932a2
 EBUILD mesa-19.1.2.ebuild 14274 BLAKE2B 91ba79babe477a14635dfe5213ff303d5afdb5aa1263df7b6ec22b16aa27aa57c71d85a84a77a080a7d4cbcf2be558b28ac315636b7949624fb34fc3743c1b7d SHA512 7cfde1a84760a5ba9ba906b61fbc8aedd9433a744485526331cf7bf3bb0e8ba5f5a32acaae03e8b3a07cdb70586e782391492f594748ec039a9896ab702932a2
-EBUILD mesa-9999.ebuild 14122 BLAKE2B fe10c24df409bb4edb3b79d4731230c1e82907e95b601e8f8db282fb762a93c574c775d1ea38beeff14817de6486ab02781063f978238bfd0ba41fd7c7e4c4a7 SHA512 478f1f09d12f9b165005aaa76f9e6d1bd7b6a4364faab44647c1a3a18c1bf3a231519cda5e0e421a3aac7946ca169edf329899db60f522ec6e0aab2db5d9cb04
+EBUILD mesa-9999.ebuild 14352 BLAKE2B ee16a3409540ddd237e48a7b1d6dc058b99d92fe193a47fb3f72693f1f945b3d9a893be4896041348aa873e33927951794cd0809ac8677d10585342abd885fd2 SHA512 0fc85cacd6550795548997ff8d9515a19a10d9eeb58c5ee9cbc9931f4382c45438bb6283305dd5308f1c7386efa7a52148ef389b52fa40fb628ab84c150e1eda
 MISC metadata.xml 2041 BLAKE2B dd7f78a57123408674d7ca6a8e7a455e84ac668bf9e6552502cf62dc2464f1a62765db5c22c0d4dab82e59a5325ad10d69b436aab96b5a4d5c789f0a7b671469 SHA512 f07128004b03ddfc6d235de15a95c0bd6338133b13daa31907bd2897d65eaa9c8ad1164ec5e21fb7fa6417927a8109cbf86b24bc62b09cfa29d0bb18fcd3c4b1
diff --git a/media-libs/mesa/mesa-19.0.8.ebuild b/media-libs/mesa/mesa-19.0.8.ebuild
index eabccac2ffbf..c566adbde7db 100644
--- a/media-libs/mesa/mesa-19.0.8.ebuild
+++ b/media-libs/mesa/mesa-19.0.8.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 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 ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index b45409f64da6..de737e259d61 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -30,7 +30,7 @@ RESTRICT="
 "
 
 RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris nouveau vc4 virgl vivante vmware"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost vc4 virgl vivante vmware"
 for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
 done
@@ -54,7 +54,9 @@ REQUIRED_USE="
 	video_cards_i915?   ( || ( classic gallium ) )
 	video_cards_i965?   ( classic )
 	video_cards_iris?   ( gallium )
+	video_cards_lima?   ( gallium )
 	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_panfrost? ( gallium )
 	video_cards_radeon? ( || ( classic gallium )
 						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
 	video_cards_r100?   ( classic )
@@ -401,11 +403,15 @@ multilib_src_configure() {
 		fi
 
 		if use video_cards_freedreno ||
+		   use video_cards_lima ||
+		   use video_cards_panfrost ||
 		   use video_cards_vc4 ||
 		   use video_cards_vivante; then
 			gallium_enable -- kmsro
 		fi
 
+		gallium_enable video_cards_lima lima
+		gallium_enable video_cards_panfrost panfrost
 		gallium_enable video_cards_vc4 vc4
 		gallium_enable video_cards_vivante etnaviv
 		gallium_enable video_cards_vmware svga
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index fa83cb62c476..7a5671ed82ba 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -10,6 +10,6 @@ AUX mlt-6.16.0-rotoscoping-interpolation.patch 998 BLAKE2B 22ae634e46fa61cc60113
 DIST mlt-6.12.0.tar.gz 1395646 BLAKE2B 18dc06c4075d8d51bc7f62d027adda92c359275b9ad2131cc015b4402b1b7a9438fe87b617075017b9fd5e9696b82c4c840fa6dd83188bd0cedb7f01d2158283 SHA512 ed2cc0eeda45558ae6f1ec8780dfd413641953dc12dc32dccf655649f68f8e6088d39fefb7bef7bae042a41096976004446019d82ea162785bc487009cb97680
 DIST mlt-6.16.0.tar.gz 1414374 BLAKE2B 6c031360721d535e95cbaf890c1f42f5f5dd914e0c6c20992bd3aec4ecbcc0b53370fe6b82b5d11c8242bb0a1f2d94f28bc61b4e5a920e5afb41ca8bb5229433 SHA512 554e8b9baa7a8578cc52315fe0583c61762bf6fbbcdd4a1e4f25753846d92f013e7d74745498625fcc781de993aa0526fd761920450b4314e67105783b9bde26
 EBUILD mlt-6.12.0.ebuild 5545 BLAKE2B 0b8e14bc305c14ad7b100d710881ae581c9224bd9af1be0476048f2906342ba543992cf02f6cad61a19a058e93559420be51fc0ba6a6f4b8c4e4dbad41e0be20 SHA512 8822ffe4b895abf16978c06f874d34f800c4f6ef486e415432c3f06c561b5380b8d98ba69e9010487482953cf6817c65cc1c50688fbf49b31167ad73acfb3451
-EBUILD mlt-6.16.0-r1.ebuild 5665 BLAKE2B d7e1363d159c463edad67d98ea695060db5c16a5cb5914ef922231cfb2917afabcc30472691530fb05f1459d365f6495485c3b9ffcfa8bdab72a4e314884fe90 SHA512 cd13f5a1caa1c3b955228f11ab1f7bcc9c2caecf48023ecb5c8fed0de806ef2d0cc133dd3e439858065b193b2b01c8604190530b6a860fc9d1a54904d7b49358
-EBUILD mlt-6.16.0-r2.ebuild 5665 BLAKE2B 90bb2409c4a3caba4f2dc5243fa66203b20c5b8f1c5b46d414f902718fe5500a1435edeb0438ec7379a086417204e939c9905b34128bc43e1e04f8354888d630 SHA512 66bc3a7e656b4fec2f502079f131c0fd2ba8c4285773e29e6175a75d3d521b528da8c97f88c01e3ce7effdfb4c07161545c6bb333b926f017fcde86c76362b61
+EBUILD mlt-6.16.0-r1.ebuild 5756 BLAKE2B f6184a6457e96053c8b7f33064054f76d76790d0d1505f24fb70f31f34cf1403fff8b657c76884b265f3807fd46e3d5e19a308cace838e82686d2be8a8b03cbf SHA512 b7e93909507a61d5e3fc1ed71d123d7e08d34fa40c710f61c4a0e03a3a45616afcee94bd726164ab9e3f2d46ca8f76e9205d2e81692d38ecd6186195860f1e51
+EBUILD mlt-6.16.0-r2.ebuild 5757 BLAKE2B c8719b417038fad701b9a8a4f7d0a6298e5cc9ec8ce0d9dbf8d87f1926bab0c2515e103857ac36cc376609eebb78a9bf34ad9ab9ccb101fa70eebb4616c72163 SHA512 7c9c6bd8d79c452b5f1589249a500b814912f790ead14779675ad3128215d9ad0da57445f09490b563ebb4759495a5577789966e3a3a173553ddcded3657db28
 MISC metadata.xml 1595 BLAKE2B 63b95c943ec9860db5c68d7ffcf683381bb0e859afe333263afc51f9e985a9f4263279aded8288ec03511d8d56d12415f5590529a4de0009ff21bb890bc1febe SHA512 7f7005732163a00fcd0ff1d21608c26296f87e0658fad912e35724b61c9072ceb67f1a515b0445159192f4959be87a63a01b717c8fe63a64aa8ceb3081cb11f8
diff --git a/media-libs/mlt/mlt-6.16.0-r1.ebuild b/media-libs/mlt/mlt-6.16.0-r1.ebuild
index 6161697e042f..f2a3118ce6ba 100644
--- a/media-libs/mlt/mlt-6.16.0-r1.ebuild
+++ b/media-libs/mlt/mlt-6.16.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 # this ebuild currently only supports installing ruby bindings for a single ruby version
 # so USE_RUBY must contain only a single value (the latest stable) as the ebuild calls
 # /usr/bin/${USE_RUBY} directly
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg
 fftw frei0r gtk jack kdenlive kernel_linux libav libsamplerate lua melt opencv opengl python
 qt5 rtaudio ruby sdl vdpau vidstab xine xml"
@@ -112,8 +112,12 @@ src_prepare() {
 
 	sed -i -e "s/env ruby/${USE_RUBY}/" src/swig/ruby/* || die
 
-	# fix python3 include dir
-	sed -i -e 's/python{}.{}/python{}.{}m/' src/swig/python/build || die
+	# fix python include dir
+	if use python; then
+		python_export PYTHON_INCLUDEDIR
+		sed -e "/PYTHON_INCLUDE=/s:=.*:=${PYTHON_INCLUDEDIR}:" \
+			-i src/swig/python/build || die
+	fi
 }
 
 src_configure() {
diff --git a/media-libs/mlt/mlt-6.16.0-r2.ebuild b/media-libs/mlt/mlt-6.16.0-r2.ebuild
index 1605afaedced..31ed25573ff9 100644
--- a/media-libs/mlt/mlt-6.16.0-r2.ebuild
+++ b/media-libs/mlt/mlt-6.16.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 # this ebuild currently only supports installing ruby bindings for a single ruby version
 # so USE_RUBY must contain only a single value (the latest stable) as the ebuild calls
 # /usr/bin/${USE_RUBY} directly
@@ -112,8 +112,12 @@ src_prepare() {
 
 	sed -i -e "s/env ruby/${USE_RUBY}/" src/swig/ruby/* || die
 
-	# fix python3 include dir
-	sed -i -e 's/python{}.{}/python{}.{}m/' src/swig/python/build || die
+	# fix python include dir
+	if use python; then
+		python_export PYTHON_INCLUDEDIR
+		sed -e "/PYTHON_INCLUDE=/s:=.*:=${PYTHON_INCLUDEDIR}:" \
+			-i src/swig/python/build || die
+	fi
 }
 
 src_configure() {
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 0aa2cebc4566..9822cf9bf211 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,5 +1,4 @@
-DIST openimageio-1.6.13.tar.gz 24846132 BLAKE2B a72b7756257d4ffd1567efd73c24bf65fc2bffff82c96c18a77211e918323e65e1c99076e272b3b77115ca30910ea4cfced222892b062e339d8e4e85bd2221f7 SHA512 8cd490b6d6a3c0b542c4bcab709897c5f35ce6844ce7465e0158ac52a1b108603ccc76439f7f2e46af2ec08be4293bda6a76ec68a959026af70a444cbbdc21d6
+AUX openimageio-1.8.17-boostpython.patch 1177 BLAKE2B 80946ef94801bf1a37cfd2930ae33bd3d331dafd458a3665e4ce28f4379143175edc6b1e096f44b51ef4a53551a5f5de52bfeb59aff990b45ad198d7b75b6e14 SHA512 4aae9f6078ff5877ca44e74c7047f0bfe279b7de6bd0c8b8dbf9f3d98b6bfde671e22e91cc66995527eb853e13917e3bb79be88987abe20570439ce57dda96c6
 DIST openimageio-1.8.17.tar.gz 27835527 BLAKE2B e524d171bb918a46aed3c5f329bc8d10853d8b170c1e9b4a6edad72db66b3a03ea32eba4338577a667254e884daebf6b5b33a70090b953a5b5e269d874c91852 SHA512 e58cad9458d71a845c3214675a41e0cffe0509fd52a95ef5a44af0015ef25a1145f9ebb50ff1f5e7200ae0a46efb40e851855f53c55d058c0bc5654a072bdbf7
-EBUILD openimageio-1.6.13.ebuild 2400 BLAKE2B 548b6e7df490f7ec13bbaeaf2da42b0806551342229cea39c61274acd7f0225d840b730d81a8b3233c55714f99f6c1b612373e3902e957fa28d19118bab76871 SHA512 88e37f6f647fff1feb647cdbd6dc5818aa1f4789f4d22689cb52668473f0cdfa254a3b12b25a50ed19fe4d185ffb05e34e0fea4e9ae473ea7ac718f99c5b966c
-EBUILD openimageio-1.8.17.ebuild 2960 BLAKE2B e37af0c59780f6217aebe3f918e661a1e80f019ae036c69a1f86bc974b870c1e3629c233983f309581dc33c397fc1ecb39c6f7bbd0a12d955a9187b3d339b066 SHA512 07324f5f8db3a697ed6f66659ccc1ab9275b492a200da659d0b69e022454293b540e979b147d743a9f4684a5c88e2d82437741bee7cb581c51b5f93f3d3cf653
-MISC metadata.xml 863 BLAKE2B 947029ba73f4ef5efdbf5a0c85e151483343136a5c3480f8670d7c189e20c9f9cbeb73f1d8bf4cec3c12515d1e053b250e726c4cd81cc5c51fd520b0a2bec1a7 SHA512 4544932bdd65125e8c026fed8c573ccfd5f4dfce47798629dc6550dd641de2918b2bf5c5c13f4e57c54d8a0d68d3627eb81f3707ba7d15a3688b42c725cf4d94
+EBUILD openimageio-1.8.17-r1.ebuild 3137 BLAKE2B fe760def3e3e728504c3c1b974897a60d3487e9e8f1b7dd286e1d09e54efcae14143447767fd5ee2feb500643e8ddfcf6491bf9f664132d3bbd539e5745d9b6e SHA512 9ed1b289abb1c2fb42024a262a83ac8b108b6634facd8ea711053b603871445e41085f285bf186590a4d8b952442272cc82d550c56521c3c51ef553683a7ff37
+MISC metadata.xml 840 BLAKE2B b1eb9cb3531989610d82fdbff7e56f87e5ad059c8afd6f7c9f513bc5ef6c7eda497dc06a52e32e5da9cc0231cb1d3acd6ca1ddf4792de002273c599824336e0f SHA512 d183b91af486faaced4d6613eddb1f5e5a0b8007a4cb719875cb858bb1135b4db4c5ee4e70cf9db9e4468a4f044e150fcc6e54670b42f4748ba210d5bde778dd
diff --git a/media-libs/openimageio/files/openimageio-1.8.17-boostpython.patch b/media-libs/openimageio/files/openimageio-1.8.17-boostpython.patch
new file mode 100644
index 000000000000..970ada64a1f8
--- /dev/null
+++ b/media-libs/openimageio/files/openimageio-1.8.17-boostpython.patch
@@ -0,0 +1,28 @@
+From 22ce65bfbaa24d79427852755c4bf8a1d77159b4 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 16 Jul 2019 17:03:40 +0200
+Subject: [PATCH] Find Boost_PYTHON
+
+---
+ src/python/CMakeLists.txt | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
+index e58d372d..98d91c48 100644
+--- a/src/python/CMakeLists.txt
++++ b/src/python/CMakeLists.txt
+@@ -16,9 +16,8 @@ find_package (PythonLibs ${PYTHON_VERSION_FOUND} REQUIRED)
+ if (NOT BOOST_CUSTOM)
+     # Finding the python component for boost is a little tricky, since it has
+     # different names on different systems. Try the most common ones.
+-    foreach (_py_lib python-${PYTHON_VERSION_FOUND} python
+-             python${PYTHON_VERSION_MAJOR}
+-             python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
++    foreach (_py_lib python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}
++             python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
+         find_package (Boost QUIET COMPONENTS ${_py_lib})
+         string (TOUPPER ${_py_lib} _py_lib_name)
+         if (Boost_${_py_lib_name}_FOUND)
+-- 
+2.22.0
+
diff --git a/media-libs/openimageio/metadata.xml b/media-libs/openimageio/metadata.xml
index 51a8e3601b05..5a6930d59d5d 100644
--- a/media-libs/openimageio/metadata.xml
+++ b/media-libs/openimageio/metadata.xml
@@ -6,9 +6,8 @@
 		<name>Gentoo Graphics Project</name>
 	</maintainer>
 	<use>
-		<flag name="cpu_flags_x86_avx512f">SIMD Optimization</flag>
-		<flag name="cpu_flags_x86_f16c">SIMD Optimization</flag>
 		<flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg></flag>
+		<flag name="dicom">Enable DICOM medical image file support via <pkg>sci-libs/dcmtk</pkg></flag>
 		<flag name="field3d">Enable f3d file (write) support via <pkg>media-libs/Field3D</pkg></flag>
 		<flag name="opencv">Enable OpenCV support via <pkg>media-libs/opencv</pkg></flag>
 		<flag name="ptex">Enable Ptex texture mapping system file support via <pkg>media-libs/ptex</pkg></flag>
diff --git a/media-libs/openimageio/openimageio-1.6.13.ebuild b/media-libs/openimageio/openimageio-1.6.13.ebuild
deleted file mode 100644
index 09f2d8e5ed0d..000000000000
--- a/media-libs/openimageio/openimageio-1.6.13.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-inherit cmake-utils python-single-r1 vcs-snapshot
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="color-management ffmpeg gif jpeg2k opencv opengl python raw ssl +truetype"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="test" #431412
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/pugixml:=
-	media-libs/ilmbase:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.2.1:=
-	media-libs/openexr:=
-	media-libs/tiff:0=
-	sys-libs/zlib:=
-	virtual/jpeg:0
-	color-management? ( >=media-libs/opencolorio-1.0.7:= )
-	ffmpeg? ( media-video/ffmpeg:= )
-	gif? ( media-libs/giflib:0= )
-	jpeg2k? ( >=media-libs/openjpeg-1.5:0= )
-	opencv? (
-		>=media-libs/opencv-2.3:=
-		python? ( >=media-libs/opencv-2.4.8[python,${PYTHON_USEDEP}] )
-	)
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	raw? ( media-libs/libraw:= )
-	ssl? ( dev-libs/openssl:0 )
-	truetype? ( media-libs/freetype:2= )"
-DEPEND="${RDEPEND}"
-
-#S=${WORKDIR}/${P}/src
-
-DOCS=( CHANGES CREDITS README.rst src/doc/${PN}.pdf )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	use python && python_fix_shebang .
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-		-DBUILDSTATIC=OFF
-		-DLINKSTATIC=OFF
-		-DINSTALL_DOCS=OFF
-		-DOIIO_BUILD_TESTS=OFF # as they are RESTRICTed
-		$(use python && echo -DPYLIB_INSTALL_DIR="$(python_get_sitedir)")
-		-DSTOP_ON_WARNING=OFF
-		-DUSE_EXTERNAL_PUGIXML=ON
-		-DUSE_FIELD3D=OFF # missing in Portage
-		-DUSE_FREETYPE=$(usex truetype)
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_GIF=$(usex gif)
-		-DUSE_OCIO=$(usex color-management)
-		-DUSE_OPENCV=$(usex opencv)
-		-DUSE_OPENGL=$(usex opengl)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENSSL=$(usex ssl)
-		-DUSE_PYTHON=$(usex python)
-		-DUSE_LIBRAW=$(usex raw)
-		-DUSE_QT=OFF # Deprecated
-	)
-
-	if [[ ${EPYTHON} == python3* ]]; then
-		mycmakeargs+=( -DUSE_PYTHON3=ON )
-	else
-		mycmakeargs+=( -DUSE_PYTHON3=OFF )
-	fi
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/openimageio/openimageio-1.8.17.ebuild b/media-libs/openimageio/openimageio-1.8.17-r1.ebuild
index 4261aca86c63..8e563d74595e 100644
--- a/media-libs/openimageio/openimageio-1.8.17.ebuild
+++ b/media-libs/openimageio/openimageio-1.8.17-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 inherit cmake-utils python-single-r1
 
 DESCRIPTION="A library for reading and writing images"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 X86_CPU_FEATURES=(
 	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
@@ -20,12 +20,16 @@ X86_CPU_FEATURES=(
 )
 CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
 
-IUSE="color-management doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python qt5 raw ssl +truetype ${CPU_FEATURES[@]%:*}"
+IUSE="color-management dicom doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python qt5 raw ssl +truetype ${CPU_FEATURES[@]%:*}"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RESTRICT="test" #431412
+RESTRICT="test" # bug 431412
 
-RDEPEND=">=dev-libs/boost-1.62:=
+BDEPEND="
+	doc? ( app-doc/doxygen[latex] )
+"
+RDEPEND="
+	>=dev-libs/boost-1.62:=
 	dev-libs/pugixml:=
 	>=media-libs/ilmbase-2.2.0-r1:=
 	media-libs/libpng:0=
@@ -35,15 +39,16 @@ RDEPEND=">=dev-libs/boost-1.62:=
 	sys-libs/zlib:=
 	virtual/jpeg:0
 	color-management? ( media-libs/opencolorio:= )
+	dicom? ( sci-libs/dcmtk )
 	ffmpeg? ( media-video/ffmpeg:= )
 	field3d? ( media-libs/Field3D:= )
 	gif? ( media-libs/giflib:0= )
 	jpeg2k? ( >=media-libs/openjpeg-1.5:0= )
 	opencv? ( media-libs/opencv:= )
 	opengl? (
+		media-libs/glew:=
 		virtual/glu
 		virtual/opengl
-		media-libs/glew:=
 	)
 	ptex? ( media-libs/ptex:= )
 	python? (
@@ -61,18 +66,25 @@ RDEPEND=">=dev-libs/boost-1.62:=
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
 	)
-	truetype? ( media-libs/freetype:2= )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[latex] )"
+	truetype? ( media-libs/freetype:2= )
+"
+DEPEND="${RDEPEND}"
 
 DOCS=( CHANGES.md CREDITS.md README.md src/doc/${PN}.pdf )
 
+PATCHES=( "${FILESDIR}/${P}-boostpython.patch" )
+
 S="${WORKDIR}/oiio-Release-${PV}"
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
+src_prepare() {
+	cmake-utils_src_prepare
+	cmake_comment_add_subdirectory src/fonts
+}
+
 src_configure() {
 	# Build with SIMD support
 	local cpufeature
@@ -85,27 +97,27 @@ src_configure() {
 	[[ -z ${mysimd} ]] && mysimd=("0")
 
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
 		-DINSTALL_DOCS=$(usex doc)
 		-DOIIO_BUILD_TESTS=OFF # as they are RESTRICTed
 		-DSTOP_ON_WARNING=OFF
 		-DUSE_EXTERNAL_PUGIXML=ON
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_FIELD3D=$(usex field3d)
-		-DUSE_FREETYPE=$(usex truetype)
-		-DUSE_GIF=$(usex gif)
 		-DUSE_JPEGTURBO=ON
-		-DUSE_LIBRAW=$(usex raw)
 		-DUSE_NUKE=NO # Missing in Gentoo
 		-DUSE_NUKE=OFF
 		-DUSE_OCIO=$(usex color-management)
+		-DUSE_DICOM=$(usex dicom)
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-DUSE_FIELD3D=$(usex field3d)
+		-DUSE_GIF=$(usex gif)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
 		-DUSE_OPENCV=$(usex opencv)
 		-DUSE_OPENGL=$(usex opengl)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENSSL=$(usex ssl)
 		-DUSE_PTEX=$(usex ptex)
 		-DUSE_PYTHON=$(usex python)
 		-DUSE_QT=$(usex qt5)
+		-DUSE_LIBRAW=$(usex raw)
+		-DUSE_OPENSSL=$(usex ssl)
+		-DUSE_FREETYPE=$(usex truetype)
 		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
 	)
 
diff --git a/media-libs/openmoiv/Manifest b/media-libs/openmoiv/Manifest
index 7d6400127428..690a8074e447 100644
--- a/media-libs/openmoiv/Manifest
+++ b/media-libs/openmoiv/Manifest
@@ -1,3 +1,3 @@
 DIST OpenMOIV.src.1.0.3a.tar.bz2 327168 BLAKE2B d713a597d1b13de80bca52541ead2a4701c52dac0f501ee2f9e8020fbe26120c1580dd09ccf5281df4f90ada40fdbae07535f0c87b67934a9458a75853e1c11a SHA512 428b151101f257e8a86b94dae9a2eb88bf0232dca613a95ea2d304985a46955a36dd00e1b709db793bbf856dd59c031b3d21fd5142f07f655f85d95a5a530c47
-EBUILD openmoiv-1.0.3a.ebuild 865 BLAKE2B c0991e27a906e05971a046f9c0af00c780c7de0d4ca900f25cd9b358fb630b918836a44125890facd41c719bcdde378bd1e896969bf3d7e056c33b9473b8e1e4 SHA512 f5e95d610d254effd722b4a0bb77307e90dfeefcd5d140f1803d6658e82c342ef950fec2d47f000fe831744ef61f9ffcd85ceb29947280218e20e988f9dea79e
+EBUILD openmoiv-1.0.3a.ebuild 862 BLAKE2B 6217a3d1cb37c17ca9afc30e95ec9c33707d17265d858496e0340f9d317139bd1c86c6ea76761693c370e2c77508449d26919a4c35908e39ac06685e3c2e9d6c SHA512 22d30f4d1706d3ed0f22da0008aed9e640d1108f93768781af9550a23a75596c20a7df6f2106016d98cabebab8ffae4449509d944cfe8ca3d81c73f3fe6209a7
 MISC metadata.xml 368 BLAKE2B 3a5b104241b195d377cbad2120137231cd61fbd1c7a7bcb69d1cf5128ec40502852afd4a9f7604a55f90800d8c5b727455fcc42d476648bcb7d370b95584dd72 SHA512 431276fad5a93e8c42af9e9387a5004afce41c9fe4988f5ce07600c89e63449f52d314519f7e309dd9b19b0b0c46dbdbb69194a5cc0886852e06c84f556cd3dd
diff --git a/media-libs/openmoiv/openmoiv-1.0.3a.ebuild b/media-libs/openmoiv/openmoiv-1.0.3a.ebuild
index 3e747e2cbb4f..9e1faf1ee665 100644
--- a/media-libs/openmoiv/openmoiv-1.0.3a.ebuild
+++ b/media-libs/openmoiv/openmoiv-1.0.3a.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.tecn.upf.es/openMOIV/download/1.0.3/OpenMOIV.src.${PV}.tar.b
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="media-libs/coin"
 DEPEND="${RDEPEND}"
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 4cf4151e0470..59ce2e52a036 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -9,4 +9,4 @@ EBUILD osl-1.10.5.ebuild 2062 BLAKE2B 167bf475ea3f3f3f3d25d434bf002b4f14335589bb
 EBUILD osl-1.8.12.ebuild 1784 BLAKE2B c01cae7aec718f704fe017dc0f3273db7e3046fa276b4b82030dafc4a59ab641b7faa20a7ce2735d52347a30b1188458a9b9f6316bd96bc406e3363018a51350 SHA512 d5148e294ac96cfd06639927af0b3d03a00193d1ffbf55b65e51e717e8ed72fc15cb81b3e418bcd9bde102ad8ede59b92aff966ae0dbb3e366f120706b119fa4
 EBUILD osl-1.9.6.ebuild 1748 BLAKE2B e6b99e1822ced26cf8d6e138f46d4c5e038f078e0b697ecd40e6cde3870efa945160af3cf83f675825fe5a878b5e5bd6a7ec8caea79d4961a0da23130d2d652b SHA512 d0ce4444dc300b869a520a7bc50ea1d95a0ac0342684495c0742a62e55a8f0cb9453ad71fa2ca0ba412970d7d0323409ae8eff99862908d80a24977ce3babaa5
 EBUILD osl-1.9.9.ebuild 1720 BLAKE2B 22d51d110a3128ece31bc2f0155e94f996ae65f2adc42690053305d4b8304737b82a991431114f48524fe5c1ab6b8643899e02a99a341ff5bf653fbff7990b91 SHA512 914cbed1d6020934a8139d8b7a553a275c09c4fa89178237c7105845e6e3cec86c5e1b163ec261a82237d0505c04b624f75294868d2ab469656b639bcefdb0c5
-MISC metadata.xml 1131 BLAKE2B f04c4ca5d3fbc47deeabcd07c48281ed0cfd4bc8d5653c66a5556af1c7ae5f43c7f2687e800999b0fb44666e81e6e94b6b5afc7898d65d0084b309d5bb2e3616 SHA512 c7f7bafda89d9b57854579179dd9d2b124b349ca3b96815a62b060a08a48686dd7e5adaad45bc3f24b0653fb0a76183a61dda25503271552d2a0f5a635120dd2
+MISC metadata.xml 922 BLAKE2B ccfefbc7d17c3d01264c68faac040d842870c34c8cb11850eb3cfa11590bf7944e43df40181f2cd5a277c3a811255d6e240a23c13a753df5341df2139c9a27dc SHA512 a7f73ff1ddd67a5965b4699cdba835629ca22bb48afae126ff0eebf83012363138ed01af45189c90201875ea8d2993fc3e52219f863649afdd23a751d2d5ebac
diff --git a/media-libs/osl/metadata.xml b/media-libs/osl/metadata.xml
index bc2afe661c3b..390182ac0ef1 100644
--- a/media-libs/osl/metadata.xml
+++ b/media-libs/osl/metadata.xml
@@ -19,12 +19,6 @@
 		lights, displacement, and pattern generation.
 	</longdescription>
 	<use>
-		<flag name="cpu_flags_x86_avx512f" restrict="&gt;=media-libs/osl-1.9.0">
-			SIMD Optimization
-		</flag>
-		<flag name="cpu_flags_x86_f16c" restrict="&gt;=media-libs/osl-1.9.0">
-			SIMD Optimization
-		</flag>
 		<flag name="partio">Use <pkg>media-libs/partio</pkg></flag>
 		<flag name="qt5">Build the osltoy binary</flag>
 	</use>
diff --git a/media-libs/raspberrypi-userland-bin/Manifest b/media-libs/raspberrypi-userland-bin/Manifest
index 68859c73bdb5..5a48e0705b60 100644
--- a/media-libs/raspberrypi-userland-bin/Manifest
+++ b/media-libs/raspberrypi-userland-bin/Manifest
@@ -1,4 +1,4 @@
 AUX 04raspberrypi-userland-bin 21 BLAKE2B c494bde8627a6068bf924d722cbc7ccb48e4d49cf9b875f0420e621018b61d83fc27de0017586f21cb839414e4aa49118bf3e2ab90e049e47a7a9e15658d2f87 SHA512 15fc252a183d45f0d80cc27edc93c40a7b577abed3e2f664c8bf635178e73875245835e770b82fda0e983c7c5878975ffe3008a937fbb7656fc01860c2219854
 DIST raspberrypi-firmware-1.20170303.tar.gz 118888867 BLAKE2B d90fc012d4371a797ed52172f0d0f94ea33901bbf10fc59f1ce0f54fbeb74a849b46dbbd4f71a73a7de655a4ed27586ee354e1535079e304bd66513452a33193 SHA512 cb0015fcaa607039db2ff40cadcfcafd0cf2ec7dd1df47f38414540fb1f86d626648bf6403989007895b0617c13ff4ec233a7b1987986224c09a8209e7732501
-EBUILD raspberrypi-userland-bin-1.20170303.ebuild 983 BLAKE2B 2356a42956084191ed6f20847af218ab2bd2be75a3ff2c8af7653bea36776cb798a231f9e105aa499f457a925cf70dcfc4f5cd4739aa618a739f4f45aad3371f SHA512 56de8b8abc4e319264c95a7a1837458b71a0ca8b5d0ef23be1422440916d4ef898f6630aa93e4a738e8619a0f9c77562e124101ad2e78421c012395e5a01b657
+EBUILD raspberrypi-userland-bin-1.20170303.ebuild 980 BLAKE2B bbb6e6844a73c96d9cf58a2addaf12dd884897b82240c0619ba31ffdacaa2c7d30608f168cfcea0ae1f2beeccb3f9f2d87e671095fcdb81042abfa0dc653daf8 SHA512 ef356c392cea33c03d98990004235b6ba3bd5d8c50883b91a6568c0beaaba23313d1b0edcf29f6fbbc53d3f6feae1901088d541b3dfaf3dc1b048f775a5e2f48
 MISC metadata.xml 317 BLAKE2B c0c853910662804b9d5a6e428006f2832130cd982ffa92f1f413aa9deb23c0f28b60e23aa6c5ef12979e7a87c56da8372aebaa48cf34ab43ff254ae1aa647b61 SHA512 706af78cf1e48f89cfa11f97d51a063219dc71af677f03ba8b0703d3b7e6d8f95af1cf832ddb74f797700529c8dff0ee7aaa083178e16cef261b11951363fbaf
diff --git a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20170303.ebuild b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20170303.ebuild
index f011422bc21c..de28e90041a5 100644
--- a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20170303.ebuild
+++ b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20170303.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${MY_P}
 
 LICENSE="BSD GPL-2 raspberrypi-videocore-bin"
 SLOT="0"
-KEYWORDS="~arm -*"
+KEYWORDS="-* ~arm"
 IUSE="+hardfp examples"
 
 RDEPEND="!media-libs/raspberrypi-userland"
diff --git a/media-libs/vidstab/Manifest b/media-libs/vidstab/Manifest
index f34e356b1812..42231441b4cd 100644
--- a/media-libs/vidstab/Manifest
+++ b/media-libs/vidstab/Manifest
@@ -2,7 +2,7 @@ AUX vidstab-1.1.0-tests-1.1.0-fix-test_motiondetect-without-openmp.patch 804 BLA
 AUX vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch 903 BLAKE2B 5eb6f0970a6d3a3ead1f7efbd6746a5de1feb0db57cc03e62d7670633fb0ddf8d810b5913e5c819c6ba57204b566f5592c4d8b86368f7776d1d7bb4eac83d39b SHA512 c8f59b8c954f4207c1c946db88c1af2f1110ed37d68ad7cc1962be9d6b1659b4833ae4257b359b25d5f1ede65ff87447a94d2d39c0028f9a3bbd7cf4a69d5bd7
 AUX vidstab-1.1.0-tests-use-sse2-only-if-available.patch 1047 BLAKE2B 198d481a781186583b0f842f677e540e0f58fbf0f146d32ed1d5c47675f02ef3e7d7457674ef87104e28d0afd5931c9c082569fd86c0e594302e1513f9a9f281 SHA512 a09f845947bc9c22700a998e2fa985f735d42146745de0b6686d61b14ef7aecb4229842b35caab8a79f874c5875241a87e0a9556ca326d54358648b515be5e5d
 DIST vidstab-1.1.0.tar.gz 77736 BLAKE2B 382cec922e9e7d521f49b431a5ddb246e331e186bf11707221a6bae0ce6544278a4c855c35e0346a78e4be105057c01ad7d53671ea22cbd2500aba4640cc96c7 SHA512 e82a4b6dd854b8415952cc0a8bdea06c01ff40a497c8e98177831e29031ec535b9f47cc30d5444c47bfd91871615a1662e3991185e9eb179acf37ea601073cdf
-EBUILD vidstab-1.1.0-r1.ebuild 1764 BLAKE2B d60d2479b9fb67f90f4f9f0e180012a86378f1a5cb16ab67034948e711a3dc9815898cc79df7a64142398a0ad353b430fa9ad127fcfd6c59e92c3642ffe65f2c SHA512 bc608ced35e63e256ad7629236eaf553aab219c24ef5d500d43e937a52cf4f9c112e1a5df4f226e2223e57907067f3e436546cc7dcff6bfceec196ee1745fecc
+EBUILD vidstab-1.1.0-r1.ebuild 1763 BLAKE2B 3f5c32e8939496f89137ec8933d0d844e6f265b0f58d57cfb96c24f68fb8e27b38f353716d090f52466ae06a172eea776e461fd84e5ae518ebd0e9b591aaefa3 SHA512 4104d16174d7f8146dfd3780fb4a5ed79a1e6bb413a78c510a2d2fc53139bba3730ab731bfc80cd5090670f24b48d641b488aa5ae1e8fd20c3cccc54c5b4a049
 EBUILD vidstab-1.1.0.ebuild 1411 BLAKE2B ed2ee8eeee6a37a3a4ec92aabffa867dfcaee7a55fb9ca9ac3bbdf1d8d199aa8015459e0d1a84ed3e7898d1c3a6ae8189708883d77cedfb9e8088d40cf7463b3 SHA512 da075da882878bfe41f8e156ce1268b87d681d32c15aea74a454727557c6e5985b0974978d1d04e0b473dfd3fe1f035a4413fab4ce4c21bcae9809328701b671
 EBUILD vidstab-9999.ebuild 1487 BLAKE2B 48a7211ee43e3f96a97e9dcf23e9781bebeb5da7f70b814d303d9a3effb053569857530edd326c977915ac13fa5697bbca59b6256b94837cd8e1b24aeda3065b SHA512 d1124e1c93b4d50e60a7b65b6046787baa15c3ff3a37dbe5ff06b4a67a0012ead3f9a709de6ebc370582d45bca6d1f45f51811f1bd627219f65a7030175748fb
 MISC metadata.xml 584 BLAKE2B dfcfa874a9ee0f9cbc884646e9ca898a3caa58eeb17b55459c9e591144d124c2e476f65c88e6994a183204e555ead73d9411bc4e663af307a17e967f5f8b7316 SHA512 48868512f6f5ad2c60e7ef6b092682f73df8540c785bef65f75a2777978612d449d83bcdf350887f4da9c9069c3ff13b25050180c5de9698d7a269c232fb1bfb
diff --git a/media-libs/vidstab/vidstab-1.1.0-r1.ebuild b/media-libs/vidstab/vidstab-1.1.0-r1.ebuild
index 89a0d2d61227..343e7c46d84e 100644
--- a/media-libs/vidstab/vidstab-1.1.0-r1.ebuild
+++ b/media-libs/vidstab/vidstab-1.1.0-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/georgmartius/vid.stab/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 	S="${WORKDIR}/vid.stab-${PV}"
 fi
 
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 4467c862d5fc..1787e82165b5 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -4,7 +4,7 @@ DIST vulkan-layers-1.1.106.tar.gz 1151285 BLAKE2B 763654d76c0c9d139ab922b2319df8
 DIST vulkan-layers-1.1.82.0.tar.gz 962993 BLAKE2B 6fe541116f8d4d4370cb5a0b2a98c07139577edf20653359f9f149b503c3d2e9aa98e95af14582c80033b535cc4cec5cc5f148396f472aaf75a8767579978a61 SHA512 c34b691a340830462b917890c97dd86c66eac097ba284183d8bf148267b1a881c909b89c6f9ab78ddd03a60cc884c982bc578cc67e4fbaf37d044004b006a65a
 DIST vulkan-layers-1.1.92.0.tar.gz 955136 BLAKE2B 8a039c17a231cda732aafd947c01a658c72932048307b81777254236eb6a2945e287cd098c2ee1fa264c21477b30e48ba83bfd0af4fb5f5bcb0adc502cc45a03 SHA512 09b32635bf26cdf3c1f18e57f7c7348a72c25de37c7afe03c0508cf5d3c6f39779d4a819eb92b2bf4f9300d80e757e8aaf9ec2164d7fd9f523f2926a497c08f6
 EBUILD vulkan-layers-1.1.101.ebuild 1397 BLAKE2B d1e42df59eb04d9f6e42f67e5c130038fcd88e52e88ab328c280d69fe4abb8ed7368699c11d2ff5eeffd21d6adda1964703859274d24db7bb6b9eb9e17d1f449 SHA512 3736990ec0e948a1840ecf7bfb7f2545024aa5b429969220a1a1d55137bcdbbb80b8e8369eece097ca6342513ac8c72f50137116b156b7eed081874de398821f
-EBUILD vulkan-layers-1.1.106.ebuild 1410 BLAKE2B e603b566971b464d3ab7ca84b1be42dcc10608c423bd9395eacddd0400ec3b7f4aa92779934753c7bd1688377b18bed212b7af9f4b55fac545614b3e95abbc0a SHA512 89fd5b60e7503d04dbb1867385bf20b7f0a5ff3447cda6749409cf33a956c5699dba0df1c5b7b96cca4797c586c654e94d5985374c66b1a68a8e081919b3b12d
+EBUILD vulkan-layers-1.1.106.ebuild 1409 BLAKE2B 63eb47c0d571a185626a984c368bcf6c9c7f24d5a71d74c94148b631732fb874a6a38d67ea7ddc8a07de6335e59181d2cd64a94d6f646527a0b5369d59ddb4fa SHA512 38e45b08f2c2bfdb1913da715cb6d6d063c59e20321c2c993025668b462a5e6d799acc48ffbee48593de06ca61c8b8f1ad60715d9de15f0f5fb9214bb7ee2e6d
 EBUILD vulkan-layers-1.1.82.0-r1.ebuild 1511 BLAKE2B 2807d2a7bb147049ceac792aca00a76ed67dd623d0680b7672ef926f9b36d48cd08ec2601d4ae96d747704221bda2f0e2e8a095c7bf6159decf5203be9bf39b9 SHA512 285690f105861791073332f918f16798b24853f22e98eae48e57604cac4c17351721746efa9f613e3b26dd801a2092137de20e7208d7acb066103bd1d233da3d
 EBUILD vulkan-layers-1.1.92.0-r1.ebuild 1393 BLAKE2B 9560cb9f3dacad4ae5002c8fab1f6c37ddbc23729fcea6352234f82535a9b1da43aaa7338118880dc62d30f67a349aa110d4e530044ed1f5498a631635e0ef4f SHA512 3dd3ea7d31947f73da6cd9bad8ea8b94756943af87be0fbb2326aeab76f1bd2e6fb57019935f367f74ffee7a9c0bfe1643eb3018fa5698a3ab381b03fb437829
 EBUILD vulkan-layers-9999.ebuild 1405 BLAKE2B 9e964a27c5a56ed5aa73d081feb5a4943d69826e6499a8e2595a352172caab45eb9d1c933c0c4471e2b9bf8b6efa798559937e3b41acbf7cc539afe444c95820 SHA512 8bb329d435bdae6e431f98649817f1a1070784e8ddf5d58b5117f821b71e302f8e1c45ea8e65a8f62432af4ebecf3e66e82063a93954cf36633e3f4b8844b620
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.106.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.106.ebuild
index d163f27cdc46..51564a729aab 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.1.106.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.1.106.ebuild
@@ -10,7 +10,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	EGIT_COMMIT="21638dfbe1f15091659a722a805c9020e87ddf49"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}"
 fi
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index ba5926035ad4..c52cb7e1e178 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -4,7 +4,7 @@ DIST vulkan-loader-1.1.114.tar.gz 1343624 BLAKE2B 1212c837d86f29160b19bbc14a8256
 DIST vulkan-loader-1.1.82.0.tar.gz 1342427 BLAKE2B 4b2c589e2c1edaa29e13e892cc839f2d7af5bbadf7dda3f50eca2543c1877af175e9640545b886ffe3e8b1c51373502ee272829ddb15c07629ea08ece697e5b9 SHA512 624e493454e622e29bc0de5fdf1c425691b3c98f317660847e95aee6bc42dafa0b4d8caa9de52e8f3229b7e743afa475485cd3affbdb295e16ba49d30d1eb19e
 DIST vulkan-loader-1.1.92.1.tar.gz 1346712 BLAKE2B 60d29c38e72ff234261a3e75934d44de08c334c475e715066c210844ea672f0e2db3ebc8826df7d72392e3c2a0bbd0604b8770c0b35ddd8f72ed875234bae15d SHA512 c29d1fb43a2bdd0f291860dee0ffe7ec23a34c9431aeb76a46f8df0ec2f70601ccd3e96280f94d881f5550e3c9f07fe478f94eebcfd2aaf123045c7281313aac
 EBUILD vulkan-loader-1.1.101.ebuild 1545 BLAKE2B 453c9783dc86b037c10e2369ca7f63a3dcc9e09507d967344e835bab8cc4348fb207ac39786a610912c01f1ef643015b345e6581acdf9f7b2ea05b2372e64dc0 SHA512 b144467cc7b0f583417c590a94d2ba7e393e135256b5ec42fe5df1d0ac55fba7ae1f2af05a7131e94c971a8fedacb98a1d85e5d9c8d3346fec545933f8c2b794
-EBUILD vulkan-loader-1.1.106.ebuild 1545 BLAKE2B 36621d2e64bd111a7ad31735cef78da859f39730b0ba1dadbbac4c051d39b35a463c1f5429831052c991f470e71439562925b7ec200a4230c342b6289380015f SHA512 f509cd95f6270a8f12ecd924e982a91074af9310ceb74e13f8f2584f1e70f81078e2833dc9fc25bc3a3c6af7f777e478898db3b0a60d220fb2c2d23b07d3b260
+EBUILD vulkan-loader-1.1.106.ebuild 1544 BLAKE2B f45fd9efdb92ea4c8c795a3b8a0dd119992d5272128bb0130004715ec08f1fa94cff558c04b3065c82f3aa5bc372c36bf9cde9673e42818095edd01494d7933f SHA512 3d08ffe794072cce055e1578cd6360d204b219f8258f7aacc63ef417950542b8fdb08274f452a6fd2b017507b2cd3eea091d23a1059ce10ed979d3bf6b1e2bc6
 EBUILD vulkan-loader-1.1.114.ebuild 1546 BLAKE2B 864d20027485428d3f252e3182fd33cb488d9fc51a4ad37e9c30986ccf91025370641ca76f6f11e4cad155b3174493f0f4351bec5eadcdd88b1987b9451c570d SHA512 01abf36a3efb2efc6d39624a715888d066768cc21a631562ade8b7d0b92acfa134fff00e1a7c7e6b673568357a461c02f996de97914bda16381ae7b97e35265d
 EBUILD vulkan-loader-1.1.82.0.ebuild 1577 BLAKE2B 35be92f5ef1db058387d143a0f3c3582184cbb6de3bfd180b4d0b65414fbdea17c288dc2c783836ca954ab86503e03d5b6c31b42a3d2f6a3bc6784ec60d4e0e1 SHA512 bf016f1e3feb1f1833b081d10748fe744556baa247919c7fdde981b8ba99d01f74a8e87290162c03648e85cd3cc553286a4fe9f2108b2733e90de2fa16f75306
 EBUILD vulkan-loader-1.1.92.1.ebuild 1541 BLAKE2B 73bedd25efbf694a49f813c1f519ad19a38da9475ffb2dbd83d56ef1f115b6a8ddf0495d1123a378830922641e25d340e7ea81dba7f87fccdb4fa8644f7adf14 SHA512 5990de98b83d7b270f35efa7de0df9b5c6fc2d226bbac8d96cbc84bd0521bd9de27b9ca5a4ef3803f391fe4e782969f61b7757399942d87edfa8125da15ee87d
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.106.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.106.ebuild
index 403cbe9e08d0..52fa6fe420b1 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.1.106.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.1.106.ebuild
@@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_SUBMODULES=()
 	inherit git-r3
 else
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 	EGIT_COMMIT="1df2ebd329df1ece1a5ed485573ea58e5bc6ff97"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-Loader-${EGIT_COMMIT}"
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index df9227f3f702..602a51e8e31b 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,6 +1,6 @@
 DIST waffle-1.5.2.tar.xz 179284 BLAKE2B 40befb3e4463605e303b404677268d4758f6a43f5d83bee5e74222e2e2bf949f51444c0df68291ef0edc76be313363eca3e59e642b0356451c10703e66d96e56 SHA512 04f90f70421c88418d1d98175b552de9e036ea36b6c870a6c968c7fcc2d4cb2fa4ce08b0adcdd50f4853a7503558eae7a05ef75b292cf85d3c9796e7b342ca62
 DIST waffle-1.6.0.tar.xz 224400 BLAKE2B 458add99b346bd75dc757243b9e7db6ac269fb2c1e488333d921c640e10efd182e51e8a5e0312d334593033936adf047fc2339d21e675654d89d66edfb8922b3 SHA512 c8796ab8adf968df2c5c88e2941c83955fe41e87eb2b75b6a5cc61b0d0c06eaa44df2f255f573a51816036dc8bc3ec63f3fb51ccfb7efbfe83cdd50b3f1be13f
 EBUILD waffle-1.5.2.ebuild 1414 BLAKE2B a88cd403d6173d0af963f2534d9df66a1b4ff184de9fcc98f88981eaea50bb338e58c12f165d5c320eb2071e6716d1dee3b6155c6367b13586e42b6cd8b9e1f2 SHA512 d0fca799279802a5deb3e8f32e85d3d63058f96ac78c8839c91f8bd2644f0fd35ea7bba647d24a57c6723f1f36340a63c5be6de264db71b8231a3ed692f85feb
-EBUILD waffle-1.6.0.ebuild 1644 BLAKE2B 80770b21e0a3c67383f07a887e8e96fb45ec29249b6df6a55426423d7a43290ddcbd61b472ccbb88dc24af100d153c683e44b1c51ad7935675a769de7d362000 SHA512 d869ab0d088ec1037e48eb577188bdc5b3668385d945f55746a2474b2759c611eaf3249cba32a64f7087806c92ca480b1a2294b97a68d672c188a61f01f46b93
+EBUILD waffle-1.6.0.ebuild 1643 BLAKE2B f7b6e1f45ffe58a2111de95829c3ad8b4a96fdd25105b821edb06d5d0fe3abef312fc4bcaeca47faa57a03dbe1aeaf81586d7871813caa6d1187c979b2a307d7 SHA512 9c3ce579256c369857f7173305a63f9c19d8d7e6c95bf966da248e505a4b61acf333199ba57634383d4934fbecb6da13a75b67930c8f8bd4876390eb64283275
 EBUILD waffle-9999.ebuild 1645 BLAKE2B 3d6c0a12d5484a9b4336d56a153a811804bdebd6aca67068b42a4824c21da01f5d1796d2ba704ed23833aa1a465bdade7208a21dadc902d60158bf81373f49b3 SHA512 15b9a381dc3b869bbdce9165ecf62582b37159a78f5b082c1b9d1eb6018b8fc2c0bbc83f7986296f5a027fab4b8dbac4405d166d372a6124d69c282f6b05ceda
 MISC metadata.xml 416 BLAKE2B 961afc9a4ed531bd3816c8e7b1c37a9f6be25b912d94b6f79811da67cecd8476964934b9ff943fc98be6177feee1c2eacd3295777a1d873ec1cf3cd58cf20e82 SHA512 850db93f3892afdb36d471b55e911c9cdfc114bcd69b4ce9e59246eb688b145ab5916d9529ded4b913f0cfb6da5fd2d64b7854c9501abec9fd9d860e1953100d
diff --git a/media-libs/waffle/waffle-1.6.0.ebuild b/media-libs/waffle/waffle-1.6.0.ebuild
index 1f4f6057005d..281ad9364c45 100644
--- a/media-libs/waffle/waffle-1.6.0.ebuild
+++ b/media-libs/waffle/waffle-1.6.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	GIT_ECLASS="git-r3"
 else
 	SRC_URI="http://www.waffle-gl.org/files/release/${P}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 fi
 inherit meson multilib-minimal ${GIT_ECLASS}