gentoo resync : 08.06.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-06-08 09:04:53 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-06-08 09:04:53 +0100
commit: 73c318acdaf6f8309d68bd266051e6dd1f1bd787 (patch)
tree: 2878053f3e7faed19a1f82c733d3bd29df69991e /media-libs
parent: 2018227e9344edb9da15fc6a4a8298086cc2aa77 (diff)
63 files changed, 1269 insertions, 1807 deletions
diff --git a/media-libs/Field3D/Field3D-1.7.2.ebuild b/media-libs/Field3D/Field3D-1.7.2.ebuild
index 1af0862f0c6d..4fe5e0457742 100644
--- a/media-libs/Field3D/Field3D-1.7.2.ebuild
+++ b/media-libs/Field3D/Field3D-1.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/imageworks/Field3D/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="mpi"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-libs/Field3D/Manifest b/media-libs/Field3D/Manifest
index c8b9a5f405c3..7679259dcb54 100644
--- a/media-libs/Field3D/Manifest
+++ b/media-libs/Field3D/Manifest
@@ -1,4 +1,4 @@
 AUX Field3D-1.7.2-Use-PkgConfig-for-IlmBase.patch 5371 BLAKE2B c8a1360db04de4cfa18b739af024934469b9cf2a2314d3fb248ad2df371be902369989f120dc7c1adb86ea77cf01a7a5e0944b9a4a57e9a9e329a06c5d24c97d SHA512 167da6b57983e317266ccbb9670cc5ec03f041343e44af3cbedc14366e349edd1d5f2a0ac163fa919827b2dfdd9811525b81c446a0e32016b3bd51f84f202bcb
 DIST Field3D-1.7.2.tar.gz 502481 BLAKE2B 8d5fbac915b52b36e66250f8fcd2beb5fff9d2446696ad1829e3edf05c9810b5d54928c6ab4f5aa99c1338da24cea446134434a59aa1d053f3da3500c2800f59 SHA512 e4ea51310105980f759dce48830db8ae3592ce32a02b246214d8aed9df7a7f5c500314f2daf92196b7a76d648f2909b18112df4c5c3c8949c0676d710dfbf1f2
-EBUILD Field3D-1.7.2.ebuild 803 BLAKE2B 85f88e8134a9c39c3e84122a39f6e80c590898c5aae95d65c8f55d3dff44f16bcf018b8fe9f523045df1bc8da3125d21494f8c12156673417a3f17d3afb0d59f SHA512 ea22e2ae2ae07cbc54f1afb47781dea15044be9284a3d16e115dd5016a6e3f351650465afb6226736fc4551864f7d41433a2eaa58335758cff954cd1447e5c05
+EBUILD Field3D-1.7.2.ebuild 802 BLAKE2B 27dc400e9da29bb4d37a74eaa9af197c23f7950619c6951fc684e0447b099faec54e2295e0ae05136e31936efe3c899432cfa7b837f6e58171c2cfb061824e0c SHA512 6be8c07b78d6c0fd350efedcf7a690cffbf49f6619838ac673f6823cadbc0d0db6412e4201ad650b45437dce8721beec4878691ad00c276524c5873cf07a0d2a
 MISC metadata.xml 820 BLAKE2B e8b04778684298db20cdea68773c50d5791eb0b024fcc0193293dcc34dd06eb0180cfb16075117c3a4b325d1ef1cb78b3bd40b64b67fb3e41e162a17fceb1cbc SHA512 3e8b636aaa7cae681572ceae3b942e20149864be38c5f437227c462185e3acf4660de7a9071988cf59e3a481e47d804de0c563d23674bc772287318cac9a933b
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 6dad278ad22d..7b19d79f1e81 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/aldumb/Manifest b/media-libs/aldumb/Manifest
index a125b999d073..3c75814f20fc 100644
--- a/media-libs/aldumb/Manifest
+++ b/media-libs/aldumb/Manifest
@@ -1,5 +1,5 @@
 AUX aldumb-0.9.3-PIC-as-needed.patch 2730 BLAKE2B c5d26002613ef712952c0aa3eeb376e9eb96c2943e7a5c09f9afeade7f65390a737faf4f3af49e11080a4bf64ecd643f0084e86b8ac9233f16796a408a448efd SHA512 b97bfdedfe4f64cc37ca52e50d0ac919747dd523f686350d8681a7629508f83ae87220622f9d431132aeb149dc6011e1461ac560ccece20a4dfb6a7d2ec9d962
 AUX aldumb-0.9.3_CVE-2006-3668.patch 637 BLAKE2B 876d7cf59b78c5f94320b08395ab64eaf71d5a97edc082f1ea73afec25e9a9bd8fba20b87df44ff936ea0ee31387dc818ab8e5ae040ff1517ed86cc6da8346e4 SHA512 ecce27757b27d997fffcc8b5736c1921a947664e2a73a4fc9ff269d8d24524fe3823a9076a3270b4296d6294102c0c7f5d2fc5c05152878dcaa11d6acede2125
 DIST dumb-0.9.3.tar.gz 167379 BLAKE2B 1a9f62b784f8e8ba5b30b892bc9588bbebca7d5270b5d1161230c1c538d1aed8c6d2f2afa6a9087858ad45dccee9c640498548a845b2f046a0c390e7a84525cc SHA512 9ecdea460858b7e6ad7ca2534ecb3581397e6c1fa904459affe19ce49f528e580e143b42b13413b292ae7b57901a8008e6a9ee3821824f6ff7914b136f75c658
-EBUILD aldumb-0.9.3.ebuild 1010 BLAKE2B 5c2892f92aba567dc5e2639057becdf85d83e63cd5ca29b7453ee7130440799e7d0e9b5bc29ff0ebeab745d04c4c97b38d0049e165266b367cc1e7dd8d436c40 SHA512 8de4573d5172345316e41c460320bb1a34ed2611293122c8f6d847bfe81e4d7dcff968c58bab14e2951239796b90b04ca0d6001335b15e16f1e3ef346ccc6cf9
+EBUILD aldumb-0.9.3.ebuild 1010 BLAKE2B fdf9d723401b1df23491112b5d5f9b64acc86cb981641328f6da0408428f7e505d3e1b171a11a4b36fcb449fee9b24c756cb66b1ff0b088b5fc117844420d1e4 SHA512 0acf4ca1e35e6911576747bca4c70524b2ec476e76a18a7b75d30efc7e1cda1153f1325290d5981012cc98169b1a8824aec7db82ebc760af3b7a26426e873837
 MISC metadata.xml 327 BLAKE2B fcd9433fc71614181970b679dfd2a3bb386b0d89199a2528c48d8c73d84490be56a5ec05a71eb629c82acd216361e0813b90f311ad1d311ab991355851dfff5c SHA512 e82c8c18d0744758b19a533b606aee382cdf2cbc36f431c3ed286704d75b759e663f2c3aaa2259c7a62352f4d73587ad34aff26a47ae06e20ab7372aa5a8c82c
diff --git a/media-libs/aldumb/aldumb-0.9.3.ebuild b/media-libs/aldumb/aldumb-0.9.3.ebuild
index 38c75c096e86..6349d6817e3e 100644
--- a/media-libs/aldumb/aldumb-0.9.3.ebuild
+++ b/media-libs/aldumb/aldumb-0.9.3.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="Allegro support for DUMB (an IT, XM, S3M, and MOD player library)"
 HOMEPAGE="http://dumb.sourceforge.net/"
 SRC_URI="mirror://sourceforge/dumb/dumb-${PV}.tar.gz"
 
-LICENSE="DUMB-0.9.2"
+LICENSE="DUMB-0.9.3"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="debug"
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index 5901083e0c7a..e3b5a9dc8dcc 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -4,7 +4,7 @@ DIST babl-0.1.62.tar.bz2 698161 BLAKE2B 21fdc009e56d40a8ee08509161dcad10c3f5b41c
 DIST babl-0.1.64.tar.bz2 705991 BLAKE2B a22522f3c9ce73b4a0d29f2dddae870e7d241c4456295cab8b3a1d6441dcc7221c510ace57ba22a86ad8aff605734430396b65dbad3a51d306344d0a230034bc SHA512 b728c2973f80b62e2ee62307880e00a95a90839e778644dd6ab4076e43708e4939c8162b9a6a474dc3c3c4c087475d51eb64d2effd6dcdf969696060cc22a8aa
 EBUILD babl-0.1.12.ebuild 1340 BLAKE2B 5134dd30060cb44092b6915c3f88da469c319d760e8aff3960c36c991b1b15cb4f696fe05966cbbeaa09910a824067893fe19b853494aae34e09562101ec7161 SHA512 809652f63a16bcc6fee76a7f4d9d2f4460f9b5e79f3e3325ec368694004c1702e5bd57efc5ec5dd91bc66494080268b89d7cecc116943311bd347a32a18b9e8b
 EBUILD babl-0.1.38.ebuild 1463 BLAKE2B 8aeb5ec689a4595cafe28fe9c7678d154f2f892b306edbe483db2c26cce220ccc24d5b8c8435aa1f687642a3f3c88180f5d7bde43f6ffcb9ca5a71c2ac5fffe6 SHA512 d79e7597bb0d5fc2670d0991964051d08dc69c090838fa36ec6b188f5062190943ebe27d01bc46fc1aedd7da24e91d7e88c976dd67e85c36887494ba0d2d677a
-EBUILD babl-0.1.62.ebuild 1537 BLAKE2B c79d279334766e1ff7621a7c90b660dc723a56acbd0b53afc55aa3f764e99d8c44aec04a608d0d756f6dd579d491c0db1524b647c2ca6fa96ac1757f468d3fa6 SHA512 8a4ade232489f16d797c771d272b465b7d187faccd528015400b86ca8d7be5f83f236344b23921a1ec1f9c959af617c4bff7bb76257219823bc1e99282b24a9e
+EBUILD babl-0.1.62.ebuild 1536 BLAKE2B 727d7fcbbd1805d9db269ea3066a0491f631ced1a04b6c2bbb2d642fe6812bf4dd1f8eaff06b507cb7ccb426b7a5120f7b0b60849929e6573ea10546aa7d98d4 SHA512 29ff68c9f01b55ac6078503eb16e5fabb8ae39ed7cd23daa41db8b31d803a3fee146721000de4d5c591e558178b8b36c6a12b052935f3bd091134f8d96e0743a
 EBUILD babl-0.1.64.ebuild 1545 BLAKE2B ffa68e0a1d0994f176767e2a5d4ffd30f4632685199a6a29de1aee57fec7cb16266805fadd190f2fe9f27c84bd96890b1be18cc7d9914ce6ba736c1e18cf2db8 SHA512 b3c6cb1abdfe65e7d86f1505c5d00ad0b2aef84dbbe5156a63913951452af30be13c8b339edefe831cdbd6eddd4ecb766c17cae2af75f1067d8f49bebe3ba506
 EBUILD babl-9999.ebuild 1545 BLAKE2B ffa68e0a1d0994f176767e2a5d4ffd30f4632685199a6a29de1aee57fec7cb16266805fadd190f2fe9f27c84bd96890b1be18cc7d9914ce6ba736c1e18cf2db8 SHA512 b3c6cb1abdfe65e7d86f1505c5d00ad0b2aef84dbbe5156a63913951452af30be13c8b339edefe831cdbd6eddd4ecb766c17cae2af75f1067d8f49bebe3ba506
 MISC metadata.xml 307 BLAKE2B 95a78257a39aec8fdf8c1c1c1fa0a6f2d911f6c7f22021021f3d1457d7beffad0a47b0f0131926e988340fccc4ca8ef49d086940e0e17acb89d4f3c6845b79f4 SHA512 a86588c27e62fec9d8474d9ba5edd9d235a6ffd1251d5ba729593ba7bdffdb272020567a7db2d596f17bba9c2a39a75eed9ac5eee5e0ba73af081a05fcb1af9e
diff --git a/media-libs/babl/babl-0.1.62.ebuild b/media-libs/babl/babl-0.1.62.ebuild
index b3470e443768..58bb27fcf618 100644
--- a/media-libs/babl/babl-0.1.62.ebuild
+++ b/media-libs/babl/babl-0.1.62.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://ftp.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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"
diff --git a/media-libs/ctl/Manifest b/media-libs/ctl/Manifest
index 9df1e061e164..bf07604fefd6 100644
--- a/media-libs/ctl/Manifest
+++ b/media-libs/ctl/Manifest
@@ -5,5 +5,5 @@ AUX ctl-1.5.2-openexr-2.3.patch 455 BLAKE2B b42032d28612bef6f6a3beeda67c6b6a20fb
 DIST ctl-1.4.1.tar.gz 996923 BLAKE2B 20dba7a3cb93e89ecb656a6ee34b35e1a35c3c4cda63bafe2162de15afca4b8e32f2156a0b1b2268d59bc5923c1687817433c41031be07b810762f9feea36fc8 SHA512 671efbdef287c69b416462d479be58c6cfba331b5b6faa1a694ece162aa2ee966482423babb49c61de3d5046499a81110e4cd30824d9d36a3d6b69068b075063
 DIST ctl-1.5.2.tar.gz 1411871 BLAKE2B 223740aa8b68630f449b65e17470c76b2825a77eead040724b65e9e69752a696f642ae6755116046e188305a7d043c4def7cb8a773ad08d51fba35e9273b3a71 SHA512 c92af23e897f30f96ecb27b4b865e2fe1a1e33c8616797fc18f68e7fcc89210ce8ae70a003169b2f449bfd5f90d192734f1e8038b1d3e03c5f48c81587c871c6
 EBUILD ctl-1.4.1.ebuild 746 BLAKE2B 95436778c6f9687dacc3969eda2530510b401e4c498e41c80b035d7a261caa2daee22f8f5ed5b0941c5b5c36a05d03f49cd6fe0105f811347b347703da753998 SHA512 f4e82d25b87b3704d60cc3701a4dbb91c0eb47716d33444a1fb2cdf5961d2b4e6e4d7b7666c51456bc2b2019f13afbfd3b239e4671085bce5d5723f2fa845802
-EBUILD ctl-1.5.2-r1.ebuild 719 BLAKE2B 9591b95505369ada4df0342b9c8f7077a8d6fd613cc53c33c7588d9f5779e33a0d7f421b94db27bbe12c834b8468c607372768dad509cb038ec35ba0d4b05888 SHA512 8e1500a0d9535af33cb9b714ce117e07f0631cd1593de1caa8a27f111211cb8d1648b1a69fc3aaed0bc7759c12c443aefe2caf35d341a97d7d624e1e43ca4ddc
+EBUILD ctl-1.5.2-r1.ebuild 718 BLAKE2B 45773a3bea5c0c5c82852e3eaf25a7fa3d2139157c00d6bc2c4a0c0435f3e55d703fad300f232909ed0407eed9c57fd30010cee0add96489df905e56f2fdc728 SHA512 aa386fa9c2f9558b71912c46faf03adc7b50753aa2fa856cd2de9bc7ed09cec229c11565721bd65c58d4079aead1e97f67a257074ff8e4a9bec63f453cbc2449
 MISC metadata.xml 297 BLAKE2B 773f2836e68b0405f210dc51fac01e9c40845d34e4d7ed036916af8f8d63bebcd91bbd672bf84e4dac6ab84135915db85914c07a8bdecdb1ce3c3ff1b5f6408b SHA512 e437384a215b9cd38ecc3e4721bb47c6acf9b8c17d6bc348ddb1272b899428cf7835371a3fca39e6b66f49f1760996fccc336bf15f6d4e36783bd12db84afe49
diff --git a/media-libs/ctl/ctl-1.5.2-r1.ebuild b/media-libs/ctl/ctl-1.5.2-r1.ebuild
index 58cb5c3e6ffb..cfa7ee63be20 100644
--- a/media-libs/ctl/ctl-1.5.2-r1.ebuild
+++ b/media-libs/ctl/ctl-1.5.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}/archive/ctl-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="AMPAS"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 
 RDEPEND="media-libs/ilmbase:=
 	media-libs/openexr:=
diff --git a/media-libs/dumb/Manifest b/media-libs/dumb/Manifest
index 0c25cb3117d0..702c2fb20c1a 100644
--- a/media-libs/dumb/Manifest
+++ b/media-libs/dumb/Manifest
@@ -1,5 +1,5 @@
 AUX dumb-0.9.3-PIC-as-needed.patch 2730 BLAKE2B c5d26002613ef712952c0aa3eeb376e9eb96c2943e7a5c09f9afeade7f65390a737faf4f3af49e11080a4bf64ecd643f0084e86b8ac9233f16796a408a448efd SHA512 b97bfdedfe4f64cc37ca52e50d0ac919747dd523f686350d8681a7629508f83ae87220622f9d431132aeb149dc6011e1461ac560ccece20a4dfb6a7d2ec9d962
 AUX dumb-0.9.3_CVE-2006-3668.patch 637 BLAKE2B 876d7cf59b78c5f94320b08395ab64eaf71d5a97edc082f1ea73afec25e9a9bd8fba20b87df44ff936ea0ee31387dc818ab8e5ae040ff1517ed86cc6da8346e4 SHA512 ecce27757b27d997fffcc8b5736c1921a947664e2a73a4fc9ff269d8d24524fe3823a9076a3270b4296d6294102c0c7f5d2fc5c05152878dcaa11d6acede2125
 DIST dumb-0.9.3.tar.gz 167379 BLAKE2B 1a9f62b784f8e8ba5b30b892bc9588bbebca7d5270b5d1161230c1c538d1aed8c6d2f2afa6a9087858ad45dccee9c640498548a845b2f046a0c390e7a84525cc SHA512 9ecdea460858b7e6ad7ca2534ecb3581397e6c1fa904459affe19ce49f528e580e143b42b13413b292ae7b57901a8008e6a9ee3821824f6ff7914b136f75c658
-EBUILD dumb-0.9.3-r3.ebuild 1947 BLAKE2B 612f433ad4ae673863914fb8bd64514c93c01128ceb7005496009d5b76b1e0098fbc74d98df1c15d57a6b6a6f84a7695aa00204d1817641105b74f72fbb2d69c SHA512 64e6af5676877de8c537f1637ae3d13365294115a8791b15f72f7e1836d77acecff00cd958c0615560ab69ada4895a0924e2759b20d66a5b666c51992db97210
+EBUILD dumb-0.9.3-r3.ebuild 1947 BLAKE2B 7cd44009dfa5105aa642ab142261630dcf2f77143f4bb232a1639a9582648cdc74587d87dc109c631652954cb31534eb71fc15a77fb63ec1ca57e90fa3c05087 SHA512 26c88f0cd9fe9b25df48ccde5f090ede9d98a919f0e6f0276140478ee2949276627e5b7e9d265a20cbda89d56e654b24bcd00276474a908367f854f5c44dbea1
 MISC metadata.xml 327 BLAKE2B fcd9433fc71614181970b679dfd2a3bb386b0d89199a2528c48d8c73d84490be56a5ec05a71eb629c82acd216361e0813b90f311ad1d311ab991355851dfff5c SHA512 e82c8c18d0744758b19a533b606aee382cdf2cbc36f431c3ed286704d75b759e663f2c3aaa2259c7a62352f4d73587ad34aff26a47ae06e20ab7372aa5a8c82c
diff --git a/media-libs/dumb/dumb-0.9.3-r3.ebuild b/media-libs/dumb/dumb-0.9.3-r3.ebuild
index f71ed0178b24..260819e13d8d 100644
--- a/media-libs/dumb/dumb-0.9.3-r3.ebuild
+++ b/media-libs/dumb/dumb-0.9.3-r3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="IT/XM/S3M/MOD player library with click removal and IT filters"
 HOMEPAGE="http://dumb.sourceforge.net/"
 SRC_URI="mirror://sourceforge/dumb/${P}.tar.gz"
 
-LICENSE="DUMB-0.9.2"
+LICENSE="DUMB-0.9.3"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE="debug"
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index b0da2a9b0b63..49c77862b50c 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -7,5 +7,5 @@ DIST libgd-2.2.5-ossfuzz5700.dat 30 BLAKE2B 5ddd3d2be2adf05e1e2eb1852cc689be57d4
 DIST libgd-2.2.5-php_bug_75571.dat 1731 BLAKE2B 4b5d3f258b73e8089ede1b2c9f538855f410965a9e01e1f3f151ae52f072036172b184bd1a4d07b8355bb974bf088bebb0e812175a277bb67926274272bd80a0 SHA512 b3048640ce7828cca7901fadc989e867cfc6d31b44c0f5a1bda54d7428f317c8c8fc6403fef301e193869a95eb46eb7195d47710ec7f8c507ba049cb6cdcb281
 DIST libgd-2.2.5.tar.xz 2594092 BLAKE2B 222a7e012fbf9924ac391ee96c7cd3dec96afd78c6d43dfb680b33e7143e7df87fe6be75bbfe8fb93e916302d7daf08271214c84da28712e93a36465566cb2bd SHA512 e4598e17a277a75e02255402182cab139cb3f2cffcd68ec05cc10bbeaf6bc7aa39162c3445cd4a7efc1a26b72b9152bbedb187351e3ed099ea51767319997a6b
 EBUILD gd-2.2.5-r1.ebuild 2098 BLAKE2B 618b894c17512da414cafcb7c483519d115567f64069e0aef6773eee7cdeedc488f328956f7ef58dec5a366d43a6fee969a882a013bb8debd7c8cf9da34279e6 SHA512 a26a8fc9d231d5d2acf7093f415e3b2431e79739f7b96be0067fe36610754357f6ca997c6cf05648ec47919dd7a01e620c77b1d985e1694b2360e1ab89e74671
-EBUILD gd-2.2.5-r2.ebuild 3142 BLAKE2B 9fd07fc3f526a80f573cfe7d4eed293749dd8e64b37d6e9070d53bb81418a81f9d2256d98a5b8801d4ea2c1a3bd0fd154ac3ccf52bf05107f12482542977bb44 SHA512 7c3c9220e1e3fa982b2c3fdea07e91aa2eab9c42198cd69c4afb1e335a2f64e881a7da24cd13321e9f18e4720f56f0e62e30ea8965156382d6e85cd14fb6f27a
+EBUILD gd-2.2.5-r2.ebuild 3140 BLAKE2B 0c3230a15c2342ba8ce7b6818b10944a4b99dc24f65ff1097c7d9365403ac51e0f4601475516c236857fb4aac24bc8b5824a16ceaa5ff1dbf53cf6828879be6b SHA512 faa020502b7e35085c085e63eac5c00f0ecb990131fc32f33c82115123e0082b53f983eb9ecd828128f3e00d47dd29eeb285938cd6cd457a5dbe061a1d5c3f38
 MISC metadata.xml 1507 BLAKE2B 34dbcbc70165ebe74ea14e6394e2691bda7523e4c848b13a512de8f0707c194a7da3de41a8fe483d7a8b2aa1af8f0d164ea210605ae76480dbf22b976b53d2f5 SHA512 0ac3c1ca25c190333e7f97dbb05e197e62e76abeaa045966fa3024dbeb22d541d78794df08d450e887591909a25dfb6a4fef861ed62f7f055b129e17b1329919
diff --git a/media-libs/gd/gd-2.2.5-r2.ebuild b/media-libs/gd/gd-2.2.5-r2.ebuild
index a5719a6acc53..e80c41907e40 100644
--- a/media-libs/gd/gd-2.2.5-r2.ebuild
+++ b/media-libs/gd/gd-2.2.5-r2.ebuild
@@ -15,7 +15,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="cpu_flags_x86_sse fontconfig jpeg png static-libs test 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 fc684b470321..929b1390b3a6 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -23,7 +23,7 @@ EBUILD gegl-0.2.0-r6.ebuild 5030 BLAKE2B 308f3f88459aadb95c729fb1597394f7a1b7173
 EBUILD gegl-0.3.0-r1.ebuild 5383 BLAKE2B ed633ea1a6331b918632a11811b248872508891fa40c21cd17d4f0b19f1463d675b5b1b7180acf904ee9f08dfa1420ae881c5c4cc7e7ff7d71e92e1e70e00e98 SHA512 21587a2c02c1d5f96ee346251271f188ea5fe1cd2711e0005c583535cd90e47d4c8ac119c2d95efa6ff5767e1c5e53802c0b25a9e0dd0b8a2124b629305e9c70
 EBUILD gegl-0.3.0.ebuild 5302 BLAKE2B 9af5ed46f899c5b2bc34c8da9763ac0fb777135bfda816b53a29b2a4dbaa67a441d26b27ce9112cc686c11f2b182bde320b46bb0dacb519a365a7083051949d0 SHA512 089ef4ca7d2833248af322062bdc05f3f155fd7cc9aa67c89e0567d0c7b6a08bb2ab2bceb54e8c0bb790f8caab4bd2418f3885f7f7cc288014f05064163eb6af
 EBUILD gegl-0.3.26.ebuild 5233 BLAKE2B 26efbb8ea85b7b55231801f735b689ff0fccc93fa64c9dfaad33b8819c786f16c57cb7af9bc8da1b74ede6ca72e2dd2e67712dc5c5a2fc26bc833177a9e98f93 SHA512 7516b2ceb2c18b90ae48306765154a33405a38cba39c9531a18d7827408f4a0286e72f51e21fea37493df5f143af8fd302d82f2287de296d6e817947ad6f1f10
-EBUILD gegl-0.3.34.ebuild 5370 BLAKE2B 63bf266cec898efbaba33d5522c540f118f84d0f5446aeaecedf3715d4c143f14b14a1f5606f412995465d899d091ebe9b02bcc4f5965dd1d018a7d73fac8cc4 SHA512 e2b4df3eefd690476429f1e7a091567f30a9171919ab26ae16264e17175f24cedd1d1d020ecf3d22e68300784d28571903b4741eafd84acf73201ea9c78dd0ce
+EBUILD gegl-0.3.34.ebuild 5367 BLAKE2B 54f2c29fb02d16f9b265d6e3b9c9d1ddcb3094025cb8cc45fa17c035625e89c5e567a9e0ce6c5d649aa9fdbede2e7a62585d3eae03b288819229fc8b009ee320 SHA512 16a254bea6fc478bbdbe90acb795180fd56e1dce3eef4817b3da47f9343608e8b12103fd008feef37e4805aa8aa21ce3ce18cd3d4acfb513814137e8d2a397ac
 EBUILD gegl-0.4.14.ebuild 5035 BLAKE2B 80c187f746edb14fb3b48a0d900750ab19b7b42ecbd7b34d714cb90fe037f243576ec96b2930c6d7e24b0b85f0e99ccca31d93ec1d57bccef83873a435de35ec SHA512 99370369820135e06e1a10cac1f19483c699dea415766b4eacedf2bb70f3778b0d37387406cc87a87c42a4b27bce5f895cdfecc05e6be7b9b732d7588e951bfe
 EBUILD gegl-0.4.16.ebuild 4921 BLAKE2B d2b59d69d4aedf53471cd4a5eef5728a4b2c75f58239f70d4452fe00c22619a28d64df1563a9c4570426f7441bee9bbc6d5652745a472a0d5fc2591b7021e05c SHA512 842175c0de307c8ce8f7ae617ade970ac18f071dd42cf250a9f27d7bd0fd7db38a09a6c1f3a0496b62d45ad2cd1d3516cf8b185b8952225877920a4674954adb
 EBUILD gegl-9999.ebuild 4860 BLAKE2B 9155550f7e4b13980aeb6ea781e817c690c5d0ba79e03adcd8cd3d1e4bc2dbd3d17eaf5e5f6eab5a387d10304376168194696aa43dffd80c777015c6647e1604 SHA512 eaf89e93e24839fb7f2523e10d6a6a714106a4d48d38aca7267d817ece01041f383fe4efddf8bf925ba9d9aab81f0f0fa1444a6d670e382d697afdad7812a043
diff --git a/media-libs/gegl/gegl-0.3.34.ebuild b/media-libs/gegl/gegl-0.3.34.ebuild
index e362bcdfb688..5d43a230b8ee 100644
--- a/media-libs/gegl/gegl-0.3.34.ebuild
+++ b/media-libs/gegl/gegl-0.3.34.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index f3944e8d71c2..bbc6b65bd65a 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -1,16 +1,4 @@
-AUX ilmbase-1.0.0-asneeded.patch 434 BLAKE2B 0bdb50ec8def23f821b8fa820c7f680f7037bd641213b5a881992141fd7afab11512f10441b94b4d596919663e59b39d56eda44415992b45a3b900b31534989e SHA512 b282b6fc8eb7a26a992deb49e62ecfa55208524b703a1e09edc53575b18593cb3d750a873f31d87c13b303fb737e64a22ef023f56be6a6fbb27e1c38861ab191
-AUX ilmbase-1.0.2-gcc43.patch 294 BLAKE2B ca179b94dfa7db269502772fefd7339281ae5c252db942da0eb527e6d782fb7a225caf3b947bacdc52605156006fa0fa1305df84842eedb3f6d80bea184683c8 SHA512 d891afedb80b2e1270469eeefce9497a025b308d88ab9b71b79130cea864f927782b00ae890cd2cc6c115e9efd56df449c4d0a5b624527faf9c33917b0bfbf64
-AUX ilmbase-2.2.0-Remove-register-keyword.patch 2582 BLAKE2B 04c54acec24b523e657ea9b5db787c4ab82fc43748c3fb47589a03f376eba31622071ae42a9ad1df4170d3dc832a9853d57ae458750d5e5241f41c5e0121fc38 SHA512 786b2edc895efd06fcfa78441704ea0ec9608d872d0953212adfe83f9a9c2c838e9caa88dfe9fab140a237e645ac90d8a099761057e3cc6a4e44865cc316459c
 AUX ilmbase-2.3.0-testBox.patch 2826 BLAKE2B ddafd231e641cd518ca864e6aa27f88b24b81f1bed29fe05fe79accc033484479e891482529ead24ddc2b1b931d808eb20a6b960f7281da83357b637c3d937ca SHA512 81eb09823fed3841742ef8b85b262d9d6fbce97ae87fdc5e902c4d85c7f8c7a01b7be08acac23fee5c5cfdb8815f410b200f2af4039ade0cedd31866312015db
-DIST ilmbase-1.0.2.tar.gz 496540 BLAKE2B 1727be15753102f56d7b23bb88c68897006cdba546000653f7028c511e6cd208bcbf23b27478db25f41890bb362e687e10fc9342785d25a92df6a3d7b0b77d90 SHA512 5a1a0011ef43132f33832d2e322320abb81a0f495e921de52af8f6e9ee50e0bed63897a0054de228f4081cc2f6591cb99a686f908620e87bf86c9d2d689923cd
-DIST ilmbase-2.0.1.tar.gz 555828 BLAKE2B 95cf3019c74c1efd95e1b7ddf2df224f4bcc93bafb9936c408f94ddaa2fa243161c91f8527ec9e67d7d48fb9d41dc84c42a2745d8e75d3a648f66bf0331d41e7 SHA512 0f2341fefd7c661b62bfd42590c9f29e5b58fbf303a4418e17d3bb831c40ebe23848250f360bc755113b84882665eb8c90497ee2f8d77bc5ed8e1fd43182c712
-DIST ilmbase-2.1.0.tar.gz 557552 BLAKE2B f210d47ab886cf9d2d76ca6ef6cc86123f887a0a3971e4063b5451293827861f10a6cc94bbe2399a9fcbacf48492e8d739b216b4baef72cc167bec1f2ed5fd6f SHA512 2d168accc4f4fb8256fa7a4488c1a930bf1f088bda93f6d8272d3ce15219716d3e85dfa1e85dc2766bce10438e8fb38607a232a145c00d5d742cbde6604df342
-DIST ilmbase-2.2.0.tar.gz 525289 BLAKE2B 951f6601075098b5f38e26d47f28a83f923d2689d306c02c855a0e8c846a339dfa589f574c6ffcb70e56ed8d7ff0202fea0709939c65aeaff3978ab9e2d58f4a SHA512 0bbad14ed2bd286dff3987b16ef8631470211da54f822cb3e29b7931807216845ded81c9bf41fd2d22a8b362e8b9904a5450f61f5a242e460083e86b846513f1
 DIST ilmbase-2.3.0.tar.gz 595490 BLAKE2B db956fe7dbabf94632eb98635f4ebda8e937f26e26ed69f33743069fa2bf6d5ed3711f00eb33377c98b4f8ea367bbfc51b11d4cb884ce02238b537857cc19a9c SHA512 db0804a7c37c2a97f9dbf81b20f40f7fdea73242baa2759d9dc3728e6849e7ecae0e178fa1c710add980d050499151650675e4b2cda6cbbaa61aca406a1f929a
-EBUILD ilmbase-1.0.2.ebuild 730 BLAKE2B 018474bd4196c2ee89f1c9e14359d2c4cfbf9b8277ae4cf1e5ee4a2be742ff0884881bf9967c28be6cf27b13edcf5e753222e5991be20239ee9604710fd98e8b SHA512 0e746dc823c5ea990a2f05329c45716ebff1c7094097a3095fd513a0a82f8c5a47688b57d37e9c158574a15947aa85426398aec728a89f825a4c5b1ce371407e
-EBUILD ilmbase-2.0.1-r1.ebuild 591 BLAKE2B b196bf67401ac210bc4846e69ddd011281d265227dc5c63e70f7c84d5ea05ac177b416cc37744bc6f5360911ed3d3e112596f14f81aa456cd472682d017efaf2 SHA512 4a5392c5be8b1758dc8c2fc0e59530fafb7d353ca70711060f4e43759a9f22c6524323b3db50774b94d7a40472b4854810d012f5eeee375af8f08b4577eae18e
-EBUILD ilmbase-2.1.0.ebuild 758 BLAKE2B 20825fee87f24bc2e31d4c01e690ed7d6ed4827ea9422dd83354da8a8c85c832f0d8d172ac802193b56a482f0d656f79a5aa483a995ae05e17e91ac8b4e8a202 SHA512 fdb41c8dc58900b21d3dd42e8cd65b99639f343985ae8b99e04a8a4e5eb0b68b13725d03b3bd03776d528d2998f62d0f6496bb6ef13b0cc9dda1d804d84b7e2e
-EBUILD ilmbase-2.2.0-r1.ebuild 970 BLAKE2B 322ac4df65286c9aedaf85b43fc8d1fecbc3816fff231695f59647d55ba978610a3156f072416f7e7f211c59606b4364917d98c93034a6a7a532dab47a401978 SHA512 c3b4313c5f67e0082ec5b0f5d7c793e99be3c1c85f9ce1ef923c784b1307a22ca82c47bb2547dd7db30a4a67a98b729ac34ca32791c0d0b62d66e089ac38db11
-EBUILD ilmbase-2.2.0.ebuild 773 BLAKE2B e2ce76ff50489895805194179dd647ff70f7cfae2e3960689a95c6b9b4d0aa543155c45fa12e461ceaadb6249df80dd75398c7841441adcfdfdbd75b01bc43b2 SHA512 a11bcce9aa6cd8a818ad2d8e9ab391e83b4a2b70155b1524d8b00b0f6c8a726aa1c4ad4f75acec1c8a81cd1d12626e0dd80da7b74a3410c7dc9aa12454b98c58
 EBUILD ilmbase-2.3.0.ebuild 1041 BLAKE2B a53b7f81ad6f2ce916280a5f59f869ae0d6d3984727f0faf360f0bc9b41270b9bfea7f8e825dd861baa36182b56fe262460664c79431f6314b4bfe859e2ac4a5 SHA512 a7f6924497a066ce26c712de0e67e050d9978ce80aa575b5d5bb5b009b829ea61814612760ec4c6ddcef0383c4f1aba0f64ac258a368a7f45b92cf5e2f14220b
 MISC metadata.xml 303 BLAKE2B 53fb5019bd6fe939d485f1eccb4a140ca9b7ce121b06744d8155842ccb6c5e1378ea39a9ae74c8d519be7b3926bd76040df4b8107137fcc2e25be97431e7a1be SHA512 0ab8d735dd7a8e0dc96b14cfde1ae06969d15cfbad956f4fda60b093660aee38fe98709376eedc9362a26858678d2f28eec795c1accb2560858fd804a11bb7ca
diff --git a/media-libs/ilmbase/files/ilmbase-1.0.0-asneeded.patch b/media-libs/ilmbase/files/ilmbase-1.0.0-asneeded.patch
deleted file mode 100644
index a3953efd3513..000000000000
--- a/media-libs/ilmbase/files/ilmbase-1.0.0-asneeded.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/IlmThread/Makefile.in
-+++ b/IlmThread/Makefile.in
-@@ -209,7 +209,7 @@
- 			  IlmThreadMutexPosix.cpp
- 
- libIlmThread_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ -no-undefined
--libIlmThread_la_LIBADD = ../Iex/libIex.la
-+libIlmThread_la_LIBADD = ../Iex/libIex.la -lpthread
- libIlmThreadincludedir = $(includedir)/OpenEXR
- libIlmThreadinclude_HEADERS = IlmThreadPool.h IlmThread.h \
- 			      IlmThreadSemaphore.h IlmThreadMutex.h
diff --git a/media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch b/media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch
deleted file mode 100644
index a4e186058fe8..000000000000
--- a/media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Imath/ImathMatrix.h
-+++ b/Imath/ImathMatrix.h
-@@ -37,6 +37,8 @@
- #ifndef INCLUDED_IMATHMATRIX_H
- #define INCLUDED_IMATHMATRIX_H
- 
-+#include <cstring>
-+
- //----------------------------------------------------------------
- //
- //      2D (3x3) and 3D (4x4) transformation matrix templates.
diff --git a/media-libs/ilmbase/files/ilmbase-2.2.0-Remove-register-keyword.patch b/media-libs/ilmbase/files/ilmbase-2.2.0-Remove-register-keyword.patch
deleted file mode 100644
index 3fd95aceda9c..000000000000
--- a/media-libs/ilmbase/files/ilmbase-2.2.0-Remove-register-keyword.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 6d297f35c5dbfacc8a5e94f33b986db7ab468db9 Mon Sep 17 00:00:00 2001
-From: Larry Gritz <lg@larrygritz.com>
-Date: Fri, 30 Sep 2016 15:58:27 -0700
-Subject: [PATCH] Remove 'register' keyword.
-
-'register' is a relic of K&R-era C, it's utterly useless in modern
-compilers.  It's been deprecated in C++11, and therefore will generate
-warnings when encountered -- and many packages that use OpenEXR's public
-headers use -Werr to turn warnings into errors. Starting in C++17, the
-keyword is removed entirely, and thus will certainly be a build break
-for that version of the standard. So it's time for it to go.
----
- IlmBase/Half/half.cpp       | 6 +++---
- IlmBase/Half/half.h         | 4 ++--
- IlmBase/Imath/ImathMatrix.h | 8 ++++----
- 3 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/Half/half.cpp b/Half/half.cpp
-index 609aaa1..09a50aa 100644
---- a/Half/half.cpp
-+++ b/Half/half.cpp
-@@ -94,9 +94,9 @@ half::convert (int i)
-     // of float and half (127 versus 15).
-     //
- 
--    register int s =  (i >> 16) & 0x00008000;
--    register int e = ((i >> 23) & 0x000000ff) - (127 - 15);
--    register int m =   i        & 0x007fffff;
-+    int s =  (i >> 16) & 0x00008000;
-+    int e = ((i >> 23) & 0x000000ff) - (127 - 15);
-+    int m =   i        & 0x007fffff;
- 
-     //
-     // Now reassemble s, e and m into a half:
-diff --git a/Half/half.h b/Half/half.h
-index f78e4f6..da418d6 100644
---- a/Half/half.h
-+++ b/Half/half.h
-@@ -459,7 +459,7 @@ half::half (float f)
- 	// to do the float-to-half conversion.
- 	//
- 
--	register int e = (x.i >> 23) & 0x000001ff;
-+	int e = (x.i >> 23) & 0x000001ff;
- 
- 	e = _eLut[e];
- 
-@@ -470,7 +470,7 @@ half::half (float f)
- 	    // bits and combine it with the sign and exponent.
- 	    //
- 
--	    register int m = x.i & 0x007fffff;
-+	    int m = x.i & 0x007fffff;
- 	    _h = e + ((m + 0x00000fff + ((m >> 13) & 1)) >> 13);
- 	}
- 	else
-diff --git a/Imath/ImathMatrix.h b/Imath/ImathMatrix.h
-index 3e96c2f..1d7f8dc 100644
---- a/Imath/ImathMatrix.h
-+++ b/Imath/ImathMatrix.h
-@@ -2527,11 +2527,11 @@ Matrix44<T>::multiply (const Matrix44<T> &a,
-                        const Matrix44<T> &b,
-                        Matrix44<T> &c)
- {
--    register const T * IMATH_RESTRICT ap = &a.x[0][0];
--    register const T * IMATH_RESTRICT bp = &b.x[0][0];
--    register       T * IMATH_RESTRICT cp = &c.x[0][0];
-+    const T * IMATH_RESTRICT ap = &a.x[0][0];
-+    const T * IMATH_RESTRICT bp = &b.x[0][0];
-+          T * IMATH_RESTRICT cp = &c.x[0][0];
- 
--    register T a0, a1, a2, a3;
-+    T a0, a1, a2, a3;
- 
-     a0 = ap[0];
-     a1 = ap[1];
--- 
-2.14.1
-
diff --git a/media-libs/ilmbase/ilmbase-1.0.2.ebuild b/media-libs/ilmbase/ilmbase-1.0.2.ebuild
deleted file mode 100644
index b92d275e1df2..000000000000
--- a/media-libs/ilmbase/ilmbase-1.0.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit libtool
-
-DESCRIPTION="OpenEXR ILM Base libraries"
-HOMEPAGE="http://openexr.com/"
-SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 -arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="static-libs"
-
-RDEPEND="!<media-libs/openexr-1.5.0"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.0-asneeded.patch"
-	"${FILESDIR}/${P}-gcc43.patch"
-)
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die "Pruning failed"
-}
diff --git a/media-libs/ilmbase/ilmbase-2.0.1-r1.ebuild b/media-libs/ilmbase/ilmbase-2.0.1-r1.ebuild
deleted file mode 100644
index e9d83ade3acd..000000000000
--- a/media-libs/ilmbase/ilmbase-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools-multilib
-
-DESCRIPTION="OpenEXR ILM Base libraries"
-HOMEPAGE="http://openexr.com/"
-SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/2.0.1" # 2.0.1 for the namespace off -> on switch, caused library renaming
-KEYWORDS="~amd64 -arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="static-libs"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/IlmBaseConfig.h )
diff --git a/media-libs/ilmbase/ilmbase-2.1.0.ebuild b/media-libs/ilmbase/ilmbase-2.1.0.ebuild
deleted file mode 100644
index bdbfe9d413fd..000000000000
--- a/media-libs/ilmbase/ilmbase-2.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools-multilib
-
-DESCRIPTION="OpenEXR ILM Base libraries"
-HOMEPAGE="http://openexr.com/"
-SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/11" # 11 from SONAME
-KEYWORDS="amd64 -arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="static-libs"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/IlmBaseConfig.h )
-
-src_configure() {
-	# Disable use of ucontext.h wrt #482890
-	if use hppa || use ppc || use ppc64; then
-		export ac_cv_header_ucontext_h=no
-	fi
-
-	autotools-multilib_src_configure
-}
diff --git a/media-libs/ilmbase/ilmbase-2.2.0-r1.ebuild b/media-libs/ilmbase/ilmbase-2.2.0-r1.ebuild
deleted file mode 100644
index db5418878b67..000000000000
--- a/media-libs/ilmbase/ilmbase-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib-minimal
-
-DESCRIPTION="OpenEXR ILM Base libraries"
-HOMEPAGE="http://openexr.com/"
-SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/12" # based on SONAME
-KEYWORDS="amd64 -arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="static-libs"
-
-DEPEND="virtual/pkgconfig[${MULTILIB_USEDEP}]"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/IlmBaseConfig.h )
-
-# https://bugs.gentoo.org/632259
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${P}-Remove-register-keyword.patch" )
-
-multilib_src_configure() {
-	# Disable use of ucontext.h wrt #482890
-	if use hppa || use ppc || use ppc64; then
-		export ac_cv_header_ucontext_h=no
-	fi
-
-	ECONF_SOURCE=${S} econf "$(use_enable static-libs static)"
-}
diff --git a/media-libs/ilmbase/ilmbase-2.2.0.ebuild b/media-libs/ilmbase/ilmbase-2.2.0.ebuild
deleted file mode 100644
index ed86d10473a1..000000000000
--- a/media-libs/ilmbase/ilmbase-2.2.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools-multilib
-
-DESCRIPTION="OpenEXR ILM Base libraries"
-HOMEPAGE="http://openexr.com/"
-SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/12" # based on SONAME
-KEYWORDS="~amd64 -arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="static-libs"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/IlmBaseConfig.h )
-
-src_configure() {
-	# Disable use of ucontext.h wrt #482890
-	if use hppa || use ppc || use ppc64; then
-		export ac_cv_header_ucontext_h=no
-	fi
-
-	autotools-multilib_src_configure
-}
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 7f5c332837d5..63038ca7f9ad 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,7 +1,5 @@
-DIST libgphoto2-2.5.16.tar.bz2 7006551 BLAKE2B 79082e691d4d9061cc35c35cabd7d0d16407764df43f8abbc7ff80f7a2b734da78a2a74a17ec2e014d9050c75235c700f3de90b61ca9fb0d68fdcc7dde64269e SHA512 7863192c2959ffc8d771eca294adc54090192e3207cf8d3a9bf143e50034c3f1248e7fe41cad75f758ab2ad09c9258d50967b921adf3223d7c74370faa110a9e
 DIST libgphoto2-2.5.20.tar.bz2 7290524 BLAKE2B 0b616863fa74430f16d96a37955f655620a88fb2df2220fbe9337eb0f61b7babd9d36e1f1d58f45ca617c57feab93e9714228eae54c742385c3e4b0fc3667ff5 SHA512 13364a8fdfe137a21ebf04dfd2b30b20c7fb652e11e1b98cd06176e9a1576ef8f67121523111395100ed39d1d3e6e5d6d458b86d58502f7056a1c06a5623640a
 DIST libgphoto2-2.5.22.tar.bz2 7169810 BLAKE2B d4947a4b5cf4a6f48ec619e0531ab29a035143031529436f566ade26d11b354328dc70e5d20533a3c023fd8b87afd0db9d85617fea9d06ee433137da6a1d9413 SHA512 8f02c460324c115810f56a9408ecba7aabb801947249c1ee79f0f0a1db1d785d34992508232bad7af112aed2dfc6b213365cee694dd0e7d5edf4072c63fa01cb
-EBUILD libgphoto2-2.5.16.ebuild 6230 BLAKE2B 14a4b1f316a0f4ba439c42a729cd5fc763662f4c78199edff7765ed5bf70e36e2234f07f7fca9e7a4f42a0d888317449b2342e7eb50412e26048f08cebfb5f4c SHA512 91baa693f5cecc6d54f3d1cf55d703fcfb62bb11b266f49c99e615fb924e20ff70ad736ffca98b67677f2e340b3fb9b55dc4e6215ca41237182b56c5702bc00f
 EBUILD libgphoto2-2.5.20.ebuild 6232 BLAKE2B 3617e5aaababfd54a469f77eb01508fe7341d25e013df88ea76c3775410d615702debc961bffebe69bf885bace54a01b979d1c0a3a0f5e54163af07dc25e1fcd SHA512 4e1d7c288187641e8201f6370134b6e8b379e2e02f56fd713af3477781d6b2df1dc6b6796ea30e24457f9f8919926f308f025236f2d7572becc12f48148bf056
 EBUILD libgphoto2-2.5.22.ebuild 6236 BLAKE2B 282f564e6172a9d5af1a3a5fcf3f282bb9e1a3bdafeebd081d5580a1b52c47a3665dec84109a8bfe57bf201418e62ff3e616dc457cb4a0f2cb022cc6b8ea6af1 SHA512 2f4b313cbc7067c74e04308691e92c9366106bba603eafcfa501ea15208c6fb931f08d2f8e6b5375fa7bb6870e756669dd05f3f4cdde1d75d58cc75c4b04854c
 MISC metadata.xml 520 BLAKE2B 113ca8821b8ba1d594d64f86facadebf238372742380ce99c6f3172712873d1ebb3d0bf32eb072d7af1771f6099f5bde84114d6e45468a0d33503fbbe393a19b SHA512 905b25e683f85a23323e1205c0492e3b955e11f9d93a9c9c360108ecdd3608fa2f9f4c2572444c0a4be0df3f5e350dd13ca4ebb5ca523c0fd70fed3f40e39ed0
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
deleted file mode 100644
index cee28f15d64a..000000000000
--- a/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO
-# 1. Track upstream bug --disable-docs does not work.
-#    https://sourceforge.net/p/gphoto/bugs/643/
-
-EAPI=6
-inherit eutils multilib multilib-minimal udev user
-
-DESCRIPTION="Library that implements support for numerous digital cameras"
-HOMEPAGE="http://www.gphoto.org/"
-SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-
-# FIXME: should we also bump for libgphoto2_port.so soname version?
-SLOT="0/6" # libgphoto2.so soname version
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc examples exif gd jpeg nls serial"
-
-# By default, drivers for all supported cameras will be compiled.
-# If you want to only compile for specific camera(s), set CAMERAS
-# environment to a space-separated list (no commas) of drivers that
-# you want to build.
-IUSE_CAMERAS="
-	adc65 agfa_cl20 aox ax203
-	barbie
-	canon casio_qv clicksmart310
-	digigr8 digita dimagev dimera3500 directory
-	enigma13
-	fuji
-	gsmart300
-	hp215
-	iclick
-	jamcam jd11 jl2005a jl2005c
-	kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica konica_qm150
-	largan lg_gsm
-	mars mustek
-	panasonic_coolshot panasonic_l859 panasonic_dc1000 panasonic_dc1580 pccam300 pccam600 pentax polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2
-	ricoh ricoh_g3
-	samsung sierra sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z
-	toshiba_pdrm11 topfield tp6801
-"
-
-for camera in ${IUSE_CAMERAS}; do
-	IUSE="${IUSE} +cameras_${camera}"
-done
-
-# libgphoto2 actually links to libltdl
-RDEPEND="
-	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
-	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-	>=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
-	cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] )
-	cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] )
-	exif? ( >=media-libs/libexif-0.6.21-r1:=[${MULTILIB_USEDEP}] )
-	gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,${MULTILIB_USEDEP}] )
-	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	serial? ( >=dev-libs/lockdev-1.0.3.1.2-r2[${MULTILIB_USEDEP}] )
-	!<sys-fs/udev-201
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	sys-devel/flex
-	>=sys-devel/gettext-0.14.1
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	doc? ( app-doc/doxygen )
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gphoto2-port-config
-	/usr/bin/gphoto2-config
-)
-
-pkg_pretend() {
-	if ! echo "${USE}" | grep "cameras_" > /dev/null 2>&1; then
-		einfo "No camera drivers will be built since you did not specify any."
-	fi
-}
-
-pkg_setup() {
-	enewgroup plugdev
-}
-
-src_prepare() {
-	default
-
-	# Handle examples ourselves
-	sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-		|| die "examples sed failed"
-
-	sed -e 's/sleep 2//' -i configure || die
-}
-
-multilib_src_configure() {
-	local myconf
-	use doc || myconf=( ac_cv_path_DOXYGEN=false )
-
-	# Upstream doesn't default to --enable-option-checking due having another
-	# configure in libgphoto2_port/ that also needs to be checked on every bump
-	#
-	# Serial port uses either lockdev or ttylock, but we don't have ttylock
-	# --with-doc-dir needed to prevent duplicate docs installation, bug #586842
-	ECONF_SOURCE=${S} \
-	econf \
-		--with-doc-dir="${EPREFIX}"/usr/share/doc/${PF} \
-		--disable-docs \
-		--disable-gp2ddb \
-		$(use_enable nls) \
-		$(use_with exif libexif auto) \
-		$(use_with gd) \
-		$(use_with jpeg) \
-		$(use_enable serial) \
-		$(use_enable serial lockdev) \
-		--with-libusb=no \
-		--with-libusb-1.0=auto \
-		--disable-ttylock \
-		--with-camlibs=${cameras} \
-		--with-hotplug-doc-dir="${EPREFIX}"/usr/share/doc/${PF}/hotplug \
-		--with-rpmbuild=$(type -P true) \
-		udevscriptdir="$(get_udevdir)" \
-		"${myconf[@]}"
-}
-
-src_configure() {
-	local cameras
-	local cam
-	local cam_warn=no
-	for cam in ${IUSE_CAMERAS} ; do
-		if use "cameras_${cam}"; then
-			cameras="${cameras},${cam}"
-		else
-			cam_warn=yes
-		fi
-	done
-
-	if [ "${cam_warn}" = "yes" ]; then
-		[ -z "${cameras}" ] || cameras="${cameras:1}"
-		einfo "Enabled camera drivers: ${cameras:-none}"
-		einfo "Upstream will not support you if you do not compile all camera drivers first"
-	else
-		cameras="all"
-		einfo "Enabled camera drivers: all"
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		doxygen doc/Doxyfile || die "Documentation generation failed"
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --modules
-
-	einstalldocs
-	dodoc TESTERS MAINTAINERS HACKING
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/README examples/*.c examples/*.h
-	fi
-
-	# FIXME: fixup autoconf bug #????
-	if ! use doc && [ -d "${ED}/usr/share/doc/${PF}/apidocs.html" ]; then
-		rm -fr "${ED}/usr/share/doc/${PF}/apidocs.html"
-	fi
-	# end fixup
-
-	local udev_rules cam_list
-	udev_rules="$(get_udevdir)/rules.d/70-libgphoto2.rules"
-	cam_list="/usr/$(get_libdir)/libgphoto2/print-camera-list"
-
-	if [ -x "${ED}"${cam_list} ]; then
-		# Let print-camera-list find libgphoto2.so
-		export LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)"
-		# Let libgphoto2 find its camera-modules
-		export CAMLIBS="${ED}/usr/$(get_libdir)/libgphoto2/${PV}"
-
-		einfo "Generating UDEV-rules ..."
-		mkdir -p "${ED}"/${udev_rules%/*}
-		echo -e "# do not edit this file, it will be overwritten on update\n#" \
-			> "${ED}"/${udev_rules}
-		"${ED}"${cam_list} udev-rules version 201 group plugdev >> "${ED}"/${udev_rules} \
-			|| die "failed to create udev-rules"
-	else
-		eerror "Unable to find print-camera-list"
-		eerror "and therefore unable to generate hotplug usermap."
-		eerror "You will have to manually generate it by running:"
-		eerror " ${cam_list} udev-rules version 201 group plugdev > ${udev_rules}"
-	fi
-
-}
-
-pkg_postinst() {
-	if ! has_version "sys-auth/consolekit[acl]" && ! has_version "sys-apps/systemd[acl]" && ! has_version "sys-auth/elogind[acl]" ; then
-		elog "Don't forget to add yourself to the plugdev group "
-		elog "if you want to be able to access your camera."
-	fi
-
-	local old_udev_rules="${EROOT}"etc/udev/rules.d/99-libgphoto2.rules
-	if [[ -f ${old_udev_rules} ]]; then
-		rm -f "${old_udev_rules}"
-	fi
-}
diff --git a/media-libs/libqaccessibilityclient/Manifest b/media-libs/libqaccessibilityclient/Manifest
index 9676ce64e429..c41a5e05eebf 100644
--- a/media-libs/libqaccessibilityclient/Manifest
+++ b/media-libs/libqaccessibilityclient/Manifest
@@ -1,5 +1,3 @@
-DIST libqaccessibilityclient-0.4.0.tar.xz 105700 BLAKE2B 30c2ebcae046480536fa2c193130b3e0e99bfeeacb40ee9fae22574d9a8ff84da4fc5d746e1ba2f369f99c9d6227fea65ef55628aeff37b455cdf730708608c9 SHA512 bd2e0d29605f222084f86664a52488a5340e0ac16433fd65c8ada195e4cb5988ebac357a991ea8ebc5af22f81825212ce07209939ad5e4a00a9daeed37b56ffb
 DIST libqaccessibilityclient-0.4.1.tar.xz 105280 BLAKE2B 7e8332e4d27e96c0728cecf73f13e9213f264e588dba321f0c0877954400c227e17e8bd4468b2567626407d2a283290e3b9752170ae602c6370d08beec7387d0 SHA512 d5c168ff39f4bb67f18120eea50f8e02a85d464a5bb6479c48dfdb02ea9bf0cc379cbed4da7d882b718a1e1723d3a00528fcb26903b617b43029fde25e82cb3c
-EBUILD libqaccessibilityclient-0.4.0.ebuild 629 BLAKE2B 1bf60e020ff19695eb84f7c8794c819ee45f302e1bcdec93334f2a38ca2bc3ae6feda9c41ea80d273b81a77c276f34a48baac3e07df5400a8bdca2ec9232dc48 SHA512 5bc23325808ea36235f8aecb8e2f4eb941f8e9315561aa68dcb3c5fab226a458669a7eb25d019a833c1f2b8ba9f1cee407b9160056189d7e5beeda32dcb06ebd
-EBUILD libqaccessibilityclient-0.4.1.ebuild 631 BLAKE2B 3724c327cf59a21cecfc9c099e36ba48d41f6890f9e3a5740a13f1eaa168e9e099845e682e5442347b95462882a0317f3882bb31b28dfeb83409e692346fe046 SHA512 1bb9dd5226df0ceb284241748a8d96c2047553d8febdec84eda35f9299dc06bc254d73f101ee2aaefa3016790397ba128eed9b4849673800ceda0450ebc83af7
+EBUILD libqaccessibilityclient-0.4.1.ebuild 629 BLAKE2B 1bf60e020ff19695eb84f7c8794c819ee45f302e1bcdec93334f2a38ca2bc3ae6feda9c41ea80d273b81a77c276f34a48baac3e07df5400a8bdca2ec9232dc48 SHA512 5bc23325808ea36235f8aecb8e2f4eb941f8e9315561aa68dcb3c5fab226a458669a7eb25d019a833c1f2b8ba9f1cee407b9160056189d7e5beeda32dcb06ebd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.0.ebuild b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.0.ebuild
deleted file mode 100644
index 244647903c51..000000000000
--- a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_KDEINSTALLDIRS="false"
-KDE_TEST="true"
-KDE_EXAMPLES="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Library for writing accessibility clients such as screen readers"
-HOMEPAGE="https://accessibility.kde.org/ https://cgit.kde.org/libqaccessibilityclient.git"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-# tests require DBus
-RESTRICT+=" test"
diff --git a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.1.ebuild b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.1.ebuild
index 7cf95fcd3bdb..244647903c51 100644
--- a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.1.ebuild
+++ b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://accessibility.kde.org/ https://cgit.kde.org/libqaccessibilityc
 SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index e67aed7e35ae..45e7d183823f 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -6,12 +6,14 @@ DIST v4l-utils-1.12.3.tar.bz2 1588049 BLAKE2B 1f76e6cd76781119beb01a1d570599cd27
 DIST v4l-utils-1.12.5.tar.bz2 1588944 BLAKE2B b87c24c6fdaf3e80407dd28b047c27420ff70007e12200e69395021def3abb74eec3565337a6484cf44b5a5cc7678d9bc718876424fa58d6d16d0e0c37ab59cf SHA512 ed2e7545a728360b9684db68330885b498a3a5611f49b80e54da72109d9ba2aa75e85f89f085ff0a6f077b17c880101fa5b78c9dff8a0df2eac1866bd80a04ea
 DIST v4l-utils-1.14.1.tar.bz2 1672480 BLAKE2B bc5c50fa0b339c79439b54e54f0c0e3847068931e34831a05e214e785fe4063764ef0d76838ca3216a46db072003dc5d86dd2c563fbb73d237a6b5059df93f5a SHA512 78b863f2cba409138efd6744895e6b1e730ec7cd5dfd0bd6088dd1336572a5f6d0b422fb4ec6577c6038192d0a3b28ae91d7402d5733904913749eff263c2eb1
 DIST v4l-utils-1.16.3.tar.bz2 1894961 BLAKE2B 71c674abbb3415e592354998e1baa3eedbb4be21757bef80b463ea987e9fc231789e6b333b37d0d9916cb30729e04951dc9f1755ab00a82502fdc415b00cb9a2 SHA512 404672d18d94861c6957ea3a15a6a48f238d3859940810952a5a8cc33b57f1a360d1a19af28405c01b073c0ece90c5995a71dbe6544b30bdb8eace7daeb4bc0b
+DIST v4l-utils-1.16.6.tar.bz2 1893768 BLAKE2B f31cf794f6949fa2c1f45db8bae99a10a5fbc67af356889f636ab03cfd04011a82939a10f01145c56001b91655664530cfbda7d64c523752b8bb77159a1c80ab SHA512 f011218591e32b0ca3239373d9ea4739d7cfe3a6bef5f8a996253cea9b9d836ba488132e2a1b8f6f61cd69f1bcecc20e4b5c26f9c95a2a912e17c400b9fa9b58
 DIST v4l-utils-1.6.2.tar.bz2 1148309 BLAKE2B 8153a1e3803b9e59eae064f2c88e4b865a56193788a8cb204dc34e9ae50e66794ba7f020ad4b0ff9af995f57d9b9a9e0225e0f8a09eeefae42d063131d7e549a SHA512 e14442e1b3660d0cb0844f1a5a88f855bc8532df9e72e1b2afd348a7c077ad25657f832d0fd47d3f567bfd399fd82c5a749d075ac9ecb911ea462685e31aa0b2
 EBUILD libv4l-1.10.0.ebuild 1395 BLAKE2B 9137b578723257d586092a1f3fd81f8ea552d93f0e50ac7d7ec8c447925c4d5a50dd4cabc46066cad5c4036c5cfe9850ffeddbfe7a1451209916ecd788c0326c SHA512 4daf5f65f9b587107864e86f5108f194c103fd3af8a1c645fcc09700021289460b3ba5aa3bedfc4c70380d454c1e8ee3fb837a01379e769c14286fdf19f8a611
 EBUILD libv4l-1.10.1.ebuild 1395 BLAKE2B 602ce585cbee9b33735055789353ff1f2296cb1216095cab81a0b4b015ff0ceb7015b2af933bbc238d0e628afdfa61af9d38080e4b407b649b974f24a7dac059 SHA512 c9f1863b392b2a24aa5e2b8d7941fb5bf3f67c142e36da3999db6a442934d68306b8b45adc73a43cb17e399ea506004a4cbba978b792fd5ba4c70ee393810edf
 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.16.3.ebuild 1361 BLAKE2B 2c12055ead5d3ff6a5ee91b99d6e82628b8c2c5fc6704e199ca43eb1c132dcbf6931c480d3ae8f861d62ae13911f04d07842783d39324143f0e67da073d20e25 SHA512 d0452e3a532b7f84efdfddec06ded78d2bcf55debcfe18c24158545abc64e75ca3b8b8e29d980279053e3fc488ac3cdc015f50339f0ec8a3b663534e0235a09f
+EBUILD libv4l-1.16.3.ebuild 1360 BLAKE2B 6a8cba7641759011fba00aa6e7d9ea052b33e4537008dec7f6616ddcddceee9040047225dc0ab470c6033f140787b1a4c3ef30c30466b55d0532bc7049480048 SHA512 d3e79e71b17e3d5f020a92962f18446a907acb1e8e19fb87d5b7e076104629c32707bea9afe5b61667f9985ac090c4f0279c39f7cf681081bfa6d1d7edb95400
+EBUILD libv4l-1.16.6.ebuild 1406 BLAKE2B 636d1c3e7362f1addc98c96bca4329e13bb1811912dde8f615c312d33345239645cdbf593ccbcd9dece1908fe645eff98325376920b40e10ee1d8dcf85b0abb0 SHA512 aa8ad4eb85ed1c7753dcb33d23dde25fa133f7be15b47bad064e19bfa7fe206037a7d1b1fbcfab0e51f5106ec2ce18c18420d9a1168c80ffa745ce79a4116fc4
 EBUILD libv4l-1.6.2.ebuild 1366 BLAKE2B 4b4d13e9e8723e0a846cde04627ea6a4af400633146b3e424b794264f9b6eaa8fec10d0e2d1d12b6572de3e96caaaa80368242cf59d33131c0afda86127e9f37 SHA512 24ae9e13eb1efc7a7e071c8a8102c065f1e9feadf8e02f4477c004403d5b94eeaba13510970bdfe48852e723619ce0579f82dc25b9c2975104fef97d1d3ba8f6
 MISC metadata.xml 1120 BLAKE2B b8854ccbfdb3674f5dd2657270945dcea8f9b48e501a07e8589bb04e0b99f927b8499afb979cb34a8d79a04e9813335188853db768dfe774fc5ab2919e9a34ee SHA512 09c21dcc53a675a4e04506dcf8b14b81947806dc761346a4bcb6a6ffdda7b60fb1adf0a778d7e4f060327aea55ec92b7fb700af7a874355d86b64a96541c8c5e
diff --git a/media-libs/libv4l/libv4l-1.16.3.ebuild b/media-libs/libv4l/libv4l-1.16.3.ebuild
index fbc183fbca7e..aca7697a07b4 100644
--- a/media-libs/libv4l/libv4l-1.16.3.ebuild
+++ b/media-libs/libv4l/libv4l-1.16.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="jpeg"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libv4l/libv4l-1.16.6.ebuild b/media-libs/libv4l/libv4l-1.16.6.ebuild
new file mode 100644
index 000000000000..36b0fe682676
--- /dev/null
+++ b/media-libs/libv4l/libv4l-1.16.6.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit libtool linux-info multilib-minimal
+
+MY_P="v4l-utils-${PV}"
+
+DESCRIPTION="Separate libraries ebuild from upstream v4l-utils package"
+HOMEPAGE="https://git.linuxtv.org/v4l-utils.git"
+SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="jpeg"
+
+RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	!elibc_glibc? ( sys-libs/argp-standalone )
+	virtual/libudev[${MULTILIB_USEDEP}]
+	!media-tv/v4l2-ctl
+	!<media-tv/ivtv-utils-1.4.0-r2"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+"
+BDEPEND="virtual/pkgconfig
+	sys-devel/gettext"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	CONFIG_CHECK="~SHMEM"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+multilib_src_configure() {
+	# Hard disable the flags that apply only to the utils.
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-static \
+		--disable-qv4l2 \
+		--disable-qvidcap \
+		--disable-v4l-utils \
+		$(use_with jpeg)
+}
+
+multilib_src_compile() {
+	emake -C lib
+}
+
+multilib_src_install() {
+	emake -j1 -C lib DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog README.lib* TODO
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index 3fba6717cacb..9256d8353df9 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -1,7 +1,4 @@
 AUX includedir.patch 403 BLAKE2B 27bf2e0e9dfb44bc62d518ac1282cc2b4d2c77a368c6b6ac7c1b09e24183eb8c40871f1c591000879c043ef322bde90c6ee2a6313d37ecb4fc9626f8a66717ab SHA512 c0aed82243a8a5a5155ba5b39e8283b9f24de498cd0a02e1f3907f5bd0c4b92e1dde9c8a7501784da49b3365ddca0fc0aa2d986119bc4543aa2aefeea46f27de
-DIST lilv-0.24.2.tar.bz2 244764 BLAKE2B e049354c2ec52116bbc0c588829c8e7d6c780a8325bb050d225e4893a4ca7b3c98b8bddd01dbfa0e67616bb6baadf2483087891d4242ccd4156aa8a8749484ef SHA512 b5d04b6bb1fb4d3a9a58d93b233db502dc2ded75672766a31d252abca657cbf2d170fa590c0c56159b2bac68c7af95d8787a512e318e3a0f30855504bb034659
 DIST lilv-0.24.4.tar.bz2 252209 BLAKE2B 71142f6a458a0edbb2087ac6eb6323b6ae4c53e45db22a616f00b22f818f507aa724ebf576f09654a98812b8b9a73689720677e64c715fbf7cd49ba26c7ddb11 SHA512 cb909c83dbac36b51a206fe508aec51e52ddf068f9a159d053888594402def8d140aae0d9e1e1866e722396f7ec8dea4b86d4c1b958f56eb3193b78307918a89
-EBUILD lilv-0.24.2-r2.ebuild 1491 BLAKE2B 4dcf0a2b5507c3ce790895a917a265ed09f2edef915bae07691788e19b83a34b2c75f7e98cb3919fe3f71d566f6fa736ef8ba2ea490ab0f2ab77390ea2f990bc SHA512 756dfb6db0cfb30532125b9e033d68f12df7eae31ac6f5c7a50d83375f16160321217aa7d78b960cfa8b2e6af6f41e24f0953d6a3cd9a21d81d647cddb2df85c
-EBUILD lilv-0.24.2-r3.ebuild 1600 BLAKE2B 846b39c71656e873d1f526e8daee94bf582e988fc28a11a6d8f7a3e4c22e9e42d5d3db843af73668d40d305bd8e5cabc93f9581dcf65e1ec9d7e8b2cda54564e SHA512 872d49474b3e2f9fedac162d9feeba0650f7c057e8aafe2a68d5ae20310b5d935f3ae409359477653caf5ec187398bf1923ab74c01dada377815b9e677a60b6c
-EBUILD lilv-0.24.4-r1.ebuild 1601 BLAKE2B 16ea39c54407f547bbc6ae16e6913e125993b40d28285ddc1f8e78894cf533fad081e07c7733739b1c6119dcd9049d6df63a787b15f821df168f3d0d864a8148 SHA512 bd6116788162314ca7060c8427d37c536d88fb073b4dcb328e0bc63d723c140f5a15b612ee85c79209b5032a97610e2cbe134d416e600c6357ef148276a901a0
+EBUILD lilv-0.24.4-r1.ebuild 1599 BLAKE2B 89991ac2abadae3ed3491dc7159773f65c11de2869f3b5cde273853a025eb57b64cb6d7e6fc453bbfeb73c89b199c7b8d29a53d608542d8af6c484cee9820e8b SHA512 a05334c8a3fc45bc6f0e91095b22954dee8f622136c2abbea29283fc72377e4038422647b7e9e997444dfc0f827b2ae0032af70beb6ad5dcb56b8e466160ee7d
 MISC metadata.xml 626 BLAKE2B 07ffc634a72982335c60d71732dca314e28b08ed40fe892f33514f0d13ac9e141fcb6a1d0507b6f35f4d6db963865ed87acb70aa8f2c1d20ff72eb4e62006841 SHA512 e2cd8e2459104889e6cc759146f86874a78784c07b966de2f6a18302098a028e7176270565922a44a72ada23eabbf5de919271296374d9547262684611ee74ce
diff --git a/media-libs/lilv/lilv-0.24.2-r2.ebuild b/media-libs/lilv/lilv-0.24.2-r2.ebuild
deleted file mode 100644
index ca54e0e874c6..000000000000
--- a/media-libs/lilv/lilv-0.24.2-r2.ebuild
+++ /dev/null
@@ -1,58 +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,3_6} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit python-any-r1 waf-utils bash-completion-r1 multilib-build multilib-minimal
-
-DESCRIPTION="Library to make the use of LV2 plugins as simple as possible for applications"
-HOMEPAGE="http://drobilla.net/software/lilv/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~ia64 ~ppc x86"
-IUSE="doc +dyn-manifest static-libs test"
-
-RDEPEND=">=media-libs/lv2-1.14.0-r1[${MULTILIB_USEDEP}]
-	>=media-libs/sratom-0.6.0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/serd-0.28.0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/sord-0.16.0-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig[${MULTILIB_USEDEP}]"
-
-DOCS=( "AUTHORS" "NEWS" "README" )
-
-src_prepare() {
-	eapply "${FILESDIR}/includedir.patch"
-	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	waf-utils_src_configure \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--no-bash-completion \
-		$(multilib_native_usex doc --docs "") \
-		$(usex test --test "") \
-		$(usex static-libs --static "") \
-		$(usex dyn-manifest --dyn-manifest "")
-}
-
-multilib_src_test() {
-	./waf test || die
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-}
-
-multilib_src_install_all() {
-	newbashcomp utils/lilv.bash_completion ${PN}
-}
diff --git a/media-libs/lilv/lilv-0.24.2-r3.ebuild b/media-libs/lilv/lilv-0.24.2-r3.ebuild
deleted file mode 100644
index 5ff84a5e6d4c..000000000000
--- a/media-libs/lilv/lilv-0.24.2-r3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit python-any-r1 waf-utils bash-completion-r1 multilib-build multilib-minimal
-
-DESCRIPTION="Library to make the use of LV2 plugins as simple as possible for applications"
-HOMEPAGE="http://drobilla.net/software/lilv/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="doc +dyn-manifest static-libs test"
-
-RDEPEND=">=media-libs/lv2-1.14.0-r1[${MULTILIB_USEDEP}]
-	>=media-libs/sratom-0.6.0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/serd-0.28.0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/sord-0.16.0-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig[${MULTILIB_USEDEP}]"
-
-DOCS=( "AUTHORS" "NEWS" "README" )
-
-src_prepare() {
-	eapply "${FILESDIR}/includedir.patch"
-	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	waf-utils_src_configure \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--no-bash-completion \
-		$(multilib_native_usex doc --docs "") \
-		$(usex test --test "") \
-		$(usex static-libs --static "") \
-		$(usex dyn-manifest --dyn-manifest "")
-}
-
-multilib_src_test() {
-	./waf test || die
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-}
-
-multilib_src_install_all() {
-	newbashcomp utils/lilv.bash_completion ${PN}
-	dodir /etc/env.d
-	echo "LV2_PATH=${EPREFIX}/usr/$(get_libdir)/lv2" > "${ED}/etc/env.d/60lv2"
-}
diff --git a/media-libs/lilv/lilv-0.24.4-r1.ebuild b/media-libs/lilv/lilv-0.24.4-r1.ebuild
index 54877d5c31b2..c23890a1e051 100644
--- a/media-libs/lilv/lilv-0.24.4-r1.ebuild
+++ b/media-libs/lilv/lilv-0.24.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 x86"
 IUSE="doc +dyn-manifest static-libs test"
 
 RDEPEND="
diff --git a/media-libs/lv2/Manifest b/media-libs/lv2/Manifest
index b949989695bd..69fec08564ca 100644
--- a/media-libs/lv2/Manifest
+++ b/media-libs/lv2/Manifest
@@ -1,3 +1,3 @@
 DIST lv2-1.14.0.tar.bz2 386438 BLAKE2B e09e6c2b1bbf24d5896e7803b970fd8877a5b6a9ded0fcf294561c365d5f0b2e89503c0306b02dd956f7ac6ebd9df4ca0c0a17564ef3851443d81847dd41b261 SHA512 6991d848ed9f04a48ca3070efc15af83431f680aa8a8559a02b1666f7b8d43af8e089f78c3b14ad3345dac32fd1c8ad0faf3a3f56dddc07c6f0e0aeef4077498
-EBUILD lv2-1.14.0-r1.ebuild 1322 BLAKE2B 684a2df3e27b4fa888c7218a258d55c5a3b4fd34718cc6ed4d05851e6a503b1808038cfbf4fac3b94712f2ac3a2377c2bdf49b888ec1b4c437fcf1bd175812e8 SHA512 8a1dc4d2e4b2d01f6e344fe8eaa4b2df598e9d300ac2fce40b24e13dbac4f6cb2337464b258de3d96d50393e96e23b4c1ad02b3dc29914e50c806f5a502328a7
+EBUILD lv2-1.14.0-r1.ebuild 1321 BLAKE2B fee2792af2801eadff23524bffaec18a53d1ca7b1f2423616088aafff1f47d72d69977b67c458a4fffcf705d4dc8b9e050356ef0b9daec3cd9e5b9a6d858e691 SHA512 24a011b3091179f7aeea145a5fe3ccbdb62c614dac6d5c530da8c520f5a9ec4bd81fafb632edf91b2e328368ad2729e7b64f04717a1ef57aa74f8307e6cb2cc9
 MISC metadata.xml 340 BLAKE2B e8469f758a451316b9d89c286f2d47c82b62d57ff9d43a6f2f93da8cf0abb5579fa8e568d8e6422e5d144a368310ccdec6e89ce2672f53b9db149bbf838afa68 SHA512 a31345dfd0bb1ac92461cd26ffcd20197775288be0ee4a2d660e90b8655f5288166c9613ba42ef3eef6dff6c97d268ffc85af3429eb093ffb29ad9581a5fa33d
diff --git a/media-libs/lv2/lv2-1.14.0-r1.ebuild b/media-libs/lv2/lv2-1.14.0-r1.ebuild
index 6c55e7291059..b2376708fca6 100644
--- a/media-libs/lv2/lv2-1.14.0-r1.ebuild
+++ b/media-libs/lv2/lv2-1.14.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://lv2plug.in/spec/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 x86"
 IUSE="doc plugins"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 6a8434002fe7..e099a6bb21f1 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -3,18 +3,22 @@ DIST mesa-19.0.2.tar.xz 11959876 BLAKE2B 4d82a339a1577fb156b48d330157894891326f3
 DIST mesa-19.0.3.tar.xz 11963844 BLAKE2B 7d8bae717c0a2a6143d3aee35852145a2032d40ad7f4edcd76eec46392f3917787592d13f9695de54a15ea5bcb3dec3181c418ddfb5b69a3e1b52fb796f04eab SHA512 aa170577252aa4157e4bd49076bbf6207e4aada9fc9f23b255de332e816f9c63e5661f752f2f276dd43e232a8926866004e2a2ff9ad4b411330969c2a9a7ffa0
 DIST mesa-19.0.4.tar.xz 11964060 BLAKE2B 5c0d0c6e019792ff6cd195f3b59303e2230fa32c24aa1524c3cccddc56ef6634732e79ff03c7bb20055c0489dbdd7cc103b27989179602f3c9ab332afd531d1a SHA512 431cd9360e1f6376e0966daf82322877b3833032c800f2d86816b37a6f3978d76294a01c3905a01af610582c9541c2a8b52b2e89c56cc954651aa7a790e84ca5
 DIST mesa-19.0.5.tar.xz 11967816 BLAKE2B 941f99194492fcdf4545d06d4f2d576a1a2b206aa9211dd8c3a018877a42dfac4a6d7b4103e781e4c4211661c118b663225252567e22226a866386a8e242f177 SHA512 aecd5ee54ac0316d5e318dbea0abdc06f23e67d75d36eb82d6cf6a396c9e850e1ccf4fa8815f8c4097b6039ebb1524673189350cbfd4b766ce75ce17c26d9d8d
+DIST mesa-19.0.6.tar.xz 11971284 BLAKE2B 264b3afe0701f288c5ba3f28f902e55f2c4888f79854b12b57faf29a27ed9141c6967cc6807a739604641a8fcfb5feb5315ba7f9ba85d3a3ea80cc2115ee7394 SHA512 320fd6b12ccd5e4a40dfc93546354848a38da09d90e4d5a1dae5d100b8106942acfc25ac3f705a2d3ab3b355162c74c7dfadbdb99a46cf2e5e0761f8542bfeb1
 DIST mesa-19.1.0-rc1.tar.xz 10877180 BLAKE2B 1ea358595875fbe46b58f5445762cec0c0bd6ee087ce9819237373e2b41aacb64365ac9832b20b9f5fb8838c3d2c6c929cd642bba18b99c7ef153ca124135918 SHA512 a56215882a7c22b7b8fe57d5703914d674841e4045676e2cc2e7834d17f4d5a765516bec4f01eea6772c50e1d979cc430e032302f38c6e7a4274bc43a4d647b1
 DIST mesa-19.1.0-rc2.tar.xz 10876808 BLAKE2B 2da9603ea7ec5c1de94ee24c3200f570e4ea127601f370230dc1bf1b64167c6d405fbd6bdb4cdae6be46ed0ff1610f12c0445c3f5a65dd6559e91b6f664872ca SHA512 4d04bec48cbfb17d6dbe7b7700083612e46cbaad3e3630d6219fd1988f5e793cdb5100b8c2531a94b6078f8bb239fef27ed440122d12a2473be5be8648b6a8b1
 DIST mesa-19.1.0-rc3.tar.xz 10878280 BLAKE2B 0b95b82d46a2c72185652fef76a50ec82b51a2f8efa9ca72e2c10eb0443e9ba43c5906de37d2479dc97ed48a8932eebea27de7e08321d7d3205b188af9f64642 SHA512 740d5d13458b54e1942bfe7165938ec414aa7949aa60109ba872236f3b483c7305ac76b1b48c38dc6fd7691748106447757ac081f364952cc9e00f45fa9e2ea5
 DIST mesa-19.1.0-rc4.tar.xz 10877676 BLAKE2B 7d9237b56c74d72c3cf6a218aa3c72e7c3cefe2511a61a9c9a16dcab306a567ffdeb2d4745dcb4113667ffa4ab5b806677e3b065d8574c1cb44419b99d193569 SHA512 04cc5a537d803359b9eb3207f7b7ab1357126fe78ae0a0ba24df51d2fbbf4e0cf1815a60f99a10b33c822c08af0c84adef44849e73c883f5ce30fdae142c5b61
+DIST mesa-19.1.0-rc5.tar.xz 10878100 BLAKE2B b24fca148d01a05bc7c7a90b07f55fa9996e80b2ccce4ad6ee855889211226b792aedf7809acba26ec20ef961fe37672945ba00ddcc4361c64b42882d2f71dc1 SHA512 033920bbbf395104bfb6ffe9482e0f504b5cb0009be25bb1b0a4269bc6cf9c737de82350e994d568f454ed5b3206fc23927122032b3702122fe7edbc2d749e6d
 EBUILD mesa-18.3.6.ebuild 13688 BLAKE2B e8738fc05efad0af1f627af3339abcb609d55bc656402f4a7cd10d0216a0bfd067ae401c357ce4d9bb7b82d81fb8df5129025840d557863a04f183c38a299ef1 SHA512 9a99c7afc94de3e259156b7e48a8059a90bf8069684ba3354e83aa599e50baf6e63ea6c87fbfd672e0f97bf8383cabe93b193d56df840d586929301fc920ae10
 EBUILD mesa-19.0.2.ebuild 13837 BLAKE2B 3add45d862939caa95daf019edca4417c63b9e7d995b01f1ffec5d1ad2d918cb272d0136f357dcb65285ccdaa20a900a246760d56a6f56e0518d5bf32ef99718 SHA512 312e014c322297e5ad3438255689a10ef32c0bb3bcd379aef5f3187648e8d7a2e17587cda27f731f6e3dd9d5bb0719a4c590b6ea1b09b1bac8c54de36f553ce8
 EBUILD mesa-19.0.3.ebuild 13837 BLAKE2B 3add45d862939caa95daf019edca4417c63b9e7d995b01f1ffec5d1ad2d918cb272d0136f357dcb65285ccdaa20a900a246760d56a6f56e0518d5bf32ef99718 SHA512 312e014c322297e5ad3438255689a10ef32c0bb3bcd379aef5f3187648e8d7a2e17587cda27f731f6e3dd9d5bb0719a4c590b6ea1b09b1bac8c54de36f553ce8
 EBUILD mesa-19.0.4.ebuild 13837 BLAKE2B 3add45d862939caa95daf019edca4417c63b9e7d995b01f1ffec5d1ad2d918cb272d0136f357dcb65285ccdaa20a900a246760d56a6f56e0518d5bf32ef99718 SHA512 312e014c322297e5ad3438255689a10ef32c0bb3bcd379aef5f3187648e8d7a2e17587cda27f731f6e3dd9d5bb0719a4c590b6ea1b09b1bac8c54de36f553ce8
 EBUILD mesa-19.0.5.ebuild 13837 BLAKE2B 3add45d862939caa95daf019edca4417c63b9e7d995b01f1ffec5d1ad2d918cb272d0136f357dcb65285ccdaa20a900a246760d56a6f56e0518d5bf32ef99718 SHA512 312e014c322297e5ad3438255689a10ef32c0bb3bcd379aef5f3187648e8d7a2e17587cda27f731f6e3dd9d5bb0719a4c590b6ea1b09b1bac8c54de36f553ce8
+EBUILD mesa-19.0.6.ebuild 13837 BLAKE2B 3add45d862939caa95daf019edca4417c63b9e7d995b01f1ffec5d1ad2d918cb272d0136f357dcb65285ccdaa20a900a246760d56a6f56e0518d5bf32ef99718 SHA512 312e014c322297e5ad3438255689a10ef32c0bb3bcd379aef5f3187648e8d7a2e17587cda27f731f6e3dd9d5bb0719a4c590b6ea1b09b1bac8c54de36f553ce8
 EBUILD mesa-19.1.0_rc1.ebuild 14245 BLAKE2B d4b326ae22614a1433054829ac586b31c616b6142a2054e1202ce442835b56b05b7227d2fce08c7ab3007dbcc82b8652ed4fefa2201b04958791468f04bdecfa SHA512 ffcc6eae28666708750fb807ea96346275f5302a50f5c2f1d40026b8683ad85db381ae62a56449fb510724cd0d8218f28090b300efc52bdc7b0e4b150ee4ba56
 EBUILD mesa-19.1.0_rc2.ebuild 14245 BLAKE2B d4b326ae22614a1433054829ac586b31c616b6142a2054e1202ce442835b56b05b7227d2fce08c7ab3007dbcc82b8652ed4fefa2201b04958791468f04bdecfa SHA512 ffcc6eae28666708750fb807ea96346275f5302a50f5c2f1d40026b8683ad85db381ae62a56449fb510724cd0d8218f28090b300efc52bdc7b0e4b150ee4ba56
 EBUILD mesa-19.1.0_rc3.ebuild 14245 BLAKE2B d4b326ae22614a1433054829ac586b31c616b6142a2054e1202ce442835b56b05b7227d2fce08c7ab3007dbcc82b8652ed4fefa2201b04958791468f04bdecfa SHA512 ffcc6eae28666708750fb807ea96346275f5302a50f5c2f1d40026b8683ad85db381ae62a56449fb510724cd0d8218f28090b300efc52bdc7b0e4b150ee4ba56
 EBUILD mesa-19.1.0_rc4.ebuild 14245 BLAKE2B d4b326ae22614a1433054829ac586b31c616b6142a2054e1202ce442835b56b05b7227d2fce08c7ab3007dbcc82b8652ed4fefa2201b04958791468f04bdecfa SHA512 ffcc6eae28666708750fb807ea96346275f5302a50f5c2f1d40026b8683ad85db381ae62a56449fb510724cd0d8218f28090b300efc52bdc7b0e4b150ee4ba56
+EBUILD mesa-19.1.0_rc5.ebuild 14245 BLAKE2B d4b326ae22614a1433054829ac586b31c616b6142a2054e1202ce442835b56b05b7227d2fce08c7ab3007dbcc82b8652ed4fefa2201b04958791468f04bdecfa SHA512 ffcc6eae28666708750fb807ea96346275f5302a50f5c2f1d40026b8683ad85db381ae62a56449fb510724cd0d8218f28090b300efc52bdc7b0e4b150ee4ba56
 EBUILD mesa-9999.ebuild 14245 BLAKE2B d4b326ae22614a1433054829ac586b31c616b6142a2054e1202ce442835b56b05b7227d2fce08c7ab3007dbcc82b8652ed4fefa2201b04958791468f04bdecfa SHA512 ffcc6eae28666708750fb807ea96346275f5302a50f5c2f1d40026b8683ad85db381ae62a56449fb510724cd0d8218f28090b300efc52bdc7b0e4b150ee4ba56
 MISC metadata.xml 2041 BLAKE2B dd7f78a57123408674d7ca6a8e7a455e84ac668bf9e6552502cf62dc2464f1a62765db5c22c0d4dab82e59a5325ad10d69b436aab96b5a4d5c789f0a7b671469 SHA512 f07128004b03ddfc6d235de15a95c0bd6338133b13daa31907bd2897d65eaa9c8ad1164ec5e21fb7fa6417927a8109cbf86b24bc62b09cfa29d0bb18fcd3c4b1
diff --git a/media-libs/mesa/mesa-19.0.6.ebuild b/media-libs/mesa/mesa-19.0.6.ebuild
new file mode 100644
index 000000000000..6e5cc0499b8b
--- /dev/null
+++ b/media-libs/mesa/mesa-19.0.6.ebuild
@@ -0,0 +1,525 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+
+inherit llvm meson multilib-minimal pax-utils python-any-r1
+
+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
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	EXPERIMENTAL="true"
+	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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+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}
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
+	lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
+	vdpau vulkan wayland xa xvmc"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vulkan? ( dri3
+			  || ( video_cards_i965 video_cards_radeonsi )
+			  video_cards_radeonsi? ( llvm ) )
+	wayland? ( egl gbm )
+	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.97"
+RDEPEND="
+	!app-eselect/eselect-mesa
+	>=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}]
+	libglvnd? (
+		media-libs/libglvnd[${MULTILIB_USEDEP}]
+		!app-eselect/eselect-opengl
+	)
+	!libglvnd? (
+		>=app-eselect/eselect-opengl-1.3.0
+	)
+	gallium? (
+		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}]
+			)
+		)
+		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		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}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${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. < 9.
+# 3. Specify LLVM_MAX_SLOT, e.g. 8.
+LLVM_MAX_SLOT="8"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:8[${MULTILIB_USEDEP}]
+		sys-devel/llvm:7[${MULTILIB_USEDEP}]
+	)
+	<sys-devel/llvm-9:=[${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/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	valgrind? ( dev-util/valgrind )
+	x11-base/xorg-proto
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${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.0.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_pretend() {
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+}
+
+python_check_deps() {
+	has_version --host-root ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+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
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_use llvm)
+			$(meson_use lm_sensors lmsensors)
+			$(meson_use unwind libunwind)
+		)
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=false)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=false)
+		fi
+
+		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_imx imx
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		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
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_radeonsi amd
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
+	fi
+
+	# on abi_x86_32 hardened we need to have asm disable
+	if [[ ${ABI} == x86* ]] && use pic; then
+		emesonargs+=( -Dasm=false )
+	fi
+
+	if use gallium; then
+		gallium_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+	else
+		dri_driver_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=dri
+		-Dshared-glapi=true
+		$(meson_use dri3)
+		$(meson_use egl)
+		$(meson_use gbm)
+		$(meson_use gles1)
+		$(meson_use gles2)
+		$(meson_use libglvnd glvnd)
+		$(meson_use selinux)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+
+	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson test -v -C "${BUILD_DIR}" -t 100
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mesa/mesa-19.1.0_rc5.ebuild b/media-libs/mesa/mesa-19.1.0_rc5.ebuild
new file mode 100644
index 000000000000..20146f77c705
--- /dev/null
+++ b/media-libs/mesa/mesa-19.1.0_rc5.ebuild
@@ -0,0 +1,538 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+
+inherit llvm meson multilib-minimal pax-utils python-any-r1
+
+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
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	EXPERIMENTAL="true"
+	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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris nouveau vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
+	lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
+	vdpau vulkan vulkan-overlay wayland xa xvmc"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vulkan? ( dri3
+			  || ( video_cards_i965 video_cards_iris video_cards_radeonsi )
+			  video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_iris?   ( gallium )
+	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.97"
+RDEPEND="
+	!app-eselect/eselect-mesa
+	>=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}]
+	libglvnd? (
+		media-libs/libglvnd[${MULTILIB_USEDEP}]
+		!app-eselect/eselect-opengl
+	)
+	!libglvnd? (
+		>=app-eselect/eselect-opengl-1.3.0
+	)
+	gallium? (
+		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}]
+			)
+		)
+		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		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}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${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] )
+	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+"
+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. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="9"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:9[${MULTILIB_USEDEP}]
+		sys-devel/llvm:8[${MULTILIB_USEDEP}]
+		sys-devel/llvm:7[${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/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	valgrind? ( dev-util/valgrind )
+	x11-base/xorg-proto
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${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.0.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_pretend() {
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+}
+
+python_check_deps() {
+	has_version --host-root ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+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
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_use llvm)
+			$(meson_use lm_sensors lmsensors)
+			$(meson_use unwind libunwind)
+		)
+
+		if use video_cards_iris ||
+		   use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=false)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_vc4 ||
+		   use video_cards_vivante; then
+			gallium_enable -- kmsro
+		fi
+
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_iris iris
+
+		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
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_iris intel
+		vulkan_enable video_cards_radeonsi amd
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
+	fi
+
+	# on abi_x86_32 hardened we need to have asm disable
+	if [[ ${ABI} == x86* ]] && use pic; then
+		emesonargs+=( -Dasm=false )
+	fi
+
+	if use gallium; then
+		gallium_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+	else
+		dri_driver_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=dri
+		-Dshared-glapi=true
+		$(meson_use dri3)
+		$(meson_use egl)
+		$(meson_use gbm)
+		$(meson_use gles1)
+		$(meson_use gles2)
+		$(meson_use libglvnd glvnd)
+		$(meson_use selinux)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		$(meson_use vulkan-overlay vulkan-overlay-layer)
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+
+	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson test -v -C "${BUILD_DIR}" -t 100
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mutagen/Manifest b/media-libs/mutagen/Manifest
index f062b0c3a76d..c9899b83ea72 100644
--- a/media-libs/mutagen/Manifest
+++ b/media-libs/mutagen/Manifest
@@ -9,5 +9,5 @@ EBUILD mutagen-1.38.ebuild 1031 BLAKE2B eef55684a41c17d279d3e58041a1b7ae42bf4eff
 EBUILD mutagen-1.39.ebuild 1076 BLAKE2B 0883613d632c85c68008af015ddc38c0737b020e9118a7f87a0c7cdbf60b52565f46aa86516b21557dd102e939af2d1cc683456932a9ab5be766d8395ae3a63d SHA512 27b94a87fdd1c01c80d3e37844918766a6f17b74e1b24f15e40892502fdebcd63e1c7fcb1390a683ca27487b3d924b219cdfce44b26fc05931ccc80d2bc55be7
 EBUILD mutagen-1.40.0.ebuild 1085 BLAKE2B 8a4e6f2aa3d65a3c6342e033e7c73931aafd133ce2313d517eff837ad4f1164d4c7ee3c79e893a01c8c88f351ed38b4dd9b8e49581c995c89ee9d8a75b1357a4 SHA512 d226ad490c6033dcaefb83d00fd26e1c0d94322f3274f4a043c1f1ef6198e9d1576d3dcdf6814ef91f366805c1ec858d5872e00dc0d997ef1c95bbd82b20476e
 EBUILD mutagen-1.41.1.ebuild 1093 BLAKE2B c09f23a432d820b157f7eb0d7dd79ebe9531e2666332e860989b205093d57505a5a66df012963ad4ae7e512c0573d00c83a853f50ef5d185cf4fecc8a430062d SHA512 e9e175cafef034d670853150b79a3b5148608396a68515b398ed5e9cb0b93dea081609936b40532a1ec939a729f1f5fb6b2cf327ee25943df33ff3dbef839b0c
-EBUILD mutagen-1.42.0.ebuild 1088 BLAKE2B e9d8f636be3f1a567ff0ff56c7dfa270a3167342aa73bd91a29412dbeff18525170063776555670d6b1f59141c57592a2a5ac2734a349314a88c0d34997f46e5 SHA512 975181d95e74da6cee6023e74ef683a1679aa5545482820a0385b6d330785c24e2e070f1733d79e19b28b67e4b1f7f355f60b78459d9e16139f92a98e6292974
+EBUILD mutagen-1.42.0.ebuild 1087 BLAKE2B bc291debdb3aa8a5b7fe3cc7ffa74da978b0e183e96566190555767f2c1ebc648dccf059c157a775609820dd5820668be4dcf861fb3283d9784a160a9baa20c7 SHA512 d073862134e08c01bf9ca1a47e9c020d2cec821e6aec01a7dff1b7fbb1c5c449c111e0196136bd54eb7ec4b85e7fc3b2522eaa574b3ca3a4b73794925c748464
 MISC metadata.xml 380 BLAKE2B 9fd70ca6ca6e8d17b66ea703f65885b87714ed0560ffe7502d85da3ee8fdf1d62545c1166b64d99f2bd2bfa6105f8f8865bc28769069c1ae3da4b1c3c174fd69 SHA512 87ce1f85bd6aff7c159fd22a412eb9ea95ac4f58fb2cc70fd4c4f470bfe9f6366b906bc9cef833ae5c10b7a3601c15edab9e8418cf78d7d9e993191873f41d59
diff --git a/media-libs/mutagen/mutagen-1.42.0.ebuild b/media-libs/mutagen/mutagen-1.42.0.ebuild
index bc9b7f337ec2..84852ce4fb50 100644
--- a/media-libs/mutagen/mutagen-1.42.0.ebuild
+++ b/media-libs/mutagen/mutagen-1.42.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 # TODO: Missing support for >=dev-python/eyeD3-0.7 API
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index e626749ed0b3..ab65cff772f0 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,20 +1,12 @@
-AUX openexr-2.2.0-CVE-2017-9110-to-9116-security-fixes.patch 2871 BLAKE2B dcc0f9feda88f101e039973d4664df32fa9269794fffdb8686d4197b90615d8b75853ad97813d31a3aabd67589951341a45ebe258e7a9431250b90693939d3dd SHA512 c24365be8c645586efacbd8983a7ccaebb1452afd0fbb45b0e12e77e1442b2d27e19bf155745eeb05b214831f7c081c1f5967d7502bc13c4b53e01ea0e0b9e65
-AUX openexr-2.2.0-Fix-typo-in-C-bindings.patch 649 BLAKE2B ded357550fa531da4288c13d0c0a402bf3c73b53dd028474efe5436b5e22393059d94858ebf9b79760e953b93acd597698baec29406be15cc4ed0f666de5ffb4 SHA512 17ce63c9ad2c39606af83886db34fec3baafe2f9816dd2f6f0189e3caab0015910f89f8eb261a49d8ccb495d36b268b148ce09e2172a7b516b4832fdc8e84fea
 AUX openexr-2.2.0-Install-missing-header-files.patch 1929 BLAKE2B 9695d1c5294d312b5551522044d838db8c19e2a46d970b392ebb2d2889ea1c54f765f3195ce9b1df42b9ac7586a6569e9621b039dde5ab562b0bce5b74a9f33b SHA512 b6d1bb5a37bdf2283da8f45b71f3a8830a96437f2459746c5d354cecaaceee5e35ba3e3cf247e3c5c6f7930490233672542d8f7aaa59b79593d209e66eac8421
-AUX openexr-2.2.0-fix-build-system.patch 17897 BLAKE2B 95f44167ce0590ee591a7b7de6708ede3673802d9497881814ec9f1bf4cbca1bc75055ad837f51d0da85d1d07b9059cd35593b4568dff5b24925bf364d543eac SHA512 a8864b4c51e8664c06c7c1a1b2900626fb8dbccdb70ec144b895b373e8ea836dc7f5048a72a2cb0c6ae04e040796e49f977e25f7f2a52d6a3469166433bc2bb4
 AUX openexr-2.2.0-fix-config.h-collision.patch 1556 BLAKE2B d7366aeae2a4d5b5496815d844de90c381d3a514dde0e37f86d2b2c5a8fe11eb3631aa44a554a5390cd2a43700cc8a36ff88af4a0e894c4774c45edf0129c4c5 SHA512 15d654f9e1546ea32a6175b1cce24ed9d979afe7dd763ca53a17c1020ca8851c31cc3b8fc0e4ef31722ead91557e24a67958ca9ee5fd0fa4e574304c3153be33
 AUX openexr-2.2.0-fix-cpuid-on-abi_x86_32.patch 2536 BLAKE2B 7eb4db8596cd157f30ba7be564f776598cfa0d893dbaf8f729e8041079e851b0272ba595298e10792a5c74c14b21fbea78a4157d9494501f2c1ca5ef946dc6af SHA512 530088a51d97039e951055361526b8afa2c322351971d26302d21ddd6fdf2d21682df0577872be608b8cd0c3d3fc05792d871e7c724546be42bfa439e74bb726
-AUX openexr-2.2.0-use-ull-for-64-bit-literals.patch 1934 BLAKE2B 616f29857b5cd95c21bfba22ed7df51b1fab88476836eecee08a1befea4f82303ce35bc00eab34762d6cbba660851356198420e6a96092b8eb0a630829d3f132 SHA512 b799c5924bf8dba468236f4d43feab8ca7d8a88444595f2355671337f38d2868957d1372385000c36ed7ae74499925060d402ef9a82a352ea85dc7378cde21e2
 AUX openexr-2.3.0-bigendian.patch 2226 BLAKE2B e11a081bee4916276a912a0e96c873a9cee093df84aac0d69bf1c071d53b79064603c09637a446438d014739ba2c27b12f42567e5135af4a9913464f25fabe44 SHA512 2d1e300a3b5d0de7611c2b155f6123c778546a0cba0ee569c915ebcc39c343f88894286e6204bb10f153c824fd6ffed78979fc51804f56065ebf478c553f1e2f
 AUX openexr-2.3.0-bigendian2.patch 655 BLAKE2B 0bbafb66a643263e756d473216f262a9e307b805bd428f102c8aa6ed28e7ce42fa7549a6a4c820b56b6195e9301f97433a0c18e5b03a2207bbb14bdc1dfb25c0 SHA512 c0d4b2b79102f8d75134debc10f4324921233384b1b404a957db2d36948527a764e2e8d911c14230b849b91cd050d3de2fc222437434802b1d71c5d9fba3e1fe
 AUX openexr-2.3.0-fix-build-system.patch 2381 BLAKE2B 37fd9c6ae5357ffb93fd47344137b4c91110a79ab2b685ac048109192f87e41f01aaa0a0fbee222bfa10ffdc58340d7c803b3068bca8bf99c323dfe46252597d SHA512 36889880813acf75a77d3d34ea3f0a6535ca45194ad491bec17df3701d1eabd2bb03d81c525ba96cf695e91ec67abeb1b2395cfa45ff0767d90b4600d63e768a
 AUX openexr-2.3.0-skip-bogus-tests.patch 1429 BLAKE2B fe9dcafb4ea5990cfcf36b16f377592dba1a6f9c31315e38596b67007b2cb67fa46a3217f335202b86b5aa8fb0498c5af5a0905a5a57b9af42b601da1bdae473 SHA512 ff13061b24f6477195e189c38e2bf855a46ab77461c8622dd2e2414a7d2103b260f5184735bb142275690e66fb469e6f6c1fbf626dd9c1c2afbc15b975eba78a
 AUX openexr-2.3.0-tests-32bits-2.patch 586 BLAKE2B 83d36040f751e07f30c5cc3be10f8ac43d62d91b87b87bc2735ecc22426401b3b671d0b397e6a9a1fba351ae66e022c9bb488f95d29a9fbcca479d3d70501eac SHA512 5ffc8bda7e476ce71ee103b519c76e630371e5cc005b04f99d2c054580e387cc2b3b9598cbe4442415c5dfe85b0de8ceedf87079c3f738b7ebb737ea23ea7729
 AUX openexr-2.3.0-tests-32bits.patch 1537 BLAKE2B 96cc98ef34a6c18102e5b96f4373f41b77d25aaf04f9a20d0d406eeae17988cc6f3eecf805f6bac1e42805b283f3123455ca1b069d7c0dc04628835ded2d8dec SHA512 58ad1d8f5dc28be60cdc290c7829d8b50708d26f3a769530e054c629170457f6b7e2b526455f6f86d2ee24931d8afdb61345ada99ae49897d926c0d50fb579f6
-DIST openexr-2.1.0.tar.gz 13680816 BLAKE2B 2d3cb4e0419160b07f1efe9a853f1d5deeb0499da4f79da201fc5eb1f57102891da666e161b2d8ec43a6f0b6ff6f5c7b92c2baae51a808892691182290192992 SHA512 d69924331c3392b8063229391414bb90f16ce317c76cfffe5fe0fcbb25e576f6ace8320b51c2a9987fee912cedd8e69116d4b49ba716b4a5f011131a81815403
-DIST openexr-2.2.0.tar.gz 14489661 BLAKE2B fae3c5a255e8bf5121561687e9d704d7de3657eb38295ff96db6ddad240391379a6624483abbe619f80f0979fd9828992d236e55b5014916d4d39d6ff51d0815 SHA512 017abbeeb6b814508180721bc8e8940094965c4c55b135a198c6bcb109a04bf7f72e4aee81ee72cb2185fe818a41d892b383e8d2d59f40c673198948cb79279a
 DIST openexr-2.3.0.tar.gz 18412067 BLAKE2B c73c4db4e414010ed8cc9f9631f3e8b17f47edf89b4ecb459aa00ff54a316b3bb1489e332bc029e0917ac4ffe7e152082244102029fd375f183da6741788dab7 SHA512 003f5bb3bd010be1ad9ff1798643ef711c683c8191625fe9b59070c9cb0c649c277cd506d890c6b239d9cbab80e83e16f1c1d1d74117c916ee3a80e061953123
-EBUILD openexr-2.1.0.ebuild 1256 BLAKE2B 0c8154e2bf910e9d3994c28f9a29f725efc1c677d1a587162e6766d24e6f6ac7d0ab7fd98b46d5ea3103321d12de217678d4de97ab555733af8e99cb1aed97fb SHA512 c5a8158b4ebb432479f7edfb39b41d3742d0bcd3cca4782dac1bfa1b4aaa6191355dc0a4b2a5c643874c19829c2118052ef1841975b6f7c97ee23542dd3063fd
-EBUILD openexr-2.2.0-r2.ebuild 1862 BLAKE2B 2ddcfb899e3213db76211cbacf9fe7afa597ac0fece9ec4655e390fd6501a5cb15f3553d374408d748c2a4364b519f15f71e82af7d93402736b9c1c245b50266 SHA512 028067478c69a1eade6bda177b734f6530de91e6350e9057aadef4028c0a5c3cc5ca8989186fe59c9b9075d9d17e119e7b53d3713acc29228af52100250a9fda
 EBUILD openexr-2.3.0.ebuild 2232 BLAKE2B e4fd31a280d2a1f7c02903178da0ebcf91ebfbde833d14847ed23a3d4ca3089d5945d7115409f7d317a41bf42856a3ee552ce30e3ec81369b9f6f2b7090b271f SHA512 7f6256cf42b8b69cc71ac4f22cb0f3524406dfad622123b129c0e4e7566d6c46e57e30e98e9f70a8cd1986f4f6865bf1488779394b6381ea74f750319876e7d6
 MISC metadata.xml 303 BLAKE2B 53fb5019bd6fe939d485f1eccb4a140ca9b7ce121b06744d8155842ccb6c5e1378ea39a9ae74c8d519be7b3926bd76040df4b8107137fcc2e25be97431e7a1be SHA512 0ab8d735dd7a8e0dc96b14cfde1ae06969d15cfbad956f4fda60b093660aee38fe98709376eedc9362a26858678d2f28eec795c1accb2560858fd804a11bb7ca
diff --git a/media-libs/openexr/files/openexr-2.2.0-CVE-2017-9110-to-9116-security-fixes.patch b/media-libs/openexr/files/openexr-2.2.0-CVE-2017-9110-to-9116-security-fixes.patch
deleted file mode 100644
index 0a37ee9c2d99..000000000000
--- a/media-libs/openexr/files/openexr-2.2.0-CVE-2017-9110-to-9116-security-fixes.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From c2b32f21cbe2db7c7ef485d62ffe9bec8eaa5165 Mon Sep 17 00:00:00 2001
-From: Shawn Walker-Salas <shawn.walker@oracle.com>
-Date: Tue, 30 May 2017 19:07:52 -0700
-Subject: [PATCH] CVE-2017-{9110,9111,9112,9113,9114,9115,9116} fixes
-
----
- OpenEXR/IlmImf/ImfDwaCompressor.cpp |  7 ++++++-
- OpenEXR/IlmImf/ImfHuf.cpp           | 10 ++++++----
- OpenEXR/IlmImf/ImfPizCompressor.cpp |  6 ++++++
- 3 files changed, 18 insertions(+), 5 deletions(-)
-
-diff --git a/IlmImf/ImfDwaCompressor.cpp b/IlmImf/ImfDwaCompressor.cpp
-index 1c1bd45..2ef8878 100644
---- a/IlmImf/ImfDwaCompressor.cpp
-+++ b/IlmImf/ImfDwaCompressor.cpp
-@@ -2377,7 +2377,12 @@ DwaCompressor::uncompress
- 
-     const char *dataPtr            = inPtr + NUM_SIZES_SINGLE * sizeof(Int64);
- 
--    if (inSize < headerSize + compressedSize) 
-+    /* Both the sum and individual sizes are checked in case of overflow. */
-+    if (inSize < (headerSize + compressedSize) ||
-+        inSize < unknownCompressedSize ||
-+        inSize < acCompressedSize ||
-+        inSize < dcCompressedSize ||
-+        inSize < rleCompressedSize)
-     {
-         throw Iex::InputExc("Error uncompressing DWA data"
-                             "(truncated file).");
-diff --git a/IlmImf/ImfHuf.cpp b/IlmImf/ImfHuf.cpp
-index a375d05..97909a5 100644
---- a/IlmImf/ImfHuf.cpp
-+++ b/IlmImf/ImfHuf.cpp
-@@ -822,7 +822,7 @@ hufEncode				// return: output size (in bits)
- }
- 
- 
--#define getCode(po, rlc, c, lc, in, out, oe)	\
-+#define getCode(po, rlc, c, lc, in, out, ob, oe)\
- {						\
-     if (po == rlc)				\
-     {						\
-@@ -835,6 +835,8 @@ hufEncode				// return: output size (in bits)
- 						\
- 	if (out + cs > oe)			\
- 	    tooMuchData();			\
-+	else if (out - 1 < ob)			\
-+	    notEnoughData();			\
- 						\
- 	unsigned short s = out[-1];		\
- 						\
-@@ -895,7 +897,7 @@ hufDecode
- 		//
- 
- 		lc -= pl.len;
--		getCode (pl.lit, rlc, c, lc, in, out, oe);
-+		getCode (pl.lit, rlc, c, lc, in, out, outb, oe);
- 	    }
- 	    else
- 	    {
-@@ -925,7 +927,7 @@ hufDecode
- 			    //
- 
- 			    lc -= l;
--			    getCode (pl.p[j], rlc, c, lc, in, out, oe);
-+			    getCode (pl.p[j], rlc, c, lc, in, out, outb, oe);
- 			    break;
- 			}
- 		    }
-@@ -952,7 +954,7 @@ hufDecode
- 	if (pl.len)
- 	{
- 	    lc -= pl.len;
--	    getCode (pl.lit, rlc, c, lc, in, out, oe);
-+	    getCode (pl.lit, rlc, c, lc, in, out, outb, oe);
- 	}
- 	else
- 	{
-diff --git a/IlmImf/ImfPizCompressor.cpp b/IlmImf/ImfPizCompressor.cpp
-index 46c6fba..8b3ee38 100644
---- a/IlmImf/ImfPizCompressor.cpp
-+++ b/IlmImf/ImfPizCompressor.cpp
-@@ -573,6 +573,12 @@ PizCompressor::uncompress (const char *inPtr,
-     int length;
-     Xdr::read <CharPtrIO> (inPtr, length);
- 
-+    if (length > inSize)
-+    {
-+	throw InputExc ("Error in header for PIZ-compressed data "
-+			"(invalid array length).");
-+    }
-+
-     hufUncompress (inPtr, length, _tmpBuffer, tmpBufferEnd - _tmpBuffer);
- 
-     //
--- 
-2.14.1
-
diff --git a/media-libs/openexr/files/openexr-2.2.0-Fix-typo-in-C-bindings.patch b/media-libs/openexr/files/openexr-2.2.0-Fix-typo-in-C-bindings.patch
deleted file mode 100644
index 966e95e72c3c..000000000000
--- a/media-libs/openexr/files/openexr-2.2.0-Fix-typo-in-C-bindings.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c229dfe63380f41dfae1e977b10dfc7c49c7efc7 Mon Sep 17 00:00:00 2001
-From: Edward Kmett <ekmett@gmail.com>
-Date: Wed, 9 Dec 2015 12:15:48 -0500
-Subject: [PATCH] Fix typo in C bindings (Close #140)
-
-IMF_RAMDOM_Y should be IMF_RANDOM_Y
----
- OpenEXR/IlmImf/ImfCRgbaFile.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/IlmImf/ImfCRgbaFile.h b/IlmImf/ImfCRgbaFile.h
-index 5ac2bf8..db58247 100644
---- a/IlmImf/ImfCRgbaFile.h
-+++ b/IlmImf/ImfCRgbaFile.h
-@@ -98,7 +98,7 @@ typedef struct ImfRgba ImfRgba;
- 
- #define IMF_INCREASING_Y	0
- #define IMF_DECREASING_Y	1
--#define IMF_RAMDOM_Y		2
-+#define IMF_RANDOM_Y		2
- 
- 
- /*
--- 
-2.14.1
-
diff --git a/media-libs/openexr/files/openexr-2.2.0-fix-build-system.patch b/media-libs/openexr/files/openexr-2.2.0-fix-build-system.patch
deleted file mode 100644
index 3ccfb1da7ac5..000000000000
--- a/media-libs/openexr/files/openexr-2.2.0-fix-build-system.patch
+++ /dev/null
@@ -1,620 +0,0 @@
-* Fix completely broken build system
-* Change pdf+examples installation directory
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,6 +1,7 @@
- dnl Process this file with autoconf to produce a configure script.
- 
- AC_INIT(OpenEXR, 2.2.0)
-+AC_CONFIG_MACRO_DIR([m4])
- 
- AC_SUBST(OPENEXR_VERSION_MAJOR, 2)
- AC_SUBST(OPENEXR_VERSION_MINOR, 2)
-@@ -11,9 +12,8 @@
- 
- AC_CANONICAL_HOST
- AC_CONFIG_SRCDIR(IlmImfTest/main.cpp)
--AC_CONFIG_HEADER(config/OpenEXRConfig.h)
--AM_INIT_AUTOMAKE(1.6.3)  dnl Require automake 1.6.3 or better
--AM_MAINTAINER_MODE
-+AC_CONFIG_HEADERS([config/OpenEXRConfig.h])
-+AM_INIT_AUTOMAKE
- 
- 
- LIBTOOL_CURRENT=22
-@@ -27,46 +27,21 @@
- AC_PROG_INSTALL
- AC_PROG_CC
- AC_PROG_LN_S
--AC_PROG_LIBTOOL
-+LT_INIT
- AC_PROG_MAKE_SET
- 
- dnl
- dnl PKGCONFIG preparations
- dnl
--
--if test -z "${PKG_CONFIG_PATH}"; then
--	PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig
--fi
--
--LIB64_IF_EXISTS=""
--if [[ -e /usr/lib64 ]]; then
--   LIB64_IF_EXISTS="-L/usr/lib64"
--fi         
--
--
--
--export PKG_CONFIG_PATH
--
--dnl
--dnl get ccflags and libs from openexr packages, then check 
--dnl whether test programs compile
--AM_PATH_PKGCONFIG(
--   [ILMBASE_CXXFLAGS],
--   [ILMBASE_LDFLAGS],
--   [ILMBASE_LIBS],
--   [IlmBase],
--   [OpenEXR],
--   [$LIB64_IF_EXISTS -L/usr/local/lib],
--   [-lImath -lHalf -lIex -lIlmThread -lpthread],
--   [ilmbase-prefix])
-+PKG_CHECK_MODULES([ILMBASE], [IlmBase])
- 
- 
- dnl Define the version string
--AC_DEFINE_UNQUOTED(OPENEXR_VERSION_STRING, "${VERSION}")
--AC_DEFINE_UNQUOTED(OPENEXR_PACKAGE_STRING, "${PACKAGE_STRING}")
--AC_DEFINE_UNQUOTED(OPENEXR_VERSION_MAJOR, ${OPENEXR_VERSION_MAJOR})
--AC_DEFINE_UNQUOTED(OPENEXR_VERSION_MINOR, ${OPENEXR_VERSION_MINOR})
--AC_DEFINE_UNQUOTED(OPENEXR_VERSION_PATCH, ${OPENEXR_VERSION_PATCH})
-+AC_DEFINE_UNQUOTED([OPENEXR_VERSION_STRING], ["${VERSION}"], [OpenEXR version string])
-+AC_DEFINE_UNQUOTED([OPENEXR_PACKAGE_STRING], ["${PACKAGE_STRING}"], [OpenEXR version string])
-+AC_DEFINE_UNQUOTED([OPENEXR_VERSION_MAJOR], [${OPENEXR_VERSION_MAJOR}], [OpenEXR version string])
-+AC_DEFINE_UNQUOTED([OPENEXR_VERSION_MINOR], [${OPENEXR_VERSION_MINOR}], [OpenEXR version string])
-+AC_DEFINE_UNQUOTED([OPENEXR_VERSION_PATCH], [${OPENEXR_VERSION_PATCH}], [OpenEXR version string])
- 
- 
- dnl --enable-threading
-@@ -75,19 +50,16 @@
-                              [enable multi-threading [[default=yes]]]),
-               [multithread="${enableval}"], [multithread=yes])
- 
--if test x$PKG_CONFIG == xno && test "x${multithread}" != xno ; then
--    ACX_PTHREAD(
--    [
--	AC_DEFINE(OPENEXR_IMF_HAVE_PTHREAD)
--	ILMBASE_LIBS="$PTHREAD_LIBS $ILMBASE_LIBS"
--	ILMBASE_CXXFLAGS="$ILMBASE_CXXFLAGS $PTHREAD_CFLAGS"
--	CC="$PTHREAD_CC"
--	
--	AM_POSIX_SEM()
--    ],
--    [AC_MSG_ERROR([POSIX thread support required])])
--    AC_MSG_NOTICE([multithread true, LIBS = $LIBS, CC = $CC, CXXFLAGS = $CXXFLAGS])
--fi
-+AS_IF([test "x${multithread}" != xno], [
-+	AX_PTHREAD
-+
-+	AC_DEFINE([OPENEXR_IMF_HAVE_PTHREAD], [1], [Define if pthreads are available])
-+
-+	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
-+	CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS}"
-+	LIBS="${LIBS} ${PTHREAD_CFLAGS}"
-+])
-+
- 
- dnl --enable-large-stack
- case "$host" in
-@@ -110,21 +82,25 @@
- esac
- 
- if test "x${large_stack}" != xno ; then
--    AC_DEFINE(OPENEXR_IMF_HAVE_LARGE_STACK)
-+    AC_DEFINE([OPENEXR_IMF_HAVE_LARGE_STACK], [1], [Define if large stack sizes are supported])
- fi
- 
--AM_COMPILELINKRUN(
--   [IlmBase],
--   [ilmbasetest],
--   [$ILMBASE_CXXFLAGS],
--   [$ILMBASE_LDFLAGS],
--   [$ILMBASE_LIBS],[[
--#include <stdlib.h>
--#include <ImathFun.h>
--]],
--   [[double d = IMATH_NAMESPACE::succd(.23); d+= .2;]],
--   AC_MSG_RESULT([Compiled and ran IlmBase test program.]), 
--   AC_MSG_ERROR([Could not compile IlmBase test program.]))
-+
-+
-+save_CXXFLAGS="${CXXFLAGS}"
-+save_LIBS="${LIBS}"
-+CXXFLAGS="${save_CXXFLAGS} ${ILMBASE_CFLAGS}"
-+LIBS="${save_LIBS} ${ILMBASE_LIBS}"
-+AC_LINK_IFELSE([
-+	AC_LANG_PROGRAM([[
-+		#include <stdlib.h>
-+		#include <ImathFun.h>
-+	]], [[
-+		double d = IMATH_NAMESPACE::succd(.23); d+= .2;
-+	]])
-+])
-+CXXFLAGS="${save_CXXFLAGS}"
-+LIBS="${save_LIBS}"
- 
- 
- dnl Checks for header files.
-@@ -137,74 +113,27 @@
- AC_TYPE_SIZE_T
- 
- dnl Checks for zlib
--AC_CHECK_LIB(z, compress,
--             [:],
--             [AC_MSG_ERROR([
--*** OpenEXR requires a recent version of zlib, which you don't appear to
--*** have.
--***
--*** This could be because the run-time linker is not finding zlib, or it
--*** is finding the wrong version.  In this case, you'll need to set your
--*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point
--*** to the proper version.  Also, make sure you have run ldconfig if
--*** that is required on your system.
--			   ])]
--)
-+PKG_CHECK_MODULES([ZLIB], [zlib])
-+
-+
-+dnl We use a modern toolchain, don't care
-+dnl about ancient broken stuff
-+AC_DEFINE([OPENEXR_IMF_HAVE_COMPLETE_IOMANIP], [1], [Define when std::right is available])
- 
--dnl Checks for std::right etc. in iomanip
--AC_MSG_CHECKING(for complete iomanip support in C++ standard library)
--complete_iomanip="no"
--AC_LANG_SAVE
--AC_LANG_CPLUSPLUS
--AC_TRY_COMPILE([#include <iomanip>],[
--
--	std::right;
--],
--AC_DEFINE(OPENEXR_IMF_HAVE_COMPLETE_IOMANIP) complete_iomanip=yes)
--AC_MSG_RESULT($complete_iomanip)
--AC_LANG_RESTORE
--
--
--AC_MSG_CHECKING(for gcc optimization flags)
--old_cflags=$CFLAGS
--CFLAGS="$CFLAGS -pipe"
--AC_TRY_COMPILE([#include <stdio.h>],
--[ printf ("hello, world"); ],
--[ EXTRA_OPT_CFLAGS="-pipe"],[ EXTRA_OPT_CFLAGS=""])
--CFLAGS=$old_cflags
--AC_MSG_RESULT([$EXTRA_OPT_CFLAGS])
- 
- dnl Check to see if the toolset supports AVX instructions in inline asm
--AC_MSG_CHECKING(for AVX instructions in GCC style inline asm)
--gcc_inline_asm_avx="no"
--AC_COMPILE_IFELSE(
--    [
--        AC_LANG_PROGRAM([],
--        [
--             #if defined(__GNUC__) && defined(__SSE2__) 
--                 int n   = 0;
--                 int eax = 0;
--                 int edx = 0;
--                 __asm__(
--                     "xgetbv     \n"
--                     "vzeroupper  "
--                     : "=a"(eax), "=d"(edx) : "c"(n) : );
--             #else
--                 #error No GCC style inline asm supported for AVX instructions
--             #endif
--        ]) 
--   ],
--   [
--      gcc_inline_asm_avx="yes"
--   ],
--   [
--      gcc_inline_asm_avx="no"
--   ]
--)
--AC_MSG_RESULT([$gcc_inline_asm_avx])
--if test "x${gcc_inline_asm_avx}" == xyes ; then
--    AC_DEFINE(OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX)
--fi
-+AC_ARG_ENABLE([avx],
-+	AS_HELP_STRING([--enable-avx], [Enable avx optimization]))
-+
-+AS_IF([test "x$enable_avx" = "xyes"], [
-+	dnl Enable AVX
-+	gcc_inline_asm_avx="yes"
-+	AC_DEFINE([OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX], [1], [Define if AVX is available])
-+], [
-+	dnl Disable AVX
-+	gcc_inline_asm_avx="no"
-+])
-+
- 
- dnl Check if sysconf(_SC_NPROCESSORS_ONLN) can be used for CPU count
- AC_MSG_CHECKING([for sysconf(_SC_NPROCESSORS_ONLN)])
-@@ -221,16 +150,16 @@
- )
- AC_MSG_RESULT([$sysconf_nproc])
- if test "x${sysconf_nproc}" == xyes ; then
--    AC_DEFINE(OPENEXR_IMF_HAVE_SYSCONF_NPROCESSORS_ONLN)
-+    AC_DEFINE([OPENEXR_IMF_HAVE_SYSCONF_NPROCESSORS_ONLN], [1], [Define if sysconf(_SC_NPROCESSORS_ONLN) can be used for CPU count])
- fi
- 
- dnl Platform-specific stuff
- case "$host" in
- *linux*)
--  AC_DEFINE(OPENEXR_IMF_HAVE_LINUX_PROCFS)
-+  AC_DEFINE([OPENEXR_IMF_HAVE_LINUX_PROCFS], [1], [Define if procfs is available])
-   ;;
- *darwin*) 
--  AC_DEFINE(OPENEXR_IMF_HAVE_DARWIN) 
-+  AC_DEFINE([OPENEXR_IMF_HAVE_DARWIN], [1], [Define if on Darwin]) 
- 
-   dnl OS X universal binary support, requires --disable-dependency-tracking
-   AC_ARG_ENABLE(osx-universal-binaries,
-@@ -245,19 +174,13 @@
-   --disable-dependency-tracking --enable-osx-universal-binary
-   		  ])
-     fi
--    CXXFLAGS="$CXXFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386"
-+    dnl CXXFLAGS="$CXXFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386"
-     dnl LDFLAGS="$LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386"
-   fi
- 
-   ;;
- esac
- 
--AM_CFLAGS="$EXTRA_OPT_CFLAGS"
--AM_CXXFLAGS="$EXTRA_OPT_CFLAGS"
--
--AC_SUBST(AM_CFLAGS)
--AC_SUBST(AM_CXXFLAGS)
--
- dnl build imfexamples example program?
- build_imfexamples="no"
- AC_ARG_ENABLE(imfexamples,
-@@ -286,7 +209,7 @@
- AM_CONDITIONAL(BUILD_IMFHUGETEST, test "x$build_imfhugetest" = xyes)
- 
- if test "x${build_imfhugetest}" != xno ; then
--    AC_DEFINE(OPENEXR_IMF_HUGETEST)
-+    AC_DEFINE([OPENEXR_IMF_HUGETEST], [1], [Define if IlmImf huge input resilience])
- fi
- 
- 
-@@ -307,19 +230,19 @@
- 
- lib_namespace="Imf"
- if test "x${library_namespace_versioning}" == xyes ; then
--    AC_DEFINE_UNQUOTED(OPENEXR_IMF_INTERNAL_NAMESPACE, Imf_${OPENEXR_VERSION_API})
--    AC_DEFINE(OPENEXR_IMF_INTERNAL_NAMESPACE_CUSTOM)
-+    AC_DEFINE_UNQUOTED([OPENEXR_IMF_INTERNAL_NAMESPACE], [Imf_${OPENEXR_VERSION_API}], [OpenEXR])
-+    AC_DEFINE([OPENEXR_IMF_INTERNAL_NAMESPACE_CUSTOM], [1], [OpenEXR])
- 
-     lib_namespace="Imf_${OPENEXR_VERSION_API}"
-     LIB_SUFFIX="${OPENEXR_VERSION_API}"
-     lib_suffix_valid="yes"
- elif test "x${library_namespace_versioning}" == xno ; then
--    AC_DEFINE_UNQUOTED(OPENEXR_IMF_INTERNAL_NAMESPACE, Imf)
-+    AC_DEFINE_UNQUOTED([OPENEXR_IMF_INTERNAL_NAMESPACE], [Imf], [OpenEXR])
- 
-     lib_namespace="Imf"
- else
--    AC_DEFINE_UNQUOTED(OPENEXR_IMF_INTERNAL_NAMESPACE, ${library_namespace_versioning} )
--    AC_DEFINE(OPENEXR_IMF_INTERNAL_NAMESPACE_CUSTOM)
-+    AC_DEFINE_UNQUOTED([OPENEXR_IMF_INTERNAL_NAMESPACE], [${library_namespace_versioning}], [OpenEXR])
-+    AC_DEFINE([OPENEXR_IMF_INTERNAL_NAMESPACE_CUSTOM], [1], [OpenEXR])
- 
-     lib_namespace="${library_namespace_versioning}"
-     LIB_SUFFIX="${library_namespace_versioning}"
-@@ -349,14 +272,14 @@
- 
- if test "x${custom_usr_namespace}" == xyes ; then
-     AC_MSG_WARN([Enabling 'custom user namespace' requires an additional argument, reverting to 'Imf'])
--    AC_DEFINE_UNQUOTED(OPENEXR_IMF_NAMESPACE, Imf)
-+    AC_DEFINE_UNQUOTED([OPENEXR_IMF_NAMESPACE], [Imf], [OpenEXR])
-     usr_namespace="Imf"
- elif test "x${custom_usr_namespace}" == xno ; then
--    AC_DEFINE_UNQUOTED(OPENEXR_IMF_NAMESPACE, Imf)
-+    AC_DEFINE_UNQUOTED([OPENEXR_IMF_NAMESPACE], [Imf], [OpenEXR])
-     usr_namespace="Imf"
- else
--    AC_DEFINE_UNQUOTED(OPENEXR_IMF_NAMESPACE, ${custom_usr_namespace})
--    AC_DEFINE(OPENEXR_IMF_NAMESPACE_CUSTOM)
-+    AC_DEFINE_UNQUOTED([OPENEXR_IMF_NAMESPACE], [${custom_usr_namespace}], [OpenEXR])
-+    AC_DEFINE([OPENEXR_IMF_NAMESPACE_CUSTOM], [1], [OpenEXR])
-     
-     usr_namespace=${custom_usr_namespace}
- fi
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -6,5 +6,4 @@
- 	InterpretingDeepPixels.pdf \
- 	TheoryDeepPixels.pdf
- 
--docdir=$(datadir)/doc/OpenEXR-@OPENEXR_VERSION@
- doc_DATA = $(EXTRA_DIST)
---- a/exrenvmap/Makefile.am
-+++ b/exrenvmap/Makefile.am
-@@ -4,11 +4,11 @@
- 
- INCLUDES = -I$(top_builddir) \
-            -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
--	   @ILMBASE_CXXFLAGS@
-+           $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
- 
--LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@\
-+LDADD = $(ILMBASE_LIBS) \
- 	$(top_builddir)/IlmImf/libIlmImf.la \
--	-lz
-+	$(ZLIB_LIBS)
- 
- exrenvmap_SOURCES = main.cpp EnvmapImage.cpp EnvmapImage.h \
- 		    readInputImage.cpp readInputImage.h \
---- a/exrheader/Makefile.am
-+++ b/exrheader/Makefile.am
-@@ -4,11 +4,11 @@
- 
- INCLUDES = -I$(top_builddir) \
-            -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
--	   @ILMBASE_CXXFLAGS@
-+           $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
- 
--LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
-+LDADD = $(ILMBASE_LIBS) \
- 	$(top_builddir)/IlmImf/libIlmImf.la \
--	-lz
-+	$(ZLIB_LIBS)
- 
- exrheader_SOURCES = main.cpp
- 
---- a/exrmakepreview/Makefile.am
-+++ b/exrmakepreview/Makefile.am
-@@ -4,11 +4,11 @@
- 
- INCLUDES = -I$(top_builddir) \
-            -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
--	   @ILMBASE_CXXFLAGS@
-+           $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
- 
--LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@\
-+LDADD = $(ILMBASE_LIBS) \
- 	$(top_builddir)/IlmImf/libIlmImf.la \
--	-lz
-+	$(ZLIB_LIBS)
- 
- exrmakepreview_SOURCES = main.cpp makePreview.cpp makePreview.h
- 
---- a/exrmaketiled/Makefile.am
-+++ b/exrmaketiled/Makefile.am
-@@ -4,11 +4,11 @@
- 
- INCLUDES = -I$(top_builddir) \
-            -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
--	   @ILMBASE_CXXFLAGS@
-+           $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
- 
--LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
-+LDADD = $(ILMBASE_LIBS) \
- 	$(top_builddir)/IlmImf/libIlmImf.la \
--	-lz
-+	$(ZLIB_LIBS)
- 
- exrmaketiled_SOURCES = main.cpp \
- 		       Image.h Image.cpp \
---- a/exrmultipart/Makefile.am
-+++ b/exrmultipart/Makefile.am
-@@ -4,11 +4,11 @@
- 
- INCLUDES = -I$(top_builddir) \
- -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
--@ILMBASE_CXXFLAGS@
-+$(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
- 
--LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
--$(top_builddir)/IlmImf/libIlmImf.la \
---lz
-+LDADD = $(ILMBASE_LIBS) \
-+	$(top_builddir)/IlmImf/libIlmImf.la \
-+	$(ZLIB_LIBS)
- 
- exrmultipart_SOURCES = exrmultipart.cpp
- 
---- a/exrmultiview/Makefile.am
-+++ b/exrmultiview/Makefile.am
-@@ -4,11 +4,11 @@
- 
- INCLUDES = -I$(top_builddir) \
-            -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
--	   @ILMBASE_CXXFLAGS@
-+           $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
- 
--LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
-+LDADD = $(ILMBASE_LIBS) \
- 	$(top_builddir)/IlmImf/libIlmImf.la \
--	-lz
-+	$(ZLIB_LIBS)
- 
- exrmultiview_SOURCES = main.cpp  \
- 		       Image.h Image.cpp \
---- a/exrstdattr/Makefile.am
-+++ b/exrstdattr/Makefile.am
-@@ -4,11 +4,11 @@
- 
- INCLUDES = -I$(top_builddir) \
-            -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
--	   @ILMBASE_CXXFLAGS@
-+           $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
- 
--LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
-+LDADD = $(ILMBASE_LIBS) \
- 	$(top_builddir)/IlmImf/libIlmImf.la \
--	-lz
-+	$(ZLIB_LIBS)
- 
- exrstdattr_SOURCES = main.cpp CMakeLists.txt
- 
---- a/IlmImf/Makefile.am
-+++ b/IlmImf/Makefile.am
-@@ -93,7 +93,7 @@
- 	               ImfSystemSpecific.cpp ImfZip.h ImfZip.cpp
- 
- 
--libIlmImf_la_LDFLAGS = @ILMBASE_LDFLAGS@ -version-info @LIBTOOL_VERSION@ \
-+libIlmImf_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ \
- 			-no-undefined 
- 
- 
-@@ -102,7 +102,7 @@
- endif
- 
- 
--libIlmImf_la_LIBADD =  -lz @ILMBASE_LIBS@
-+libIlmImf_la_LIBADD = $(ZLIB_LIBS) $(ILMBASE_LIBS)
- 
- libIlmImfincludedir = $(includedir)/OpenEXR
- 
-@@ -188,20 +188,21 @@
- EXTRA_DIST = $(noinst_HEADERS) b44ExpLogTable.cpp b44ExpLogTable.h dwaLookups.cpp dwaLookups.h CMakeLists.txt
- 
- 
--INCLUDES = @ILMBASE_CXXFLAGS@ \
--	   -I$(top_builddir)  \
--	   -I$(top_srcdir)/config
-+INCLUDES = \
-+	   -I$(top_builddir) \
-+	   -I$(top_srcdir)/config \
-+	   $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
- 
- CLEANFILES = b44ExpLogTable b44ExpLogTable.h dwaLookups dwaLookups.h
- 
- b44ExpLogTable_SOURCES = b44ExpLogTable.cpp
--b44ExpLogTable_LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@
-+b44ExpLogTable_LDADD = $(ILMBASE_LIBS)
- 
- b44ExpLogTable.h: b44ExpLogTable
- 	./b44ExpLogTable > b44ExpLogTable.h
- 
- dwaLookups_SOURCES = dwaLookups.cpp
--dwaLookups_LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@
-+dwaLookups_LDADD = $(ILMBASE_LIBS)
- 
- dwaLookups.h: dwaLookups
- 	./dwaLookups > dwaLookups.h
---- a/IlmImfExamples/Makefile.am
-+++ b/IlmImfExamples/Makefile.am
-@@ -6,11 +6,11 @@
- 
- INCLUDES = -I$(top_builddir) \
-            -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
--	   @ILMBASE_CXXFLAGS@
-+           $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
- 
- LDADD = -L$(top_builddir)/IlmImf \
--	@ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
--	-lIlmImf -lz
-+	$(ILMBASE_LIBS) \
-+	-lIlmImf $(ZLIB_CFLAGS)
- 
- imfexamples_SOURCES = main.cpp drawImage.cpp rgbaInterfaceExamples.cpp \
- 		      rgbaInterfaceTiledExamples.cpp \
-@@ -23,7 +23,7 @@
- 		      lowLevelIoExamples.h previewImageExamples.h \
- 		      namespaceAlias.h
- 
--examplesdir = $(datadir)/doc/OpenEXR-@OPENEXR_VERSION@/examples
-+examplesdir = $(docdir)/examples
- examples_DATA = $(imfexamples_SOURCES)
- 
- imfexamplesdir = $(examplesdir)
---- a/IlmImfFuzzTest/Makefile.am
-+++ b/IlmImfFuzzTest/Makefile.am
-@@ -14,11 +14,11 @@
- INCLUDES = -I$(top_builddir)  \
- 	   -I$(top_srcdir)/IlmImf \
- 	   -I$(top_srcdir)/config \
--	   @ILMBASE_CXXFLAGS@
-+	   $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
- 
- LDADD = -L$(top_builddir)/IlmImf \
--	@ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
--	-lIlmImf -lz
-+	$(ILMBASE_LIBS) \
-+	-lIlmImf $(ZLIB_LIBS)
- 
- if BUILD_IMFFUZZTEST
- TESTS = IlmImfFuzzTest
---- a/IlmImfTest/Makefile.am
-+++ b/IlmImfTest/Makefile.am
-@@ -62,11 +62,11 @@
- INCLUDES = -I$(top_builddir)  \
- 	   -I$(top_srcdir)/IlmImf \
- 	   -I$(top_srcdir)/config \
--	   @ILMBASE_CXXFLAGS@
-+	   $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
- 
- LDADD = -L$(top_builddir)/IlmImf \
--	@ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
--	-lIlmImf -lz
-+	$(ILMBASE_LIBS) \
-+	-lIlmImf $(ZLIB_LIBS)
- 
- TESTS = IlmImfTest
- 
---- a/IlmImfUtil/Makefile.am
-+++ b/IlmImfUtil/Makefile.am
-@@ -20,7 +20,7 @@
- 	ImfImageChannelRenaming.h
- 	
- 
--libIlmImfUtil_la_LDFLAGS = @ILMBASE_LDFLAGS@ -version-info @LIBTOOL_VERSION@ \
-+libIlmImfUtil_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ \
- 			-no-undefined 
- 
- 
-@@ -29,14 +29,15 @@
- endif
- 
- 
--libIlmImfUtil_la_LIBADD =  -L$(top_builddir)/IlmImf @ILMBASE_LIBS@ -lIlmImf
-+libIlmImfUtil_la_LIBADD =  -L$(top_builddir)/IlmImf $(ILMBASE_LIBS) -lIlmImf
- 
- libIlmImfUtilincludedir = $(includedir)/OpenEXR
- 
- EXTRA_DIST = CMakeLists.txt
- 
--INCLUDES = @ILMBASE_CXXFLAGS@ \
--	   -I$(top_builddir)  \
--	   -I$(top_srcdir)/IlmImf  \
--	   -I$(top_srcdir)/config
-+INCLUDES = \
-+	   -I$(top_builddir) \
-+	   -I$(top_srcdir)/IlmImf \
-+	   -I$(top_srcdir)/config \
-+	   $(ILMBASE_CFLAGS)
- 
---- a/IlmImfUtilTest/Makefile.am
-+++ b/IlmImfUtilTest/Makefile.am
-@@ -11,12 +11,12 @@
- 	   -I$(top_srcdir)/IlmImf \
- 	   -I$(top_srcdir)/IlmImfUtil \
- 	   -I$(top_srcdir)/config \
--	   @ILMBASE_CXXFLAGS@
-+	   $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
- 
- LDADD = -L$(top_builddir)/IlmImf \
- 	-L$(top_builddir)/IlmImfUtil \
--	@ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
--	-lIlmImfUtil -lIlmImf -lz
-+	$(ILMBASE_LIBS) \
-+	-lIlmImfUtil -lIlmImf $(ZLIB_LIBS)
- 
- TESTS = IlmImfUtilTest
- 
diff --git a/media-libs/openexr/files/openexr-2.2.0-use-ull-for-64-bit-literals.patch b/media-libs/openexr/files/openexr-2.2.0-use-ull-for-64-bit-literals.patch
deleted file mode 100644
index 6b107af29927..000000000000
--- a/media-libs/openexr/files/openexr-2.2.0-use-ull-for-64-bit-literals.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 57ecf581d053f5cacf2e8fc3c024490e0bbe536f Mon Sep 17 00:00:00 2001
-From: Brendan Bolles <brendan@fnordware.com>
-Date: Wed, 13 Aug 2014 19:54:10 -0700
-Subject: [PATCH] Use ULL for 64-bit literals
-
-On a 32-bit architecture, these literals are too big for just a long,
-they need to be ULL, since Int64 is unsigned.
----
- IlmImf/ImfFastHuf.cpp | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/IlmImf/ImfFastHuf.cpp b/IlmImf/ImfFastHuf.cpp
-index 86c84dc..01edad4 100644
---- a/IlmImf/ImfFastHuf.cpp
-+++ b/IlmImf/ImfFastHuf.cpp
-@@ -107,7 +107,7 @@ FastHufDecoder::FastHufDecoder
-     for (int i = 0; i <= MAX_CODE_LEN; ++i)
-     {
-         codeCount[i] = 0;
--        base[i]      = 0xffffffffffffffffL;
-+        base[i]      = 0xffffffffffffffffULL;
-         offset[i]    = 0;
-     }
- 
-@@ -352,7 +352,7 @@ FastHufDecoder::buildTables (Int64 *base, Int64 *offset)
- 
-     for (int i = 0; i <= MAX_CODE_LEN; ++i)
-     {
--        if (base[i] != 0xffffffffffffffffL)
-+        if (base[i] != 0xffffffffffffffffULL)
-         {
-             _ljBase[i] = base[i] << (64 - i);
-         }
-@@ -362,7 +362,7 @@ FastHufDecoder::buildTables (Int64 *base, Int64 *offset)
-             // Unused code length - insert dummy values
-             //
- 
--            _ljBase[i] = 0xffffffffffffffffL;
-+            _ljBase[i] = 0xffffffffffffffffULL;
-         }
-     }
- 
-@@ -417,7 +417,7 @@ FastHufDecoder::buildTables (Int64 *base, Int64 *offset)
- 
-     int minIdx = TABLE_LOOKUP_BITS;
- 
--    while (minIdx > 0 && _ljBase[minIdx] == 0xffffffffffffffffL)
-+    while (minIdx > 0 && _ljBase[minIdx] == 0xffffffffffffffffULL)
-         minIdx--;
- 
-     if (minIdx < 0)
-@@ -427,7 +427,7 @@ FastHufDecoder::buildTables (Int64 *base, Int64 *offset)
-         // Set the min value such that the table is never tested.
-         //
- 
--        _tableMin = 0xffffffffffffffffL;
-+        _tableMin = 0xffffffffffffffffULL;
-     }
-     else
-     {
diff --git a/media-libs/openexr/openexr-2.1.0.ebuild b/media-libs/openexr/openexr-2.1.0.ebuild
deleted file mode 100644
index 14cc4d86d161..000000000000
--- a/media-libs/openexr/openexr-2.1.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools-multilib
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="http://openexr.com/"
-SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/21" # 21 from SONAME
-KEYWORDS="amd64 -arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="examples static-libs"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	>=media-libs/ilmbase-${PV}:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_prepare() {
-	# Fix path for testsuite
-	sed -i -e "s:/var/tmp/:${T}:" IlmImfTest/tmpDir.h || die
-	autotools-multilib_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable examples imfexamples)
-	)
-	autotools-multilib_src_configure
-}
-
-src_install() {
-	autotools-multilib_src_install \
-		docdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \
-		examplesdir="${EPREFIX}"/usr/share/doc/${PF}/examples
-
-	docompress -x /usr/share/doc/${PF}/examples
-
-	if ! use examples; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/media-libs/openexr/openexr-2.2.0-r2.ebuild b/media-libs/openexr/openexr-2.2.0-r2.ebuild
deleted file mode 100644
index 8f9775ff2e70..000000000000
--- a/media-libs/openexr/openexr-2.2.0-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic multilib-minimal
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="http://openexr.com/"
-SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/22" # based on SONAME
-KEYWORDS="amd64 -arm ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="cpu_flags_x86_avx examples static-libs"
-
-RDEPEND="
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	>=media-libs/ilmbase-${PV}:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	>=sys-devel/autoconf-archive-2016.09.16"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-cpuid-on-abi_x86_32.patch"
-	"${FILESDIR}/${P}-use-ull-for-64-bit-literals.patch"
-	"${FILESDIR}/${P}-fix-build-system.patch"
-	"${FILESDIR}/${P}-fix-config.h-collision.patch"
-	"${FILESDIR}/${P}-Fix-typo-in-C-bindings.patch"
-	"${FILESDIR}/${P}-Install-missing-header-files.patch"
-	"${FILESDIR}/${P}-CVE-2017-9110-to-9116-security-fixes.patch"
-)
-
-src_prepare() {
-	default
-	# Fix path for testsuite
-	sed -i -e "s:/var/tmp/:${T}:" IlmImfTest/tmpDir.h || die
-
-	# delete stray config files causing havoc
-	rm -f config*/OpenEXRConfig.h* || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# Fails to build with lto, https://bugs.gentoo.org/650876
-	filter-flags -flto*
-
-	ECONF_SOURCE="${S}" econf \
-		--enable-threading \
-		$(use_enable cpu_flags_x86_avx avx) \
-		$(use_enable static-libs static) \
-		$(use_enable examples imfexamples)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-	else
-		rm -rf "${ED%/}"/usr/share/doc/${PF}/examples || die
-	fi
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest
index d7440d622952..3ec7b7d21889 100644
--- a/media-libs/opensubdiv/Manifest
+++ b/media-libs/opensubdiv/Manifest
@@ -1,8 +1,6 @@
 AUX opensubdiv-3.3.0-add-CUDA9-compatibility.patch 897 BLAKE2B 528eaabdbe1613e6fde30f3e0688c64d796c599a7c9efa49575b817de559938344326b8606f9c9ed013a97c46037a49805ee1d1c27fa9beb78b3d9153771e119 SHA512 0a4c20dff82f6500019f45ef88539a32fb7e5b885d48c7108f05d6c018890518cd735e20a020cf058d47cf68e19f74e14e8496c5facabfa90e9401478d315ffa
 AUX opensubdiv-3.3.0-fix-quotes.patch 432 BLAKE2B e2b80762392cfe6b9ddb714780adbfffed3eb05feb5072c4b1856164eb01896eb9298723aac4bc032e0aaba8ec55d84bb1dfa6664f1def32af2bd93b553c396b SHA512 89eca174bf991920f71fd278e61f04bb90d143491ec05575507013215c92bca18f0274b6084d61750a66f877d928f01f0e779d08dd3b2372d8119aecaa8b58a9
 AUX opensubdiv-3.3.0-use-gnuinstalldirs.patch 1133 BLAKE2B f762b52e23c60c2dded82948be891654923adae6a2e4f870857e357478f92cb9a239c282f0d09f75f6f2a58682c50d8f437989859710668071b46b1cde499424 SHA512 4f463fbea3e94e93711888a077faa375054aae193abfbe4c600081fae43efa4adf5dc5687ceb7c59795c20ae97ec158ce4035e72dfdb0c89ee5943e41e58bdef
-DIST opensubdiv-3.3.0.tar.gz 19263469 BLAKE2B f169b5c58877d1dd4ea45cb04d52567803da7c2d11edab072e2b65583109c7c2d52abe07f5bd2b03cba215cdb524a0468900419d8381e95c35eb2f3f4bebe02b SHA512 7c17d847187d46182d08fbee9396fd8793ac04591821084d40da475c9d25560d01575282946e1a30252bba12db9ea06cbf50ff649f91adce72f6127ad6a36418
 DIST opensubdiv-3.3.3.tar.gz 19286806 BLAKE2B 05e25f28a6f2194122d9d4e5299e6d68e236c1e78b4e8494a70191dfb37e45da30968322719bbb784a15d698206fea9e26e92d4689668592bc9ec9bccbc0201d SHA512 65cd72b4240eeb3fdb6d52497a2daa2fc68e10c25c41ffa0cf81449ebcb860e303539043c672265916267a0115f250566570b5705fd5da54f46abe7b9f7baf81
-EBUILD opensubdiv-3.3.0.ebuild 1642 BLAKE2B 934fe6e9f491dbb4ba0e36bacba6ad2bfae774e33099ef3b966573288e1479452bb769ad9c6619b4e859feba89963348d56cd45aa5aa761399dadc485895bc7e SHA512 0bae40e658414b4cf94750fa2b680069be3e63b9a03880a01454db0eef78094ee2d726f12bb967de33003814d6c0241c832158fef7f32402ecceb7adb8bba189
 EBUILD opensubdiv-3.3.3.ebuild 1598 BLAKE2B c61ed763e2567b091e040097605cc646d80c48ce70842e816bccd3acfd03c9c36fbe6577229067e8a06720ce474c1ce650ce64c3b40d49a034c54c17cc231e82 SHA512 ab2e4725f77f7ef0cc804382af8616d06009c16d252c8fb9a880a8b8a8dfa87912436cc861652f31582ca374e7043dc28960cb6c6bb80fd098a382f7adf02cb2
 MISC metadata.xml 1145 BLAKE2B 21093cf63091de9706146ce01ddacd277ac425d947260ade355825eca4b0aafd0d0c487c8f85c66e3d455b766d4c566f01dac3ec0275018fba37bc30b2bafce8 SHA512 c9dc92192cf95c30f14516635a3e656a09f080aafc4404cf506e012e8d32173fdbdca63edef8f0c2769928eb62c9900ae810cfe4e64a95a735da5744c502ceeb
diff --git a/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild b/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild
deleted file mode 100644
index fc3580b365e6..000000000000
--- a/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils toolchain-funcs versionator
-
-MY_PV="$(replace_all_version_separators '_')"
-DESCRIPTION="An Open-Source subdivision surface library"
-HOMEPAGE="http://graphics.pixar.com/opensubdiv/"
-SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="cuda doc opencl openmp ptex tbb"
-
-RDEPEND="media-libs/glew:=
-	media-libs/glfw:=
-	cuda? ( dev-util/nvidia-cuda-toolkit:* )
-	opencl? ( virtual/opencl )
-	ptex? ( media-libs/ptex )"
-
-DEPEND="${RDEPEND}
-	tbb? ( dev-cpp/tbb )
-	doc? (
-		dev-python/docutils
-		app-doc/doxygen
-	)"
-
-S="${WORKDIR}/OpenSubdiv-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-quotes.patch"
-	"${FILESDIR}/${P}-use-gnuinstalldirs.patch"
-	"${FILESDIR}/${P}-add-CUDA9-compatibility.patch"
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DNO_CLEW=1
-		-DNO_DOC=$(usex !doc)
-		-DNO_TBB=$(usex !tbb)
-		-DNO_PTEX=$(usex !ptex)
-		-DNO_OMP=$(usex !openmp)
-		-DNO_OPENCL=$(usex !opencl)
-		-DNO_CUDA=$(usex !cuda)
-		-DNO_REGRESSION=1 # They don't work with certain settings
-		-DNO_EXAMPLES=1 # Not needed.
-		-DNO_TUTORIALS=1 # They install illegally. Need to find a better solution.
-		-DGLEW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
-		-DGLFW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/sratom/Manifest b/media-libs/sratom/Manifest
index 145de0ed9585..5b9b327b757e 100644
--- a/media-libs/sratom/Manifest
+++ b/media-libs/sratom/Manifest
@@ -1,3 +1,3 @@
 DIST sratom-0.6.0.tar.bz2 149340 BLAKE2B c661e0c4fba0cdf6cfb8a7dba90ff92135422557a0721bc394c7500853aeb9370554df8a02b7faea2fa222b96db36b20b265cc1fa50e6e06655946dbe992f815 SHA512 899bb01896e2b65b69482041c7e06edc9e45e9a3466392c82a58f16dfc71462a6c3e3e16a5aa50a6347c8366ea72898468910a59a084762f75eb8c7031ceacf8
-EBUILD sratom-0.6.0-r1.ebuild 1206 BLAKE2B 95cb41aa86be6f6c56be7375f6c9f5d6439d00aa7493a94577dc3cd4c8ea300dcf4d32ce27fce739ed7cefd4c8344d853ffc24e3f8116e64f6081ef5ce44d61c SHA512 58e56be4c0b43f0d29efd4fc75dece7f2b057e99c6cdea793e1109391a6ab91395e7bb624f8a3ac9b6de77b63fb725991ffa394a127b504bb17241c325de63dc
+EBUILD sratom-0.6.0-r1.ebuild 1205 BLAKE2B bef0c3394f3e05b9989bf8909f067a00b0adfa48df93acc7836ecebe4ec61f6c2f35b9bdab1b5a12567574e195611521452ff9ba5cc8937fc4312d63392e5255 SHA512 0239d2deeec257c90608ac4a93ed2a7324e4258a8af13ab2d7ebd37df067b9f5c5194a3f59044df2e58b68206935d8b63fe2f5e3caadd3fbf7f5643b6ea6bbc1
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/sratom/sratom-0.6.0-r1.ebuild b/media-libs/sratom/sratom-0.6.0-r1.ebuild
index 5e284d8928ad..1f019f6f36bb 100644
--- a/media-libs/sratom/sratom-0.6.0-r1.ebuild
+++ b/media-libs/sratom/sratom-0.6.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 x86"
 IUSE="doc static-libs test"
 
 RDEPEND=">=media-libs/lv2-1.14.0-r1
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index 6e61d44eaee8..38602dcc95c3 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -2,6 +2,5 @@ AUX vigra-1.11.1-fix-incorrect-template-parameter-type.patch 7890 BLAKE2B 523eec
 AUX vigra-1.11.1-lib_suffix.patch 1032 BLAKE2B ce1b73b89c4d10c3b2ef3185a3c9a7ca791f58efe85eb205bb5f4e638ddc18d171bb7f4a9487670bb1a276c998f0e5096e2efa4fee0f167907d3d02df01bcb42 SHA512 c1cb242eb2ebdf398c81e16acc5a493312b310836caa7f25717dd20d23e885800beeef9ca0589c75ec3a0bd1ba2d879b1e999094cfef3956134e0d6d13f25d0f
 DIST vigra-1.11.1-src.tar.gz 55119047 BLAKE2B c67dc61515075843faacb4ee054f3e28b4edd033dc6cb89d3c591827309eafa697b839ca85ff7c68d6aff9d7e08b1d3db73d50e6c3b065a5210b64a90e242444 SHA512 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3
 EBUILD vigra-1.11.1-r2.ebuild 3617 BLAKE2B 0fd6ace945e05d9d155f7eaa6f2d0f8f73a64e5b72e2e0ab6467e8af983f9d02f524d4ed96d0f811989dcf92b3fa97f9bb42bbf64a434fa8beffc1abe50afbe3 SHA512 b7793841d2b02ef95207aea37370a654c570bae3be099eb8871f4194f4845bda6112de9c8a488191745bfee8b9913c4d1c42605ac535f1199d308cbc2f4266b5
-EBUILD vigra-1.11.1.ebuild 3720 BLAKE2B b8c427c008186eace9c1f4fcf937507e4c749a659fd04995bd7fbfc827c971d9f806a111242295f0c73a009a64ca2abda1986da465922adf55724102af5d711f SHA512 ab1779f2519e468579b104d53c024379f80aa49d31ac51d9177ff3542e043b47813136b3ca96c74b8f810dfc083b658e22b775388b4c921852f96a2094a5194b
 EBUILD vigra-9999.ebuild 3556 BLAKE2B 3284010b2ec1871f26d960b6805a6593742ffdba62d92dcc6dc36c89fc284a06fd2f7c7dc8dcad1dce308848a41b035bd663685440aa8e2cef8b3b1dca79c20f SHA512 97cce6937d77611f715dca8d719429f8cb94ba54e6e35ce7bc2dd09edf78e9f6064619bba78259b4992b1ba25bcd421fcc1aff4058cc094b97aa1cc1e0dc9997
 MISC metadata.xml 413 BLAKE2B 985f005fa338d566dddb20126e0a83cb8e9ec5aa4ac9ed2d5ec6a42743eeb92f521375b74f8caaa94500c42450d68d0a4bf5c036c9a2909e13c922f50896824a SHA512 e5c2a32f7495cfceffc8da8464131b918134b7255fbcde9a10175a24698f5a6aff17630436935c6cda7d8a3cd8b182c299845a24528f3a9c40dff1022dce4f71
diff --git a/media-libs/vigra/vigra-1.11.1.ebuild b/media-libs/vigra/vigra-1.11.1.ebuild
deleted file mode 100644
index b2db9b985bc5..000000000000
--- a/media-libs/vigra/vigra-1.11.1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MY_P="${P}-src"
-MY_V="${PV//\./-}"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,xml"
-
-inherit cmake-utils python-r1
-
-DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
-HOMEPAGE="https://ukoethe.github.io/vigra/"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/ukoethe/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${MY_V}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind"
-
-# runtime dependency on python:2.7 is required by the vigra-config script
-RDEPEND="
-	dev-lang/python:2.7
-	>=dev-libs/boost-1.52.0-r6:=[python?,${PYTHON_USEDEP}]
-	fftw? ( sci-libs/fftw:3.0 )
-	hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi?] )
-	jpeg? ( virtual/jpeg:0 )
-	openexr? ( media-libs/openexr:= )
-	png? ( media-libs/libpng:0= )
-	python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
-	tiff? ( media-libs/tiff:0= )
-	valgrind? ( dev-util/valgrind )"
-
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		python? ( >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] )
-	)
-	test? ( >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] )"
-
-REQUIRED_USE="
-	doc? ( hdf5 fftw )
-	python? ( hdf5 ${PYTHON_REQUIRED_USE} )
-	test? ( hdf5 python fftw )"
-
-# Severely broken, also disabled in Fedora, bugs #390447, #653442
-RESTRICT="test"
-
-DOCS=( README.md )
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-incorrect-template-parameter-type.patch"
-)
-
-pkg_setup() {
-	use python && python_setup
-}
-
-src_prepare() {
-	einfo "Removing shipped docs and VCS files"
-	rm -rf doc || die
-	rm .git* .travis.yml || die
-
-	cmake-utils_src_prepare
-
-	# Don't use python_fix_shebang because we can't put this behind USE="python"
-	sed -i -e '/env/s:python:python2:' config/vigra-config.in || die
-}
-
-src_configure() {
-	vigra_configure() {
-		local libdir="$(get_libdir)"
-
-		local mycmakeargs=(
-			-DAUTOEXEC_TESTS=OFF
-			-DDOCDIR="${BUILD_DIR}/doc"
-			-DDOCINSTALL="share/doc/${P}"
-			-DLIBDIR_SUFFIX="${libdir/lib}"
-			-DUSE_DOC=$(usex doc ON OFF) # unused
-			-DUSE_FFTW3=$(usex fftw ON OFF) # unused
-			-DUSE_JPEG=$(usex jpeg ON OFF) # unused
-			-DUSE_MPI=$(usex mpi ON OFF) # unused
-			-DUSE_PNG=$(usex png ON OFF) # unused
-			-DUSE_TIFF=$(usex tiff ON OFF) # unused
-			-DWITH_HDF5=$(usex hdf5 ON OFF)
-			-DWITH_OPENEXR=$(usex openexr ON OFF)
-			-DWITH_VALGRIND=$(usex valgrind ON OFF)
-			-DWITH_VIGRANUMPY=$(usex python ON OFF)
-			-DBUILD_TESTING=$(usex test ON OFF) # unused
-			-DUSE_AUTOBUILD_TESTS=$(usex test ON OFF) # unused
-			-DUSE_CREATE_CTEST_TARGETS=$(usex test ON OFF) # unused
-		)
-		cmake-utils_src_configure
-	}
-
-	if use python; then
-		python_foreach_impl vigra_configure
-	else
-		# required for docdir
-		_cmake_check_build_dir init
-		vigra_configure
-	fi
-}
-
-src_compile() {
-	local VIGRA_BUILD_DIR
-	vigra_compile() {
-		cmake-utils_src_compile
-		VIGRA_BUILD_DIR="${BUILD_DIR}"
-	}
-	if use python; then
-		python_foreach_impl vigra_compile
-	else
-		vigra_compile
-	fi
-
-	if use doc; then
-		einfo "Generating Documentation"
-		# use build dir from last compile command
-		VARTEXFONTS="${T}/fonts" BUILD_DIR="${VIGRA_BUILD_DIR}" cmake-utils_src_make doc
-	fi
-}
-
-src_install() {
-	if use python; then
-		python_foreach_impl cmake-utils_src_install
-		python_optimize
-	else
-		cmake-utils_src_install
-	fi
-}
-
-src_test() {
-	# perhaps disable tests (see #390447)
-	vigra_test() {
-		PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake-utils_src_test
-	}
-	if use python; then
-		python_foreach_impl vigra_test
-	else
-		vigra_test
-	fi
-}
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 4d359a3ded9f..4467c862d5fc 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -3,7 +3,7 @@ DIST vulkan-layers-1.1.101.tar.gz 1036750 BLAKE2B 5c59ade7826f382cfb5e56e0aa1498
 DIST vulkan-layers-1.1.106.tar.gz 1151285 BLAKE2B 763654d76c0c9d139ab922b2319df8becef5357c140ade3ba5d99cdbf6c7440b156048970202c2735bed4cb7de213d6647e492fa608023c91cf94a4b0353b4b9 SHA512 caf2c54c89aee2760747fc03f6d3e7742687f86aed5f05e1e8beffac35b114fd61af761bf95593f7cbdb3f9dbc92f570916af1225c7cdce3c16ba81024dc2027
 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 1398 BLAKE2B 44aeaeb5d3e711834cdb20a94b0ac7f226eeae437b474701d103786a8de056bf78f7663531319d0ed3070a8fab732bc28a44e14dcf43494c6fc884d7e118f5fe SHA512 041345ec23edede74a498d63a8bc89b4616259b929239bb052f882b4ebb74adcec4955d16e637dc1a9d6c8d4c43128ad0f73136fb2ccdc457f0a214a12491f3c
+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.82.0-r1.ebuild 1511 BLAKE2B 2807d2a7bb147049ceac792aca00a76ed67dd623d0680b7672ef926f9b36d48cd08ec2601d4ae96d747704221bda2f0e2e8a095c7bf6159decf5203be9bf39b9 SHA512 285690f105861791073332f918f16798b24853f22e98eae48e57604cac4c17351721746efa9f613e3b26dd801a2092137de20e7208d7acb066103bd1d233da3d
 EBUILD vulkan-layers-1.1.92.0-r1.ebuild 1393 BLAKE2B 9560cb9f3dacad4ae5002c8fab1f6c37ddbc23729fcea6352234f82535a9b1da43aaa7338118880dc62d30f67a349aa110d4e530044ed1f5498a631635e0ef4f SHA512 3dd3ea7d31947f73da6cd9bad8ea8b94756943af87be0fbb2326aeab76f1bd2e6fb57019935f367f74ffee7a9c0bfe1643eb3018fa5698a3ab381b03fb437829
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.101.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.101.ebuild
index 49a1f35e671e..cee610cca79a 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.1.101.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.1.101.ebuild
@@ -10,7 +10,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	EGIT_COMMIT="f06d731b7caf3e446acef3f4f5e62bdecd6f73d6"
-	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 f370eb57daf6..8247ca39e90e 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -2,7 +2,7 @@ DIST vulkan-loader-1.1.101.tar.gz 1346567 BLAKE2B a116df430606e4d94a94c5b307319e
 DIST vulkan-loader-1.1.106.tar.gz 1347960 BLAKE2B cfce908571d7033cfaeb1491847b3b1d2032a073cd824e0368402840dfc49ff223023b2d5b2de66f2df63bca7a526c94ab8e11d27d3c1d47b43042659ac38052 SHA512 b5c0f50644f6f026d309af41a232373052ba926c969ce4e5eacdb0accd997906f673bdb3c73b98593ca90e656d444ebd40a7e26a48470b64dea6e9f0c88cfe22
 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 1546 BLAKE2B 5b1a81dbf30c73b9948dc9026e954abf30b04d2b168620562e9100e438d5891776a3a206a9989b90e7079e15d98bf15702dd71a73d83a57b1b067ae8181135f0 SHA512 7c3fa181a91338bf74c1450b6fdf2311e82376ebc65283b93adebd29eab4965ddd542ab6e20bd4e87420361a5810f2bc2f54d3a41ab8903f66196390654b16d5
+EBUILD vulkan-loader-1.1.101.ebuild 1545 BLAKE2B 453c9783dc86b037c10e2369ca7f63a3dcc9e09507d967344e835bab8cc4348fb207ac39786a610912c01f1ef643015b345e6581acdf9f7b2ea05b2372e64dc0 SHA512 b144467cc7b0f583417c590a94d2ba7e393e135256b5ec42fe5df1d0ac55fba7ae1f2af05a7131e94c971a8fedacb98a1d85e5d9c8d3346fec545933f8c2b794
 EBUILD vulkan-loader-1.1.106.ebuild 1546 BLAKE2B f8a7a088de48a84759b6405d124cbed065661036d9edc17395bc346e058827d817ace560984ea647d5feed61fe4ae5dc11d159f49dda04a412e59b4ea7a8196c SHA512 ff7547d2e86e386acdd397ce11c58597964839d5293aef07590c23b833b61f8cacac04f088b9593b8ea91c09a1a3a2d725bd75819be55eb90bbf56f0987f11d7
 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.101.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.101.ebuild
index df4927b62624..65da95c20fc5 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.1.101.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.1.101.ebuild
@@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_SUBMODULES=()
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 x86"
 	EGIT_COMMIT="15fa85d92454f7823febeb68b56038d427e2a7a4"
 	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 5a64d89d9c27..1c02df166ca0 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,4 +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-9999.ebuild 1417 BLAKE2B c31f5b83990c3a8ef7ae90106bbf39fc508731fded1909fbb508beb3eede5ff5cf987f97602ecaf3e22e2d37348cebe1af472d26f345a85b89cae82073721606 SHA512 4f6ecbeaf8b830dcef8d57511ff8f1856f78c75b8186c9fecd194653b0a5f4184fbce7de7cfadc84b9868324fbd995bbae78fb7215cfab7db4587b3b21619a96
+EBUILD waffle-1.6.0.ebuild 1645 BLAKE2B 3d6c0a12d5484a9b4336d56a153a811804bdebd6aca67068b42a4824c21da01f5d1796d2ba704ed23833aa1a465bdade7208a21dadc902d60158bf81373f49b3 SHA512 15b9a381dc3b869bbdce9165ecf62582b37159a78f5b082c1b9d1eb6018b8fc2c0bbc83f7986296f5a027fab4b8dbac4405d166d372a6124d69c282f6b05ceda
+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
new file mode 100644
index 000000000000..a7c32a6cf596
--- /dev/null
+++ b/media-libs/waffle/waffle-1.6.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}"
+	GIT_ECLASS="git-r3"
+else
+	SRC_URI="http://www.waffle-gl.org/files/release/${P}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+fi
+inherit meson multilib-minimal ${GIT_ECLASS}
+
+DESCRIPTION="Library that allows selection of GL API and of window system at runtime"
+HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="doc egl gbm test wayland X"
+RESTRICT="test" # gl_basic tests don't work when run from portage
+
+RDEPEND="
+	>=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
+	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
+	doc? (
+		dev-libs/libxslt
+		app-text/docbook-xml-dtd:4.2
+	)
+"
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature X glx)
+		$(meson_feature wayland)
+		$(meson_feature X x11_egl)
+		$(meson_feature gbm)
+		$(meson_feature egl surfaceless_egl)
+		$(meson_use test build-tests)
+		$(meson_use doc build-manpages)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+
+	rm -rf ${D}/usr/share/doc/waffle1
+}
diff --git a/media-libs/waffle/waffle-9999.ebuild b/media-libs/waffle/waffle-9999.ebuild
index dc2a60608875..a7c32a6cf596 100644
--- a/media-libs/waffle/waffle-9999.ebuild
+++ b/media-libs/waffle/waffle-9999.ebuild
@@ -1,23 +1,24 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/waffle-gl/${PN}.git"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}"
 	GIT_ECLASS="git-r3"
 else
-	SRC_URI="https://people.freedesktop.org/~chadversary/${PN}/files/release/${P}/${P}.tar.xz"
+	SRC_URI="http://www.waffle-gl.org/files/release/${P}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 fi
-inherit cmake-multilib ${GIT_ECLASS}
+inherit meson multilib-minimal ${GIT_ECLASS}
 
 DESCRIPTION="Library that allows selection of GL API and of window system at runtime"
-HOMEPAGE="https://people.freedesktop.org/~chadversary/waffle/"
+HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle"
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="doc egl gbm test wayland"
+IUSE="doc egl gbm test wayland X"
+RESTRICT="test" # gl_basic tests don't work when run from portage
 
 RDEPEND="
 	>=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
@@ -35,20 +36,34 @@ DEPEND="${RDEPEND}
 	)
 "
 
-src_configure() {
-	local mycmakeargs=(
-		-Dwaffle_has_glx=ON
-		-Dwaffle_build_examples=OFF
-		-Dwaffle_build_manpages=$(usex doc )
-		-Dwaffle_has_x11_egl=$(usex egl)
-		-Dwaffle_has_gbm=$(usex gbm)
-		-Dwaffle_build_tests=$(usex test)
-		-Dwaffle_has_wayland=$(usex wayland)
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature X glx)
+		$(meson_feature wayland)
+		$(meson_feature X x11_egl)
+		$(meson_feature gbm)
+		$(meson_feature egl surfaceless_egl)
+		$(meson_use test build-tests)
+		$(meson_use doc build-manpages)
 	)
+	meson_src_configure
+}
 
-	cmake-multilib_src_configure
+multilib_src_compile() {
+	meson_src_compile
 }
 
-src_test() {
-	emake -C "${CMAKE_BUILD_DIR}" check
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+
+	rm -rf ${D}/usr/share/doc/waffle1
 }
author	V3n3RiX <venerix@redcorelinux.org>	2019-06-08 09:04:53 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-06-08 09:04:53 +0100
commit	73c318acdaf6f8309d68bd266051e6dd1f1bd787 (patch)
tree	2878053f3e7faed19a1f82c733d3bd29df69991e /media-libs
parent	2018227e9344edb9da15fc6a4a8298086cc2aa77 (diff)