gentoo resync : 28.04.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
commit: b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree: e318514216845acb8f2e49fff7a5cba4027e9d91 /media-libs
parent: dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)
283 files changed, 3348 insertions, 4050 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index d75bdd61f17c..0d2eca81df89 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 59fcc4834a85..1bbd2397621e 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -4,7 +4,7 @@ DIST alsa-lib-1.1.6.tar.bz2 989316 BLAKE2B 2aec62d262148571cc1b93ac8053002b61266
 DIST alsa-lib-1.1.7.tar.bz2 1005257 BLAKE2B 0ee0eb9db057421d75436bbed49e0a0ef560700d480a5dc73bc0e9e6abaa29892dc4e4482c671996fbc9f6bb5f70ba645010bd714f30959fef897e3dc906980f SHA512 7cc81464d876a137e9ac9700420bfff7cd528338bdc6e0bdbe313d45c5b97c81f1a9483df0556fe390d54a9db747fbec62e843b42d2cbc740d5a91b015714f6c
 DIST alsa-lib-1.1.8.tar.bz2 1002562 BLAKE2B a531ab501943924d007f7ae0e4489deea805ccbc8f2f02d3ee392aa2dbe54ffe31f58ee1744308f851a68f693c83125088708e901d0d83e4a7a5f644ef448aa3 SHA512 50ae107c6efe8200b4c41e0463e099d16e149332f1d3a22c3e81d3e7d980b7f93f3610fc9711ef62067caeb1054e7ea612ba3903bf8a91ebeffa48687cf80eed
 EBUILD alsa-lib-1.1.2.ebuild 2105 BLAKE2B 2be4af40e69e4b3e06ce8ea954848c143090ed275f19dcbfd49b867d1edd03e497a248a2f16f5ed9181ea409be5ca46864445f729d634174e8376b256b877b8f SHA512 6f02e3234a638ebf9e88f5c6db7f6edca4f6f76acb1e7c09bc120825a6d1c994f83baa22d5c9b6c2f07fc6717a4e32714d7cab13ccddbc653e57ea489b17fdde
-EBUILD alsa-lib-1.1.6-r1.ebuild 2049 BLAKE2B ae2e9b036ee5a3021b0427af84966b93fa9cb92d4d0a98bc52c18870cc6a4ac3a5459e6c20d28cedc043283498036763227307e6863813630819b657414f8e1d SHA512 84cc713f39241903f448aa2913d7f2528a68065499f9feded6248f8f3c47de2e96547d28331acc1b5f2ab98be5e351bce1847f780646273d0884981236a79897
-EBUILD alsa-lib-1.1.7.ebuild 2063 BLAKE2B b3a5a74cfb2772f4a88699067ba8bad9971de795732450eb704eae5ece252830a3bbb2a06b436a1672043ddf138ed1ea5d855e856afba21a2d20e0409ac4915b SHA512 c868b015979edb7cc8a8b1d59c4f361ddd012ad4753c4597413caae27f4a023787e23786f44ba721de401fc696715a8e2837219c53598dca5e19860358b043ff
-EBUILD alsa-lib-1.1.8.ebuild 2061 BLAKE2B 79c6985e08c31256dfeb731a5bafacb22bf6c586aaf803a43f0280c009116ae56529274d54c95e3f92a97076e819cefce27746210888a4204f273184a756f1c1 SHA512 7c8874e9919139b4b4858a1250c26e3388bd6ed318a9e28d6dcd32ea2dd39aa5ff75ffc27d6e8bcb31742309c2d570a840d4a873e0cd7f120ea79871499a22fe
+EBUILD alsa-lib-1.1.6-r1.ebuild 2047 BLAKE2B 106e4eec3488a7f76a505f8afb0ed4687f11893aadec2afc393a2c198f387d848052954a110617cbbc451fc446a3a166b445eed101db544bfb9c44859ef92d05 SHA512 8c95080b33d5360f66e586544223f94bae816bcc94115c3f3a6b03c065ef9f54354ccdefcebd6f306facc05f258a89a80cf48465db9369492a88234ee17723ed
+EBUILD alsa-lib-1.1.7.ebuild 2061 BLAKE2B 4d85f8e9ba863e56a7100c5a3b64d00980c389aaf71a34fadf3026de610c92b7ac7d7fa21e1498bbdfcbd938d8bacf95a96d7315c65099226c593fd18af3622d SHA512 c9fd20fa7b2a891702ad0b8452dc5cbc91d57c0fdc1cde2be352eb2fee256ddd5fdfbd7fd752ff0127c234234929f19a46893c9904ab400a6c5cf735e4f0d885
+EBUILD alsa-lib-1.1.8.ebuild 2058 BLAKE2B 3e78962d6149f9f572f8546b96f2b9b3b1109b4d3494160e7685666a6dcf7585a01403aa4b838745d50dccea12541e645b1e2b105728a00f0c4f3e763b028fff SHA512 d1be036bcd64715e117923e13bde9e5f8c5ffb21766bbca2aac6518c62783cbd9d36ced6ac3c9639ead1f5a31b3d9d48972ceda845ddc4f565077c8176b701f4
 MISC metadata.xml 502 BLAKE2B 06ee247fafa9de0b13dc4723279d82367bf580e8ad5216b301e23e1abf2a4ea464febaf456c31a91d223bec81603c1b65c2de0fb5fe491d464cfae754ecc6ad5 SHA512 0ca6ff20c3eda2f898d20df9e8a572b9a8d0504bf3a79bc1ef14026ea8b72e13638cbd3ef63ce2bf19efea80729ca25c27ca131d965edad4a4d3d23ac1352085
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild
index 71087d0c3ed8..9c6322c42e45 100644
--- a/media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 
 inherit autotools multilib multilib-minimal python-single-r1
 
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.7.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.7.ebuild
index 69bf71d7b425..d0d8d828dd6b 100644
--- a/media-libs/alsa-lib/alsa-lib-1.1.7.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.1.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
 inherit autotools multilib multilib-minimal python-single-r1
 
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild
index 802ee5fac83b..db73845281d0 100644
--- a/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
 inherit autotools multilib multilib-minimal python-single-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc elibc_uclibc python +thread-safety"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/media-libs/alsa-oss/Manifest b/media-libs/alsa-oss/Manifest
index c90346a61819..12cef170bd7d 100644
--- a/media-libs/alsa-oss/Manifest
+++ b/media-libs/alsa-oss/Manifest
@@ -4,5 +4,5 @@ DIST alsa-oss-1.1.6.tar.bz2 291588 BLAKE2B 2db4b6d80a17518aeadff8a8f12a40eb4f9e5
 DIST alsa-oss-1.1.8.tar.bz2 291800 BLAKE2B 47124c4edd14878b202e6ff6866b5441ffa0991ac3011a3db1efcd1dd2a0c27c9f2b8b38c2a51e8b46cb5714a97393a462154cdfaf89f1238244f7b2635a7740 SHA512 42966af0ca1be33b4ab1e20b2e3320056ad6caf6ecc5ecde3ae19571809a2fa924dd91d9b2a5d5b6f345b29d937b079400d2a165dbe2b8a33b857cd406c4ac7c
 EBUILD alsa-oss-1.0.28.ebuild 876 BLAKE2B e322d42d78583a296b49e32e316d4f7e0bc41fd4cc40bbc8873e5bfe0cc47a46c84af4813cfe9f916da8d5cf30a0577e0fe9030f2387f62b99cc8ac2a2a675c5 SHA512 519092dd88cb74fdb8a2fb9e87de716dcbbf9e19c0c75f82245535c2827467f9a1f429f4477f68f23a9804026b90e265fef20b31db48db41396fcfaaf37a417a
 EBUILD alsa-oss-1.1.6.ebuild 914 BLAKE2B f4d40c1a5ba78451221491f5eb7da72cc3e228cf306dd0bd82097ba3a1b6e34a9896c34e903da06486752b893d116a243e89cca6fdc1b99dbe47b5ac2759fba0 SHA512 a05bfc6a2ee9e964c79f831a3854c4183781124250ca70110fe91ce03a2f3955a89417623c7798d89304e4431fd4fde670f31b5e82cc426515bf3a65589904da
-EBUILD alsa-oss-1.1.8.ebuild 1022 BLAKE2B 3346a4630e96e1ff6a0c2ad8276234be2959f6bea5384ffd94ed762ac721af2d0c0e09447519dd2e0be49ce532a547b9d89f82e579345e4bc0b862dfff7eed57 SHA512 d59bae79adc619fba32c6bf49be9ec4762cc5974937898f1aabcd6930c1c167ed91cecca6603d30265313ad7d57356e43bb21449861fee2341fba6c084e92923
+EBUILD alsa-oss-1.1.8.ebuild 1021 BLAKE2B cba8a742482916b38139d375863c039700decb5858bcc083024f36b5d6e1847a59a90bd1a7f0a6b7b59eab6d9e02dfd855e97bd4bfaff0ada8ae0eeba86fe80a SHA512 58154010935c62acdcf2255ffe5db529f7818fc0ad24fb40981d236c3568357428bbefd66e0ac27d83d20f4ccd42385bc5c55609f2feab76a35d300a7ee22359
 MISC metadata.xml 217 BLAKE2B ee5131ede673a41d69ab787db1d05f6d64afc4d625294c8314d0db362124dddca5b31ff6d29cc41ebb3f464f4665e2bc9bccfac84f69231ebe819d262e8ed7c7 SHA512 783364e33af22e28ba41661e2380968c95f6464ae9ebb300d542ca159a54c4e53cf5e8b1053a72e75902f433e90fa26f6456fa127fca6daa44542bda57779e5a
diff --git a/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild b/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
index aa46e9a34f2b..afff1dc8c150 100644
--- a/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
+++ b/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://alsaproject/oss-lib/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="static-libs"
 
 RDEPEND=">=media-libs/alsa-lib-${PV}[${MULTILIB_USEDEP}]"
diff --git a/media-libs/aribb24/Manifest b/media-libs/aribb24/Manifest
index 0110ed9a4161..f4be5771e606 100644
--- a/media-libs/aribb24/Manifest
+++ b/media-libs/aribb24/Manifest
@@ -3,6 +3,6 @@ AUX aribb24-1.0.3-fix-default-macros.patch 1511 BLAKE2B 04b32f01928d66389c771f57
 AUX aribb24-1.0.3-reset-control_time.patch 713 BLAKE2B ae8d2bcc787ff12c5bd3374c171785f25b39294c78f8f4f0d2cf610298d0ecc951071b758c33bc1d68230859f032f9e7191a11dd6f7995c4e112a62705a87a54 SHA512 ab9cf73d508d5ae4d570ddf50cb6e914738312951aee49ff010df46d37fc9fd3be67accec518bc43562a12e228fa0d420f005a29c5d17bf1c38bf6bc3a8da090
 DIST aribb24-1.0.3.tar.gz 57378 BLAKE2B 72d5c56a214d63e477ed0bb77e5f20e79ff69fe3712623f54f1369b041622aef1853909f3dfc31685b346c62ef36ffe205bf7a8d2c9f0a2996ae378b025228b7 SHA512 622cc0c3928fd6db0b5ab3921f27348c956af20f8c0133ad5d9bf4de3d199077d9f23cc86ae149a9f0d13c7ee5906ec95de3fb8388207160cebd1f0c59078c8f
 EBUILD aribb24-1.0.3-r1.ebuild 692 BLAKE2B 31de88410fe23acfbfc52aca125563792566e296315b614ae07c0d378176d10722574eca4bb16d775ded48bb3bd2f679f92cb0f5bec2e6db952c77a9385218d5 SHA512 7650c1ccb3cdc429570da6a677b43c0721a41eafbae387908862123dc7f8f7f65283810cb9c91f0b037cf3b1db364b4da9836c37a7768657991b4584ebb91cd4
-EBUILD aribb24-1.0.3-r2.ebuild 846 BLAKE2B 3a0818a785fd5fbe440897953b82ac755df947dfa2f5ad6476084ebb978ef72661b602db0e8e3a69a24688d92c32d38e1686bb5d946c92b51d701c525ca330dd SHA512 6853d6fa86391c1f42d230636d8f26cb56a7c760ee22e13d5ab078b41e001f7575a15c04a02faf6fc89a87b0bdbc4cd765d7c23af2d1ea49a0d1f264a70565fd
+EBUILD aribb24-1.0.3-r2.ebuild 853 BLAKE2B bab9cc33bda115f2be63fb47e076f7f038cfad7e06814cab4dee51839e9aac8f98e7eda9cc56da08224694b799baa047c3ae675a4c70710d5a4a74bc91215eb4 SHA512 23ff30f07977bb69af456a6c9c603e02e870646aec33550ea2c993acd16cf65c7b55425c3c6911132628124c6504c02688c7f64d618d5494070bbc7bef87fef7
 EBUILD aribb24-1.0.3.ebuild 610 BLAKE2B be387cc22c418985fe567238db2dfe1add1576f0484d3fc28162f4f47e4e6f22a2ecd642670d8f5dcb43d3866448b7cb6a0206032f9c25b525d9efcd9bd40054 SHA512 5fec871008d5d91cabb85d145327a748d910898b3eda002eb4efbdc7ab7eff4fa6cf0770b900986c8e8046a1e11a7338cdfc3ca55f0fef59eda79b1b9c1c2040
 MISC metadata.xml 362 BLAKE2B a58d2df31cfb55e76bec5b2055ae17cbfed0de0a0cc85d8d604ee5c4442539b00d40500722b9a589861f6de1e49ef9fe171bdae2219325c93fc07b735a349949 SHA512 0266c8f4f74468aca028c09b9bd61817f1358022ba11020c5f1829581113c0510c4f59228304fe4a5e76f4a666c640e0afc6e96385bae7c0de98c5d4b8a64d44
diff --git a/media-libs/aribb24/aribb24-1.0.3-r2.ebuild b/media-libs/aribb24/aribb24-1.0.3-r2.ebuild
index 33746cda604e..722db73a6ba6 100644
--- a/media-libs/aribb24/aribb24-1.0.3-r2.ebuild
+++ b/media-libs/aribb24/aribb24-1.0.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nkoriyama/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="media-libs/libpng:0=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-libs/aubio/Manifest b/media-libs/aubio/Manifest
index f44074fc0c39..5d5689a8cbe5 100644
--- a/media-libs/aubio/Manifest
+++ b/media-libs/aubio/Manifest
@@ -4,6 +4,6 @@ DIST aubio-0.4.7.tar.bz2 372173 BLAKE2B 544239b215dd87d4cf4a6ed6b5dd856411d0a3f1
 DIST aubio-0.4.8.tar.bz2 387933 BLAKE2B e30d0ce97360376edf8eba895dc3040157a139c843ef9d6bf0483ffb750916eaccf9e28b8d80dcc0034572cca4f08479e4db44468c96206ce7b60a2fa9600634 SHA512 e58b32beda36865a5243ec7ed4647cf96e3652a25fd319fc697c08f93487f895070dc66b830700b40b879220c2e3a53b8cdc255ce2e34770ba5e34b36a4f51b4
 DIST aubio-0.4.9.tar.bz2 397604 BLAKE2B b849d92678ea8fb20e17921b1a61fdc85a84d4a528acfefa3278169ab5f7fe935217ec37dd9f931202f0f0a1fd3a9518372afbce34cc2dd3ca30c6b4e5d9a301 SHA512 0cb81bb4b15051db3f3f4d160d500af56fdfb237e0a74e3f366f53c2870030aa0a7cee8469a611a9694c36b8866d3d42ffb48241c999de08f3fee43e6d903130
 EBUILD aubio-0.4.7.ebuild 2450 BLAKE2B 975c2121ba3b505134e3b079e8654f77d16902e2fe6c31b158577922e3a2332909ff78f3eb04e16eef14039e1fdb4ead67a949eecc6f166f5efaf69a17bfc5c9 SHA512 7f26d97bf9de42e2429f797c3af73079a3105822ded2550fcf2852c5e6807fc4b60e9dd1688ef97aed1389161bde2544c94360f9fb82dfd92ba23d072ff90f8d
-EBUILD aubio-0.4.8.ebuild 2521 BLAKE2B d47d0ed05b3c03db6aa943ade15fa1715fda088e206d958ed257f451373353fa7d802dc3ee8c4223e3b16bd6151641d917af1faf32e125c8e12c47575b62073d SHA512 31883798430b6682e73f1ca2d05c5214aa54b0eb39f10886dd78278541487d6e610865af14509ab6621f87940e129894fd8229303b0c1f748b1dc2ada3222b5d
-EBUILD aubio-0.4.9.ebuild 2546 BLAKE2B c3df6e4e9dcbec869fc3fd808c61ceb10a24627037d810e4fa08c9690dc025e1afedfb46ea0364aedff9fbb678434e12c022d6ca04d119e74ba7e5de1158a778 SHA512 2b613a1b1c32d41fc25901cd4efadffdf39b46c942d2eb0d27cc09ff277c19c851b6c28cb7cfb474f514b06ff17cc75a0179309038858329d682a19af58ea21a
+EBUILD aubio-0.4.8.ebuild 2519 BLAKE2B fa2d62ac5ae0cc31ae18f72dce097e8a007f7c8662f75463583c924b01ff9fbc739dad525deb69d4d2e3e839019e9be7bb472325e652848e51bb94a85071f5e8 SHA512 e95141cfd5e2532ba9ac3e5fd7b7590c0f985790472c859b9c6e36a181e7d6ac3cd1e4dc5c177eaf2c8dc3662ae77330bca5453fad21104d36de547891ea601b
+EBUILD aubio-0.4.9.ebuild 2544 BLAKE2B 030de5ee0318b5413d24f828b0e57c154115b49f62dcf1ab30b46b04638117332a5aa05ae8385abbcb18a5e4adb21ec829c3dd3e06829eb08ac09ea132051815 SHA512 0252af4b21719ed23efe0f29f7042a42ac1edb3aa6ae506e2caa7f892ce39a0b2d88a3128295dc0f8e4307b3905007c7c77e8626b18f60f43478b5542fe3a503
 MISC metadata.xml 346 BLAKE2B 00429033f506bf3818f26f13062d21d0d04d8fc84185244615a09d008c5da6e350df5f32bdcba2c07103039ed64f802cc563a0ca8cd79e117741b947e421142d SHA512 ff3830c2d2322fabdb34458fd27c3e05ad825b1d707eee6150417e4c21480bdffbe4e639ff33a9914cc28189b91e970719326f065746f4241e186f7b27b168d1
diff --git a/media-libs/aubio/aubio-0.4.8.ebuild b/media-libs/aubio/aubio-0.4.8.ebuild
index f75c644d475e..3a1b634cdba2 100644
--- a/media-libs/aubio/aubio-0.4.8.ebuild
+++ b/media-libs/aubio/aubio-0.4.8.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 PYTHON_REQ_USE='threads(+)'
 inherit distutils-r1 waf-utils
 
diff --git a/media-libs/aubio/aubio-0.4.9.ebuild b/media-libs/aubio/aubio-0.4.9.ebuild
index 657b2bcec037..1a8f50444b57 100644
--- a/media-libs/aubio/aubio-0.4.9.ebuild
+++ b/media-libs/aubio/aubio-0.4.9.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 PYTHON_REQ_USE='threads(+)'
 inherit distutils-r1 waf-utils
 
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index c267440651c0..7d6f23ddf99e 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -11,6 +11,6 @@ EBUILD babl-0.1.38.ebuild 1463 BLAKE2B 8aeb5ec689a4595cafe28fe9c7678d154f2f892b3
 EBUILD babl-0.1.56.ebuild 1537 BLAKE2B 1858b7fd4b0dd6eff9031c92150a4870b3edac208819e905ceb7635dd2ce603c0387cefb989fccca639adaa147d9d866040e437d7e70dfc11399181e8f499dda SHA512 add502c131a3691698aa68d7a2e00628675abc0e086c16ac97a1211017f18290470ba0c9044cb6266113aef45671a6bf6a474026393c8fd3eff4d87ff29d034d
 EBUILD babl-0.1.58.ebuild 1534 BLAKE2B b02f952cde0678f29087c7356252681e5a71d2be900689e9a07fa6dd8308ee4c75d43e15dee24266805d22b0844ddb2e61e86cbc6b14347b403fa5fcb31be374 SHA512 1cca3329bcb2441790e843ce0c5864e020b1bce31b09083d53d793aeda78e9f6604abd0d35cf434a69d7d01427bd9a575e4cf59a41c0646c882225e6331fde6f
 EBUILD babl-0.1.60.ebuild 1534 BLAKE2B b02f952cde0678f29087c7356252681e5a71d2be900689e9a07fa6dd8308ee4c75d43e15dee24266805d22b0844ddb2e61e86cbc6b14347b403fa5fcb31be374 SHA512 1cca3329bcb2441790e843ce0c5864e020b1bce31b09083d53d793aeda78e9f6604abd0d35cf434a69d7d01427bd9a575e4cf59a41c0646c882225e6331fde6f
-EBUILD babl-0.1.62.ebuild 1545 BLAKE2B ffa68e0a1d0994f176767e2a5d4ffd30f4632685199a6a29de1aee57fec7cb16266805fadd190f2fe9f27c84bd96890b1be18cc7d9914ce6ba736c1e18cf2db8 SHA512 b3c6cb1abdfe65e7d86f1505c5d00ad0b2aef84dbbe5156a63913951452af30be13c8b339edefe831cdbd6eddd4ecb766c17cae2af75f1067d8f49bebe3ba506
+EBUILD babl-0.1.62.ebuild 1543 BLAKE2B 16b6d7d3d27feb2c848f1a774a697975e821c2b23e1fca96a93d2b2aec87daf8f10b272a48a2c84e235d32cce4a147c662dd21ea81a1007a7f36396d5853b501 SHA512 9787526ab94218c59083d7f93d5bad05ad2ee4fb41849ed8018119b788b451876f1892d227eae08280f87fb21bd3fcc6a17882b11b226245856cfc43ef7ad0b8
 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 c6f18423b435..4bd957b7a291 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/ccaudio2/Manifest b/media-libs/ccaudio2/Manifest
deleted file mode 100644
index ffb93f36323b..000000000000
--- a/media-libs/ccaudio2/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX disable_gsm_automagic.patch 727 BLAKE2B 0b6bb97444cc7dd0db7b4958280afc67e7f52816fffddf065a8f56186f32a5fe7e261df14ec139f7232e9578924b4fb29d1cd87642438db8dfe8938a17a193f5 SHA512 053109cfcb960da417e061f9b9d6de0abf01322d9f3d20216e2358a4703dbc943e699c5f0a2da78c79a981bc47ac5c5b7ab8e82dfa8d085fe79bff3c1b5d8479
-DIST ccaudio2-2.1.3.tar.gz 443867 BLAKE2B 98eaf9d7ef21d278095c92b297f5eb68f059e5bcc850247836d95c0121450418cf94adef47be7ba10c65e4e37b548542229f2c4be1e84090573eed419f5816da SHA512 3f6d80a503ddacb473b559450a6fac0cba7f1788a7c17a0326b1ef66918a1403a1c69c1578fbd2f382e75969d95a116c579dae810cdd3719da24a3e25027b9ae
-EBUILD ccaudio2-2.1.3.ebuild 796 BLAKE2B 0457f1551935334d2020745bac364b3ce3b134946c659b81728c01c463c1951f8690060ac69846e10e4c3a2af8a48bf1aff4f96cc5ec25269f211932cea0a640 SHA512 6ad335ec3d20f143a175ef40ac01ca05069a1229bb5dff8e17e99acb60c8bbe3a4199449ac9b4aaf38f7fbf971e5d3c4e8c85b9244eee314256413ac31090ead
-MISC metadata.xml 245 BLAKE2B 5599732e8923ea2b90a26adcb5708b6cf95cd3db28e810b9f881ac7d0e2c63745609f4c6e21708bdda7792f769df77bfa4b9d4d135eda71831efcaaab122c384 SHA512 1c6cdb75d4cbbd8d3a5f2cc24950924c030db330e135cf2cacecdaaa99ee65117efd7abd9f8652bf5dfa8169d427f51ff84123aab11fa8ef82498a6834b0805a
diff --git a/media-libs/ccaudio2/ccaudio2-2.1.3.ebuild b/media-libs/ccaudio2/ccaudio2-2.1.3.ebuild
deleted file mode 100644
index 1c87c2187e6b..000000000000
--- a/media-libs/ccaudio2/ccaudio2-2.1.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF="1"
-
-inherit autotools-utils
-
-DESCRIPTION="C++ class framework for manipulating audio data"
-HOMEPAGE="https://www.gnu.org/software/ccaudio"
-SRC_URI="mirror://gnu/ccaudio/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug static-libs +speex gsm"
-
-RDEPEND="dev-libs/ucommon
-	gsm? ( media-sound/gsm )
-	speex? ( media-libs/speex )
-	"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	"
-
-PATCHES=("${FILESDIR}"/disable_gsm_automagic.patch)
-DOCS=(AUTHORS ChangeLog INSTALL NEWS README SUPPORT THANKS TODO)
-
-REQUIRED_USE="^^ ( gsm speex )"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable speex)
-		$(use_enable gsm)
-	)
-	autotools-utils_src_configure
-}
diff --git a/media-libs/ccaudio2/files/disable_gsm_automagic.patch b/media-libs/ccaudio2/files/disable_gsm_automagic.patch
deleted file mode 100644
index 1ae6a79239c7..000000000000
--- a/media-libs/ccaudio2/files/disable_gsm_automagic.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- configure.ac.orig	2011-05-15 21:40:14.000000000 +0300
-+++ configure.ac	2011-05-15 21:46:11.000000000 +0300
-@@ -138,6 +138,9 @@
- ac_gsm_codec=false
- ac_spx_codec=false
- 
-+AC_ARG_ENABLE(gsm, [ --disable-gsm          disable gsm support])
-+if test "$enable_gsm" != "no" ; then
-+
- AC_CHECK_HEADER(gsm/gsm.h, [
-     ac_gsm_codec=true
-     AC_DEFINE(HAVE_GSM_GSM_H, [1], [gsm header found])
-@@ -145,9 +148,11 @@
- ],[
-     AC_CHECK_HEADER(gsm.h, [
-         AUDIO_LIBS="$AUDIO_LIBS -lgsm"
--        AC_DEFINE(HAVE_GSM_H, [1], [gsm default header])
-+	AC_DEFINE(HAVE_GSM_H, [1], [gsm default header])
-+
-     ])
- ])
-+fi
- 
- AC_ARG_ENABLE(speex, [ --disable-speex          disable speex support])
- if test "$enable_speex" != "no" ; then
diff --git a/media-libs/ccaudio2/metadata.xml b/media-libs/ccaudio2/metadata.xml
deleted file mode 100644
index c5adddd4b3e6..000000000000
--- a/media-libs/ccaudio2/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>maksbotan@gentoo.org</email>
-	<name>Maxim Koltsov</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest
index 48768eb33147..266ca4249c2f 100644
--- a/media-libs/cogl/Manifest
+++ b/media-libs/cogl/Manifest
@@ -1,3 +1,5 @@
 DIST cogl-1.22.2.tar.xz 1682360 BLAKE2B f5a1543266bd87c6835322d5dbf501ec4f9fec52cc18d73d140323fef2f1b6b2293b5998bc8914b0a8cb514e7fefe5a1500793e1c7d8b5e0a4365fe8ef13233f SHA512 2ec99f5ff22683d12925b9a1f748387b47c4506aaf3c5afec851b3b6fe6b7cdfd211fb7e4359bd7a1d1b7cb3cb7fbd257efbcb7d2941d0f133a60bad1c9645e3
+DIST cogl-1.22.4.tar.xz 1723856 BLAKE2B 9e8532e3a0d17662042e2e61e45a7ddab6d3a35c7fbb070426b574292d7d3ed81e42a05cde9ab9a58ecda4eb6d560d0dca6c44b7791bba195e2ab2a33e8c0dc1 SHA512 85f3af49c16dd2e545a3b91c076ac10107a4b9d0dc785cefe489e91eabdd82837f732685f1f0dca1695fc2f8095f42d5f30f145b659eb4295964787f06c1e37a
 EBUILD cogl-1.22.2.ebuild 3860 BLAKE2B b9d54bb15ad24bfea7d35239c1a047ca2b9c7bb323a2e920febe5e9c5c0715a277e7edd067d0401c945f86b455fa93160a5d99e2925a03d80766fee7fa6437ec SHA512 5322d779a49ed67efbadef97588e6b9a23a422f31efc9e5b90c1604605df09a2a2b8dccdb777ed091bb3a354ebdda280676e3142e96f7520fdf35ebda701bba8
+EBUILD cogl-1.22.4.ebuild 3862 BLAKE2B aec883f43490d01b4caebbe5158cd781a7da768b9b03b7bf83c63b0134f5cfd2cc38376b4a6d53066c858003cbf1436d6613eaa83112da69adaea1dbe8acd425 SHA512 250842d2b6a1c55155a30732285421c8987e2f1d915384217b1a17a48f48923041464919f33b552a0a453ac848c0188a1ccc298de0b14bb929a981ac2eee98bc
 MISC metadata.xml 457 BLAKE2B 79c55fb3e5a1e5772c7b26cea5b54b15d683772204ec2ff2229481085130f4945b877a4608f01308a297571c01fa0da50220cd44b6a333eb34d2aae71c3a9157 SHA512 e0e4be51119ec98c906ca2f5df69c9024d77855fafa53ec00bc30b481f33dfd98708c2c9021737f84a46121788079fdc1d9ecffc2693a3257819f05879318a44
diff --git a/media-libs/cogl/cogl-1.22.4.ebuild b/media-libs/cogl/cogl-1.22.4.ebuild
new file mode 100644
index 000000000000..7061df2b3cde
--- /dev/null
+++ b/media-libs/cogl/cogl-1.22.4.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2 multilib virtualx
+
+DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
+HOMEPAGE="https://www.cogl3d.org/"
+
+LICENSE="MIT BSD"
+SLOT="1.0/20" # subslot = .so version
+
+# doc and profile disable for now due to bugs #484750 and #483332
+IUSE="debug examples gles2 gstreamer +introspection +kms +opengl +pango test wayland" # doc profile
+REQUIRED_USE="
+	wayland? ( gles2 )
+	|| ( gles2 opengl )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.32:2
+	x11-libs/cairo:=
+	>=x11-libs/gdk-pixbuf-2:2
+	x11-libs/libX11
+	>=x11-libs/libXcomposite-0.4
+	x11-libs/libXdamage
+	x11-libs/libXext
+	>=x11-libs/libXfixes-3
+	>=x11-libs/libXrandr-1.2
+	virtual/opengl
+	gles2? ( media-libs/mesa[gles2] )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.34.2:= )
+	kms? (
+		media-libs/mesa[gbm]
+		x11-libs/libdrm:= )
+	pango? ( >=x11-libs/pango-1.20.0[introspection?] )
+	wayland? (
+		>=dev-libs/wayland-1.1.90
+		media-libs/mesa[egl,wayland] )
+"
+# before clutter-1.7, cogl was part of clutter
+RDEPEND="${COMMON_DEPEND}
+	!<media-libs/clutter-1.7
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.13
+	>=sys-devel/gettext-0.19
+	virtual/pkgconfig
+	test? (
+		app-eselect/eselect-opengl
+		media-libs/mesa[classic] )
+"
+
+# Need classic mesa swrast for tests, llvmpipe causes a test failure
+# For some reason GL3 conformance test all fails again...
+RESTRICT="test"
+
+src_prepare() {
+	# Do not build examples
+	sed -e "s/^\(SUBDIRS +=.*\)examples\(.*\)$/\1\2/" \
+		-i Makefile.am Makefile.in || die
+
+	if ! use test ; then
+		# For some reason the configure switch will not completely disable
+		# tests being built
+		sed -e "s/^\(SUBDIRS =.*\)test-fixtures\(.*\)$/\1\2/" \
+			-e "s/^\(SUBDIRS +=.*\)tests\(.*\)$/\1\2/" \
+			-e "s/^\(.*am__append.* \)tests\(.*\)$/\1\2/" \
+			-i Makefile.am Makefile.in || die
+	fi
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# TODO: think about quartz, sdl
+	# Prefer gl over gles2 if both are selected
+	# Profiling needs uprof, which is not available in portage yet, bug #484750
+	# FIXME: Doesn't provide prebuilt docs, but they can neither be rebuilt, bug #483332
+	gnome2_src_configure \
+		--disable-examples-install \
+		--disable-maintainer-flags \
+		--enable-cairo             \
+		--enable-deprecated        \
+		--enable-gdk-pixbuf        \
+		--enable-glib              \
+		$(use_enable debug)        \
+		$(use_enable opengl glx)   \
+		$(use_enable opengl gl)    \
+		$(use_enable gles2)        \
+		$(use_enable gles2 cogl-gles2) \
+		$(use_enable gles2 xlib-egl-platform) \
+		$(usex gles2 --with-default-driver=$(usex opengl gl gles2)) \
+		$(use_enable gstreamer cogl-gst)    \
+		$(use_enable introspection) \
+		$(use_enable kms kms-egl-platform) \
+		$(use_enable pango cogl-pango) \
+		$(use_enable test unit-tests) \
+		$(use_enable wayland wayland-egl-platform) \
+		$(use_enable wayland wayland-egl-server) \
+		--disable-profile
+#		$(use_enable profile)
+}
+
+src_test() {
+	# Use swrast for tests, llvmpipe is incomplete and "test_sub_texture" fails
+	# NOTE: recheck if this is needed after every mesa bump
+	if [[ "$(eselect opengl show)" != "xorg-x11" ]]; then
+		ewarn "Skipping tests because a binary OpenGL library is enabled. To"
+		ewarn "run tests for ${PN}, you need to enable the Mesa library:"
+		ewarn "# eselect opengl set xorg-x11"
+		return
+	fi
+	virtx emake check LIBGL_DRIVERS_PATH="${EROOT}/usr/$(get_libdir)/mesa"
+}
+
+src_install() {
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/{*.c,*.jpg}
+	fi
+
+	gnome2_src_install
+
+	# Remove silly examples-data directory
+	rm -rvf "${ED}/usr/share/cogl/examples-data/" || die
+}
diff --git a/media-libs/ctl/Manifest b/media-libs/ctl/Manifest
index 6b3aff3f18e0..a5f17f618e44 100644
--- a/media-libs/ctl/Manifest
+++ b/media-libs/ctl/Manifest
@@ -1,8 +1,9 @@
 AUX ctl-1.4.1-gcc43.patch 2696 BLAKE2B 628ad07e0a8fdf1677cdf01dc47400ed8e9437b90ec382511686fd5edabf155478a4e23e3b2ef62dd302eaac47cc0b63f16fd528b7a977dc5555c55af0193cf6 SHA512 dfceeb1ab50299c1f8b09e118d28c81307bca5a28691994e4a7e413f8e1e508b4efd06084857dcfcfa7605fa304f312495d354a8d33748858cb77c02ac4933ba
 AUX ctl-1.4.1-gcc47.patch 302 BLAKE2B 8cbf57d3e0068e8527f82f426f7128d66ff096c24ec602ab7630e1c119cc83e8972161f4a0679b75b8ab887e4ffec253dd888125e28209aa50fa15bd282ba488 SHA512 40f2afde912a9d35703b755f569c9d42f8c90f957e1acecea4eed6b55d514fee1252acbf1f229b23e69ea9d5e47c73311e0a293af801af2e61e3981566258c93
 AUX ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch 16825 BLAKE2B 4a732a2b461e81016d0d3e165d998b19904fbd9a77af4cc041b29a6c785beaedec109fe33ddcc6cb05c08f3001231b1e832a687dfccf96fbef70c4e517737fb0 SHA512 53df4449eb0acca2f20a42cf9945870e580de3be6be416c52428e300aca1833eda081d6fc17024aa61f1ecd0886098958d187249a9189fb6d1e62c82d0964afb
+AUX ctl-1.5.2-openexr-2.3.patch 455 BLAKE2B b42032d28612bef6f6a3beeda67c6b6a20fb4b99527003acd6a97eceec8286e073b3c6594c92ae99ad559c9d520b9d94fe93ea783e9d6021d81f66b258c3e2f1 SHA512 0e97065c78c6ef5c2a8f657c6c41031f66379483aaf2754f612d69261932a7f6ee1ccd01c5c0b1b450e511aa758a640cacf55629651d5974a92c519f4ff3a25a
 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 688 BLAKE2B 5391c6bf83c3a7f1ecf5717020fffbdc0583b9a43fff3051c23efea6f6b0b60ea28822907bc2095df347895327a3068f2acc8e6b99e11182d6374a0df3b69cb9 SHA512 8b0f01a45f4a61de31e03aff05a641292e67f7309664c574838af1c5a5c9a515fbfefb27aaf8504558a77cef7f9df4c07ff350810f587569c6787881aa962b5c
+EBUILD ctl-1.5.2-r1.ebuild 721 BLAKE2B 2dd5935be43105ac9176568ebd909d317166987b60ff68fad952c10e730d271fcd67b4a912d0ab40c84a1c4e1465d418bda916851075223caba9e657db06e210 SHA512 d8a40ed6dd1b50bab13b8e4a23657e09ed6a241df531a7a415eb4c4d741f0de5d78ef82a9cd65c05ffac5e8ca4693730b7e8ed3a73a3c556547ce41f6e66dc5c
 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 55acc2744c99..e266c6fa8fd7 100644
--- a/media-libs/ctl/ctl-1.5.2-r1.ebuild
+++ b/media-libs/ctl/ctl-1.5.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="${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:=
@@ -22,6 +22,9 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/CTL-ctl-${PV}"
 
-PATCHES=( "${FILESDIR}/${P}-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch"
+	"${FILESDIR}/${P}-openexr-2.3.patch"
+)
 
 mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" )
diff --git a/media-libs/ctl/files/ctl-1.5.2-openexr-2.3.patch b/media-libs/ctl/files/ctl-1.5.2-openexr-2.3.patch
new file mode 100644
index 000000000000..ac4ceb3e5487
--- /dev/null
+++ b/media-libs/ctl/files/ctl-1.5.2-openexr-2.3.patch
@@ -0,0 +1,13 @@
+Index: CTL-ctl-1.5.2/lib/IlmCtlSimd/CtlSimdInst.cpp
+===================================================================
+--- CTL-ctl-1.5.2.orig/lib/IlmCtlSimd/CtlSimdInst.cpp
++++ CTL-ctl-1.5.2/lib/IlmCtlSimd/CtlSimdInst.cpp
+@@ -189,7 +189,7 @@ SimdInst::executePath (SimdBoolMask &mas
+ 	    REPLACE_EXC
+ 		(e, "\n" <<
+ 		 xcontext.fileName() << ":" <<
+-		 inst->lineNumber() << ": " << e);
++		 inst->lineNumber() << ": " << e.what());
+ 
+ 	    throw e;
+ 	}
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index b92e738eb73b..067971432324 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,7 +1,9 @@
 DIST Image-ExifTool-11.29.tar.gz 4503877 BLAKE2B 9afbb695edebb1be2c673abbdf32626482c81c847610840e82ca0cb1fa83d697aeb2635ad4b62a692f09ae1effb8f2261aa3968adc35d72e82f1261db393b48a SHA512 fa9a7d28ef09dcbc52e43e1f5b938fa857d4d2b949b47b36ea259bf010637852b3aa7fe8d51bbf5ab22adc6fb67f7858f38a08c2be143f0b0139960347688a3f
 DIST Image-ExifTool-11.32.tar.gz 4513430 BLAKE2B cae07a83ab5c46297ce0b4a12707450b9ded1a4e7edca08413e9671105a34d82ba7ee35eaf39ca64dfbd2b4607cd672b2399a325f8a3d3a76e18e348456fa550 SHA512 9dbb0d297292051171c28cf110976557f96df7079ea7ee38a722ed6ea9efbd758849ca77d9503c7d61964da5e48ab766c8cf58b3c5dfa96d499cbe6b5fb66668
 DIST Image-ExifTool-11.33.tar.gz 4526448 BLAKE2B a286809cdfc10c4015ddca95666ea7ac294c1b4c04c36cc2895918406e2cfed005b5b194a7f2a9c66e6d8f3551553e86ccfbc22339a14b2f9b906038b5fe8a6f SHA512 96a3a2421e3849ae6a2e49b7099415c11c2f65db1a49bebaf8b0c7f4de285aff0d412fb4ac12fa3d7fb59939199fdd49d86be0e55c72cd8b2056803a16fe5eb9
+DIST Image-ExifTool-11.37.tar.gz 4531738 BLAKE2B 2ed39e3767aed9766dad91869ae55503aaec7abd20a70a4bdf69646559fa2886e9a484c83dd3ae6257399267ceef8cc8f6a44dbbd71c0814fb8b1e7b342505cf SHA512 582198247e4804caa94df8acf684c6ac27b9f0b9b90b163079ed03b2f150ce7861f8d6464e56dec54a58e416d00f78ce8b02051b64f5e4df6df49a0c4c3ca25b
 EBUILD exiftool-11.29.ebuild 599 BLAKE2B cfc938c8e90e668addfedfb2c180043d181c5ce3119311bc5bb2f801960459c760336c60c34fb1df48ea676571005d83f366d7a90ecd4396795264e00680b2eb SHA512 5d292d66e8508c3f93d9f571cb382bde448909f3d146bf939afdcf555bcbef6bed31c6961ce4379312cb6dc882bb2b0d84caff176d83f30d166ab433d1fa6305
 EBUILD exiftool-11.32.ebuild 603 BLAKE2B 00226b431f94580444fcc66ef0a2d8980ef06c792c60cca04504d6e5e460c18bd16573ab7d9151b588c1b8756428ed90679a0207a08ac4ed6a190c2391ddedc8 SHA512 5289573c84cc3e1a7e63079bfa821534982babf9fb334b2a84bb1929b4f67131f8010e464b9d5acf4b331ff2a8e3b9b52a0694e5ede936ecd405041cb427f373
 EBUILD exiftool-11.33.ebuild 603 BLAKE2B 00226b431f94580444fcc66ef0a2d8980ef06c792c60cca04504d6e5e460c18bd16573ab7d9151b588c1b8756428ed90679a0207a08ac4ed6a190c2391ddedc8 SHA512 5289573c84cc3e1a7e63079bfa821534982babf9fb334b2a84bb1929b4f67131f8010e464b9d5acf4b331ff2a8e3b9b52a0694e5ede936ecd405041cb427f373
+EBUILD exiftool-11.37.ebuild 603 BLAKE2B 00226b431f94580444fcc66ef0a2d8980ef06c792c60cca04504d6e5e460c18bd16573ab7d9151b588c1b8756428ed90679a0207a08ac4ed6a190c2391ddedc8 SHA512 5289573c84cc3e1a7e63079bfa821534982babf9fb334b2a84bb1929b4f67131f8010e464b9d5acf4b331ff2a8e3b9b52a0694e5ede936ecd405041cb427f373
 MISC metadata.xml 10159 BLAKE2B 3b879f3679b07864e8e32d0223d1512919d56ede4b51bc5a550a83694c8c956c6e6e60a92309ceafef61ed738ccd0b5a6817094b4132be013560d3d7830f6349 SHA512 88662e634877bf2b67144fd37a862626e247f7df5daa82ed8d7a91a00611290d3976687221b5f58b78111a8894d45d55c8999966436f621baebf1bc7b3561484
diff --git a/media-libs/exiftool/exiftool-11.37.ebuild b/media-libs/exiftool/exiftool-11.37.ebuild
new file mode 100644
index 000000000000..f6bf1a90acd6
--- /dev/null
+++ b/media-libs/exiftool/exiftool-11.37.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_NAME=Image-ExifTool
+inherit perl-module
+
+DESCRIPTION="Read and write meta information in image, audio and video files"
+HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
+SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
+IUSE="doc"
+
+SRC_TEST="do"
+
+src_install() {
+	perl-module_src_install
+	use doc && dodoc -r html/
+
+	insinto /usr/share/${PN}
+	doins -r fmt_files config_files arg_files
+}
diff --git a/media-libs/fdk-aac/Manifest b/media-libs/fdk-aac/Manifest
index 7a1971a8150f..10a539aa899c 100644
--- a/media-libs/fdk-aac/Manifest
+++ b/media-libs/fdk-aac/Manifest
@@ -3,5 +3,5 @@ DIST fdk-aac-0.1.6.tar.gz 2091618 BLAKE2B e3036879e21677ea0ba6d6a030aff0568572e4
 DIST fdk-aac-2.0.0.tar.gz 2864593 BLAKE2B beaefd5186a6253496a656ccea514e764e6c6515b46ea0fa324f66985af8374f3813afddb29018da12d28d1672ebe10821f5e4e98d131ad4fb77a3d01ffab234 SHA512 40b02a9e42e17015fa6531c7b7eb51098ab43224c11c1c85e981d950642ffc6884146367cb423062b1da11679020ee5c5779dce5f4dc62175c8bf471831ed918
 EBUILD fdk-aac-0.1.5.ebuild 1329 BLAKE2B 4b253218fe7f3792205f1f4a49f825cb2e3659256309189cbac4176744957a9739c365eac282a45f43f0294bdef2204844ad064c7aa0d4dc0980f103574b212b SHA512 4d1cf29c86faf68d62604d324cc68132a386486fb7c88b5c54b893019fa59c9b14438a0011c701e1286ec5a6f1078313acf0eb8df17d27e741762d00807ae49b
 EBUILD fdk-aac-0.1.6.ebuild 1360 BLAKE2B 140c2622a15b32a10e6c79f249c15a591d5ae2b68f2e695662d84a221ae031b8fbb460258aaf823b5efec4fc318b312d1e77fc6795599c26c2a79a092df42344 SHA512 aaa3428c0840753488d2019a8d58524868d237a3d0c0324fd5ce77e7500e2bf0be8520ee0dfeda7d44963a2fba5280009ab5e3c40b6a607b3bc3cf480f1bcb0f
-EBUILD fdk-aac-2.0.0.ebuild 1356 BLAKE2B a2739dfd07c008d7b179f2e580bb66fa545216447293e8425a8b919b3a08e4561af8b2641147a740339dbd462209060526e277ec6c43abc7b2411d07ed228fc2 SHA512 6da26ddcfdf1d6eb1023c528c7c84cc0f9a5150051a54a2b23b75eacf20b6563568d95c6dd72a2fd2257b1ec6346f9f6563a902a69abbe23a6c4453870f7500c
+EBUILD fdk-aac-2.0.0.ebuild 1356 BLAKE2B 228a3c640240c959ec98de26fd995f6cbf226628bdba72de2838af16fc36c96d550ae87e16931064b022e85476973fd014580c1826090b4aacc5a2407133fa52 SHA512 d4e5b828336e631861435719e9cb3d7af1c4f68a06524a723b9da403b14d6439be8190a07148fb37d051b28c893b859895df1869f9beb0baae054e3dd622c537
 MISC metadata.xml 426 BLAKE2B 701e014c8a2fb5649fc546c205d705e8c13e0b3acf2bd445c4058ffc96e607743c5e6c8c21e3c0f0941421064a169b18b3736bf5f34b979f36fedabdf0fe318d SHA512 217c0f757ba4c8bd4e649aab097900eebaa9097d6f56ea373e78de2f3a392d25401c8dbb654b80219bceaea7db7ff616f532174f4a5119bd1b3c093e9fc89da1
diff --git a/media-libs/fdk-aac/fdk-aac-2.0.0.ebuild b/media-libs/fdk-aac/fdk-aac-2.0.0.ebuild
index 355c1bb05947..4f12537b1d3e 100644
--- a/media-libs/fdk-aac/fdk-aac-2.0.0.ebuild
+++ b/media-libs/fdk-aac/fdk-aac-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/media-libs/fmod/Manifest b/media-libs/fmod/Manifest
index 8ae9a6fe2f03..e9668d8003ff 100644
--- a/media-libs/fmod/Manifest
+++ b/media-libs/fmod/Manifest
@@ -3,5 +3,5 @@ DIST fmodapi43800linux64.tar.gz 22276575 BLAKE2B 652cd504e7bae1429a8fcde93cbefcf
 DIST fmodapi43802linux.tar.gz 21992247 BLAKE2B e0bb112ca47649390c7aba33a1cd75cb7b13c9a2d4cc5eb5c9a6bad02af9ae4958bdd8d458bd4fcc76eb42f5e09f8f989206c971bd7cbcb05359aaeab392fe38 SHA512 6a3f0f62acc71e24e48f8aaa03270d95ce09ace6d37f75a40452c84788b06f4cd6889772e9a6c00fc4799020c046905a9185d08900bc3b573a28b42cbb7f45b5
 DIST fmodapi43802linux64.tar.gz 22282269 BLAKE2B 733b3531f9e107332ab2c91e07f39363810f748e72fdbdcc865b87d86bee766859c01eb2357b5169cb79cad490d6186227d481335a1114968a1cbe2ab6e33ae6 SHA512 95b8688bbf54e19c2471f508d7ed9fbb93f6c88eaadc090813b02a86082e15dc7578220a40ae2b39358f8a4dfcacb4cb78823f4577f5ce9bc3d53af2f591d558
 EBUILD fmod-4.38.00.ebuild 1618 BLAKE2B 84dda179833fc68824f41e1931ee12f27eebc6d7fc77c381dff9ffed5fe85b368b45aee032fbff80cfb3f0764b7a22bedfb6c241d5d4dccfb398a4f93c20f7a2 SHA512 33f236d08e96784d53c1c560badbdc030d7f33e258ef58b2bc9f819942f3ceb23258116c55d3cfcbb1119b9f4497c5d37d1664384842a6392e955808355463ad
-EBUILD fmod-4.38.02.ebuild 1620 BLAKE2B 1637ee797be6a1b06e505fa57785da1adf388f82fb6042421f879e044def34e55ac344d8682812d0acddda93ccfa3793510092d3b3cd7d0558e1125c500b697c SHA512 c1e4b8b46f39d96f65fa60f4c883747cece86d9210f3a8957698b2ab8c755e153a98663420a843b333044fb73c1df4b7eaf9a68bc406b4fe000a3a7eb450aeed
+EBUILD fmod-4.38.02.ebuild 1616 BLAKE2B 5cef5a33687a8cfabebfa6c7a0244d08d74b2a5095d8ed6940342f634148920be9b739fd5415aeb891be38d4c72c8951ba778739369ecb40ebc6045b77c62dcd SHA512 a3dcf8b251aaef998528c4be3f48ce3cd6156b7e9ec9b263a50a79857b4b82db0acc1d8aa90a23479202406ee50d412248b1ebfe89299554a6ed6835b760ee5b
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/fmod/fmod-4.38.02.ebuild b/media-libs/fmod/fmod-4.38.02.ebuild
index 76f7b6b9e8c9..18d0fe0d9053 100644
--- a/media-libs/fmod/fmod-4.38.02.ebuild
+++ b/media-libs/fmod/fmod-4.38.02.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -14,7 +14,7 @@ SRC_URI="x86? ( http://www.fmod.org/index.php/release/version/${MY_P}.tar.gz )
 
 LICENSE="BSD BSD-2 fmod"
 SLOT="1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="examples"
 
 RESTRICT="strip test"
diff --git a/media-libs/freealut/Manifest b/media-libs/freealut/Manifest
index d3d05a0e8c5c..72c590e96fb7 100644
--- a/media-libs/freealut/Manifest
+++ b/media-libs/freealut/Manifest
@@ -1,3 +1,3 @@
 DIST freealut-1.1.0.tar.gz 461830 BLAKE2B e19c800e2d678dd41b9e41153e0f99d84300b3f6d0226bd81e7724515597a2641fc2203e46b193dd506a1c90e968d2d951f84afa29cf375fbf5acb72999c1305 SHA512 270f74972548b4ac6b98c52c51787ed43c20cf79979063d073bbee7bd08ac4f34c2b579fbf15c09c4e606a5ed38dcd0252f5c46fb3cfe43b727b6b53cf747933
-EBUILD freealut-1.1.0-r3.ebuild 865 BLAKE2B 3ab10672421ecc1de8fa5f7abf6f24596ad201cd962cd92243bd812a2def595fcc6024569225b4239ae85c746594b662ffe931a4946bfaf92b3e5cd386f541e3 SHA512 2f8673244f3c366717102a791324a77eac0421b6816bbbf72d837e09fbb313a743f7e5d2a7617f17ba09986b13095d8c2e0317b677dd61195f4cf97fae682ad3
+EBUILD freealut-1.1.0-r3.ebuild 863 BLAKE2B 6880f33b266871a73c91da3979c0788dd15bd5a7763c1c79a06a482a4aa699fcf31064f378a49b64342bab94cef917d2fb4c1f24374420062241da73dd1ab175 SHA512 08e883cefb43a508f41043c9d7b3a2b0f4bb19f965df6c253d05d1e2e3869a83c02f133bb53c8edbc34e30e250ef61f300309b846b0ca0aa09f8a2c1c6f1caf3
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/freealut/freealut-1.1.0-r3.ebuild b/media-libs/freealut/freealut-1.1.0-r3.ebuild
index 5a8934e3e715..6e80353c534c 100644
--- a/media-libs/freealut/freealut-1.1.0-r3.ebuild
+++ b/media-libs/freealut/freealut-1.1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="http://connect.creativelabs.com/openal/Downloads/ALUT/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest
index 89d9e4977515..aa70a08f6a15 100644
--- a/media-libs/freeimage/Manifest
+++ b/media-libs/freeimage/Manifest
@@ -5,7 +5,16 @@ AUX freeimage-3.15.4-libjpeg-turbo.patch 20346 BLAKE2B 38ecea346812c292e69771731
 AUX freeimage-3.15.4-libjpeg9.patch 1581 BLAKE2B 717a2e0b757c5d7ca540ec5ef6cfa2a2bc06bfc2de86e7b67bfc6c8010b7b32272456ed67d3297f02477318b3c3af8075df004c432cd1bd795652dab4096f7e5 SHA512 76f05f35118e96405977ebe746b600a3887677c30ce1fe0600d1e8f0c2aa0238f4dd418a0c612021ec8551692c2420190bcfb2f6b305a24c5a4070c77f1b7899
 AUX freeimage-3.15.4-raw.patch 350 BLAKE2B 4f97bc847878eef03c4af249fb20353979aa043fd37840b9cdb3159fa097a8b52455c2a0f4bd6f97140ebcf15739692c270f7ae1e62859da7188b835fb28a9f8 SHA512 2429bec7ec8f4963d3b0bd658093e8c3ff83d8ea5d934beb28526b80e89cb3aee6fe849800d80a81680614fa98e962744ced33ee198e04e32fc4be4d105e528b
 AUX freeimage-3.15.4-unbundling.patch 17258 BLAKE2B 309707fe4b07c3808fb2824a07eeef77a6b424267b5363e7b67c5677f33903962b887d1116e6c8bdd786c244cb80e84b4a2d9b5941a89ed640aabc6fddd1e320 SHA512 96883a598a6386b322e69497760cff606d95e354dd7a197b858060b41402641c9188bf6c77a9a249d04a8c3d59561ccb034581a43e1df3fd0806f3a2a521f3a0
+AUX freeimage-3.18.0-disable-plugin-G3.patch 1553 BLAKE2B d122df83a8889cd599d12c65cee5678b3654266c2e128d1d8d963eed7743b62ba6da7c582acc389f874fd218e2f7857d718a562bd81c52cf23f31284fdc00dc4 SHA512 9a0adeaaa3bf839387dbbccc54e0e32e0af87af4c398edd4cc44f1c6d380228dc7c174a7715ac397c15d48b7b5337543aac05020e25b6680187e179e8738dccd
+AUX freeimage-3.18.0-libjpeg9.patch 520 BLAKE2B 4788a3c4c209568df7176ed7b2699f9c33efb8c2ff2dc51d1e6bc76329ade073bdd296d7e9aa2441a655e46407df31cc5dd84c0d1805ca75418bae9d4ca4ecfa SHA512 75fc7c4d257d4bd67202c5c91af23f3e990342490c4661ab2219b89c40626703d9ceb5f05dc8d2a912153fbe5b9e07f24566570597f84cec15fbe03cb7d4b69e
+AUX freeimage-3.18.0-raw.patch 432 BLAKE2B 96c89d051a849f5909bdb9b3f720d4146651504f972a1661b55caa6344eeac3dc64dda1beb027e43e9b2eb7ce5ac8193db424422e74ce957744d9e6d14086a7a SHA512 01e150205a62ee9eb240890a5c9b92160a74073a1fe43811ed8941aeda824ba3c87bf4a2e631cbe367a7391374e93d309d95a6b5ec31009e4e8f1c2fc6b10da1
+AUX freeimage-3.18.0-remove-jpeg-transform.patch 3392 BLAKE2B d82f5723aaff66a995ec4d748a8bc988a18ef149e525d108b458971dc3ae7278e9f0d65527576b6ebcd54b403d296810e19cc2d808397a8aa3558a13bd296331 SHA512 071b5dc814020db19d41527f2f6fe89f2a3a1340d5825c204ea3fa496d4d1c3075bdd006fa041b0a819892d5b01f1b9b32ed8827e9a180ef9bbe92bf2554a67e
+AUX freeimage-3.18.0-rename-jpeg_read_icc_profile.patch 1278 BLAKE2B b387457b89614c4fe3e7e37891c8ce0cc296b8e05300cd88b789e1a6551cb78761a58446f1a16d0d59af6ea05fcf73defd898fe99e6b12e6cde9de6bd7606edc SHA512 4c18f02f750c47796a718f579ae3bfda91354eba4ba991f4df9d71a09ead04e13087bcd1423374c359a39b98c729a38466e464b46d7cd1af15e9e4aadd72a3b4
+AUX freeimage-3.18.0-unbundling.patch 20927 BLAKE2B 14f7d49ddd8df8b7e7231a337ba8fae078c7e02548d05a9274901d00f281be49f8db74bf7f3aed53c22fa80b227b8a585f020d89725cdaf7b763510d312d67e1 SHA512 e799e6808f8793866ec60eabf730bf25ec29786ab70ff96aea9be53dc49e0b1ebe727e7ff37abbfd228c908039e750381b951ac7fc48a448673c588999b41783
 DIST FreeImage3154.pdf 1007480 BLAKE2B 801d39c4b7eeab833c7225c2d53a3a0e8e9d2a91ea3f7173047705c8b750706f3a4a9ac60f7ba9d5e8150b548bd5add242e9e40f498c57ad9e5a623972bbb239 SHA512 cebde5e2609c9a0c06b4e07e1c595d7d6714895095cd9935f59c8b2ff9b34116248f5453b41f469f6242d87cae79be82d59f6a9ec0f75b1ea3df61ac1f651b28
 DIST FreeImage3154.zip 5513923 BLAKE2B 376b00faaae2c10c9eb36f89726a022734e109ca7ca11951c9e6525f21d2a7ee305ec195be29a272ecb7935ba5d0b61f3d84f26a6aec5f7a9229d5e47cd665bb SHA512 0db9eb7d0ed8e08e10ff4fa274c4484541ca119c3d437a85fdc3b2d9232bf14a7877c79b1e62c8c99278d7020a9f623c161f2342475f3ee526233404138112cc
+DIST FreeImage3180.pdf 1665541 BLAKE2B 5d40ee6fa0a1e73df0cc961edbd70a2835ef88fb540f123fd81f2bb826d4c949d2a60dfe3fc02406ce632a389935abac0d471c963c9803b8c2aece2b48afb003 SHA512 632f68b14f7a5916a1b95bbf86c268d0afe786a2537472301bb002254aa3195f046efb41f073133633211e985e90edbb99285ab6f42bc55501c756292a3c4c03
+DIST FreeImage3180.zip 7415716 BLAKE2B b695271f4e80eb304eccde66e38b5095eceae51fbe0dd97df69c55f364f8440d8c97139b8edc2f01c400f5c53a7336fdfab1e28aa3ea04f485901d5def443d25 SHA512 9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818
 EBUILD freeimage-3.15.4-r1.ebuild 3004 BLAKE2B b67721500490eab75a294efa32d508eed33e909e0acea8ed5b49dfd79ab7cbcb074ab0e571a0106a606fd996a2afb4c7eafe10b9d3ec31b97f4b3e50da8f8f36 SHA512 c2fe03d952891e8be4709f7819d5326f18d1755cee625f0bdc7e0a6e05e3dde2093b82780183fdf36f639397ffeb511a653b3caadd0b4b26d1f7fe8cf0529275
+EBUILD freeimage-3.18.0.ebuild 2976 BLAKE2B f701f466ef86c26db8a731da62f5686e1b2e17076cb88f8cf750969dab3e27eeaed659c36e60dd7386a73e4c98a73425b91866b51c3e1a75991ac3533f870618 SHA512 7717ee6cd9685b1866133a046a74ae486679ba4362cb66a1f78a5c47169e05a7985131e519ce2d64fe7dde5eb466e5c6b37f6d966d3307369abaf3fa44a60b96
 MISC metadata.xml 332 BLAKE2B e0048362683712cbd48296fa15c743d7ec86e71a7ab1c58f8abece77dd77b38e2f67b099efc2ece05294a9a39258ad81f5947162b66fa020d6fa639f8abb95a9 SHA512 060e17cbb418ebf7df3ee40bb1e99e12ce281101fc50e62e1a1d9cf0294fffbb2f475df1c25e954cb049bf065b316e155ccbf94dcae0bf49acf9e45e306144c5
diff --git a/media-libs/freeimage/files/freeimage-3.18.0-disable-plugin-G3.patch b/media-libs/freeimage/files/freeimage-3.18.0-disable-plugin-G3.patch
new file mode 100644
index 000000000000..a541bfa9464e
--- /dev/null
+++ b/media-libs/freeimage/files/freeimage-3.18.0-disable-plugin-G3.patch
@@ -0,0 +1,56 @@
+From d07a573fa1e0593e6af4f59e7bef15b78a8edfca Mon Sep 17 00:00:00 2001
+From: Patrick Nicolas <xytovl@laposte.net>
+Date: Tue, 13 Nov 2018 20:48:39 +0100
+Subject: [PATCH 4/4] disable plugin G3
+
+---
+ Makefile.srcs               | 3 ---
+ Source/FreeImage/Plugin.cpp | 3 ---
+ fipMakefile.srcs            | 3 ---
+ 3 files changed, 9 deletions(-)
+
+diff --git a/Makefile.srcs b/Makefile.srcs
+index a306aae..dac3ec2 100644
+--- a/Makefile.srcs
++++ b/Makefile.srcs
+@@ -37,9 +37,6 @@ SRCS-yes += \
+ SRCS-$(USE_EXR) += \
+ 	Source/FreeImage/PluginEXR.cpp \
+ 
+-SRCS-$(USE_TIFF) += \
+-	Source/FreeImage/PluginG3.cpp \
+-
+ SRCS-yes += \
+ 	Source/FreeImage/PluginGIF.cpp \
+ 	Source/FreeImage/PluginHDR.cpp \
+diff --git a/Source/FreeImage/Plugin.cpp b/Source/FreeImage/Plugin.cpp
+index 7768a32..43d8b6d 100644
+--- a/Source/FreeImage/Plugin.cpp
++++ b/Source/FreeImage/Plugin.cpp
+@@ -273,9 +273,6 @@ FreeImage_Initialise(BOOL load_local_plugins_only) {
+ 			s_plugins->AddNode(InitDDS);
+ 	        s_plugins->AddNode(InitGIF);
+ 	        s_plugins->AddNode(InitHDR);
+-#ifdef USE_TIFF
+-			s_plugins->AddNode(InitG3);
+-#endif
+ 			s_plugins->AddNode(InitSGI);
+ #ifdef USE_EXR
+ 			s_plugins->AddNode(InitEXR);
+diff --git a/fipMakefile.srcs b/fipMakefile.srcs
+index 74c9ec0..8a48b67 100644
+--- a/fipMakefile.srcs
++++ b/fipMakefile.srcs
+@@ -37,9 +37,6 @@ SRCS-yes += \
+ SRCS-$(USE_EXR) += \
+ 	Source/FreeImage/PluginEXR.cpp \
+ 
+-SRCS-$(USE_TIFF) += \
+-	Source/FreeImage/PluginG3.cpp \
+-
+ SRCS-yes += \
+ 	Source/FreeImage/PluginGIF.cpp \
+ 	Source/FreeImage/PluginHDR.cpp \
+-- 
+2.19.1
+
diff --git a/media-libs/freeimage/files/freeimage-3.18.0-libjpeg9.patch b/media-libs/freeimage/files/freeimage-3.18.0-libjpeg9.patch
new file mode 100644
index 000000000000..fe344229520f
--- /dev/null
+++ b/media-libs/freeimage/files/freeimage-3.18.0-libjpeg9.patch
@@ -0,0 +1,24 @@
+Bug: https://bugs.gentoo.org/647422
+Upstream Patch: https://sourceforge.net/p/freeimage/patches/130/
+
+diff -Naur a/Source/FreeImage.h b/Source/FreeImage.h
+--- a/Source/FreeImage.h	2018-03-24 23:24:11.066695395 -0400
++++ b/Source/FreeImage.h	2018-03-24 23:26:35.945391182 -0400
+@@ -117,12 +117,17 @@
+ #ifndef _WINDOWS_
+ #define _WINDOWS_
+ 
++#if JPEG_LIB_VERSION < 90
++
+ #ifndef FALSE
+ #define FALSE 0
+ #endif
+ #ifndef TRUE
+ #define TRUE 1
+ #endif
++
++#endif
++
+ #ifndef NULL
+ #define NULL 0
+ #endif
diff --git a/media-libs/freeimage/files/freeimage-3.18.0-raw.patch b/media-libs/freeimage/files/freeimage-3.18.0-raw.patch
new file mode 100644
index 000000000000..94accaba9695
--- /dev/null
+++ b/media-libs/freeimage/files/freeimage-3.18.0-raw.patch
@@ -0,0 +1,15 @@
+Index: FreeImage/Source/FreeImage.h
+===================================================================
+--- FreeImage.orig/Source/FreeImage.h
++++ FreeImage/Source/FreeImage.h
+@@ -155,8 +155,10 @@ typedef uint8_t BYTE;
+ typedef uint16_t WORD;
+ typedef uint32_t DWORD;
+ typedef int32_t LONG;
++#ifndef _LIBRAW_TYPES_H
+ typedef int64_t INT64;
+ typedef uint64_t UINT64;
++#endif
+ #else
+ // MS is not C99 ISO compliant
+ typedef long BOOL;
diff --git a/media-libs/freeimage/files/freeimage-3.18.0-remove-jpeg-transform.patch b/media-libs/freeimage/files/freeimage-3.18.0-remove-jpeg-transform.patch
new file mode 100644
index 000000000000..fb79cf7b5135
--- /dev/null
+++ b/media-libs/freeimage/files/freeimage-3.18.0-remove-jpeg-transform.patch
@@ -0,0 +1,82 @@
+From cb27fc742dd0b569f9ffe91a99ebeb5f077971da Mon Sep 17 00:00:00 2001
+From: Patrick Nicolas <xytovl@laposte.net>
+Date: Tue, 13 Nov 2018 20:27:59 +0100
+Subject: [PATCH 2/4] remove jpeg transform
+
+---
+ Makefile.srcs      | 7 -------
+ Source/FreeImage.h | 2 ++
+ fipMakefile.srcs   | 8 --------
+ 3 files changed, 2 insertions(+), 15 deletions(-)
+
+diff --git a/Makefile.srcs b/Makefile.srcs
+index cb41903..a306aae 100644
+--- a/Makefile.srcs
++++ b/Makefile.srcs
+@@ -141,17 +141,10 @@ SRCS-yes += \
+ 	Source/FreeImageToolkit/CopyPaste.cpp \
+ 	Source/FreeImageToolkit/Display.cpp \
+ 	Source/FreeImageToolkit/Flip.cpp \
+-
+-SRCS-$(USE_JPEG) += \
+-	Source/FreeImageToolkit/JPEGTransform.cpp \
+-
+-SRCS-yes += \
+ 	Source/FreeImageToolkit/MultigridPoissonSolver.cpp \
+ 	Source/FreeImageToolkit/Rescale.cpp \
+ 	Source/FreeImageToolkit/Resize.cpp \
+ 
+-SRCS-$(USE_JPEG) += \
+-	Source/transupp.c
+ SRCS = $(SRCS-yes)
+ 
+ INCLS = Dist/FreeImage.h \
+diff --git a/Source/FreeImage.h b/Source/FreeImage.h
+index 12182cd..ac4e6a0 100644
+--- a/Source/FreeImage.h
++++ b/Source/FreeImage.h
+@@ -1089,6 +1089,7 @@ DLL_API const char* DLL_CALLCONV FreeImage_TagToString(FREE_IMAGE_MDMODEL model,
+ // JPEG lossless transformation routines
+ // --------------------------------------------------------------------------
+ 
++#if 0 // not supported on Gentoo
+ DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransform(const char *src_file, const char *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect FI_DEFAULT(TRUE));
+ DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformU(const wchar_t *src_file, const wchar_t *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect FI_DEFAULT(TRUE));
+ DLL_API BOOL DLL_CALLCONV FreeImage_JPEGCrop(const char *src_file, const char *dst_file, int left, int top, int right, int bottom);
+@@ -1097,6 +1098,7 @@ DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformFromHandle(FreeImageIO* src_io,
+ DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombined(const char *src_file, const char *dst_file, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE));
+ DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombinedU(const wchar_t *src_file, const wchar_t *dst_file, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE));
+ DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombinedFromMemory(FIMEMORY* src_stream, FIMEMORY* dst_stream, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE));
++#endif
+ 
+ 
+ // --------------------------------------------------------------------------
+diff --git a/fipMakefile.srcs b/fipMakefile.srcs
+index e58f046..74c9ec0 100644
+--- a/fipMakefile.srcs
++++ b/fipMakefile.srcs
+@@ -141,11 +141,6 @@ SRCS-yes += \
+ 	Source/FreeImageToolkit/CopyPaste.cpp \
+ 	Source/FreeImageToolkit/Display.cpp \
+ 	Source/FreeImageToolkit/Flip.cpp \
+-
+-SRCS-$(USE_JPEG) += \
+-	Source/FreeImageToolkit/JPEGTransform.cpp \
+-
+-SRCS-yes += \
+ 	Source/FreeImageToolkit/MultigridPoissonSolver.cpp \
+ 	Source/FreeImageToolkit/Rescale.cpp \
+ 	Source/FreeImageToolkit/Resize.cpp \
+@@ -157,9 +152,6 @@ SRCS-yes += \
+ 	Wrapper/FreeImagePlus/src/fipWinImage.cpp \
+ 	Wrapper/FreeImagePlus/src/FreeImagePlus.cpp 
+ 
+-SRCS-$(USE_JPEG) += \
+-	Source/transupp.c
+-
+ SRCS = $(SRCS-yes)
+ INCLUDE = -I. \
+ 	-ISource \
+-- 
+2.19.1
+
diff --git a/media-libs/freeimage/files/freeimage-3.18.0-rename-jpeg_read_icc_profile.patch b/media-libs/freeimage/files/freeimage-3.18.0-rename-jpeg_read_icc_profile.patch
new file mode 100644
index 000000000000..982d00747c59
--- /dev/null
+++ b/media-libs/freeimage/files/freeimage-3.18.0-rename-jpeg_read_icc_profile.patch
@@ -0,0 +1,34 @@
+From 27c02a3ed6196b4b0bab5524f2825da58a76d706 Mon Sep 17 00:00:00 2001
+From: Patrick Nicolas <xytovl@laposte.net>
+Date: Tue, 13 Nov 2018 20:28:51 +0100
+Subject: [PATCH 3/4] rename jpeg_read_icc_profile
+
+---
+ Source/FreeImage/PluginJPEG.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Source/FreeImage/PluginJPEG.cpp b/Source/FreeImage/PluginJPEG.cpp
+index dd97e63..569f71e 100644
+--- a/Source/FreeImage/PluginJPEG.cpp
++++ b/Source/FreeImage/PluginJPEG.cpp
+@@ -507,7 +507,7 @@ marker_is_icc(jpeg_saved_marker_ptr marker) {
+   return FALSE.  You might want to issue an error message instead.
+ */
+ static BOOL 
+-jpeg_read_icc_profile(j_decompress_ptr cinfo, JOCTET **icc_data_ptr, unsigned *icc_data_len) {
++_jpeg_read_icc_profile(j_decompress_ptr cinfo, JOCTET **icc_data_ptr, unsigned *icc_data_len) {
+ 	jpeg_saved_marker_ptr marker;
+ 	int num_markers = 0;
+ 	int seq_no;
+@@ -749,7 +749,7 @@ read_markers(j_decompress_ptr cinfo, FIBITMAP *dib) {
+ 	BYTE *icc_profile = NULL;
+ 	unsigned icc_length = 0;
+ 
+-	if( jpeg_read_icc_profile(cinfo, &icc_profile, &icc_length) ) {
++	if( _jpeg_read_icc_profile(cinfo, &icc_profile, &icc_length) ) {
+ 		// copy ICC profile data
+ 		FreeImage_CreateICCProfile(dib, icc_profile, icc_length);
+ 		// clean up
+-- 
+2.19.1
+
diff --git a/media-libs/freeimage/files/freeimage-3.18.0-unbundling.patch b/media-libs/freeimage/files/freeimage-3.18.0-unbundling.patch
new file mode 100644
index 000000000000..ad2e4961e440
--- /dev/null
+++ b/media-libs/freeimage/files/freeimage-3.18.0-unbundling.patch
@@ -0,0 +1,724 @@
+From 03a713e62529d1bcb45aedf767c7cb33ddd6e1a7 Mon Sep 17 00:00:00 2001
+From: Patrick Nicolas <xytovl@laposte.net>
+Date: Tue, 13 Nov 2018 19:40:58 +0100
+Subject: [PATCH 1/4] unbundling
+
+diff --git a/Makefile.fip b/Makefile.fip
+index b59c419..c6b82bb 100644
+--- a/Makefile.fip
++++ b/Makefile.fip
+@@ -11,7 +11,26 @@ INSTALLDIR ?= $(DESTDIR)/usr/lib
+ # Converts cr/lf to just lf
+ DOS2UNIX = dos2unix
+ 
+-LIBRARIES = -lstdc++
++PKG_CONFIG ?= pkg-config
++
++USE_EXR ?= yes
++USE_JPEG ?= yes
++USE_JPEG2K ?= yes
++USE_MNG ?= yes
++USE_PNG ?= yes
++USE_TIFF ?= yes
++USE_RAW ?= yes
++USE_WEBP ?= yes
++
++LIBRARIES-yes = $(shell $(PKG_CONFIG) --libs zlib)
++LIBRARIES-$(USE_EXR)    += $(shell $(PKG_CONFIG) --libs OpenEXR)
++LIBRARIES-$(USE_JPEG)   += -ljpeg
++LIBRARIES-$(USE_JPEG2K) += $(shell $(PKG_CONFIG) --libs libopenjp2)
++LIBRARIES-$(USE_MNG)    += -lmng
++LIBRARIES-$(USE_PNG)    += $(shell $(PKG_CONFIG) --libs libpng)
++LIBRARIES-$(USE_TIFF)   += $(shell $(PKG_CONFIG) --libs libtiff-4 IlmBase)
++LIBRARIES-$(USE_RAW)    += $(shell $(PKG_CONFIG) --libs libraw)
++LIBRARIES-$(USE_WEBP)    += $(shell $(PKG_CONFIG) --libs libwebp)
+ 
+ MODULES = $(SRCS:.c=.o)
+ MODULES := $(MODULES:.cpp=.o)
+@@ -68,16 +87,18 @@ $(STATICLIB): $(MODULES)
+ 	$(AR) r $@ $(MODULES)
+ 
+ $(SHAREDLIB): $(MODULES)
+-	$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
++	$(CXX) $(CXXFLAGS) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES-yes)
+ 
+ install:
+ 	install -d $(INCDIR) $(INSTALLDIR)
+-	install -m 644 -o root -g root $(HEADER) $(INCDIR)
+-	install -m 644 -o root -g root $(HEADERFIP) $(INCDIR)
+-	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
+-	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
++	install -m 644 $(HEADER) $(INCDIR)
++	install -m 644 $(HEADERFIP) $(INCDIR)
++ifneq ($(STATICLIB),)
++	install -m 644 $(STATICLIB) $(INSTALLDIR)
++endif
++	install -m 755 $(SHAREDLIB) $(INSTALLDIR)
+ 	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
+-	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)	
++	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
+ 
+ clean:
+ 	rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
+diff --git a/Makefile.gnu b/Makefile.gnu
+index 92f6358..345f0db 100644
+--- a/Makefile.gnu
++++ b/Makefile.gnu
+@@ -11,7 +11,26 @@ INSTALLDIR ?= $(DESTDIR)/usr/lib
+ # Converts cr/lf to just lf
+ DOS2UNIX = dos2unix
+ 
+-LIBRARIES = -lstdc++
++PKG_CONFIG ?= pkg-config
++
++USE_EXR ?= yes
++USE_JPEG ?= yes
++USE_JPEG2K ?= yes
++USE_MNG ?= yes
++USE_PNG ?= yes
++USE_TIFF ?= yes
++USE_RAW ?= yes
++USE_WEBP ?= yes
++
++LIBRARIES-yes = $(shell $(PKG_CONFIG) --libs zlib)
++LIBRARIES-$(USE_EXR)    += $(shell $(PKG_CONFIG) --libs OpenEXR)
++LIBRARIES-$(USE_JPEG)   += -ljpeg
++LIBRARIES-$(USE_JPEG2K) += $(shell $(PKG_CONFIG) --libs libopenjp2)
++LIBRARIES-$(USE_MNG)    += -lmng
++LIBRARIES-$(USE_PNG)    += $(shell $(PKG_CONFIG) --libs libpng)
++LIBRARIES-$(USE_TIFF)   += $(shell $(PKG_CONFIG) --libs libtiff-4 IlmBase)
++LIBRARIES-$(USE_RAW)    += $(shell $(PKG_CONFIG) --libs libraw)
++LIBRARIES-$(USE_WEBP)    += $(shell $(PKG_CONFIG) --libs libwebp)
+ 
+ MODULES = $(SRCS:.c=.o)
+ MODULES := $(MODULES:.cpp=.o)
+@@ -67,13 +86,15 @@ $(STATICLIB): $(MODULES)
+ 	$(AR) r $@ $(MODULES)
+ 
+ $(SHAREDLIB): $(MODULES)
+-	$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
++	$(CXX) $(CXXFLAGS) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES-yes)
+ 
+ install:
+ 	install -d $(INCDIR) $(INSTALLDIR)
+-	install -m 644 -o root -g root $(HEADER) $(INCDIR)
+-	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
+-	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
++	install -m 644 $(HEADER) $(INCDIR)
++ifneq ($(STATICLIB),)
++	install -m 644 $(STATICLIB) $(INSTALLDIR)
++endif
++	install -m 755 $(SHAREDLIB) $(INSTALLDIR)
+ 	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
+ 	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)	
+ #	ldconfig
+diff --git a/Makefile.srcs b/Makefile.srcs
+index de25754..cb41903 100644
+--- a/Makefile.srcs
++++ b/Makefile.srcs
+@@ -1,6 +1,15 @@
++USE_EXR ?= yes
++USE_JPEG ?= yes
++USE_JPEG2K ?= yes
++USE_MNG ?= yes
++USE_PNG ?= yes
++USE_TIFF ?= yes
++USE_RAW ?= yes
++USE_WEBP ?= yes
++
+ VER_MAJOR = 3
+ VER_MINOR = 18.0
+-SRCS = \
++SRCS-yes = \
+ 	Source/FreeImage/BitmapAccess.cpp \
+ 	Source/FreeImage/ColorLookup.cpp \
+ 	Source/FreeImage/ConversionRGBA16.cpp \
+@@ -12,39 +21,80 @@ SRCS = \
+ 	Source/FreeImage/LFPQuantizer.cpp \
+ 	Source/FreeImage/MemoryIO.cpp \
+ 	Source/FreeImage/PixelAccess.cpp \
++
++SRCS-$(USE_JPEG2K) += \
+ 	Source/FreeImage/J2KHelper.cpp \
++
++SRCS-$(USE_MNG) += \
+ 	Source/FreeImage/MNGHelper.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImage/Plugin.cpp \
+ 	Source/FreeImage/PluginBMP.cpp \
+ 	Source/FreeImage/PluginCUT.cpp \
+ 	Source/FreeImage/PluginDDS.cpp \
++
++SRCS-$(USE_EXR) += \
+ 	Source/FreeImage/PluginEXR.cpp \
++
++SRCS-$(USE_TIFF) += \
+ 	Source/FreeImage/PluginG3.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImage/PluginGIF.cpp \
+ 	Source/FreeImage/PluginHDR.cpp \
+ 	Source/FreeImage/PluginICO.cpp \
+ 	Source/FreeImage/PluginIFF.cpp \
++
++SRCS-$(USE_JPEG2K) += \
+ 	Source/FreeImage/PluginJ2K.cpp \
++
++SRCS-$(USE_MNG) += \
+ 	Source/FreeImage/PluginJNG.cpp \
++
++SRCS-$(USE_JPEG2K) += \
+ 	Source/FreeImage/PluginJP2.cpp \
++
++SRCS-$(USE_JPEG) += \
+ 	Source/FreeImage/PluginJPEG.cpp \
+-	Source/FreeImage/PluginJXR.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImage/PluginKOALA.cpp \
++
++SRCS-$(USE_MNG) += \
+ 	Source/FreeImage/PluginMNG.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImage/PluginPCD.cpp \
+ 	Source/FreeImage/PluginPCX.cpp \
+ 	Source/FreeImage/PluginPFM.cpp \
+ 	Source/FreeImage/PluginPICT.cpp \
++
++SRCS-$(USE_PNG) += \
+ 	Source/FreeImage/PluginPNG.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImage/PluginPNM.cpp \
+ 	Source/FreeImage/PluginPSD.cpp \
+ 	Source/FreeImage/PluginRAS.cpp \
++
++SRCS-$(USE_RAW) += \
+ 	Source/FreeImage/PluginRAW.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImage/PluginSGI.cpp \
+ 	Source/FreeImage/PluginTARGA.cpp \
++
++SRCS-$(USE_TIFF) += \
+ 	Source/FreeImage/PluginTIFF.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImage/PluginWBMP.cpp \
++
++SRCS-$(USE_WEBP) += \
+ 	Source/FreeImage/PluginWebP.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImage/PluginXBM.cpp \
+ 	Source/FreeImage/PluginXPM.cpp \
+ 	Source/FreeImage/PSDParser.cpp \
+@@ -78,7 +128,11 @@ SRCS = \
+ 	Source/Metadata/IPTC.cpp \
+ 	Source/Metadata/TagConversion.cpp \
+ 	Source/Metadata/TagLib.cpp \
++
++SRCS-$(USE_TIFF) += \
+ 	Source/Metadata/XTIFF.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImageToolkit/Background.cpp \
+ 	Source/FreeImageToolkit/BSplineRotate.cpp \
+ 	Source/FreeImageToolkit/Channels.cpp \
+@@ -87,11 +141,19 @@ SRCS = \
+ 	Source/FreeImageToolkit/CopyPaste.cpp \
+ 	Source/FreeImageToolkit/Display.cpp \
+ 	Source/FreeImageToolkit/Flip.cpp \
++
++SRCS-$(USE_JPEG) += \
+ 	Source/FreeImageToolkit/JPEGTransform.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImageToolkit/MultigridPoissonSolver.cpp \
+ 	Source/FreeImageToolkit/Rescale.cpp \
+ 	Source/FreeImageToolkit/Resize.cpp \
+ 
++SRCS-$(USE_JPEG) += \
++	Source/transupp.c
++SRCS = $(SRCS-yes)
++
+ INCLS = Dist/FreeImage.h \
+ 	Examples/OpenGL/TextureManager/TextureManager.h \
+ 	Examples/Plugin/PluginCradle.h \
+@@ -117,7 +179,18 @@ INCLS = Dist/FreeImage.h \
+ 	Wrapper/FreeImagePlus/test/fipTest.h \
+ 	TestAPI/TestSuite.h
+ 
+-INCLUDE = -I. \
++INCLUDE-yes = -I. \
+ 	-ISource \
+ 	-ISource/Metadata \
+ 	-ISource/FreeImageToolkit \
++
++INCLUDE-yes += $(shell $(PKG_CONFIG) --cflags-only-I zlib)
++INCLUDE-$(USE_EXR)    += -DUSE_EXR    $(shell $(PKG_CONFIG) --cflags-only-I OpenEXR)
++INCLUDE-$(USE_JPEG)   += -DUSE_JPEG
++INCLUDE-$(USE_JPEG2K) += -DUSE_JPEG2K $(shell $(PKG_CONFIG) --cflags-only-I libopenjp2)
++INCLUDE-$(USE_MNG)    += -DUSE_MNG
++INCLUDE-$(USE_PNG)    += -DUSE_PNG    $(shell $(PKG_CONFIG) --cflags-only-I libpng)
++INCLUDE-$(USE_TIFF)   += -DUSE_TIFF   $(shell $(PKG_CONFIG) --cflags-only-I libtiff-4 IlmBase)
++INCLUDE-$(USE_RAW)    += -DUSE_RAW    $(shell $(PKG_CONFIG) --cflags-only-I libraw)
++INCLUDE-$(USE_WEBP)   += -DUSE_WEBP   $(shell $(PKG_CONFIG) --cflags-only-I libwebp)
++INCLUDE = $(INCLUDE-yes)
+diff --git a/Source/FreeImage/J2KHelper.cpp b/Source/FreeImage/J2KHelper.cpp
+index 1776c3b..538f1c5 100644
+--- a/Source/FreeImage/J2KHelper.cpp
++++ b/Source/FreeImage/J2KHelper.cpp
+@@ -21,7 +21,7 @@
+ 
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../LibOpenJPEG/openjpeg.h"
++#include <openjpeg.h>
+ #include "J2KHelper.h"
+ 
+ // --------------------------------------------------------------------------
+diff --git a/Source/FreeImage/Plugin.cpp b/Source/FreeImage/Plugin.cpp
+index 11e7294..7768a32 100644
+--- a/Source/FreeImage/Plugin.cpp
++++ b/Source/FreeImage/Plugin.cpp
+@@ -238,23 +238,33 @@ FreeImage_Initialise(BOOL load_local_plugins_only) {
+ 			*/
+ 			s_plugins->AddNode(InitBMP);
+ 			s_plugins->AddNode(InitICO);
++#ifdef USE_JPEG
+ 			s_plugins->AddNode(InitJPEG);
++#endif
++#ifdef USE_MNG
+ 			s_plugins->AddNode(InitJNG);
++#endif
+ 			s_plugins->AddNode(InitKOALA);
+ 			s_plugins->AddNode(InitIFF);
++#ifdef USE_MNG
+ 			s_plugins->AddNode(InitMNG);
++#endif
+ 			s_plugins->AddNode(InitPNM, NULL, "PBM", "Portable Bitmap (ASCII)", "pbm", "^P1");
+ 			s_plugins->AddNode(InitPNM, NULL, "PBMRAW", "Portable Bitmap (RAW)", "pbm", "^P4");
+ 			s_plugins->AddNode(InitPCD);
+ 			s_plugins->AddNode(InitPCX);
+ 			s_plugins->AddNode(InitPNM, NULL, "PGM", "Portable Greymap (ASCII)", "pgm", "^P2");
+ 			s_plugins->AddNode(InitPNM, NULL, "PGMRAW", "Portable Greymap (RAW)", "pgm", "^P5");
++#ifdef USE_PNG
+ 			s_plugins->AddNode(InitPNG);
++#endif
+ 			s_plugins->AddNode(InitPNM, NULL, "PPM", "Portable Pixelmap (ASCII)", "ppm", "^P3");
+ 			s_plugins->AddNode(InitPNM, NULL, "PPMRAW", "Portable Pixelmap (RAW)", "ppm", "^P6");
+ 			s_plugins->AddNode(InitRAS);
+ 			s_plugins->AddNode(InitTARGA);
++#ifdef USE_TIFF
+ 			s_plugins->AddNode(InitTIFF);
++#endif
+ 			s_plugins->AddNode(InitWBMP);
+ 			s_plugins->AddNode(InitPSD);
+ 			s_plugins->AddNode(InitCUT);
+@@ -263,16 +273,26 @@ FreeImage_Initialise(BOOL load_local_plugins_only) {
+ 			s_plugins->AddNode(InitDDS);
+ 	        s_plugins->AddNode(InitGIF);
+ 	        s_plugins->AddNode(InitHDR);
++#ifdef USE_TIFF
+ 			s_plugins->AddNode(InitG3);
++#endif
+ 			s_plugins->AddNode(InitSGI);
++#ifdef USE_EXR
+ 			s_plugins->AddNode(InitEXR);
++#endif
++#ifdef USE_JPEG2K
+ 			s_plugins->AddNode(InitJ2K);
+ 			s_plugins->AddNode(InitJP2);
++#endif
+ 			s_plugins->AddNode(InitPFM);
+ 			s_plugins->AddNode(InitPICT);
++#ifdef USE_RAW
+ 			s_plugins->AddNode(InitRAW);
++#endif
++#ifdef USE_WEBP
+ 			s_plugins->AddNode(InitWEBP);
+-#if !(defined(_MSC_VER) && (_MSC_VER <= 1310))
++#endif
++#if 0
+ 			s_plugins->AddNode(InitJXR);
+ #endif // unsupported by MS Visual Studio 2003 !!!
+ 			
+diff --git a/Source/FreeImage/PluginEXR.cpp b/Source/FreeImage/PluginEXR.cpp
+index b286430..faa8037 100644
+--- a/Source/FreeImage/PluginEXR.cpp
++++ b/Source/FreeImage/PluginEXR.cpp
+@@ -28,16 +28,16 @@
+ #pragma warning (disable : 4800) // ImfVersion.h - 'const int' : forcing value to bool 'true' or 'false' (performance warning)
+ #endif 
+ 
+-#include "../OpenEXR/IlmImf/ImfIO.h"
+-#include "../OpenEXR/Iex/Iex.h"
+-#include "../OpenEXR/IlmImf/ImfOutputFile.h"
+-#include "../OpenEXR/IlmImf/ImfInputFile.h"
+-#include "../OpenEXR/IlmImf/ImfRgbaFile.h"
+-#include "../OpenEXR/IlmImf/ImfChannelList.h"
+-#include "../OpenEXR/IlmImf/ImfRgba.h"
+-#include "../OpenEXR/IlmImf/ImfArray.h"
+-#include "../OpenEXR/IlmImf/ImfPreviewImage.h"
+-#include "../OpenEXR/Half/half.h"
++#include <ImfIO.h>
++#include <Iex.h>
++#include <ImfOutputFile.h>
++#include <ImfInputFile.h>
++#include <ImfRgbaFile.h>
++#include <ImfChannelList.h>
++#include <ImfRgba.h>
++#include <ImfArray.h>
++#include <ImfPreviewImage.h>
++#include <half.h>
+ 
+ 
+ // ==========================================================
+diff --git a/Source/FreeImage/PluginG3.cpp b/Source/FreeImage/PluginG3.cpp
+index 0a083b4..b3a9bd7 100644
+--- a/Source/FreeImage/PluginG3.cpp
++++ b/Source/FreeImage/PluginG3.cpp
+@@ -20,7 +20,7 @@
+ // Use at your own risk!
+ // ==========================================================
+ 
+-#include "../LibTIFF4/tiffiop.h"
++#include "tiffiop.h"
+ 
+ #include "FreeImage.h"
+ #include "Utilities.h"
+diff --git a/Source/FreeImage/PluginJ2K.cpp b/Source/FreeImage/PluginJ2K.cpp
+index b8bcfc8..621a903 100644
+--- a/Source/FreeImage/PluginJ2K.cpp
++++ b/Source/FreeImage/PluginJ2K.cpp
+@@ -21,7 +21,7 @@
+ 
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../LibOpenJPEG/openjpeg.h"
++#include <openjpeg.h>
+ #include "J2KHelper.h"
+ 
+ // ==========================================================
+diff --git a/Source/FreeImage/PluginJP2.cpp b/Source/FreeImage/PluginJP2.cpp
+index 742fe2c..c57f626 100644
+--- a/Source/FreeImage/PluginJP2.cpp
++++ b/Source/FreeImage/PluginJP2.cpp
+@@ -21,7 +21,7 @@
+ 
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../LibOpenJPEG/openjpeg.h"
++#include <openjpeg.h>
+ #include "J2KHelper.h"
+ 
+ // ==========================================================
+diff --git a/Source/FreeImage/PluginJPEG.cpp b/Source/FreeImage/PluginJPEG.cpp
+index 8db177d..dd97e63 100644
+--- a/Source/FreeImage/PluginJPEG.cpp
++++ b/Source/FreeImage/PluginJPEG.cpp
+@@ -35,11 +35,15 @@ extern "C" {
+ #undef FAR
+ #include <setjmp.h>
+ 
+-#include "../LibJPEG/jinclude.h"
+-#include "../LibJPEG/jpeglib.h"
+-#include "../LibJPEG/jerror.h"
++#include <string.h>
++#include <stdio.h>
++#include <jconfig.h>
++#include <jpeglib.h>
++#include <jerror.h>
+ }
+ 
++#define SIZEOF(object)        ((size_t) sizeof(object))
++
+ #include "FreeImage.h"
+ #include "Utilities.h"
+ 
+diff --git a/Source/FreeImage/PluginPNG.cpp b/Source/FreeImage/PluginPNG.cpp
+index 661f160..504fafe 100644
+--- a/Source/FreeImage/PluginPNG.cpp
++++ b/Source/FreeImage/PluginPNG.cpp
+@@ -40,8 +40,8 @@
+ 
+ // ----------------------------------------------------------
+ 
+-#include "../ZLib/zlib.h"
+-#include "../LibPNG/png.h"
++#include <zlib.h>
++#include <png.h>
+ 
+ // ----------------------------------------------------------
+ 
+diff --git a/Source/FreeImage/PluginRAW.cpp b/Source/FreeImage/PluginRAW.cpp
+index e9bd5bf..680e634 100644
+--- a/Source/FreeImage/PluginRAW.cpp
++++ b/Source/FreeImage/PluginRAW.cpp
+@@ -19,7 +19,7 @@
+ // Use at your own risk!
+ // ==========================================================
+ 
+-#include "../LibRawLite/libraw/libraw.h"
++#include <libraw.h>
+ 
+ #include "FreeImage.h"
+ #include "Utilities.h"
+diff --git a/Source/FreeImage/PluginTIFF.cpp b/Source/FreeImage/PluginTIFF.cpp
+index 67fab0b..36f99e8 100644
+--- a/Source/FreeImage/PluginTIFF.cpp
++++ b/Source/FreeImage/PluginTIFF.cpp
+@@ -37,9 +37,9 @@
+ 
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../LibTIFF4/tiffiop.h"
++#include "tiffiop.h"
+ #include "../Metadata/FreeImageTag.h"
+-#include "../OpenEXR/Half/half.h"
++#include <half.h>
+ 
+ #include "FreeImageIO.h"
+ #include "PSDParser.h"
+diff --git a/Source/FreeImage/PluginWebP.cpp b/Source/FreeImage/PluginWebP.cpp
+index 7c9f62f..c401447 100644
+--- a/Source/FreeImage/PluginWebP.cpp
++++ b/Source/FreeImage/PluginWebP.cpp
+@@ -24,9 +24,9 @@
+ 
+ #include "../Metadata/FreeImageTag.h"
+ 
+-#include "../LibWebP/src/webp/decode.h"
+-#include "../LibWebP/src/webp/encode.h"
+-#include "../LibWebP/src/webp/mux.h"
++#include <webp/decode.h>
++#include <webp/encode.h>
++#include <webp/mux.h>
+ 
+ // ==========================================================
+ // Plugin Interface
+diff --git a/Source/FreeImage/ZLibInterface.cpp b/Source/FreeImage/ZLibInterface.cpp
+index 3ab6d32..7e32110 100644
+--- a/Source/FreeImage/ZLibInterface.cpp
++++ b/Source/FreeImage/ZLibInterface.cpp
+@@ -19,10 +19,10 @@
+ // Use at your own risk!
+ // ==========================================================
+ 
+-#include "../ZLib/zlib.h"
++#include <zlib.h>
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../ZLib/zutil.h"	/* must be the last header because of error C3163 in VS2008 (_vsnprintf defined in stdio.h) */
++#define OS_CODE 0x03
+ 
+ /**
+ Compresses a source buffer into a target buffer, using the ZLib library. 
+diff --git a/Source/FreeImageToolkit/JPEGTransform.cpp b/Source/FreeImageToolkit/JPEGTransform.cpp
+index 6f9ba8e..988d777 100644
+--- a/Source/FreeImageToolkit/JPEGTransform.cpp
++++ b/Source/FreeImageToolkit/JPEGTransform.cpp
+@@ -26,10 +26,11 @@ extern "C" {
+ #undef FAR
+ #include <setjmp.h>
+ 
+-#include "../LibJPEG/jinclude.h"
+-#include "../LibJPEG/jpeglib.h"
+-#include "../LibJPEG/jerror.h"
+-#include "../LibJPEG/transupp.h"
++#include <string.h>
++#include <stdio.h>
++#include <jpeglib.h>
++#include <jerror.h>
++#include "transupp.h"
+ }
+ 
+ #include "FreeImage.h"
+diff --git a/Source/Metadata/XTIFF.cpp b/Source/Metadata/XTIFF.cpp
+index d5be902..7f2be42 100644
+--- a/Source/Metadata/XTIFF.cpp
++++ b/Source/Metadata/XTIFF.cpp
+@@ -29,7 +29,7 @@
+ #pragma warning (disable : 4786) // identifier was truncated to 'number' characters
+ #endif
+ 
+-#include "../LibTIFF4/tiffiop.h"
++#include "tiffiop.h"
+ 
+ #include "FreeImage.h"
+ #include "Utilities.h"
+diff --git a/Source/tiffiop.h b/Source/tiffiop.h
+index 2fe7556..1642582 100644
+--- a/Source/tiffiop.h
++++ b/Source/tiffiop.h
+@@ -28,7 +28,10 @@
+  * ``Library-private'' definitions.
+  */
+ 
+-#include "tif_config.h"
++#include <tiffconf.h>
++#define HAVE_SEARCH_H
++#define HAVE_FCNTL_H
++#define HAVE_SNPRINTF
+ 
+ #ifdef HAVE_FCNTL_H
+ # include <fcntl.h>
+diff --git a/Source/transupp.c b/Source/transupp.c
+index d10f57b..d50216c 100644
+--- a/Source/transupp.c
++++ b/Source/transupp.c
+@@ -15,8 +15,7 @@
+ /* Although this file really shouldn't have access to the library internals,
+  * it's helpful to let it call jround_up() and jcopy_block_row().
+  */
+-#define JPEG_INTERNALS
+-
++#include <jerror.h>
+ #include "jinclude.h"
+ #include "jpeglib.h"
+ #include "transupp.h"		/* My own external interface */
+diff --git a/fipMakefile.srcs b/fipMakefile.srcs
+index d271b4b..e58f046 100644
+--- a/fipMakefile.srcs
++++ b/fipMakefile.srcs
+@@ -1,6 +1,15 @@
++USE_EXR ?= yes
++USE_JPEG ?= yes
++USE_JPEG2K ?= yes
++USE_MNG ?= yes
++USE_PNG ?= yes
++USE_TIFF ?= yes
++USE_RAW ?= yes
++USE_WEBP ?= yes
++
+ VER_MAJOR = 3
+ VER_MINOR = 18.0
+-SRCS = \
++SRCS-yes = \
+ 	Source/FreeImage/BitmapAccess.cpp \
+ 	Source/FreeImage/ColorLookup.cpp \
+ 	Source/FreeImage/ConversionRGBA16.cpp \
+@@ -12,39 +21,80 @@ SRCS = \
+ 	Source/FreeImage/LFPQuantizer.cpp \
+ 	Source/FreeImage/MemoryIO.cpp \
+ 	Source/FreeImage/PixelAccess.cpp \
++
++SRCS-$(USE_JPEG2K) += \
+ 	Source/FreeImage/J2KHelper.cpp \
++
++SRCS-$(USE_MNG) += \
+ 	Source/FreeImage/MNGHelper.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImage/Plugin.cpp \
+ 	Source/FreeImage/PluginBMP.cpp \
+ 	Source/FreeImage/PluginCUT.cpp \
+ 	Source/FreeImage/PluginDDS.cpp \
++
++SRCS-$(USE_EXR) += \
+ 	Source/FreeImage/PluginEXR.cpp \
++
++SRCS-$(USE_TIFF) += \
+ 	Source/FreeImage/PluginG3.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImage/PluginGIF.cpp \
+ 	Source/FreeImage/PluginHDR.cpp \
+ 	Source/FreeImage/PluginICO.cpp \
+ 	Source/FreeImage/PluginIFF.cpp \
++
++SRCS-$(USE_JPEG2K) += \
+ 	Source/FreeImage/PluginJ2K.cpp \
++
++SRCS-$(USE_MNG) += \
+ 	Source/FreeImage/PluginJNG.cpp \
++
++SRCS-$(USE_JPEG2K) += \
+ 	Source/FreeImage/PluginJP2.cpp \
++
++SRCS-$(USE_JPEG) += \
+ 	Source/FreeImage/PluginJPEG.cpp \
+-	Source/FreeImage/PluginJXR.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImage/PluginKOALA.cpp \
++
++SRCS-$(USE_MNG) += \
+ 	Source/FreeImage/PluginMNG.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImage/PluginPCD.cpp \
+ 	Source/FreeImage/PluginPCX.cpp \
+ 	Source/FreeImage/PluginPFM.cpp \
+ 	Source/FreeImage/PluginPICT.cpp \
++
++SRCS-$(USE_PNG) += \
+ 	Source/FreeImage/PluginPNG.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImage/PluginPNM.cpp \
+ 	Source/FreeImage/PluginPSD.cpp \
+ 	Source/FreeImage/PluginRAS.cpp \
++
++SRCS-$(USE_RAW) += \
+ 	Source/FreeImage/PluginRAW.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImage/PluginSGI.cpp \
+ 	Source/FreeImage/PluginTARGA.cpp \
++
++SRCS-$(USE_TIFF) += \
+ 	Source/FreeImage/PluginTIFF.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImage/PluginWBMP.cpp \
++
++SRCS-$(USE_WEBP) += \
+ 	Source/FreeImage/PluginWebP.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImage/PluginXBM.cpp \
+ 	Source/FreeImage/PluginXPM.cpp \
+ 	Source/FreeImage/PSDParser.cpp \
+@@ -78,7 +128,11 @@ SRCS = \
+ 	Source/Metadata/IPTC.cpp \
+ 	Source/Metadata/TagConversion.cpp \
+ 	Source/Metadata/TagLib.cpp \
++
++SRCS-$(USE_TIFF) += \
+ 	Source/Metadata/XTIFF.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImageToolkit/Background.cpp \
+ 	Source/FreeImageToolkit/BSplineRotate.cpp \
+ 	Source/FreeImageToolkit/Channels.cpp \
+@@ -87,7 +141,11 @@ SRCS = \
+ 	Source/FreeImageToolkit/CopyPaste.cpp \
+ 	Source/FreeImageToolkit/Display.cpp \
+ 	Source/FreeImageToolkit/Flip.cpp \
++
++SRCS-$(USE_JPEG) += \
+ 	Source/FreeImageToolkit/JPEGTransform.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImageToolkit/MultigridPoissonSolver.cpp \
+ 	Source/FreeImageToolkit/Rescale.cpp \
+ 	Source/FreeImageToolkit/Resize.cpp \
+@@ -98,6 +156,11 @@ SRCS = \
+ 	Wrapper/FreeImagePlus/src/fipTag.cpp \
+ 	Wrapper/FreeImagePlus/src/fipWinImage.cpp \
+ 	Wrapper/FreeImagePlus/src/FreeImagePlus.cpp 
++
++SRCS-$(USE_JPEG) += \
++	Source/transupp.c
++
++SRCS = $(SRCS-yes)
+ INCLUDE = -I. \
+ 	-ISource \
+ 	-ISource/Metadata \
+-- 
+2.19.1
+
diff --git a/media-libs/freeimage/freeimage-3.18.0.ebuild b/media-libs/freeimage/freeimage-3.18.0.ebuild
new file mode 100644
index 000000000000..fa58c6fc2f75
--- /dev/null
+++ b/media-libs/freeimage/freeimage-3.18.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils toolchain-funcs
+
+MY_PN=FreeImage
+MY_PV=${PV//.}
+MY_P=${MY_PN}${MY_PV}
+
+DESCRIPTION="Image library supporting many formats"
+HOMEPAGE="http://freeimage.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
+	mirror://sourceforge/${PN}/${MY_P}.pdf"
+
+LICENSE="|| ( GPL-2 FIPL-1.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
+
+# The tiff/ilmbase isn't a typo.  The TIFF plugin cheats and
+# uses code from it to handle 16bit<->float conversions.
+RDEPEND="
+	sys-libs/zlib
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	mng? ( media-libs/libmng:= )
+	openexr? ( media-libs/openexr:= )
+	png? ( media-libs/libpng:0= )
+	raw? ( media-libs/libraw:= )
+	tiff? (
+		media-libs/ilmbase:=
+		media-libs/tiff:0
+	)
+	webp? ( media-libs/libwebp:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_PN}
+
+DOCS=( "${DISTDIR}"/${MY_P}.pdf README.linux Whatsnew.txt )
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.18.0-unbundling.patch
+	"${FILESDIR}"/${PN}-3.18.0-remove-jpeg-transform.patch
+	"${FILESDIR}"/${PN}-3.18.0-rename-jpeg_read_icc_profile.patch
+	"${FILESDIR}"/${PN}-3.18.0-disable-plugin-G3.patch
+	"${FILESDIR}"/${PN}-3.18.0-raw.patch
+	"${FILESDIR}"/${PN}-3.18.0-libjpeg9.patch
+)
+
+src_prepare() {
+	pushd Source >/dev/null || die
+	cp LibJPEG/{transupp.c,transupp.h,jinclude.h} . || die
+	cp LibTIFF4/{tiffiop,tif_dir}.h . || die
+	rm -rf LibPNG LibMNG LibOpenJPEG ZLib OpenEXR LibRawLite LibTIFF4 LibJPEG LibWebP LibJXR || die
+	popd >/dev/null || die
+
+	edos2unix Makefile.{gnu,fip,srcs} fipMakefile.srcs */*.h */*/*.cpp
+	sed -i \
+		-e "s:/./:/:g" \
+		-e "s: ./: :g" \
+		-e 's: Source: \\\n\tSource:g' \
+		-e 's: Wrapper: \\\n\tWrapper:g' \
+		-e 's: Examples: \\\n\tExamples:g' \
+		-e 's: TestAPI: \\\n\tTestAPI:g' \
+		-e 's: -ISource: \\\n\t-ISource:g' \
+		-e 's: -IWrapper: \\\n\t-IWrapper:g' \
+		-e 's:INCLS:\nINCLS:g' \
+		Makefile.srcs fipMakefile.srcs || die
+	sed -i \
+		-e "/LibJPEG/d" \
+		-e "/LibJXR/d" \
+		-e "/LibPNG/d" \
+		-e "/LibTIFF/d" \
+		-e "/Source\/ZLib/d" \
+		-e "/LibOpenJPEG/d" \
+		-e "/OpenEXR/d" \
+		-e "/LibRawLite/d" \
+		-e "/LibMNG/d" \
+		-e "/LibWebP/d" \
+		-e "/LibJXR/d" \
+		Makefile.srcs fipMakefile.srcs || die
+
+	default
+}
+
+foreach_make() {
+	local m
+	for m in Makefile.{gnu,fip} ; do
+		emake -f ${m} \
+			USE_EXR=$(usex openexr) \
+			USE_JPEG=$(usex jpeg) \
+			USE_JPEG2K=$(usex jpeg2k) \
+			USE_MNG=$(usex mng) \
+			USE_PNG=$(usex png) \
+			USE_TIFF=$(usex tiff) \
+			USE_RAW=$(usex raw) \
+			USE_WEBP=$(usex webp) \
+			$(usex static-libs '' STATICLIB=) \
+			"$@"
+	done
+}
+
+src_compile() {
+	tc-export AR PKG_CONFIG
+	foreach_make \
+		CXX="$(tc-getCXX) -fPIC" \
+		CC="$(tc-getCC) -fPIC" \
+		${MY_PN}
+}
+
+src_install() {
+	foreach_make install DESTDIR="${ED}" INSTALLDIR="${ED%/}"/usr/$(get_libdir)
+	einstalldocs
+}
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 811898798b73..3a6b4a573013 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -6,8 +6,8 @@ DIST freetype-doc-2.10.0.tar.bz2 2130601 BLAKE2B 7814b8ad53343dc72f0b11b29224f97
 DIST freetype-doc-2.9.1.tar.bz2 2130292 BLAKE2B 667032fa447fbc28c0f753df3ade7a07a4f8d4d26cdd00fed2fa0e8098e9d6a083572608b7d06446ea91baa932e3c6d18beb1f86f6b549a8cd2c07a2df567da0 SHA512 1668f02f67e6e047df04e5e2fccb564cd9af780ec9b3c4878109868302a83eaec7b627390ff82c3e875122400e6f20fc690936a1e4964dfa65143e5309fa22d4
 DIST ft2demos-2.10.0.tar.bz2 237599 BLAKE2B 722e586f412059b8b29a26c832037a860dc1b26afed85b8b0aa5fc71245293f45d19b379c54993f64ba4b8de329799834656d00fc4b6f6610ddd0b08cfd05449 SHA512 d48cbabd5cc673e0af2e0c4056dba95cee8e08092f881958c6908ea2d4da7104ca81b701d47a17640ac36cbdfd8aa274cc26353bb43f026f55c00d565f2ad641
 DIST ft2demos-2.9.1.tar.bz2 233462 BLAKE2B c689942b222b2c600b5ec3963791621ae87acefb9b01caa5dc35af52525d03e3a1094e48c0789d5eaabbce787bddd7c3055e12454e54ea3c7fae92bca47614de SHA512 38bee59184b20c2eb983deaa5c1f241e31c1b4793e47dc06b1b419601489cfece3b11fde4cf4fb6c5af12254ad0c1ce9a1547885c208e8e715655e9c48f22a46
-EBUILD freetype-2.10.0.ebuild 6744 BLAKE2B 196ffa36d501ddc9e39d767520dd9737b5ee735c838922e89a1fb1940175f1d7a95637c0cd88a641e59f21908c1ee8656c829c70b0223f67bda74eabc976425f SHA512 426bbf8dce36e13dbfa441f3869945e3a6ce6b5a6ba53ef1b1f78420e4c626e1d10a8dd1c8d37a400799e9fec05aacb8a3a45dfdc734a15609b17cdfd61d3f90
-EBUILD freetype-2.9.1-r3.ebuild 6690 BLAKE2B bf817875d28b6361d8916bf998e7e05e26301a858319a49b1c6c1f1bc2de723c138d897d6819d13377893cabcb0d3a0731ed305937cb655f6e0da49566f705cf SHA512 3583bc9bca21c740741b4a6e7d7d28402505f655482c0e0c8b14d55410a8f80f3f2781dfc1d0a95567c9d4f40a70846bfe58e994a3fcb44250385bb8124252a9
-EBUILD freetype-2.9.1-r4.ebuild 6702 BLAKE2B af94a4761e7915ac7fe330cfb8af45f9b162943675436af49ef22791b5da6519c344dc29784b5a0dde548de845b04c55328d21410ce05488f6a02d8133fa5983 SHA512 b4168030a91cd30cb9490268c28123b15e803847e35bb1abf7a728e7b90c02e800d6b2a2c176d31383700dc6dd829cc517eafe74cd6d5c4f53d008bf73c58709
-EBUILD freetype-9999.ebuild 6744 BLAKE2B 196ffa36d501ddc9e39d767520dd9737b5ee735c838922e89a1fb1940175f1d7a95637c0cd88a641e59f21908c1ee8656c829c70b0223f67bda74eabc976425f SHA512 426bbf8dce36e13dbfa441f3869945e3a6ce6b5a6ba53ef1b1f78420e4c626e1d10a8dd1c8d37a400799e9fec05aacb8a3a45dfdc734a15609b17cdfd61d3f90
+EBUILD freetype-2.10.0.ebuild 6746 BLAKE2B e6eb8129f4b6ec62562894b8d3e784579e530d147c62ff77b8f8a197d3858c97d47bb6b4008a53a1390e6dbf5c992b117d2c1a6205184763f1649c804110c61d SHA512 b854be4a2cd7978718799f3f696529e83ed4b377c16583faf47dcec34dd6ff2aa7aa2b41d35f2c3392baaf46f7c9331fbcb3396f2bd157d839eed292de75bd89
+EBUILD freetype-2.9.1-r3.ebuild 6689 BLAKE2B 252937acb877001d791d75cbd525472a46ad3553ab914f2206bb18d11118c23ac27ea769a1a8384e87d05c6114c9fd9af89e3220a510524314c79cfe9f6580f8 SHA512 dc1700843ea2b73b48f6914599b2cae5277be3bc44811821f1bfe306af60e318eed9563dc126a26f7ac0ec112f74dc1c6a7511458382a6cdbfc5b38a64dfc098
+EBUILD freetype-2.9.1-r4.ebuild 6701 BLAKE2B ac812cb18c4c6c9304c9d67c84c2ce782de3c19984c42004afa4ee76fa69f9ec5770a7a9ad0aa3c48c9db234d1ab45157042a00ab070430048cf020dba3930bc SHA512 a14a2b29ca998ef0c23933e2f192d9ec4cdc4b478c9007165d49cf9d964f7fd6ee7f9aee2dd4337a1f6f6300e53f26487e5e3bffac46185ddc1aa094ef5294c7
+EBUILD freetype-9999.ebuild 6746 BLAKE2B e6eb8129f4b6ec62562894b8d3e784579e530d147c62ff77b8f8a197d3858c97d47bb6b4008a53a1390e6dbf5c992b117d2c1a6205184763f1649c804110c61d SHA512 b854be4a2cd7978718799f3f696529e83ed4b377c16583faf47dcec34dd6ff2aa7aa2b41d35f2c3392baaf46f7c9331fbcb3396f2bd157d839eed292de75bd89
 MISC metadata.xml 1363 BLAKE2B 2cadaca7ada476301e4fa15dabaf7e823a9bcf6e59fb018876e3d2ca61c528c7096cb65ac44d8311a8e9a5eada744f41db3ca2960622980a8f5438d2f003202c SHA512 a9272c439ffb4c9ca6597b2ef26e86e99830ff298940abf38fdecf5c8d794ffdb96a212c67e2e23526a0e2686deff48664da4a5af01d2977256038846e7221f8
diff --git a/media-libs/freetype/freetype-2.10.0.ebuild b/media-libs/freetype/freetype-2.10.0.ebuild
index 2563974f72bf..d845306b9464 100644
--- a/media-libs/freetype/freetype-2.10.0.ebuild
+++ b/media-libs/freetype/freetype-2.10.0.ebuild
@@ -209,7 +209,7 @@ multilib_src_install() {
 		dodir /usr/bin #654780
 		local ft2demo
 		for ft2demo in ../ft2demos-${PV}/bin/*; do
-			./libtool --mode=install $(type -P install) -m 755 "$ft2demo" \
+			./libtool --mode=install $(type -P install) -m 755 "${ft2demo}" \
 				"${ED}"/usr/bin || die
 		done
 	fi
diff --git a/media-libs/freetype/freetype-2.9.1-r3.ebuild b/media-libs/freetype/freetype-2.9.1-r3.ebuild
index e74ac0244134..d3cd1dee862b 100644
--- a/media-libs/freetype/freetype-2.9.1-r3.ebuild
+++ b/media-libs/freetype/freetype-2.9.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -206,7 +206,7 @@ multilib_src_install() {
 		dodir /usr/bin #654780
 		local ft2demo
 		for ft2demo in ../ft2demos-${PV}/bin/*; do
-			./libtool --mode=install $(type -P install) -m 755 "$ft2demo" \
+			./libtool --mode=install $(type -P install) -m 755 "${ft2demo}" \
 				"${ED%/}"/usr/bin || die
 		done
 	fi
diff --git a/media-libs/freetype/freetype-2.9.1-r4.ebuild b/media-libs/freetype/freetype-2.9.1-r4.ebuild
index 62dcbc706372..9dbc2fc98b53 100644
--- a/media-libs/freetype/freetype-2.9.1-r4.ebuild
+++ b/media-libs/freetype/freetype-2.9.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -206,7 +206,7 @@ multilib_src_install() {
 		dodir /usr/bin #654780
 		local ft2demo
 		for ft2demo in ../ft2demos-${PV}/bin/*; do
-			./libtool --mode=install $(type -P install) -m 755 "$ft2demo" \
+			./libtool --mode=install $(type -P install) -m 755 "${ft2demo}" \
 				"${ED%/}"/usr/bin || die
 		done
 	fi
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index 2563974f72bf..d845306b9464 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -209,7 +209,7 @@ multilib_src_install() {
 		dodir /usr/bin #654780
 		local ft2demo
 		for ft2demo in ../ft2demos-${PV}/bin/*; do
-			./libtool --mode=install $(type -P install) -m 755 "$ft2demo" \
+			./libtool --mode=install $(type -P install) -m 755 "${ft2demo}" \
 				"${ED}"/usr/bin || die
 		done
 	fi
diff --git a/media-libs/freeverb3/Manifest b/media-libs/freeverb3/Manifest
index e0659b6ce53d..d127e3ad1ebf 100644
--- a/media-libs/freeverb3/Manifest
+++ b/media-libs/freeverb3/Manifest
@@ -1,5 +1,5 @@
 DIST freeverb3-3.1.2.tar.xz 6015544 BLAKE2B 7589e7aeb04f2253124c94036b53cb86151ffb9f53ae1caefd932ac4ea2c75063a3697101c481e89b7a978044eb02849541b11a7064ede2aec1cd92beba54ad6 SHA512 d3c0b64f14e98f3641b593f3902017fcb457d7a920082bc31e4fc70aaaa11e9172ecabe56bd93c1722b4860239e5ac127c11da6ced6f708def440018451d86bd
 DIST freeverb3-3.2.1.tar.xz 6031592 BLAKE2B 8fbabde0e1c359048f4dc2595729ba93323c1f41176aedfaef406b10c570fc15913a63383f5dd054163efc1f2924958871a8e23d5d7edd0d5e07d52553bc7e38 SHA512 7cab3b2389c8d0a60d0c5f809b214677221204727a74a2b8622455b579aa8fcbd6952da3a343d0ff4bd06a386bbaed0371ddac99bb8ee85862b62435eaeba21b
 EBUILD freeverb3-3.1.2-r1.ebuild 1813 BLAKE2B 0e2ec279432bcd93970f08593c3bf05f053b511c91b1b38cc927bd91beef751b3dade3ced654098b6e075501e89607819ea55a48b49286ff9e1f1acd18d0e267 SHA512 548450eec1904a8c306deba338890c4fe57ddb7c97549fb6c88d1b6754b3cda4d0139e3cea50d1c98501077d2cdd484193f2e43b97fd1ae78dd645cf9c873f5d
-EBUILD freeverb3-3.2.1-r1.ebuild 1327 BLAKE2B 87201177482e9485512c824da7a7cb1828e56da276198a35ea80eab60a7ddd27bae02068e7ae76439d6d378a0dca4c13a1634fff7f9721f6dfff4db923934938 SHA512 5bbfde57c1382ae025ddef45ddac01c93d07e1391073c7b3855be1c75aca63f9776be6d0c1c064ca9f53ed77312b88babc45e7be53dcea2f521ed8515a8eaa88
+EBUILD freeverb3-3.2.1-r1.ebuild 1326 BLAKE2B 01a2794cd05d4d316f8fbe2cc1b2eaaea27152437fd93f8f7cb684ad47dd804d90560e1fbefd47c0a6a85a649184e7a03112ed412dd27fdefe3c74e77326df07 SHA512 ee8b5ff70d1e9372da1303cbc2e9b5c7d26a1a6b2b7a67bcf933d20f3c0ed9de10c4f0f9dcd2249fc8cdebd3e222ac25ce3b85fe41b3b46a1ce8353615aed82e
 MISC metadata.xml 659 BLAKE2B a7f87a8f8a936d3b366baa087d928641b6690029a039526b4d10bb66ae65d1017d476ea278482853444e613844ab1a16030a7816fe120ecc26c5ee34f8ecd181 SHA512 160cb0784d386e3afe894c5552de7991ceacf332c78e47ebf4b33f02e8f36c3eb05b355f2156cea4b7146a0f13551c1341e5aed0e47ceee39f43c63885e4cece
diff --git a/media-libs/freeverb3/freeverb3-3.2.1-r1.ebuild b/media-libs/freeverb3/freeverb3-3.2.1-r1.ebuild
index 91bbe796c8ba..ad6ce443e98f 100644
--- a/media-libs/freeverb3/freeverb3-3.2.1-r1.ebuild
+++ b/media-libs/freeverb3/freeverb3-3.2.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="audacious forcefpu jack openmp plugdouble threads"
 
 REQUIRED_USE="jack? ( audacious )"
diff --git a/media-libs/ganv/Manifest b/media-libs/ganv/Manifest
index ec37ba18c01d..e3920040b37f 100644
--- a/media-libs/ganv/Manifest
+++ b/media-libs/ganv/Manifest
@@ -1,4 +1,4 @@
 AUX ganv-1.4.2-no-fdgl.patch 775 BLAKE2B f89f72f91941325ce8912f8f107dd36c2519dda6837e1103a23a2c2cb085c55795cedc38a14667d2f59a1a326420215f1fe3e62a09cebb8ffcd54aa88177e6e2 SHA512 760d5332df51f91f4045d80a21f8d06e08578dda8ddf383d0ff2cbd150cb0553db253b6cb8b9d45cc6c8bbdccf97c11fd164babf42965809110c452e2e8243c5
 DIST ganv-1.4.2.tar.bz2 175510 BLAKE2B 4e6d7e411c78a516ea6603245ae13787607591b061d3856f305bcc4731f27ef46897d032a9b8a1f672776b41351823f89a2ddfeac40b47f584dbf638af79d466 SHA512 0609dea81cceb0c560286ad2f132f318c2d583af5163dcea4511155e78a022248dcb7ae535233493bdf906fb036422ebd4368d688123f3e1676c4e0398cbc6c2
 EBUILD ganv-1.4.2.ebuild 1025 BLAKE2B b95c91f7e4849cfb0978d2303ab5144930dfa5855252bb95bf15e28c64b04b3493c02712380fb34b60ea0f7c9ca1ec79c02a99f5d8615d133e2aa9363d79a0d5 SHA512 e0a423a6d9347f4232f6ee326c6dbc34e4994e27046a4cefba841b5079050caaba991e8eedec94b32a6c0bee9db43288cf38763e5a420c064a6ec0d4378494ee
-MISC metadata.xml 474 BLAKE2B 5c63ee1e372f3b7d1ffa329a6902f92a9a1fa9901eb40acf730052c124d580a8e6d96122ec82ac9a53eb608d5eb38a3e7a7104b438a8ca016bb134de3a06ac4e SHA512 f84f57d5af4931c7be60c1a333f2835ddbfa8cf0f20a3b1d8b1d22e4623e18d7226dd092a9549d0c29594272285c0a50e571ad9d091b303016eb074156285a9f
+MISC metadata.xml 356 BLAKE2B 0ca0ad63495c9f314c3fe7bfc48a7538d07ad65f9b772996b86ffc268420bf9548002a920a9a7f53f25984c309fc50d9a1735281dd18421a82cef913e10d49da SHA512 f2b5f01deb2f8d879b4a4107571ac469caf163bd2c44a066b8758a9596445f0baaa125b5e3ea883008221aee90d98982222b40b43c10f694d2672842bc1103ef
diff --git a/media-libs/ganv/metadata.xml b/media-libs/ganv/metadata.xml
index c803b5488254..58e1776412af 100644
--- a/media-libs/ganv/metadata.xml
+++ b/media-libs/ganv/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>karl.j.linden@gmail.com</email>
-    <name>Karl Lindén</name>
-  </maintainer>
   <maintainer type="project">
     <email>proaudio@gentoo.org</email>
     <name>Gentoo ProAudio Project</name>
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 8524796c23c1..4e3ea23f2ec1 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 3144 BLAKE2B 6180ae05d449c9d02df55e6f7318da206cebde1d7aa2ac194df4dbc9c6a3132b2de9fc8bfea35abdb6f55fa1018db8554ee0172107e541afadaacb98aa7139fb SHA512 d5a3fa0b80c37dcbdcb0c3c2c7de42525fd4779c64375a39f625ac5064a8ca08f5e29ed0de154c4b83c566d8b1abf5603f529bff97ed2f38c72fea771be632c6
+EBUILD gd-2.2.5-r2.ebuild 3143 BLAKE2B 947ee8383ba1e25be2791ea661597ce3d681da95948ff3d73a1403d99a8032e4ecae75c39ee2245bb3ddfa0e12ed6291b535be389e5d4dffe7290fc79c594437 SHA512 2f2508525ebaacce2c8691e67ec86bf747096a5a942bd2b8b7bf604d0b10b06141c72422a6f350cbf668354992cd757dc1a19bf0b6ff75d9b0299cdc80bd16d8
 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 6ce506513bf6..ed5c3a96905b 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 fefc875a11c6..29ca97feae26 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -18,7 +18,6 @@ DIST gegl-0.3.26.tar.bz2 6530788 BLAKE2B 1cd1a61737ec94cb30fdf16ca8dcb5667ebaa48
 DIST gegl-0.3.34.tar.bz2 6707964 BLAKE2B 4424a2c218067bd0a77d79c2334528da393350db3062019f3889b8cdb8d222f6e436ccfc845b61fdf425a1634698a7a6963702a29bb1666f515b1395c50dc99f SHA512 a7a394dcce4137d5224163ca324f1585e64d1cc797e77d452ba444afe2bff39aa2e2d5d040d07b394697b75162bc310bc51490a5af80240b26aac14b6e7abe02
 DIST gegl-0.4.12.tar.bz2 7065555 BLAKE2B f0801739e67e6d6ecc88abaed8638c900edd7229d240f63af7cc0bf503cd29b33b84d7e3018c757b0bdb6ee5245f6af595b96decc3916b57debfb46712213577 SHA512 cacf9f5c34357b3939162d0d4712ee2b47298a3e806b55e275cdf5e23f186d436ea1a840b91b1b72b76d450d94674cca217b7c253cd6b52a7d9505b4ad73fde2
 DIST gegl-0.4.14.tar.bz2 7209142 BLAKE2B a056f02c3fa9e075aa62cb8cb0d8183560ac66ffed68072add3ea6afc9da3b47c9854eb4e1799c61f451287b244bee4dfc8942365f556a0e820dd7485b9fc305 SHA512 1fcec83a961c0b9c98487de99d26893f98a5401816fa6d7238af4c645672d0eb0474cdb7251b8ebcd344aff589e8979bee0304b50fcfae9513fdbf8a02068e3b
-DIST gegl-0.4.6.tar.bz2 6931774 BLAKE2B c8fabc8efbcc21a3663c8a3a698e6bc072506a66a21b81e6696c37c81aec1458c695f773c554b6d98c2fd21a3d3ab7fcca4b2f6567ec9d4f94b1e925b9bc9ce5 SHA512 6df34b6e76318a375820bccac6efeb2792c737e47154902fcc08ef93cb45b978992ee263260c99f8e865964d80cd1fac6dc2d6c8e4453174df64a9044b57325e
 DIST gegl-0.4.8.tar.bz2 7017022 BLAKE2B ec934fe6faa0c9328ae8c6476e19e175a8e8082e3d1f59052fb83fad766030ede9dd3464a215d332238277492151d988b17c6d3ac87f3d9cec01797acd259fae SHA512 20d2700cc74bce02e3e1b477f5e4dbd6546bb74625de235baaaa31e24f506930927af53de3d0880c0b16f93a10cec993c58a12adba59dec7dda0e389261799aa
 EBUILD gegl-0.2.0-r2.ebuild 4777 BLAKE2B ed7a2d4ee08e7b0b9ca6f657e7cbec1acb5a1269f0eec3cd3cb6861f585c3be38381a3f754e16ab5243b4bc0c05f3db7912dd204b31fe1c9439c7050b1c941c9 SHA512 ab067c5e98dc06f8de2cf6d3f6e4914485c2c9845a7d7840d7d51ddb0f7875bcd40fdf0a0c1331271f70c1326c95839b10ce1167bc9d86c647e31c212fdbfe80
 EBUILD gegl-0.2.0-r5.ebuild 4984 BLAKE2B 46d4f811b53c6db09ca75f93bb07c68cc9094e4e790e6fbdbcad29680c1e39173577b06474dfaefe1abab0b0e14d6bd836adbfb33dbb9f0907b6ef2fc507990b SHA512 da64b73c555f36830d5e6641eef87008d868c566ed5adaed7de3bad519a1d091c189643859b1b30ee025eadb54a1add9847a67839a5006b207bf558e423f2f32
@@ -28,8 +27,7 @@ EBUILD gegl-0.3.0.ebuild 5302 BLAKE2B 9af5ed46f899c5b2bc34c8da9763ac0fb777135bfd
 EBUILD gegl-0.3.26.ebuild 5233 BLAKE2B 26efbb8ea85b7b55231801f735b689ff0fccc93fa64c9dfaad33b8819c786f16c57cb7af9bc8da1b74ede6ca72e2dd2e67712dc5c5a2fc26bc833177a9e98f93 SHA512 7516b2ceb2c18b90ae48306765154a33405a38cba39c9531a18d7827408f4a0286e72f51e21fea37493df5f143af8fd302d82f2287de296d6e817947ad6f1f10
 EBUILD gegl-0.3.34.ebuild 5377 BLAKE2B ac84c85d0ab0a6fab5e2176639f30cefda1081acab0bcc155915cdeb702cd681efe0d332d6ccfe29055b7e16d6b4406893f525574d702d7f2609e952c440b6bc SHA512 a7991520a562539a9f975fb7b7199b8c3129fee1415ddd1211b2b513fec29db7e4740f20109081981dbf656edc5cafac2c3cec339dc3a22e98c8bb272eb6e564
 EBUILD gegl-0.4.12.ebuild 4918 BLAKE2B 38df7754c5b30c18d6d2858a8cafb701f008b5c33ce9c45f9136f64746bacb9e22089ccb4758f844604dbf547834be23ab2d5c0947db6d0cdd4d97647bd0b162 SHA512 d2b0a08f7713683c2f62d1b29a94b23e37fc948a287c537f5d4cda60d1713e61815a78cdf629dbb3bacd41edc774c0ab59952846fe9761a894669c15b25b31ff
-EBUILD gegl-0.4.14.ebuild 5037 BLAKE2B 9e1610c90c4324b542562cbe39b533d263c4d58444c01731b6271070962b6bc8e9172949dcff3175e51d8f6cf7dd4612c2fb92242b878620d5f038e43e16097f SHA512 b9e03224de06edd921e8e5882a365772f059c13eaf36543cb970fbb7de4c6d3e533a6e8d84e4a7d4ac817dd5c990f2385c8b00af2710a39d20663b0d5157b36e
-EBUILD gegl-0.4.6-r1.ebuild 5389 BLAKE2B 4eba81cf6624d66ceb3d3e27b9bff465f9b5702e53d12abccc6ccf8bf17e1ccbe439dbb5b9842564da374510ac3c01ffaac28be89aa3cc1b6c3b8493744c358a SHA512 4e010197d78a08ecc574975d3069a1fcfd2cb15b0cbc40f28b28494213369fc926c1e7bd082314213f823381a52b687facfc122ed000c3078b409bd406f79ff9
+EBUILD gegl-0.4.14.ebuild 5036 BLAKE2B 9c1a1f5768cf68a27e0495a2a868e649cdcc255e8b9e3ed2da5b59f47ca3f85b121caa9bff423b5b4476e4b56cd454ec67cd5cdaffd3b56f860d4678a901be1c SHA512 07f49bc6ae89e80b466116d2404f15a0f82ca9a2c502e127857546e2826b8ac1ffbab8f0bf283a370473ab8dd5b1d3dadc546ca5ca0a376f1ba8bb5be73a06d0
 EBUILD gegl-0.4.8-r1.ebuild 4968 BLAKE2B 3cdb9f610500db2fd90fbb55e64c22bac6fe13cc153d5b42b5f16509e09efba77e50e5cc803b33d0e0845f61f65bc201f4e2bfec5fcdcbfb6d6eeaf4966f8204 SHA512 5cef00dcb12ce6153a0831a129dedf0051c29abb683b06b5f5e4d85467f293c93de28149ed73946fc63bedaaac22150f6ade4b21c679a6a4cd422ea702ec307d
 EBUILD gegl-9999.ebuild 4976 BLAKE2B 8510368b9fa38dfb28782ba7076af4eb8d6ea8e912b4aa7f5029ba733a33eaf3827c48a0fd4853801672d583e5e004143d346f64ee245475b6bd40618f3230ff SHA512 5181b917e6db0170348f7b698bf55bf48914eccb678619d8515d16fd8073d63a03299c6ce7918bddb0877907f2d3653e2f0b48197e9d659735b59b08c668272a
 MISC metadata.xml 396 BLAKE2B aeb29a940e3747b4ea2418e3723c549291cbfd49d8152c75fcc9116b46892eac29338b36875b32c7f3968deecf142296b0f9725d02a80a0380dfba6fba17d810 SHA512 7530e0bc7d86a57334d1dc6fc75b6acc1eb3512c2618d1ed47bbc025aa95f72fa1d41b78765ae53721ea794538d22df1be22189dd54e30fa4bf94e7f0cdced1a
diff --git a/media-libs/gegl/gegl-0.4.14.ebuild b/media-libs/gegl/gegl-0.4.14.ebuild
index 58165e607836..ac4f0a461ad5 100644
--- a/media-libs/gegl/gegl-0.4.14.ebuild
+++ b/media-libs/gegl/gegl-0.4.14.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/gegl/gegl-0.4.6-r1.ebuild b/media-libs/gegl/gegl-0.4.6-r1.ebuild
deleted file mode 100644
index 6e303217ef0f..000000000000
--- a/media-libs/gegl/gegl-0.4.6-r1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-# vala and introspection support is broken, bug #468208
-VALA_USE_DEPEND=vapigen
-
-inherit autotools gnome2-utils python-any-r1 vala
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
-	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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="http://www.gegl.org/"
-
-LICENSE="|| ( GPL-3+ LGPL-3 )"
-SLOT="0.4"
-
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp"
-REQUIRED_USE="
-	svg? ( cairo )
-	vala? ( introspection )
-"
-
-# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
-#       so there is no chance to support libav right now (Gentoo bug #567638)
-#       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	dev-libs/json-glib
-	>=media-libs/babl-0.1.54
-	sys-libs/zlib
-	>=x11-libs/gdk-pixbuf-2.32:2
-	x11-libs/pango
-
-	cairo? ( >=x11-libs/cairo-1.12.2 )
-	ffmpeg? (
-		>=media-video/ffmpeg-2.8:0=
-	)
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	virtual/jpeg:0=
-	jpeg2k? ( >=media-libs/jasper-1.900.1:= )
-	lcms? ( >=media-libs/lcms-2.8:2 )
-	lensfun? ( >=media-libs/lensfun-0.2.5 )
-	openexr? ( =media-libs/openexr-2.2*:= )
-	>=media-libs/libpng-1.6.0:0=
-	raw? ( >=media-libs/libraw-0.15.4:0= )
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	svg? ( >=gnome-base/librsvg-2.40.6:2 )
-	tiff? ( >=media-libs/tiff-4:0 )
-	umfpack? ( sci-libs/umfpack )
-	v4l? ( >=media-libs/libv4l-1.0.1 )
-	webp? ( >=media-libs/libwebp-0.5.0:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1
-	>=sys-devel/gettext-0.19.8
-	dev-lang/perl
-	virtual/pkgconfig
-	>=sys-devel/libtool-2.2
-	test? ( ffmpeg? ( media-libs/gexiv2 )
-		introspection? (
-		$(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]') ) )
-	vala? ( $(vala_depend) )
-"
-
-pkg_setup() {
-	use test && use introspection && python-any-r1_pkg_setup
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
-)
-
-src_prepare() {
-	default
-
-	# FIXME: the following should be proper patch sent to upstream
-	# fix OSX loadable module filename extension
-	sed -i -e 's/\.dylib/.bundle/' configure.ac || die
-	# don't require Apple's OpenCL on versions of OSX that don't have it
-	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
-		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
-	fi
-
-	# commit 7c78497b : tests that use gegl.png are broken on non-amd64
-	sed -e '/clones.xml/d' \
-		-e '/composite-transform.xml/d' \
-		-i tests/compositions/Makefile.am || die
-
-	eautoreconf
-
-	gnome2_environment_reset
-
-	use vala && vala_src_prepare
-}
-
-_use_with_both() {
-	if use "$1" && use "$2"; then
-		echo "--with-$3"
-	else
-		echo "--without-$3"
-	fi
-}
-
-src_configure() {
-	# never enable altering of CFLAGS via profile option
-	# libspiro: not in portage main tree
-	# disable documentation as the generating is bit automagic
-	#    if anyone wants to work on it just create bug with patch
-
-	# Also please note that:
-	#
-	#  - Some auto-detections are not patched away since the docs are
-	#    not built (--disable-docs, lack of --enable-gtk-doc) and these
-	#    tools affect re-generation of docs, only
-	#    (e.g. ruby, asciidoc, dot (of graphviz), enscript)
-	#
-	#  - Parameter --with-exiv2 compiles a noinst-app only, no use
-	#    but needed during testing
-	#
-	#  - Parameter --disable-workshop disables any use of Lua, effectivly
-	#
-	#  - v4l support does not work with our media-libs/libv4l-0.8.9,
-	#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
-	#
-	#  - There are two checks for dot, one controllable by --with(out)-graphviz
-	#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
-	#
-	#  - mrg is not in tree and gexiv2 support only has effect when mrg support
-	#    is enabled
-	#
-	# So that's why USE="exif graphviz lua v4l" got resolved.  More at:
-	# https://bugs.gentoo.org/show_bug.cgi?id=451136
-	#
-	econf \
-		--disable-docs \
-		--disable-profile \
-		--disable-silent-rules \
-		--disable-workshop \
-		--program-suffix=-${SLOT} \
-		--with-gdk-pixbuf \
-		--with-pango \
-		--without-libspiro \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable debug) \
-		$(use_with cairo) \
-		$(use_with cairo pangocairo) \
-		--without-exiv2 \
-		$(use_with ffmpeg libavformat) \
-		$(_use_with_both ffmpeg test gexiv2) \
-		--without-graphviz \
-		$(use_with jpeg2k jasper) \
-		$(use_with lcms) \
-		$(use_with lensfun) \
-		--without-lua \
-		--without-mrg \
-		$(use_with openexr) \
-		$(use_with raw libraw) \
-		$(use_with sdl) \
-		$(use_with svg librsvg) \
-		$(use_with tiff libtiff) \
-		$(use_with umfpack) \
-		$(use_with v4l libv4l) \
-		$(use_with v4l libv4l2) \
-		$(use_enable introspection) \
-		$(use_with vala) \
-		$(use_with webp)
-}
-
-src_compile() {
-	default
-
-	[[ ${PV} == *9999* ]] && emake ./ChangeLog  # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped."
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index fff612727ecd..07edf5d05bfe 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -1,8 +1,6 @@
 AUX gexiv2-0.10.10-meson-fixup.patch 1718 BLAKE2B 0460652424a8314eeba8f0d677b5dff5b0efc9165079c9232824bbfffb2a13a1ca2acef89ae066bc13ec4c40baef4ac4b1c66c02d4365b999fdd4f54858ea7af SHA512 06f7b13502b9397770b0d9ab20dd70d902feb7d70fd42381cda53183859db15102bbf16d0e4ce5f9b124de99c58c8e4cb0ec85ca1c6f60e3e5287cafcdfadd64
 AUX gexiv2-0.10.10-vala-fixup.patch 1785 BLAKE2B d82ec357f2ee7d50b79fa1c82bd9c4b6d0a528561fcacc08e966c73f9d89daf3c2ce2e2712f69e246507e14e0f10a0a5470c830e43aeeb06fdceffc3484cbc0e SHA512 e9708245ddee0fb88939ae26987e4e5859fd5e13efb03f01d276eeb77d4361832eac11b2873e73984ef25dbdcf502f2f3a82a78330f3c7b57b2e186cfb49395f
 DIST gexiv2-0.10.10.tar.xz 638168 BLAKE2B ae75a06007dcaca4c22e463661073d796b77921a313a5bb450c488ee963f72c6095d7abc12dedc0d089a28905cf386062221073100ba3513d9fb13eb524365ee SHA512 41e5b4a9d81882ea4b1bc6f3b9ced95ca4d03f836de30ff90b7a43311e5319f7c0f46cbad767bf2b00926c8e5fd2c1e8ca2a2113c308e23b7a4c21205399abf7
-DIST gexiv2-0.10.8.tar.xz 634696 BLAKE2B 182cda3bac5b3211e5ef8267628a86cc496c0242f25c5cd94ed9eab81c7460022373f3bb794c976fd0b9a10e49f9ca7109521ac6f99bbe7a4e0306a31db899da SHA512 4c25cf6884495151947a70e62a096f3279223673bece4d4ff02720b2820aaad9e80c8715e02bf46c3f5598f582fdf07b4b3ddabd017d53001245e3381a4cc286
-EBUILD gexiv2-0.10.10-r1.ebuild 1848 BLAKE2B e272960da779d7b40ae25db6456dc9a1eb45c324a4ae7bb8c60d279c1faa9631eec29290f63c77bb6000c530415823a3879eb74c22e49dceb6ca3a4c538ae702 SHA512 a4c6326c2cce1ac74d632f09701d516826582073c493d8cef9530a7fb71fc870def1170c4ef1d8e07d8d063a618766a76dc767a6d8ffbce921abcc61de9e72e7
-EBUILD gexiv2-0.10.8.ebuild 1527 BLAKE2B 6ddf3a6433cc5d6b566075718011be7ad782186482a3146533fdd1364b5385f2f8977e09a5ec3c73f7624fc929f6f8753d30bacb60ee27f35341c49a68429860 SHA512 2f50314429b7cd4b47bb5172c801490551cae93989a41d919ce7ebf35d6c0005a657507019dbf0356e4ff8f405747492782a95796558e9c4e05e446f043f2ade
-EBUILD gexiv2-9999.ebuild 1652 BLAKE2B 5a00ff2ccdd58025bdc614384e70975f871ea4c861ad7ec91ccdc5b942dc621ca4fcdbcefcf40e2016c548bd0874b168609dc1939ec54d4a13be163872f70bcd SHA512 b5d591aa541ec76e8aff3372b28815500815ca686ddca872ebbb3c6a082077e285a69b37794f676cb7b83dae5fe3a24531e35141b2f166ffd5702be2c0151a73
+EBUILD gexiv2-0.10.10-r1.ebuild 1846 BLAKE2B 373cd362dd1062da5773fde0ed3065a21c21fd74b369f5538afb0b8c572f09c5cd4579fe75d17a1700ed170a4588b22245bfec7c9563c02b7b07c40afa17da09 SHA512 efbb28059e59f23862e0fbda53ac826ff1e36b1d47ec94b59dcc1fe6ef74a4c8d4a948e719741e1b3fac706540f2fc0673edf684c983917f38858032fb77427f
+EBUILD gexiv2-9999.ebuild 1650 BLAKE2B 648e3adfb789c2b410c155e5c5f9392327b017581c98893ed3fcf7a6e7b40c0558ee4417a7937ac98d82132747a492fff9d7d9e6c4bfca934173219a1dfb3b28 SHA512 0a3104e245f5ba7236c91cf6469398b997ad6eecf97caa80a1a8dead8af3cb2216d64ab587e1ee1d3d61b356401476ccc9d4423d534240fa348cb8eb764517fd
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild b/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
index b7fa5ece19cb..b82e65a292f3 100644
--- a/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit meson python-r1 vala xdg-utils
 
diff --git a/media-libs/gexiv2/gexiv2-0.10.8.ebuild b/media-libs/gexiv2/gexiv2-0.10.8.ebuild
deleted file mode 100644
index 51a7aefc81c4..000000000000
--- a/media-libs/gexiv2/gexiv2-0.10.8.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit autotools eutils multilib python-r1 toolchain-funcs versionator vala xdg-utils
-
-MY_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="GObject-based wrapper around the Exiv2 library"
-HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
-SRC_URI="mirror://gnome/sources/${PN}/${MY_PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
-IUSE="introspection python static-libs test vala"
-
-REQUIRED_USE="
-	python? ( introspection ${PYTHON_REQUIRED_USE} )
-	test? ( python introspection )
-	vala? ( introspection )
-"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.26.1:2
-	>=media-gfx/exiv2-0.21:0=
-	introspection? ( dev-libs/gobject-introspection:= )
-	vala? ( $(vala_depend) )
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pygobject
-		media-gfx/exiv2[xmp]
-	)
-	dev-libs/gobject-introspection-common
-	virtual/pkgconfig"
-
-src_prepare() {
-	xdg_environment_reset
-	tc-export CXX
-	use vala && vala_src_prepare
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable introspection) \
-		$(use_enable static-libs static) \
-		$(use_enable vala)
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIB="$(get_libdir)" install
-	dodoc AUTHORS NEWS README THANKS
-
-	if use python ; then
-		python_moduleinto gi/overrides/
-		python_foreach_impl python_domodule GExiv2.py
-	fi
-
-	use static-libs || prune_libtool_files --modules
-}
diff --git a/media-libs/gexiv2/gexiv2-9999.ebuild b/media-libs/gexiv2/gexiv2-9999.ebuild
index b5d7c56dc951..91c86ef6de69 100644
--- a/media-libs/gexiv2/gexiv2-9999.ebuild
+++ b/media-libs/gexiv2/gexiv2-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit meson python-r1 vala xdg-utils
 
diff --git a/media-libs/giblib/Manifest b/media-libs/giblib/Manifest
index bda94b76289d..020c40706cb3 100644
--- a/media-libs/giblib/Manifest
+++ b/media-libs/giblib/Manifest
@@ -1,3 +1,3 @@
 DIST giblib-1.2.4.tar.gz 287653 BLAKE2B 0b936fe3b56b933a5038751428ec56a872911d3c4ae972e9670cb1ce2496de6a8e21cb4718e7bab4eb1d547eb67ca71b25d77405ff04ebcb1ca0dc03fafea7ef SHA512 4866df223e6d219a5c9a327874bcd67260c83fba8f99862222df41ef86fb31efa0172a777bf46c853ca380dc2a64bbd41bf4fd658fcb84a924cab4e0f525dcfd
-EBUILD giblib-1.2.4-r1.ebuild 895 BLAKE2B ae292f6ea1c0688a20d4fd63172e469fed0a3cd42fa2be8c3583404166139a15a28e9d965b51ba3102dbe335aee30e939e8902f21244c727f0c65e316dbb4f1d SHA512 d79eac983c0c9bb85d11951eb672672cbb70934aef5ef9d470aef929e318acd9b20ae72118e22fa37a2253a75d6472ed43132011b94463ec5a7a0bd754b43da0
+EBUILD giblib-1.2.4-r1.ebuild 899 BLAKE2B f5b6dee111a89e991182d3b1abf6821fef098e3146b1b4931e92e0ebe3698e251f60a4b7588174a50dc610a2e300930ea34c8e8efe08b65ef89724fafb0f5e42 SHA512 41d7b33cfd56cc69436d50af7e9f984521a50fd41f522464b68cf1e2a5e82f34aa6a36083e8fecb5bc4ad737bbf3cc0648e80042a5c724bcdfe704609d1c45e1
 MISC metadata.xml 750 BLAKE2B d02c2f96076c9be5a95d8701e935ed802f3b8759d2c1cc220e6235e6a310773a05dcd5e77398ee3f32f7a55822c407c5d18c3cb79b674ba5124043934b04539b SHA512 4827fa23f4b181c3e0a76eb422bd05b1504f6982edd7b8de4ac0464043b9cb8339939629162ec0f2ca1a663940e3a52f8c95ca890ad1eb9aed6d9df4c6580c34
diff --git a/media-libs/giblib/giblib-1.2.4-r1.ebuild b/media-libs/giblib/giblib-1.2.4-r1.ebuild
index 4217dce14038..8ce183b197b5 100644
--- a/media-libs/giblib/giblib-1.2.4-r1.ebuild
+++ b/media-libs/giblib/giblib-1.2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -10,7 +10,7 @@ SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
 
 LICENSE="feh"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static-libs"
 
 RDEPEND=">=media-libs/imlib2-1.0.3[X]
diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest
index b98ccfbf7899..7cd8001d39ac 100644
--- a/media-libs/glm/Manifest
+++ b/media-libs/glm/Manifest
@@ -1,10 +1,8 @@
-AUX glm-0.9.8.5-gcc7_tests.patch 2495 BLAKE2B afb4e8d64272497cd3e02ea73ba5536b660b3d73302fab4f2eff4fe87b3a2eae604a04fd5aa7ebc55dc860e419ea370a1c240a1b2d30fd6d522c9f37d3277c50 SHA512 c21859d4db606bd6420a889ae4ae3242b1e60a7f660cbe7aaee1583919a82c47b2f209d596378f8d919aa59c34ebb12beef05a06f969fd6941168b9bbe7e8467
 AUX glm-0.9.9.2-avx.patch 1124 BLAKE2B d7cf404b222d98ea4771c354ad3afa712e217be0a4e917c026f79cfb7262e1be9faa2efe85c5bf2cae8df446b421b5f3c1c5545fcc8f6cf3181f6b50425dd680 SHA512 a6a67dccfd9eeecf3ddf083de89da2fd48498a1d815e58d82a9f53feab164d46450c8a41978fcb131b9517e468bdc0949ce4c15b1b24ffe9c0dd6e94516c7874
-AUX glm-gcc73.patch 1378 BLAKE2B 98be49157daff3250931510e26f7b21cdee74ab2931f5df50153d31a66d4b85e6b7eeeed2316154a2a4c70ed63c53f530a486672fc6b5255a1de9521cac512ef SHA512 c816b9ab071f5d6ef2435c10699c562807d1e8dac08c896d0a6a76f0bcd6c21f82e831349f544e171897e826c26d23a3bf958f808abc8a3d6b8f1c8b534ccda5
 DIST glm-0.9.9.2.tar.gz 4572279 BLAKE2B 8b9ade542989b3f73f1a80403b73b5c04c5d64ae259891a6b41564eb7b4417876d527ea8440352f2feec6480ec926ca877a4849c4e75c6ece3692d24d87c942a SHA512 80a5fbeaaea5f1034cd6f8ad3f4daf8b5fa8d9410ccce15ced20f37e24c0f6083332fde82b1fa7357399b3e37c1a31dd3a14f257b7847a5f1ddefa627b50351a
-DIST glm-0.9.9.3.tar.gz 4577239 BLAKE2B 167312e95a43417dba59481b1d45976d9249af9fda9ebb6d0ec598e706bc2469b8c0928877683d47335e0c55ee881a20c1c7f648dd77e183880f7c2792bd5277 SHA512 44152ea6438763feda3b78813287fd59d3574a9630a41647a157825bf5ce4a18fbbecae5a5ccd94acc118ed3d42cbce53d3a67f25632d0c00ab77e7de2bb4650
 DIST glm-0.9.9.4.tar.gz 4578404 BLAKE2B 4c0bb64bb477ca46d45b4d25d7d992a39a82a7d745d4564dfac04c7f6e31ea0741b33d2d6c7832580e6f51f62a2efe269a9601c10d87f1e68b333e71e20c3d02 SHA512 50e4784fcd5f1da4ae27830948ffe4b412ec53447b89d30c6dcc2b4e0f9ec05cca4b07461d3d8a339eb103fae8dac325fabc87607b5397122ce2021d6e15a1a1
+DIST glm-0.9.9.5.tar.gz 4578601 BLAKE2B 9ce4dc7e638a651f958e2e0e1bfa0da121aefc382579838bfd810952bb8f4253e17caa6d743de713c86a4e8bd5f1afa38f8162e5f2d98ab141d94574d1103d40 SHA512 3b329acf5144aab1c0f47f8045d34e097699bd6685118ad8322c5ce23afdcb44ba2bb07e49301db06355b8eef7d4340b72251d55e113b533740d1e6ef6609911
 EBUILD glm-0.9.9.2.ebuild 901 BLAKE2B 1c30f2fc621753312f50d87ec0d30f52ad3b9a7398eac0d2a9616ea7da8e0e64910df8e62906ccb177066ad6bf8c4ba5b0b9e60a1c7ab18f589785fa74fb59fc SHA512 609b1bf19b416890cbfc4be4e2a44dede933227d8c41e766a29a4ca8466432598f9a7a4f8c1f7c43d8a5f84f2adb37f31ea5e4292a853a7765cf46828cbaaf68
-EBUILD glm-0.9.9.3.ebuild 862 BLAKE2B 9b34afe8021029980017534376e5fb49faeb7e5ec1ebf17859424cfcacdfc4cd10a3943df9bfae3888cd5317e024ceaaafbbdc6590c75ae908b3cec6c030f017 SHA512 7f004b7285c6304a2e268b7cf6f14f7bb8e79a5ca23bf181446797afe8c57731cf19995448f8cc88c967006418d03f6799ef23ee3471b4a8a13a2e3b60d6a71a
 EBUILD glm-0.9.9.4.ebuild 862 BLAKE2B c61eb288647c2a83103c8a86c7b252b4c13a7585ecde28683df41561eb652a0a3cc9eb3ad31041110f55398ecc467ef7e77f41545f340bd2526d80338bb9c1cb SHA512 ccc3cc2e8c95d6b31aa5ebadd3f7c5c5418e3e1060bfd92cb8b2cf595a6c0b03ffea9c837985a60c2c022d17077b18586e492841df8bb18922f3715aa6f70b73
+EBUILD glm-0.9.9.5.ebuild 862 BLAKE2B c61eb288647c2a83103c8a86c7b252b4c13a7585ecde28683df41561eb652a0a3cc9eb3ad31041110f55398ecc467ef7e77f41545f340bd2526d80338bb9c1cb SHA512 ccc3cc2e8c95d6b31aa5ebadd3f7c5c5418e3e1060bfd92cb8b2cf595a6c0b03ffea9c837985a60c2c022d17077b18586e492841df8bb18922f3715aa6f70b73
 MISC metadata.xml 545 BLAKE2B 842701f1a6d1483b75f14aa99f546975b4c7de1a84d36b1e15a882d17662d98d37b491e236da73d9457706b667f0499405b5717af3ccfed73ad0518f34167c72 SHA512 637114ed9721e6d1c8f1d1ce56e9b9c208ca4dfe5f3a0c2b844d90bcdbab8344c00682c9647f7323eec7c485abcd841ef37300a8fe0bc8a5f5c12cfbb1da4971
diff --git a/media-libs/glm/files/glm-0.9.8.5-gcc7_tests.patch b/media-libs/glm/files/glm-0.9.8.5-gcc7_tests.patch
deleted file mode 100644
index d7744aed5551..000000000000
--- a/media-libs/glm/files/glm-0.9.8.5-gcc7_tests.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Bug: https://bugs.gentoo.org/638312
-Upstream commit: https://github.com/g-truc/glm/commit/e37cf6e47fa4305c82845103b17af58f6cfe23db
-
-From e37cf6e47fa4305c82845103b17af58f6cfe23db Mon Sep 17 00:00:00 2001
-From: Christophe Riccio <christophe.riccio@unity3d.com>
-Date: Thu, 17 Aug 2017 00:08:37 +0200
-Subject: [PATCH] Fixed GCC 7.1.0 failing tests #666
-
----
- test/core/core_type_mat2x4.cpp | 4 +++-
- test/core/core_type_mat3x4.cpp | 4 +++-
- test/core/core_type_mat4x4.cpp | 3 ++-
- 3 files changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/test/core/core_type_mat2x4.cpp b/test/core/core_type_mat2x4.cpp
-index 17afebf91..eea3e46f4 100644
---- a/test/core/core_type_mat2x4.cpp
-+++ b/test/core/core_type_mat2x4.cpp
-@@ -1,3 +1,5 @@
-+#include <glm/gtc/epsilon.hpp>
-+#include <glm/gtc/constants.hpp>
- #include <glm/vector_relational.hpp>
- #include <glm/mat2x2.hpp>
- #include <glm/mat2x3.hpp>
-@@ -83,7 +85,7 @@ namespace cast
- 		glm::mat2x4 Identity(1.0f);
- 
- 		for(glm::length_t i = 0, length = B.length(); i < length; ++i)
--			Error += glm::all(glm::equal(B[i], Identity[i])) ? 0 : 1;
-+			Error += glm::all(glm::epsilonEqual(B[i], Identity[i], glm::epsilon<float>())) ? 0 : 1;
- 
- 		return Error;
- 	}
-diff --git a/test/core/core_type_mat3x4.cpp b/test/core/core_type_mat3x4.cpp
-index e3b78d31b..74a45d87a 100644
---- a/test/core/core_type_mat3x4.cpp
-+++ b/test/core/core_type_mat3x4.cpp
-@@ -1,3 +1,5 @@
-+#include <glm/gtc/epsilon.hpp>
-+#include <glm/gtc/constants.hpp>
- #include <glm/vector_relational.hpp>
- #include <glm/mat2x2.hpp>
- #include <glm/mat2x3.hpp>
-@@ -87,7 +89,7 @@ namespace cast
- 		glm::mat3x4 Identity(1.0f);
- 
- 		for(glm::length_t i = 0, length = B.length(); i < length; ++i)
--			Error += glm::all(glm::equal(B[i], Identity[i])) ? 0 : 1;
-+			Error += glm::all(glm::epsilonEqual(B[i], Identity[i], glm::epsilon<float>())) ? 0 : 1;
- 
- 		return Error;
- 	}
-diff --git a/test/core/core_type_mat4x4.cpp b/test/core/core_type_mat4x4.cpp
-index 3966c2b7f..fd2aca8b4 100644
---- a/test/core/core_type_mat4x4.cpp
-+++ b/test/core/core_type_mat4x4.cpp
-@@ -1,3 +1,4 @@
-+#include <glm/gtc/constants.hpp>
- #include <glm/gtc/epsilon.hpp>
- #include <glm/matrix.hpp>
- #include <glm/mat2x2.hpp>
-@@ -263,7 +264,7 @@ namespace cast
- 		glm::mat4x4 Identity(1.0f);
- 
- 		for(glm::length_t i = 0, length = B.length(); i < length; ++i)
--			Error += glm::all(glm::equal(B[i], Identity[i])) ? 0 : 1;
-+			Error += glm::all(glm::epsilonEqual(B[i], Identity[i], glm::epsilon<float>())) ? 0 : 1;
- 
- 		return Error;
- 	}
diff --git a/media-libs/glm/files/glm-gcc73.patch b/media-libs/glm/files/glm-gcc73.patch
deleted file mode 100644
index 68033b5b6f63..000000000000
--- a/media-libs/glm/files/glm-gcc73.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ur glm-0.9.8.5.orig/glm/simd/platform.h glm-0.9.8.5/glm/simd/platform.h
---- glm-0.9.8.5.orig/glm/simd/platform.h	2017-08-16 05:15:24.000000000 -0700
-+++ glm-0.9.8.5/glm/simd/platform.h	2018-01-26 15:38:57.584130263 -0800
-@@ -111,7 +111,8 @@
- #define GLM_COMPILER_GCC70			0x02000A00
- #define GLM_COMPILER_GCC71			0x02000B00
- #define GLM_COMPILER_GCC72			0x02000C00
--#define GLM_COMPILER_GCC80			0x02000D00
-+#define GLM_COMPILER_GCC73			0x02000D00
-+#define GLM_COMPILER_GCC80			0x02000E00
- 
- // CUDA
- #define GLM_COMPILER_CUDA			0x10000000
-@@ -283,6 +284,8 @@
- #		define GLM_COMPILER (GLM_COMPILER_GCC71)
- #	elif (__GNUC__ == 7) && (__GNUC_MINOR__ == 2)
- #		define GLM_COMPILER (GLM_COMPILER_GCC72)
-+#	elif (__GNUC__ == 7) && (__GNUC_MINOR__ == 3)
-+#		define GLM_COMPILER (GLM_COMPILER_GCC73)
- #	elif (__GNUC__ >= 8)
- #		define GLM_COMPILER (GLM_COMPILER_GCC80)
- #	else
-diff -ur glm-0.9.8.5.orig/test/core/core_setup_message.cpp glm-0.9.8.5/test/core/core_setup_message.cpp
---- glm-0.9.8.5.orig/test/core/core_setup_message.cpp	2017-08-16 05:15:24.000000000 -0700
-+++ glm-0.9.8.5/test/core/core_setup_message.cpp	2018-01-26 15:37:56.953298475 -0800
-@@ -86,6 +86,9 @@
- 		case GLM_COMPILER_GCC72:
- 			std::printf("GCC 7.2\n");
- 			break;
-+		case GLM_COMPILER_GCC73:
-+			std::printf("GCC 7.3\n");
-+			break;
- 		case GLM_COMPILER_GCC80:
- 			std::printf("GCC 8.0\n");
- 			break;
diff --git a/media-libs/glm/glm-0.9.9.3.ebuild b/media-libs/glm/glm-0.9.9.5.ebuild
index 6d61f3165def..169bf319fadf 100644
--- a/media-libs/glm/glm-0.9.9.3.ebuild
+++ b/media-libs/glm/glm-0.9.9.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils
 
diff --git a/media-libs/glpng/Manifest b/media-libs/glpng/Manifest
index b103213a0ab9..df5fa9457b22 100644
--- a/media-libs/glpng/Manifest
+++ b/media-libs/glpng/Manifest
@@ -1,3 +1,3 @@
 DIST glpng-1.46.tar.gz 41024 BLAKE2B a0e521ec5ebd3d6b9d62e64b001dfa0aac97be6a72f44222816f5cb2dda3949d33261f66e96ecaa1fc6feaf7ece67721d3606440d760b305fbb7cb57462b24b3 SHA512 82fbd6154a0ca16102b4c31f7fbd907cf8c18b20c1693c60f8dcdd1fe42ebe579f98da2b36c00fc080b2880c720e8099dac0d460a8de1b2bf1145abbf05a20ae
-EBUILD glpng-1.46-r1.ebuild 683 BLAKE2B 612011a97c4cbd80cf2238a0e164e8f8eb020f0cf658ebb72eb37b02f0ded0bed1019c6b164592335e059bc045019cbfd6ad960bc146f56a72a73bc03ec95ac4 SHA512 375c315de0723fd5568d3180317f739ac89175611c987a61228f4c94bc20d8f1d69d831cc356bdcf9802e1facff1bc47c625a4508126ebd71c3b3f458971e80c
+EBUILD glpng-1.46-r1.ebuild 685 BLAKE2B 650323f988da970229ec6ee4221f6fddda4bc1a4cdd8a142c07a67a126a3d2d84e71f8007135bb2db3968c1093d8e4bbc4645ba8b11840215fa89893479a85a7 SHA512 8e2dc4cc9b22f4cc3fb11c298c94d83fd1cd064630a04f817d64d43a64a0b665f605849968c2e4f6466927b5d186a60cb10c2337c1b6001e456d9b4dfe86c15f
 MISC metadata.xml 461 BLAKE2B e5bc7b8a1b80dd383a5187799bb3e43540ec0b26694fcc62c289e2df08544484b8aba3ef9e396512ffed6dfc9457358d4eb683dd27484b13d5c44def8a68063e SHA512 bc6e0802c3ca98c29fcef3b36d34d688b5249c0e9103fbe336653003c2142821a732d26a48a6052003fc2e6f82f42694fe8ba9a4b32e896f689b10ef186c30e1
diff --git a/media-libs/glpng/glpng-1.46-r1.ebuild b/media-libs/glpng/glpng-1.46-r1.ebuild
index 2753b6ec6853..381438333a1c 100644
--- a/media-libs/glpng/glpng-1.46-r1.ebuild
+++ b/media-libs/glpng/glpng-1.46-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit cmake-multilib
 
 DESCRIPTION="An OpenGL PNG image library"
-HOMEPAGE="http://repo.or.cz/w/glpng.git"
-SRC_URI="http://repo.or.cz/w/glpng.git/snapshot/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://repo.or.cz/w/glpng.git"
+SRC_URI="https://repo.or.cz/w/glpng.git/snapshot/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
diff --git a/media-libs/graphene/Manifest b/media-libs/graphene/Manifest
index 0466ed84864f..41a01665fe63 100644
--- a/media-libs/graphene/Manifest
+++ b/media-libs/graphene/Manifest
@@ -1,5 +1,5 @@
 DIST graphene-1.8.2.tar.xz 127436 BLAKE2B a22251db7cf4719c8a6cde49e6feb0a998d1ec7296fee549a4797d72fa575d4266e48fb5a6d9ebd204b93954a6278b4fa88dc56e5f86d7cf8625a5edc685a09b SHA512 8d250dccac345251081419f4ad7079c8035cb6225e10b23d25799386b067288831c23be667d608228ef44a2f6107ac47fc86bb495eda7881b1336598d6c43234
 DIST graphene-1.8.6.tar.xz 127984 BLAKE2B 7f67b99796cca1a47324674b1871ddfbcce1193ded5f0a37c8c2894d52b6b5823b0fb1909018ea6adb90f7ed53ad6b09eeda9b1606a22a8b85cd0d661d500195 SHA512 ef6e9b5587bd540099216a7e3f7c86eb62368d49876dcd380c9767c6740c8267c9d510c5025dbe56402f3cd15084ef8fc634d3abe486b516f4f5328b87df277c
-EBUILD graphene-1.8.2.ebuild 1745 BLAKE2B c3d1ea746af88d2b0dfdfd4749a5e0f6cce22930ebff02d855db5007c8e6f5ec2b14cff20f70ef36859602e4087c6b87dc0d8ab00f5d44c68ad5a454b2d1dc3e SHA512 8cd410d64f66a079196d303e978539f3278648d762708290a12405f1dd65bececec714cf0afba8a685dfa251cbd7144b137a143adcb25a58c4caa72aa8636ed1
-EBUILD graphene-1.8.6.ebuild 1821 BLAKE2B ed717ba1f75815d802b5cd748b3b2d00369bb9495d93a896bca1d6089c8c910d0ab3d90a1816d2b6590a89ecae25485d4fbca1c4aad1b445e591bbec1f25caf6 SHA512 021b59a696ccc1a6929935e8e6190af183469f7252a9ebe2813b3e47c4be1120ef0303f5bd33023da880b497753c12895d042445434afa4424fd6b68a77975d7
+EBUILD graphene-1.8.2.ebuild 1743 BLAKE2B ee7cf602d60a917cbf63d825e0ce2c82c702f1719f7bc772645a956b1889c133cdd284b397bbbfd9cd4f3521f4e29d47c9a1df626f7c820e7026adfe689a509a SHA512 02c21c16bffaed406bd4cd1d3c0a439ec571d2e9c88981bbfe7c5983a840ac6df3bccb74c42ed7562ea0b00f2cb2efffe7a7b20f8a4f50173f5c4d2cc01d6962
+EBUILD graphene-1.8.6.ebuild 1826 BLAKE2B 12809ef5fca294e35d6a528b66ec5749c52bda09e809976ea80b0cb9b4b9d6401b09b468a18efe0d452ae292011e5f281b01b7a3b148336bb9f49dcd3ab6c22c SHA512 30cb4c18125cf39027892453eb509162ba16bc39e1b023cb80623f6500e8e654af42966300e045314b492c8b830b0a5179246ba62cea9bfd987014a011053cc2
 MISC metadata.xml 333 BLAKE2B 3d34baf2b84e2ca8cc20638b381fdb4771e94f07df133f5d997b5d7bdf3704f8b8f77d2c79815f70246affa2e399d1118e03eae7c7cf8e419fec3dae89ef0405 SHA512 aef6b787ac7f14b56e4eacd746c91671b9a115cb40b312b415c7302d4339f5d3b3a887bd52a2b30ba31b3e0f027360a9fa55f6d3065cf7baedc4bd28dbbcd056
diff --git a/media-libs/graphene/graphene-1.8.2.ebuild b/media-libs/graphene/graphene-1.8.2.ebuild
index c66c350b3841..9e2e37488754 100644
--- a/media-libs/graphene/graphene-1.8.2.ebuild
+++ b/media-libs/graphene/graphene-1.8.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 inherit xdg-utils meson multilib-minimal python-any-r1
 
 DESCRIPTION="A thin layer of types for graphic libraries"
diff --git a/media-libs/graphene/graphene-1.8.6.ebuild b/media-libs/graphene/graphene-1.8.6.ebuild
index ee623381f0f2..d5f4356f18b6 100644
--- a/media-libs/graphene/graphene-1.8.6.ebuild
+++ b/media-libs/graphene/graphene-1.8.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 inherit xdg-utils meson multilib-minimal python-any-r1
 
 DESCRIPTION="A thin layer of types for graphic libraries"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ebassi/graphene/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test"
 
 RDEPEND="
diff --git a/media-libs/grilo/Manifest b/media-libs/grilo/Manifest
index 79ce629c0bb3..6396ae0b2919 100644
--- a/media-libs/grilo/Manifest
+++ b/media-libs/grilo/Manifest
@@ -1,5 +1,5 @@
 DIST grilo-0.3.6.tar.xz 653864 BLAKE2B 58570975b2c4623b2a43b441c60d88146080327a86018bfd1a37967d35b6389e5102915296ceba1a8ebf23d27a3e4f8d23eeb59555a6c5cd0ca596b5ab674878 SHA512 175cf61a43aea8456a41f4dce7694fac50e854cf6340ed0671f233e6188fa34347c1e7308aac99bc49d081c36747776b9a8c1c5cc7c0be00a1df2c9d015d8849
 DIST grilo-0.3.7.tar.xz 232544 BLAKE2B 2d1f7942b09808bb5e09040b4a633a6bd354220ba1369d31ff6160c12ab15c1e2642617ae7f35c8320d7a5842736d8714c6e7dc7f3cb0651d841b6513633f5c9 SHA512 82c41d63edc23c056e189a73b0de87db342bba575d42efeda78ed4bf78fb8994111a2e9457e6f2453045b9b7b2d171b9e89d71c3a107cfa06af24644d9cb71df
-EBUILD grilo-0.3.6.ebuild 2362 BLAKE2B 1e99d886f7a4b334366f0b579763e1ce0654a19fe80f410910e869b5698ce7534b776181971108327e7f1636c99d6cd1929c737d3f4eaae3d524a60956b75d32 SHA512 b7703ecad923fd1411e2be10596b028e0226b4d7e8fe1ea01c277aceb4b8c36ba29408a15b8b030967b4babb14b05015f5a3cf3c66013034d70d65a7af49f879
-EBUILD grilo-0.3.7.ebuild 2059 BLAKE2B 5817bae9bf197dc0769ffdc3d69b2326818a449d2ec5bc2f8064b2ad3a243faa544c0367966987d01efe606a2d934cfe1ec552f346bf128669a38458c188a4cc SHA512 4eb143b74da60ae936659afc13a2d5013d3ffb7ea4bfb9a25fd3783625155ec75dbf89028fa24863998b646cc79b306eb9faaaaeee559e1319672c31cdfd5a8e
+EBUILD grilo-0.3.6.ebuild 2358 BLAKE2B 306c6edb5517fc82856449f757785a3763842c53678f776d3269e4c3a1942a1b3485f326bbf89b7d994140cc7a64e26a7b671ee4925cab17ddc327310c2188ae SHA512 e5cbdbd5b32e77f6a82fc096525a51b283916943b8136d2059f446e176497dc9312b1fb97c9a7f63aef7d8e461a8ef1b15dd301479be93cdbecf49a38840e535
+EBUILD grilo-0.3.7.ebuild 2055 BLAKE2B 9867228ab704bd224033804f70c75ac0199b8225c8c235a7e4b9e91d5c1f740812b972efba680498e47d1d27cd91259b6ac4ad11f2b840245b2de716ef129f24 SHA512 e2c6446c202042b3fdc3ec9a35b5c1dbd4721b472e02b019457e71fa374d1f9f24d8ab35b3ee8e973bd3ef123b1e3601280253071a566862917714a09bde539d
 MISC metadata.xml 728 BLAKE2B f552b3317894c70912c17e3e46367198f4451940b5029508f83ba3ce904faea24ed3876195f1b062145582dd268064e0c63636ddd5d6033b7032b392e10abba0 SHA512 bbd75a063a5697c257dd9084961d6519fb71409dcd1375d66ff25218deee87841c822edfa66d440cd5c6bfbad70942f01b30f2b7e1a3cc9727beac23ca717b5f
diff --git a/media-libs/grilo/grilo-0.3.6.ebuild b/media-libs/grilo/grilo-0.3.6.ebuild
index 3a8200f3a8ca..ffac95bae787 100644
--- a/media-libs/grilo/grilo-0.3.6.ebuild
+++ b/media-libs/grilo/grilo-0.3.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 VALA_MIN_API_VERSION="0.28"
 VALA_USE_DEPEND="vapigen"
 
diff --git a/media-libs/grilo/grilo-0.3.7.ebuild b/media-libs/grilo/grilo-0.3.7.ebuild
index c1bd0204de90..0cc27f52b04e 100644
--- a/media-libs/grilo/grilo-0.3.7.ebuild
+++ b/media-libs/grilo/grilo-0.3.7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 VALA_USE_DEPEND="vapigen"
 
 inherit gnome.org meson python-any-r1 vala xdg
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index 50156d8007e1..8ae257c67ed9 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -3,6 +3,6 @@ AUX gst-plugins-base-0.10.36-resync-ringbuffer.patch 530 BLAKE2B cbf4d51313e94df
 DIST gst-plugins-base-0.10.36.tar.xz 2364108 BLAKE2B a71ef5d5c7462d60937602681c060e85ed086a753b7ef354dad48354d6c3741d809f2c0c6a321ef9ac60fb12d24ec65e1baa63e51211134d2a5e03aae16f73d2 SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8
 DIST gst-plugins-base-1.14.4.tar.xz 3703232 BLAKE2B b22c44b857bc4f1972f03752cc1afb35c8d76e2d0c4a06c574af0ac4f3a91080c584ae4e4fc2a263ee879a53d58505c24a756ebc051d81ec62661c4f9e532f0e SHA512 42c59df9f2d848108f12afa0466acbcfa5ccda64e4d0d44608d4268abed20f2e036713de04e7d71feaed1868ad742c5bcb55ae0eef5dec8e19e053dc8541b8af
 EBUILD gst-plugins-base-0.10.36-r2.ebuild 2120 BLAKE2B 5e670a72e651af6a8ef1e4992fc42a7a444e9a77e708b86cdf5d373d96cc549c2953df5da5b001479938f77498eb09de861e89e705ce555618cd45227209a769 SHA512 bc9f491322b473f7ae2a55a7fab8315584b1ef3f71f94ec4968705fb1063d72e6dd2dd80342bd85b7abb29315abb26adbe3002c94c7a7ec27517c8edcf32eafb
-EBUILD gst-plugins-base-1.14.4-r1.ebuild 5901 BLAKE2B 52afa4dcf9c9e94feca3b7284dee699c48cca260d0b106d3bcb47b1b21fde59cf70a6b321fcc370badec144d3907f35d1f65cdce6b23529461f827fbfd7a3b38 SHA512 850c527748109fdcb4b19e47e2a6a81acb1a3ee5863ad391498de101cc6b71a8106674076ada514dfbd90e26181378345512a09dca23c41cd22b21b4f39ff48f
+EBUILD gst-plugins-base-1.14.4-r1.ebuild 5908 BLAKE2B b6728c8bb4a9e1345f14896e711c468bb2f00dbd7d965e7d8fa549e06985ee02767e9c1ece9cdd4ffded5d59fff481e83b9ee4a22eda360f78b7877d457f3ae8 SHA512 df14406e13b77d286a01044a3f27bcb7182952b1bc34cc330f37ea4a5310124c7df7f90cca96b3df78f0bbc6f18d5246a6c21e722f1511b89f3a81c7b899ebcf
 EBUILD gst-plugins-base-1.14.4.ebuild 6061 BLAKE2B bf46ef975e9675c8d55bd807e11074cff4b31dc7d308750ceedd43bb67889473183dc1c83109f4783af4564180b23e14b92787bd4ac2ccc75d28917b03dc14e5 SHA512 9493adf3513a16e4f07fe15d9572e60285817396f43a8ec79fba0a3b37f1e35bf845e3edab2e92454d9b59bcaa69c21702e8de62243905cab45427d6a123f9c1
 MISC metadata.xml 1065 BLAKE2B 9736df3218c6157e5cc0f14e96a15ec6ab6140e8774c7361dd4fe9378efd37d1a3da593527313a81591818ad48a5585bd4395fbeb85d357449b00bf7e51bbb5c SHA512 520802b59fc6575e16edd765dacab4ff0ff6e51dd162f03fe7e4e07eb472aeb78f3974a32ba613939932e123179106a450c503234ed806a08416dc6b8dd534c2
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.4-r1.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.4-r1.ebuild
index c67fdc2692fa..1843a1f8dc2a 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.14.4-r1.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.14.4-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="amd64 arm ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~sparc x86"
 
 # For OpenGL we have three separate concepts, with a list of possibilities in each:
 #  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
diff --git a/media-libs/gstreamer-editing-services/Manifest b/media-libs/gstreamer-editing-services/Manifest
index 611b894698f9..2c677e87d0d1 100644
--- a/media-libs/gstreamer-editing-services/Manifest
+++ b/media-libs/gstreamer-editing-services/Manifest
@@ -1,3 +1,3 @@
 DIST gstreamer-editing-services-1.14.3.tar.xz 1066740 BLAKE2B c5511ca12eccb08d49733540e2d264290a6ca53ec0d5e9007d354e10808568727ed10bfb205c425fd56d334ef12e30324d67b0dcff8115b3c13d1123fe6026b9 SHA512 5dc4fc65c7ce9604b75516774c4481f3214ed703c0d3bb2a6fa348e5a8a09c963ac711e81e5c91f12f57ab3df63a94d7d178fcd4aab4d4d429f32e055c14a205
-EBUILD gstreamer-editing-services-1.14.3.ebuild 1539 BLAKE2B 5c9848103655bbf47f69789a3b38c20ec6ec334469d98e393b736279ebf6368a39ee4de94226b86284041d96f3277c4fe67973d46be132bc783d2a8ca76afbe6 SHA512 ec00de8be9297223728c99f626a383c8b0c6f8105dd80218c23b3b9ce743ed72a2e744bd3c9c459b33701aa1e764f624c490e6c601e95822a5fff8b6c0792d15
+EBUILD gstreamer-editing-services-1.14.3.ebuild 1537 BLAKE2B 7eb0e96fff92c3e3c20c08ede0364fa3f3588eaef2f942f2da3841fb3a6109a747fb9c1a1a16b64a2de4b20a5a7c4db52e7eab6c954eb94ece825124036649d2 SHA512 a3d88b7f7b40b17fe24f5ccb8ec80fc09a0487a5a6163886ef8b4255a4aa197948a5ad7cc1027dfab5ff3ca80b148fb51c000f7d7d56f7f037806cba7871a5e9
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.3.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.3.ebuild
index 3143ffd4efcc..d91d85232e17 100644
--- a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.3.ebuild
+++ b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 GNOME2_LA_PUNT="yes"
 
 inherit bash-completion-r1 gnome2 python-r1
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index 198f55696828..4922002e83af 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -2,6 +2,6 @@ DIST hamlib-3.1.tar.gz 2130615 BLAKE2B dbc348d5df04015e1706b6f165496f0b0d9a4f7ce
 DIST hamlib-3.2.tar.gz 2223125 BLAKE2B c9bffa2b4d2aa4b3f9c590276058c159aa1236f22d3f37a063124af09002dc3034a88fd6f1273b5f4562ae22618222ea50c254fb59384bfae778448fe029ef49 SHA512 9aec2d361980abafdedf7b80f5b8bcf5b71f4f0c32bbfecebc0a50e6f74eb263ddc5188cf77283ed7361baabedb8364a2ce94a12fdda1bbdfaa0a030f510f224
 DIST hamlib-3.3.tar.gz 2192119 BLAKE2B edefd8b8c75876c07fa498c98f7d6760985fdecc477bf6711e948071e45964bf7fdf6705b3172e56951366a7dfb0288e025eab66d3b6436d158649ae53ac39bd SHA512 4cf6c94d0238c8a13aed09413b3f4a027c8ded07f8840cdb2b9d38b39b6395a4a88a8105257015345f6de0658ab8c60292d11a9de3e16a493e153637af630a80
 EBUILD hamlib-3.1.ebuild 2201 BLAKE2B c32627db7df6714ad241a526c0fc18d3a3ee93d7db2a641028610926e1e45e1c27f71ac46f0030a07786b5b19932374d319c0756ae279e2310067a1bf5d4920c SHA512 3b8a200d30cb246aaefc8df5c9b200557abae9632b57e0232757679dba5f92da79e289f72902025fa799401f3b179367ba5004ba29f8118bebd57c3b01c3259e
-EBUILD hamlib-3.2.ebuild 2227 BLAKE2B 23d7ae9e5987706a88d124a3c6731bb82bcf4c8616380b4f57a79b195d4589164148dc20c4bfdcab2ca76353bee0514fdebd7cece62a9f441e65af762d871855 SHA512 b11c5cdc7952aef7a02b3a245ae7d0e139a2bfec3eb4ca682aaa638d155e7825804debda11595c940c30bf4fdef6d8bb3e68ac36f9bb3be1128005305a1c9e21
-EBUILD hamlib-3.3.ebuild 2079 BLAKE2B d6c2ae89f4de4978074fa799ea9187eef147ab7312d97b7e99fbaf40cb48b9711de0b6d9daeabe7c101e5a19a84934468d9df0697b8a60c8cbbc24063921fe3e SHA512 cdda3c6c4c5d0e64ee164fa648d1c5e3929c21741940eb88008121110654d42023a4c6682c2c16d0774005990b817e4895df1150def58e65f168d265662027d0
+EBUILD hamlib-3.2.ebuild 2222 BLAKE2B 89f771a598c460f8fb1120f2cad4c7742a25a1eb15299ba4c1d9376b062418790eb6e452004f4ddb1a712769bcd65198b343a2f3797531ae15350b5f228af612 SHA512 6a4a7793939c404c8645770eff0f4830f99e19de813d9da2f429e27a2f645e44e051a816b8d4350c1ebfe1e3b9e972ec2cde282acbe8a8a948d377a8dd45524b
+EBUILD hamlib-3.3.ebuild 2077 BLAKE2B 75d28610f980fec3db21a65cc73c7c7128b3ff1d2018b72b24a72dd078908ab2ab116895e528e4e4af7356ae63c7f282981ab889d571ae08b31c8f6b0b0ec2a4 SHA512 681d1bbda463c7c01ed46fcbd3fdedd7c9a6b3aa7ee34836091c765309909a0b69cf16a8da4865e02a96bcfa1973cc257ce741e40f97602f4c4fbced05b4b9e9
 MISC metadata.xml 325 BLAKE2B c1966def562280393eeb5b575d4e136525dc3cf36ef4e6c00dbeff7e0069a4d10eb16706f4b4e929eda1f046d18a8e25fd0025c74695eba1f9c10d19a9f55598 SHA512 fb6d5d77da29969e9b61921ae59e5d5c71b74cebd331867a546a6b2c568650f89191a39a3a1a73c58e1244fa5d13a090b45b866c21b3a3dd71cff0a812c149e5
diff --git a/media-libs/hamlib/hamlib-3.2.ebuild b/media-libs/hamlib/hamlib-3.2.ebuild
index 82d0cf58c42f..02653279373c 100644
--- a/media-libs/hamlib/hamlib-3.2.ebuild
+++ b/media-libs/hamlib/hamlib-3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit autotools-utils eutils multilib python-single-r1
 
diff --git a/media-libs/hamlib/hamlib-3.3.ebuild b/media-libs/hamlib/hamlib-3.3.ebuild
index 55fcdb8e6b20..486e71723bd0 100644
--- a/media-libs/hamlib/hamlib-3.3.ebuild
+++ b/media-libs/hamlib/hamlib-3.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit autotools python-single-r1
 
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 5e13398d3dd4..1e446c4dfc36 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -2,7 +2,7 @@ DIST harfbuzz-2.0.2.tar.bz2 4322171 BLAKE2B c844a623de5c2be7b6fb4a2cf0d38e689a6e
 DIST harfbuzz-2.3.1.tar.bz2 17942960 BLAKE2B b1a29144b608463fa668bb66572c1530e90338ac1968b0747011637a91bed4030d77e8fa22e5a229374a0bc1976922e2e8de452e9017917f7c09ae94c3a52570 SHA512 78a8f05bfcc95cfe3fc0f1a595bdc7298c9c1456db6c7ef70914051fda43f37aaff15eac75aa6922eca82d2291baeb8385e02e6aacb44ca05b4873c311a662ac
 DIST harfbuzz-2.4.0.tar.bz2 17922003 BLAKE2B 7fd1cde76f8587ca08043c54b967bc1f5162fef8b02cb69f30ffd3bfce36d67471109f1c38641c733dbb9a86248f9e2501d51e353a5f7f4fca91223e17bb3e76 SHA512 88919576ac23f1ba36705212c3bd1cd3c91294f99234c076f13c6cb1f5c78447638c5cfb1bb397f5948db799e6b343667aab2f631fe35295c3d10d10783fd12a
 EBUILD harfbuzz-2.0.2-r1.ebuild 2967 BLAKE2B 0a57e126a32b29bc80e1e9c21b7f41f65e7b802674254ac7873d3ff74a6f76afa1133d4a13db2d909a25175d6e8978f1701e4d9811e13da2845f9a991e05cd0d SHA512 087a6d939fdbba2a3c57c6a0ded302a2ebb27b8776a3a16431c624ffda8a8742a71d4d8e105f87f9354eb7c13c82badd4b50841475324d33855692ffef106f6b
-EBUILD harfbuzz-2.3.1.ebuild 3025 BLAKE2B a41399029598ce6b82176a518db0be0b879d917bbab4aa1383b0f71a4947a7730991d137b3be1e79d15f7a014c431a6755ce3babba27bbbaf48144d46194e69c SHA512 8104111566f0543677059ea81776241cb6e97cbc8d06359f216319262beeb6cf1c696f7972551d7332db1abb9d66066a9129292df378922bfaa43a0d8f3e18aa
+EBUILD harfbuzz-2.3.1.ebuild 3023 BLAKE2B b9a3d08627e11d8b78a5b1c293e3fb929d5796527d4986796235e3e4a0f6ce54d90096eb931bbd6bfb943a36fca9db2ac207be4fdabbc355be407b89831bd9e3 SHA512 0774d1f803551979890e15ce733f400aeb1343af66bd5569c4ca23b3d90131ce82afb3ade7e516b3e5cbf36af0c7fafdd9b07a465b20654aab76eeaeaa6c2004
 EBUILD harfbuzz-2.4.0.ebuild 3034 BLAKE2B 7d620a2005df18eced9e5288632a102730b5531f4373289b9c584cfd2b7096ef1264f3778001a5c47f4d455f19c5dbf7f2e8ef27a1939956befe188b779ee487 SHA512 4ea2f1c1f1c4b166c5c69e735c99badf1eb88d25eb78bc9632426cb1639bd121c80016c72798087b167526a13c2748829f93134d59564a1c3e50d40974887f58
 EBUILD harfbuzz-9999.ebuild 3034 BLAKE2B 7d620a2005df18eced9e5288632a102730b5531f4373289b9c584cfd2b7096ef1264f3778001a5c47f4d455f19c5dbf7f2e8ef27a1939956befe188b779ee487 SHA512 4ea2f1c1f1c4b166c5c69e735c99badf1eb88d25eb78bc9632426cb1639bd121c80016c72798087b167526a13c2748829f93134d59564a1c3e50d40974887f58
 MISC metadata.xml 645 BLAKE2B aadcef9412392874d361b5c09e7450bf88db64fa704558553861cf16ffd1a5b5715291fefc0624e3ad0d86a537cdbd2b810fa093b289428e68a19c82049188ef SHA512 645e451768a5dba2e16d18b51ece20fa28172450bf22e29fe73ed29748f712187f997ce2f6f0a24c725f0cb10434b4a65c6de9a5fd1aa7d820e00b7dca8b8b63
diff --git a/media-libs/harfbuzz/harfbuzz-2.3.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.3.1.ebuild
index b4e7019fafc4..ca088f9e04e6 100644
--- a/media-libs/harfbuzz/harfbuzz-2.3.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.3.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index 5fc3cab0e467..c802ee7ac91f 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -1,6 +1,7 @@
 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
@@ -11,5 +12,5 @@ EBUILD ilmbase-2.0.1-r1.ebuild 591 BLAKE2B b196bf67401ac210bc4846e69ddd011281d26
 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 998 BLAKE2B 2160f67f7c9de45bd011b4ef50fe1925c3313798fd7eca4a756fad4eae894bfb099864976b80105ad888d28feeb60a7b4268049b6455bda4463f148a41ff1150 SHA512 7d528e45616c193dbdd60b8dc55adcb2e1bada1e320bd01c423ca6fd9750a92aedfbc12b33a280a755d5af130d7bcefd868b312a04358dce1476f001a05fe151
+EBUILD ilmbase-2.3.0.ebuild 1042 BLAKE2B b1fe229848863224f1bc5f8629f0d6fbcb75c450ee78b3f8089f410a43a2058111ed9f8f63427af3b4ed5aa1157977b58b7ca867e996aecd5b90d452053eaafd SHA512 12ee90923697b5bbd3690c00a43019eced5900943acc776a30aa6c03c24cab46ee9e145d72c711e4208ae1e835f38d017aa9384a5772e5cb0432dc179ddc02e8
 MISC metadata.xml 303 BLAKE2B 53fb5019bd6fe939d485f1eccb4a140ca9b7ce121b06744d8155842ccb6c5e1378ea39a9ae74c8d519be7b3926bd76040df4b8107137fcc2e25be97431e7a1be SHA512 0ab8d735dd7a8e0dc96b14cfde1ae06969d15cfbad956f4fda60b093660aee38fe98709376eedc9362a26858678d2f28eec795c1accb2560858fd804a11bb7ca
diff --git a/media-libs/ilmbase/files/ilmbase-2.3.0-testBox.patch b/media-libs/ilmbase/files/ilmbase-2.3.0-testBox.patch
new file mode 100644
index 000000000000..8211846b09b6
--- /dev/null
+++ b/media-libs/ilmbase/files/ilmbase-2.3.0-testBox.patch
@@ -0,0 +1,104 @@
+Subject: testBox: allow fuzzy comparison of floats, doubles
+From: Steven Chamberlain <steven@pyro.eu.org>
+Date: Wed, 24 Feb 2016 01:10:11 +0000
+
+Allow for inexact values, as long as the error is smaller than the
+epsilon of the data type.
+
+On 32-bit x86, allow even greater discrepency at double
+precision, due to possible double-rounding.  See
+https://lists.nongnu.org/archive/html/openexr-devel/2015-12/msg00001.html
+
+Index: ilmbase/ImathTest/testBox.cpp
+===================================================================
+--- ilmbase.orig/ImathTest/testBox.cpp
++++ ilmbase/ImathTest/testBox.cpp
+@@ -47,6 +47,58 @@ using namespace IMATH_INTERNAL_NAMESPACE
+ 
+ namespace {
+ 
++template <class T>
++bool
++approximatelyEqual (const T &p1, const T &p2)
++{
++	/* int and short should be exact */
++	return (p1 == p2);
++}
++
++bool
++approximatelyEqual (const Vec2<float> &p1, const Vec2<float> &p2)
++{
++    float e = limits<float>::epsilon();
++    float m = 0;
++
++    for (int i = 0; i < 2; ++i)
++    {
++	m = max (m, abs (p1[i]));
++	m = max (m, abs (p2[i]));
++    }
++
++    for (int i = 0; i < 2; ++i)
++	if (!equalWithAbsError (p1[i], p2[i], m * e))
++	    return false;
++
++    return true;
++}
++
++bool
++approximatelyEqual (const Vec2<double> &p1, const Vec2<double> &p2)
++{
++#if defined(__i386__) || defined(_M_IX86)
++    /* double-rounding on 32-bit x86 may cause larger error:
++       use epsilon of float rather than double */
++    double e = limits<float>::epsilon();
++#else
++    double e = limits<double>::epsilon();
++#endif
++    double m = 0;
++
++    for (int i = 0; i < 2; ++i)
++    {
++	m = max (m, abs (p1[i]));
++	m = max (m, abs (p2[i]));
++    }
++
++    for (int i = 0; i < 2; ++i)
++	if (!equalWithAbsError (p1[i], p2[i], m * e))
++	    return false;
++
++    return true;
++}
++
+ //
+ // Test case generation utility - create a vector of IMATH_INTERNAL_NAMESPACE::Vec{2,3,4}
+ // with all permutations of integers 1..T::dimensions().
+@@ -250,7 +302,8 @@ testExtendByPoint(const char *type)
+                               
+         IMATH_INTERNAL_NAMESPACE::Box<T> b;
+         b.extendBy(p);
+-        assert(b.min == p && b.max == p);
++        assert (approximatelyEqual (b.min, p));
++        assert (approximatelyEqual (b.max, p));
+     }
+ 
+     //
+@@ -283,7 +336,8 @@ testExtendByPoint(const char *type)
+ 
+             b.extendBy(p);
+ 
+-            assert(b.min == min && b.max == max);
++            assert (approximatelyEqual (b.min, min));
++            assert (approximatelyEqual (b.max, max));
+         }
+     }
+ }
+@@ -358,7 +412,8 @@ testExtendByBox(const char *type)
+             }
+             b.extendBy(IMATH_INTERNAL_NAMESPACE::Box<T>(p0, p1));
+ 
+-            assert(b.min == min && b.max == max);
++            assert (approximatelyEqual (b.min, min));
++            assert (approximatelyEqual (b.max, max));
+         }
+     }
+ }
diff --git a/media-libs/ilmbase/ilmbase-2.3.0.ebuild b/media-libs/ilmbase/ilmbase-2.3.0.ebuild
index 318a31fd3910..e48e632932dd 100644
--- a/media-libs/ilmbase/ilmbase-2.3.0.ebuild
+++ b/media-libs/ilmbase/ilmbase-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,11 +10,13 @@ SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0/24" # 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"
+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}]"
 
+PATCHES=( "${FILESDIR}"/${PN}-2.3.0-testBox.patch )
+
 DOCS=( AUTHORS ChangeLog NEWS README.md )
 MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/IlmBaseConfig.h )
 
diff --git a/media-libs/jbig2dec/Manifest b/media-libs/jbig2dec/Manifest
index 6cc94454545a..851a2ff286fc 100644
--- a/media-libs/jbig2dec/Manifest
+++ b/media-libs/jbig2dec/Manifest
@@ -3,5 +3,5 @@ DIST jbig2dec-0.13-patchset.tar.bz2 8452 BLAKE2B 473a338b460c8a66991fb50e110f438
 DIST jbig2dec-0.13.tar.gz 442571 BLAKE2B 6a973f91502d8effc00cd49b68bb2f853edd41286fdc5cb159460607db8627c2c959ba1c96e65b2ef1df3d4072c9993ce66c06bc5dc1837c89f87c6da0025550 SHA512 ef64a65c54bec65f61602de7130dc9594aae58aaea7958f7cc987f25d0794511e15a423e86501ace4f40c0364796fb97ceab72edb0b69232926767ba16c1b05d
 DIST jbig2dec-0.14.tar.gz 463572 BLAKE2B 91351a3879bd1906fabe2620cf5379fbbc32eaae808a8c2754c661d6dc592d3c9da13c558c8f7ced30c48b73fbd9ed4631f2817298f959b59ad4dff5fce9ac1a SHA512 066bd880ac0665fc1e42b0ae0e481008b125aab6e173b7f82d61a2a30e72c90085cbded9b2a68c6836f92dea3d8d8d5c2228dba76e0d99c79c922197d215705b
 EBUILD jbig2dec-0.13-r4.ebuild 1473 BLAKE2B acad9053091c1be3d6b7c72ed249cdbb90a92f2c532c250ae863deff76c5142d67d27ab77b6e05b42b74087d223e861b9d71278ccd007931d588c1bc3802b315 SHA512 035196ce25a11ac4c73ee2f8cf2dadd2c1d869d9f5625cbd894f50807af7cb85438b4b7783f775655059ef108d367fc084c1123aabc674d275216831c15fce47
-EBUILD jbig2dec-0.14.ebuild 1176 BLAKE2B ccaaaef6b6f3d9b4914592e26719d4fbad1c1b1e39aa932a106379c43f989d56d67b04d49ec29314069413ba6c61b3a585328bc6cafe56cd88fe7812f90da6fe SHA512 f86882e7028db15af653be3e8c5cfd6bfcd9ac134c4c3dbc67c4b9974b4089ba01b18e99dff337543ce03735e3e091c87e07aec2c1ea1136e6e540eb1edfecf4
+EBUILD jbig2dec-0.14.ebuild 1170 BLAKE2B 1c3fee5070bd716f63750b1c00208fa1724115d101d63ba2b128b5f07f0738aa9fdb126a4bc52207a2c57d237f9fbce5a6d07c60f643c788d226162b2ad56a52 SHA512 e003e0e9e8a1a2ec72e9a8e0d018723aa06a9c6d25be7fc5f01ce6979e3464270ca8333dec4dc1030210e8255dd1ef0452906b7599b33019ea358f2a0d36fcc7
 MISC metadata.xml 473 BLAKE2B 6d374023a106375c7f5500968ed4ea2f4dd5584fb0db8f85b042844d08afb6196b7d7c019ae69b35917f43e496c9a25212aec328f0c3cf78aaa94b963de65c15 SHA512 501077ac27f5c6f8a616fa32cec23d28cb16dc0e0c19ce933cbc067494117c9c55fc3e00dfc21270892d57478a9e268f99215c8d074d6cc4114916f55a571a6f
diff --git a/media-libs/jbig2dec/jbig2dec-0.14.ebuild b/media-libs/jbig2dec/jbig2dec-0.14.ebuild
index 022ab8eb536b..9911b82c53ba 100644
--- a/media-libs/jbig2dec/jbig2dec-0.14.ebuild
+++ b/media-libs/jbig2dec/jbig2dec-0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://downloads.ghostscript.com/public/${PN}/${P}.tar.gz
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="png static-libs test"
 
 RDEPEND="png? ( media-libs/libpng:0= )"
diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index 178cc41d77f8..d9477d70eec4 100644
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -6,7 +6,6 @@ DIST jpegsrc.v8d.tar.gz 991456 BLAKE2B 6644af7dd47a3b1cbcbc8f6bc111c882ed1790eaa
 DIST jpegsrc.v9c.tar.gz 1028200 BLAKE2B 621ef910f3fa397da0d19da1e1771b13ae1e524ba541f7f2562de1da27a8a3b26abc63d01218ae56ddbf480ba5d6ea6a778a23693304f7b4364edb1bcd4839e7 SHA512 c95aacb0f1972a2271953ee17b5c6a6c3662d5f4fbc4d1e9aef59dece42a169b0f34d3fa1d385b88580ad11cefd194250094ee72843f4e0028204df6741cb611
 DIST libjpeg8_8d-1.debian.tar.gz 13676 BLAKE2B ac6fab3e52f91c9ece95ed809fc972afc92c55754a59358f7dacb056917b1878f6f9be85a20ccb34eb13489a9963a00659fe25c27e8b18b44961c6ba5f3214cd SHA512 7def4f13524f0af3b9adf35a370027a18f43b9a635f56a17d5bb7883370db8b18b8a12737d0f0cb4b0287ccf8fb474eb5f754de6b398ffe7d522c54e5bf68040
 EBUILD jpeg-6b-r12.ebuild 1126 BLAKE2B 8a161ddc45d213b874815518bbaf5d3b5f5053658153e60bdbf6c376c29d0964aff0f220e41135935d1276641fad69fd8f4ce042023a9d6e4460ca07c7929694 SHA512 97aa4b853ca53728cebf56da61468b0cba0c35f78ac37add53c403489c7c13df2530194f2876f0c49f13dd3ff2fe162c9472eca8ab87266c0b6aec38f6c9ff25
-EBUILD jpeg-8d-r1.ebuild 1942 BLAKE2B 05938a73c8013d923e450b189b9c7f746a928237810ec41a017ecad5924d92a61d6b6c887f4aa3f26231604b94526905b83e8e5215bb714a432d1402a7a2f5e4 SHA512 f4aab4bda823dc772d309cb96156ae60bdf4d8528a8117540e7b7d82e116cc11cd45bcf0abc0dfc4767cc782e24905792cae6f96b1a24eae4de40a338dc124cf
 EBUILD jpeg-8d-r2.ebuild 1405 BLAKE2B 5bea27ef13659ebfc7f4e3aa9605da42b49ba478f15abe9cf0aca65206641a89692f6b764d99df40e977299e4c233da8a481285768369dc5aefc03a472950afe SHA512 809b128963ac2a257d8eaf58e2df54c34fd42a7f1a8756552dd88758f572eb30edfa2378f49b765276fd0d83eda4bbf9682efcf6b739d34164687c0b0f9ed2cf
 EBUILD jpeg-9c.ebuild 1996 BLAKE2B 551b1beaea68d26e51597259209c60cb2134cc4a2367ca30e8461b7b334362852771ccd190307ece3bf1c09c32ef8935391c69d21f27d5dc0480b453e215f4bd SHA512 1712e96882b6643520f2b40df62bcf03e8a01f89051b8890c7a2b320fae095ed7cd7e524326a52a602f2d699309a74b08626cc8d28c33b08819b8d6441916fc6
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-libs/jpeg/jpeg-8d-r1.ebuild b/media-libs/jpeg/jpeg-8d-r1.ebuild
deleted file mode 100644
index 2c7155f00bd5..000000000000
--- a/media-libs/jpeg/jpeg-8d-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils libtool toolchain-funcs multilib-minimal
-
-DESCRIPTION="Library to load, handle and manipulate images in the JPEG format"
-HOMEPAGE="http://jpegclub.org/ http://www.ijg.org/"
-SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
-	mirror://debian/pool/main/libj/lib${PN}8/lib${PN}8_8d-1.debian.tar.gz"
-
-LICENSE="IJG"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND="!media-libs/libjpeg-turbo:0"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-7-maxmem_sysconf.patch \
-		"${FILESDIR}"/${P}-CVE-2013-6629.patch
-	elibtoolize
-}
-
-multilib_src_configure() {
-	# Fix building against this library on eg. Solaris and DragonFly BSD, see:
-	# http://mail-index.netbsd.org/pkgsrc-bugs/2010/01/18/msg035644.html
-	local ldverscript=
-	[[ ${CHOST} == *-solaris* ]] && ldverscript="--disable-ld-version-script"
-
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		--enable-maxmem=64 \
-		${ldverscript}
-}
-
-multilib_src_compile() {
-	emake
-
-	if multilib_is_native_abi; then
-		# Build exifautotran and jpegexiforient
-		cd ../debian/extra
-		emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-
-	dodoc change.log example.c README *.txt
-
-	# Install exifautotran and jpegexiforient
-	newdoc ../debian/changelog changelog.debian
-	cd ../debian/extra
-	emake \
-		DESTDIR="${D}" prefix="${EPREFIX}"/usr \
-		INSTALL="install -m755" INSTALLDIR="install -d -m755" \
-		install
-	# Remove +x bits from man pages.
-	find "${ED}"/usr/share/man/ -type f -perm /1 -exec chmod a-x {} + || die
-}
diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest
index 771ec92fcc11..c1c0c18f2b95 100644
--- a/media-libs/lensfun/Manifest
+++ b/media-libs/lensfun/Manifest
@@ -1,3 +1,3 @@
 DIST lensfun-0.3.2.tar.gz 784825 BLAKE2B c77cd6b2f1bda0313a980fbd3bbc7ca9ad5ed0b9777cce924f66da5de3974ccfc8939d054c7a7532508b6b0913e2d436a825a83916800b625ff2c552c96a0ae3 SHA512 9c6f546fa70e6dc692e66ef378447345be6d3383812934780d326d772d775c1918cbf3447cd91c067655044cf659025763bf47ba2d938a82a3c2de4d60127446
-EBUILD lensfun-0.3.2-r1.ebuild 1402 BLAKE2B 6a2965c5bbbbfc8a53ae0dd4eb128712c52badef5c35155584527cc4360b28e89aac4153ddca6159f9f24385ac715fd64419b2375b75618cdb9d8d64b95881f1 SHA512 7756e99fb5b5a97e95f770d2b4afe99aae4fbbb453ccaa3768d3a1f09e61af3d8a2f3a8ac35f46f5e2c3e7253aca89313f2c18ca102c03344b28b71eaf3c2717
+EBUILD lensfun-0.3.2-r1.ebuild 1397 BLAKE2B 472befa3a3be5a93fb6ca146ab5ea492c2f8e278d4404681c916544f00254430aad23e353ff5ced370892d30b5eb6acfa0fb10596cf49ecdd7b3c8fadf313c3d SHA512 248a592d88a3273a1efc2f78880882bce1cc4241dfef05eeebf82d653137d5c69a99ac80fd7bda9c6a394f3dbbf7eff43b84d5c95bfa251e48b5cc0fa54ab006
 MISC metadata.xml 609 BLAKE2B f9ebe22f93c9622961688f478f0f46c111fda47252c57c96aa4f566107705f27b6beb820c0d3c6df6414f7d31dd3d1c89e31a66b064ff96fc7e7e481faf47b7c SHA512 f3c9ae5432aaae9e83dec01dc9d6a4b8d01998183ef1c6ba7731ea9eb92b4960ddfdd0a2395bfb9f137224e83d4c938a7187f01579eb5c9e882e9f4d8008ee39
diff --git a/media-libs/lensfun/lensfun-0.3.2-r1.ebuild b/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
index cc4ef4da7f40..5c63f0e17bee 100644
--- a/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
+++ b/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit python-single-r1 cmake-utils
 
diff --git a/media-libs/libaacplus/Manifest b/media-libs/libaacplus/Manifest
index 566c1d4455a0..24149c4a7dcc 100644
--- a/media-libs/libaacplus/Manifest
+++ b/media-libs/libaacplus/Manifest
@@ -2,5 +2,5 @@ AUX libaacplus-2.0.2-clang-inline-redefinition.patch 1277 BLAKE2B 6df3ac18034ad7
 DIST 26410-800.zip 1348294 BLAKE2B ff774eb4c6db9a545ccd06611237d35bca192509b44cdfdcdc538c4aa4895e3ca6139904e25e44a457bbfdaa2306b17c3029b916b02c2e35bf9c267fb3007901 SHA512 a1d5a4d9b67b4e7292d3d07ba62090f92e9f6cd90e72aadb0e4067120941cc89b93ed136023461354567e845f34274a8097187a70d1477695b3e2024f86ee29d
 DIST libaacplus-2.0.2.tar.gz 42155 BLAKE2B fd65ac4d1a59136b1af1209f5ade9ba331ccb3d529e184329594c95654829e0bce29d107a221542b2ac3800610062774be52a1619aa0b591eaec3d8836b049a1 SHA512 05a6cc206fc187c96b065e94a80a57f6f1610fc5a3228f0163ac5acedabab2f2501dec8df3d196b9a1e2c2785277b0224cd5bb4d2a090bad2dcae44e023f9189
 EBUILD libaacplus-2.0.2-r2.ebuild 1388 BLAKE2B 43ad57a0d74847c633e10fb87184e4369fcaf0a156cc57037ab4a824dbc8b34a543bc1f7c266a4113e1a8a151b3c7f1280c28fdcd517cbf3fd9984d604ec345a SHA512 a066d2b1557944a0b5b9991ae018e0bfec5eec96b036a8341e4ee1f8a7eead15789a1f34c3520370e8191b07a5cfa1b6443b76399d62d1b648b048af6637206c
-EBUILD libaacplus-2.0.2-r3.ebuild 1430 BLAKE2B e701751759d193dcfb2ff05ab588cfbd43d767f42aed086a0452f2e654ca99e60deb778baabbb05d05e84d3657ceb0d7d9810add5af53ea0ce82aa8e0ea44818 SHA512 e223c36c4f3aad6f19f4bac3fe828d166731665303c7be8aac0b95d27c21b86af4293afa9b83ec1cc8c8cf2d1f39fb69532d27f4c6b7cfc69e2ed6dd2181a1e8
+EBUILD libaacplus-2.0.2-r3.ebuild 1423 BLAKE2B 3acecddc9573ca3a9e70e9655a7cfb9d2489b00bcb2f1247586d515e777a4d22c6bc085eba9157ce79db5336d49c0ad937498b5e664b57cbd37e21efc6cc9806 SHA512 cc0be87e9e5f5ecba823701769e9792585ab1dc717941b924aacf9d6444a51dd25e79b0f7fde06d4d00475b408baebc31703b21e104e6a66fa44ab2f539c21d2
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libaacplus/libaacplus-2.0.2-r3.ebuild b/media-libs/libaacplus/libaacplus-2.0.2-r3.ebuild
index d7f28f2d22a6..e95ddf9bd4ba 100644
--- a/media-libs/libaacplus/libaacplus-2.0.2-r3.ebuild
+++ b/media-libs/libaacplus/libaacplus-2.0.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="fftw static-libs"
 RESTRICT="bindist mirror"
 
diff --git a/media-libs/libaacs/Manifest b/media-libs/libaacs/Manifest
index 2c27515de615..46ca6cd5623b 100644
--- a/media-libs/libaacs/Manifest
+++ b/media-libs/libaacs/Manifest
@@ -1,5 +1,3 @@
-DIST libaacs-0.7.1.tar.bz2 318472 BLAKE2B 8284c219bcb43a9e7d3e0d1a431e99c933678580f84ab45297c3103566e5f6207970ca76d525bc0a2815b5ff09e869f4152bd58e1b30de481d08db998ba284ff SHA512 0fc603854380d51c0d517d64fad54047c726de4c8ad510b035f1d8fe50e6febb41bea9ef00f38356be8c3588b531e687fae7655a56ad93bf48c40bd7cf90bff7
 DIST libaacs-0.9.0.tar.bz2 316323 BLAKE2B 4fd1ecca0ba5106b1d0195884356a8a8d7163614ebc2fe09f85ed79fa1534b6376951ab90670b3a7d375129e76fae80e3c42f3e1971d0cbcabd6e4e8384bde1a SHA512 b9c658db22a0966486070d3b762509a7c0120469ab29d1e57c1b624cad309701de8b92455ec649db4d731be4a5c29c38fb4f99bb7617dbb4254270284a1903f6
-EBUILD libaacs-0.7.1.ebuild 814 BLAKE2B f016e8e235f080ba9ad2838128d69d83ae84e8e2c79d3cf92da0f1a936229a055f9e5fcb5e6c259a02538f0b6b6522bc8cc71616336a7614895538d08862d462 SHA512 741d4261398bea943f5de46760fe1c6c96f948a8997d199295ec4a4d373df0fb5a766249b2c751c913e24be43318428a3bb6183ee9f776e1ff779dda4d4e5a9c
-EBUILD libaacs-0.9.0.ebuild 828 BLAKE2B 475972032dc625212466b31defaf8536e2f652d7cf9f6d5928f028f641b0dac0052ed55dbe3c0bc86044523c1a4017dc198099129d8fb004f91a7280357ca068 SHA512 61451ec43d64108e76def98790b603b66499e1c11541e387039f2d9c0207e3eabdc8c8b9a46df8f8f0488fe4cb103f87f907baf4e7c80a23d27c01c8408dfb74
+EBUILD libaacs-0.9.0.ebuild 819 BLAKE2B e6ade8d24c9ec33ac9636d2f6d912b4aa5de1906c57f2f7161ab8a28278f1f1b453f92007cd2e45f071b6c848a37abe3c1ceef49759f3e5eb15a36017c48bdcf SHA512 ff58d41093b1b3770b8d15bda7dd98578154a8420a3a298aae4ae466639f5fa4b368d7adae4cfdee4f40ae99a1cbdca4f67f3ba59c35879da519e01ecd382a4a
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-libs/libaacs/libaacs-0.7.1.ebuild b/media-libs/libaacs/libaacs-0.7.1.ebuild
deleted file mode 100644
index 6df599bfe119..000000000000
--- a/media-libs/libaacs/libaacs-0.7.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-multilib
-
-DESCRIPTION="Open implementation of the Advanced Access Content System (AACS) specification"
-HOMEPAGE="https://www.videolan.org/developers/libaacs.html"
-SRC_URI="https://downloads.videolan.org/pub/videolan/libaacs/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 sparc x86 ~amd64-fbsd"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}]
-	>=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc"
-
-DOCS=( ChangeLog KEYDB.cfg README.txt )
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_configure() {
-	local myeconfargs=(
-		--disable-optimizations
-	)
-	autotools-multilib_src_configure
-}
diff --git a/media-libs/libaacs/libaacs-0.9.0.ebuild b/media-libs/libaacs/libaacs-0.9.0.ebuild
index be9e47b2195d..bb5b69d1e040 100644
--- a/media-libs/libaacs/libaacs-0.9.0.ebuild
+++ b/media-libs/libaacs/libaacs-0.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.videolan.org/pub/videolan/libaacs/${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libass/Manifest b/media-libs/libass/Manifest
index 1acf91432c79..4facc698a2cb 100644
--- a/media-libs/libass/Manifest
+++ b/media-libs/libass/Manifest
@@ -3,5 +3,5 @@ DIST libass-0.13.7.tar.xz 352752 BLAKE2B 7ab5dd5656b58b090718e000893e6eb1a05512f
 DIST libass-0.14.0.tar.xz 356256 BLAKE2B cf38d472003d6590c69da9347310386559b1ce13425d47505daca881b504453802a60cd553bbe478044764c108586668886372b79a61ccba42cdf49b2ed9ca74 SHA512 0f5fe5d7e662ee1d649981f829e5ef7a53457754f74faaed5679252a5a6769c8f267b6119cda922ebc6a8e5b5b331569f13813ac74881b4e94da7b2e8143a9e6
 EBUILD libass-0.13.6.ebuild 1340 BLAKE2B dcdca280de6863af783fc81a57d803f284771eae3c38a6938f9135c1f04f2875890d28827949b87ecfce895b484d7256d29e799577644f14a06dbe5bcfea8ec2 SHA512 11fa0782ccad86072400819dc309c18c197f54f561bfac24ef53cc6f7462220c8dadfb4e9589fc14dd30bb46cc2f8768830db1a41ff7971d052aa8dbf8b693d4
 EBUILD libass-0.13.7.ebuild 1350 BLAKE2B 2b9c7009fbad3743ec1d53abab5c8eb72b5d49d9c625ddb2e22a109c3857d93eba2d08fc91197337f144e8fc77dd492181f19cbd997a7b445c81a8083ff3b855 SHA512 6db190fb50a10ef1ceab912daf9c8822bf35451f1f05e64292002887903400c89967e23685bf35fbab451036a8e4d221016d212f18a80849af4dffd857f915f4
-EBUILD libass-0.14.0.ebuild 1350 BLAKE2B b820997bdc07e3538cbd203d00ede7893717683b651f08a258278da85bf12917b86840d73cc12b22ab45aecfe0fa8d4caa2349af53bb4bf60f84b03b2677798c SHA512 ad86641393a796b5baa06df3246cbf3ff30eacdf5344bbc239ce2bf572828bcd0e2595d9c38b73e1f86ba84d7795ad54320f1b9fd3a4d439edb2172e40c063a8
+EBUILD libass-0.14.0.ebuild 1341 BLAKE2B dab1f1b18dbcdf97887d19620794f3f2a850d1c7f2a7458fcef2478e569d752dc677d64be134fc35383233f14b9af82c076d91d484b5d48c7f7b676bf5448208 SHA512 73e5298b6b65fe18630f8a1418c530b207f162068c4885052f5f539650e76c98ca7bc4414355f02b7d8d8fedb728de2d89fc76e4cec4c249db033b3cf6f0860a
 MISC metadata.xml 420 BLAKE2B 160123e29ca333ee5aa8cc197a986ae489ea578e54efebab089133db45a7d3ba5b554161c2a835fa0f53537a16043b627d41f26c752460e6bf3118aab185f0d6 SHA512 ea6cdb493942844567b8acc3dddf71983ab02ba05d849aaaa0cdf0c8e435a0acd159eca447c3e049ddf27d384fb0e94826ff9aad42322eea459e4313f0319964
diff --git a/media-libs/libass/libass-0.14.0.ebuild b/media-libs/libass/libass-0.14.0.ebuild
index 2e35150fc88b..8defa629259b 100644
--- a/media-libs/libass/libass-0.14.0.ebuild
+++ b/media-libs/libass/libass-0.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0/9" # subslot = libass soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+fontconfig +harfbuzz static-libs"
 
 RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index 4018574ec2f7..2d5245ae2096 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -1,4 +1,7 @@
+AUX libbluray-jars.patch 1371 BLAKE2B 1c32115ec03db19b849248bcdbe4b9868527717b279d9222ad94bf4c3875522db75ba585566b0609d1a27cbd4e25066832b19351acf05f5b00295ed5364c2984 SHA512 2b376149680edf6891f2129de2fc074dfc32a236d8eb19b3d899e1f7d3ac98eaf8cdf6e13c7b548ab59354c558e2c149f06d85c1c5be61c5e05cc5ec4382d86d
 DIST libbluray-1.0.2.tar.bz2 733058 BLAKE2B 6428b3cb8a2339e2c2d7f86663d6917d8484b858fb03aaf3bda6824181d072050625d37280cf011574c07316ef83103b334f654de1a6219e3a33343532cfe986 SHA512 e1360ad08aa6cc67a80efa81a09004faebbe31105f1961494f82f655e3e7378b198ee3bc534b0d0c2bfec726939b11b545cc8bbfa30794fc647432dadf71089b
+DIST libbluray-1.1.1.tar.bz2 746034 BLAKE2B 031d9c4f5ed85cb9128ec6f9b0c4232e889578ca03e131024ce2bc7049ff7990ef1936aa5a525266f8d5402e58d9c2a92b14338259c37dfaebb50c6b9745ca1e SHA512 0a3bcef06d2a58c51c3d46934c32941ec0606dc9b71fe36f72a6e34ab8113cf72cfb6e2fdd51f23e0a44ccd404323f5ac5c666aa1d839ae16cc775267cbce839
 EBUILD libbluray-1.0.2.ebuild 2216 BLAKE2B 0ccf81a396903645ca601a72cfb09e1adc8c970a30d8a3498441b5c0535c13d9c8a11edc43479e3409b3235bd46534f0a87cab0dc45062683ef38a394605aa18 SHA512 193b8ef72dfe4e958b1144c77bfcba0a221a1abe1bbb0ea5dd2978295e91b8966d801dfcc9ebcbde5ff1004c139bb15fcc58b55d58bb238513fe75f1c89dd9e9
-EBUILD libbluray-9999.ebuild 2229 BLAKE2B 33cae05a133f9a311c2e8cee63f9fdb304b6594f129df78a9d4f65ca29875a7689cbd40aa4cdb40165318589fbee2c04b5d0b62c3cee8adbf03268acd9f36d4f SHA512 76da49990af9602e089b916b3ef2255aceb0967e898627383e935395f665c0ea90ed8d2ee5e10cd5285cc9fab524162a68f1afa779ea84f778a1b0d0451dbdac
+EBUILD libbluray-1.1.1.ebuild 2038 BLAKE2B afd04eb0f2fd05133ecde5b8d83bcb4e32fa05c31f00d43b17d1bb2c14b25bb35ac3ec63709485187caa8d2671dbad29edac54c5e2e86e4934eab0a9aa6ddc8c SHA512 8b35ef9724cc546f90345eb34eec9d1746c341b72780bf4edaf4bf3120af2fd004c40dc6d0ab9d6fa911dec30e124718a70f6e93af4dfd1b601aa6d0c518b112
+EBUILD libbluray-9999.ebuild 2038 BLAKE2B afd04eb0f2fd05133ecde5b8d83bcb4e32fa05c31f00d43b17d1bb2c14b25bb35ac3ec63709485187caa8d2671dbad29edac54c5e2e86e4934eab0a9aa6ddc8c SHA512 8b35ef9724cc546f90345eb34eec9d1746c341b72780bf4edaf4bf3120af2fd004c40dc6d0ab9d6fa911dec30e124718a70f6e93af4dfd1b601aa6d0c518b112
 MISC metadata.xml 540 BLAKE2B 1385b09e4a4a1a2ffe572ca02cc50ae5808a2d283841128258a906742ab8fd67d48b1a677d601990d84a587cc18e9ae68409bf6e9af40e084c05da6f73988aef SHA512 181c79234a6c7a88d6df5b8e2de071fd7746505b153a1f2d92c4d6bffb95cbfaa3f276656b95786e02bc7c097d1fdce65afcc953c569bd82639707c843b1e575
diff --git a/media-libs/libbluray/files/libbluray-jars.patch b/media-libs/libbluray/files/libbluray-jars.patch
new file mode 100644
index 000000000000..f313bf22a210
--- /dev/null
+++ b/media-libs/libbluray/files/libbluray-jars.patch
@@ -0,0 +1,46 @@
+diff -Naur a/Makefile.am b/Makefile.am
+--- a/Makefile.am	2019-04-05 09:34:16.000000000 +0100
++++ b/Makefile.am	2019-04-14 20:30:19.570385252 +0100
+@@ -239,10 +239,10 @@
+ awt_src = java-$(BDJ_TYPE)
+ endif
+ 
+-jardir=$(datadir)/java/
++jardir=$(datadir)/libbluray/lib/
+ jar_DATA = \
+-	$(top_builddir)/.libs/libbluray-$(BDJ_TYPE)-$(VERSION).jar \
+-	$(top_builddir)/.libs/libbluray-awt-$(BDJ_TYPE)-$(VERSION).jar
++	$(top_builddir)/.libs/libbluray-$(BDJ_TYPE)-gentoo.jar \
++	$(top_builddir)/.libs/libbluray-awt-$(BDJ_TYPE)-gentoo.jar
+ 
+ $(jar_DATA): all-local
+ 
+@@ -253,13 +253,13 @@
+ 	    -Dsrc_awt=:$(awt_src) \
+ 	    $(java_versions) \
+ 	    -Dbootclasspath="$(BDJ_BOOTCLASSPATH)" \
+-	    -Dversion='$(BDJ_TYPE)-$(VERSION)'
++	    -Dversion='$(BDJ_TYPE)-gentoo'
+ 
+ clean-local:
+ 	ant -f $(top_srcdir)/src/libbluray/bdj/build.xml \
+ 	    -Dbuild='$(abs_builddir)/src/libbluray/bdj/build' \
+ 	    -Ddist='$(abs_builddir)/.libs' \
+-	    -Dversion='$(BDJ_TYPE)-$(VERSION)' \
++	    -Dversion='$(BDJ_TYPE)-gentoo' \
+ 	    clean
+ endif
+ 
+diff -Naur a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c
+--- a/src/libbluray/bdj/bdj.c	2019-04-05 09:34:16.000000000 +0100
++++ b/src/libbluray/bdj/bdj.c	2019-04-14 20:21:01.927193454 +0100
+@@ -22,6 +22,9 @@
+ #include "config.h"
+ #endif
+ 
++#undef VERSION
++#define VERSION "gentoo"
++
+ #include "bdj.h"
+ 
+ #include "native/register_native.h"
diff --git a/media-libs/libbluray/libbluray-1.1.1.ebuild b/media-libs/libbluray/libbluray-1.1.1.ebuild
new file mode 100644
index 000000000000..4a5301a677de
--- /dev/null
+++ b/media-libs/libbluray/libbluray-1.1.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ "${PV#9999}" != "${PV}" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.videolan.org/git/libbluray.git"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
+fi
+
+inherit autotools java-pkg-opt-2 flag-o-matic multilib-minimal
+
+DESCRIPTION="Blu-ray playback libraries"
+HOMEPAGE="https://www.videolan.org/developers/libbluray.html"
+
+LICENSE="LGPL-2.1"
+SLOT="0/2"
+IUSE="aacs bdplus +fontconfig java static-libs +truetype utils +xml"
+
+COMMON_DEPEND="
+	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	aacs? ( >=media-libs/libaacs-0.6.0[${MULTILIB_USEDEP}] )
+	bdplus? ( media-libs/libbdplus[${MULTILIB_USEDEP}] )
+	java? ( >=virtual/jre-1.6 )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	java? ( >=virtual/jdk-1.6 )
+"
+BDEPEND="
+	java? (
+		>=virtual/jdk-1.6
+		dev-java/ant-core
+	)
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-jars.patch
+)
+
+DOCS=(
+	ChangeLog
+	README.txt
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	use java || unset JDK_HOME # Bug #621992.
+
+	ECONF_SOURCE="${S}" econf \
+		--disable-optimizations \
+		$(multilib_native_use_enable utils examples) \
+		$(multilib_native_use_enable java bdjava-jar) \
+		$(use_with fontconfig) \
+		$(use_with truetype freetype) \
+		$(use_enable static-libs static) \
+		$(use_with xml libxml2)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	multilib_is_native_abi || return
+
+	use utils &&
+		find .libs/ -type f -executable ! -name "${PN}.*" \
+			 $(use java || echo '! -name bdj_test') -exec dobin {} +
+
+	use java &&
+		java-pkg_regjar "${ED}"/usr/share/${PN}/lib/*.jar
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libbluray/libbluray-9999.ebuild b/media-libs/libbluray/libbluray-9999.ebuild
index 811597459685..4a5301a677de 100644
--- a/media-libs/libbluray/libbluray-9999.ebuild
+++ b/media-libs/libbluray/libbluray-9999.ebuild
@@ -1,7 +1,7 @@
-# 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}" != "${PV}" ]] ; then
 	inherit git-r3
@@ -33,6 +33,9 @@ RDEPEND="
 "
 DEPEND="
 	${COMMON_DEPEND}
+	java? ( >=virtual/jdk-1.6 )
+"
+BDEPEND="
 	java? (
 		>=virtual/jdk-1.6
 		dev-java/ant-core
@@ -40,24 +43,23 @@ DEPEND="
 	virtual/pkgconfig
 "
 
-DOCS=( ChangeLog README.txt )
+PATCHES=(
+	"${FILESDIR}"/${PN}-jars.patch
+)
+
+DOCS=(
+	ChangeLog
+	README.txt
+)
 
 src_prepare() {
 	default
-	unset JDK_HOME #621992
-	if use java ; then
-		export JDK_HOME="$(java-config -g JAVA_HOME)"
-
-		# don't install a duplicate jar file
-		sed -i '/^jar_DATA/d' Makefile.am || die
-
-		java-pkg-opt-2_src_prepare
-	fi
-
 	eautoreconf
 }
 
 multilib_src_configure() {
+	use java || unset JDK_HOME # Bug #621992.
+
 	ECONF_SOURCE="${S}" econf \
 		--disable-optimizations \
 		$(multilib_native_use_enable utils examples) \
@@ -70,18 +72,14 @@ multilib_src_configure() {
 
 multilib_src_install() {
 	emake DESTDIR="${D}" install
+	multilib_is_native_abi || return
 
-	if multilib_is_native_abi && use utils; then
-		cd .libs/ || die
-		dobin index_dump mobj_dump mpls_dump bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump
-		if use java; then
-			dobin bdj_test
-		fi
-	fi
+	use utils &&
+		find .libs/ -type f -executable ! -name "${PN}.*" \
+			 $(use java || echo '! -name bdj_test') -exec dobin {} +
 
-	if multilib_is_native_abi && use java; then
-		java-pkg_dojar "${BUILD_DIR}"/.libs/${PN}{,-awt}-j2se-*.jar
-	fi
+	use java &&
+		java-pkg_regjar "${ED}"/usr/share/${PN}/lib/*.jar
 }
 
 multilib_src_install_all() {
diff --git a/media-libs/libcdr/Manifest b/media-libs/libcdr/Manifest
index c4ccbf778068..3e456efe368e 100644
--- a/media-libs/libcdr/Manifest
+++ b/media-libs/libcdr/Manifest
@@ -1,6 +1,6 @@
 DIST libcdr-0.1.4.tar.xz 609592 BLAKE2B 201ed19cfe9aa93137279dfa6b9c3908691b2bddd1e8b7fb25505ab475cb8ae533d1b27857c99e36f618938aa7ee88075c3c7f5780872abe68994f380dc893c8 SHA512 769b0319b5a904ce9f727b7076f82cd915ecd8c9e5e2456416e3e6739c6403bbd4108787ab124d36efb1b47d5c9e37c48b0e12d096eb440ae8f9979ec06048a6
 DIST libcdr-0.1.5.tar.xz 612252 BLAKE2B d23c7ae0d0f5cbdb535bfba4dff4ad40e8b0633115cbc8c5b3a40343d941eaeafbffafe99ba2107640eafdd8181ab6eed7917095d05644a43f2b11cfcc66f8f1 SHA512 e985389b0cbad65dbfa9f59d7f9dba55f1684f63e852f9acca9abb863cdaab17072e761b48dca690673360d643686b5e9bc9878530f0a3a8b5b98d917f892cf0
 EBUILD libcdr-0.1.4.ebuild 1165 BLAKE2B 52b9a6e747d26e2ab7d649faa3c9f7ba7e02973194fcb259963790ab387d1580ee6e35ef2f93d32017329d322a8476d0a312c13f624f7bb9816f9a438495f539 SHA512 50105446ee1d69d75fe6583c123f66832803da3987d9b67402d6e415ca2cc31a430a48b85e455bb43798a5660c0b6ece8e01d4b09596d066f1cc45a2fde8a842
-EBUILD libcdr-0.1.5.ebuild 1161 BLAKE2B 21f1290d4db13374ae72f5304b025dbda4762319aa5d491558c3fa8bcf42013d8569b25a2dbc8b110384acf4551790edf35190e1f649f4b5a0ff20446d2e7cc4 SHA512 de4e16a64875a30f4920a5167e51fe44851a23669bf4099dc07291b5439c30ca2872c1ba9a9430f7379aa32f43c2a1b227de48f81e1d93dac1162ee751255a70
+EBUILD libcdr-0.1.5.ebuild 1160 BLAKE2B d0928d3a66257d38b2332b56605f626c130d5e9de79beedd8689137014b111591fbfd7f2059cac7ac8704648324b9de52c27546f4784e3fa67db64cd0396d7a8 SHA512 a111403928d5e6cbef9def49c3f2860ea7d0810b3cf72aa57f0d2acd81b8f9d014fcd491546d5ffed26dc4ab6bdc4be66cd1fddc20d7eb0062794972b26bc3ac
 EBUILD libcdr-9999.ebuild 1164 BLAKE2B 2ebed7c2dbd73964ea5a203693681b51c9e4dd4fcbfe24723dd3a92ee82ac286edbb9eef311fc891cff3cab2990084e176b6453b17dfbfb7df6120d29acd5389 SHA512 c4d2fdaeb651c2fa6065b7c7355375cfd813547d4007e0bdc37de70c785f99eee0f435b568e2dc7825390ee1832fc6b6e5d572ec6ea50a9a8b379cd254b55c94
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/media-libs/libcdr/libcdr-0.1.5.ebuild b/media-libs/libcdr/libcdr-0.1.5.ebuild
index a6d334edc822..00b103be1047 100644
--- a/media-libs/libcdr/libcdr-0.1.5.ebuild
+++ b/media-libs/libcdr/libcdr-0.1.5.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://dev-www.libreoffice.org/src/libcdr/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 DESCRIPTION="Library parsing the Corel cdr documents"
diff --git a/media-libs/libchamplain/Manifest b/media-libs/libchamplain/Manifest
index 631ab6d30c91..963eedeb00d4 100644
--- a/media-libs/libchamplain/Manifest
+++ b/media-libs/libchamplain/Manifest
@@ -1,5 +1,6 @@
+AUX 0.12.19-gdk-meson-fixes.patch 4022 BLAKE2B 55d1c2710ae8fca1e0befeedc87fc49c5776cfd2eaf34f6a544ac668ead2475eae4761b2c28caa513f26e92401c89f0c9464d928710b5612516d935b847eb8f9 SHA512 e67cdfef9025d00e5be8786cce71f4fd4caac06c48cc117a40827d70e759c5150ff8965dc395f7165f3ae705c36e8075f714fb571d4d9fc2dd54aaaa0982e358
 DIST libchamplain-0.12.16.tar.xz 623912 BLAKE2B fcdf351e5b264cc31e2ce2954e05abd9f9aaaa9ad622eb015e2267b24a8c281cd9fc79d0e5081f80b8805e0b9329b6c463d04e18d5704d75ab45139d86896e62 SHA512 78db380d87bd6437cab84b546af7f6505a8aaed7e8d9e8a06f3fdab1896b06a3bf1d11201384e4daedd2c78e528221e1d7e40665557e78251efec5fa036f4137
 DIST libchamplain-0.12.19.tar.xz 233084 BLAKE2B b46ef4b1ceaef3d3b7d52652e825de30a11d7b8f5a68b5a08abcec7111c58443ba76b9aea6b350007ccd91bfc86a4062079c51416fc4e63795318269045ce509 SHA512 3fc03c123859b078f1c4f5062706c95446146a7ed2352306cea3f72f3fbf95099afd2a99f61182e3cb7c47e546de6501ff3ed6ff17614f23dc2e4139ba5e4902
 EBUILD libchamplain-0.12.16.ebuild 1627 BLAKE2B 5b27437597ad463e41c731ad01aca90a9280bdcd8164bc500fc8870cef5770a391c8cd66d4467d2e7f1a784d2a854378be6d0b5976cf585c4c3ecef7366451dc SHA512 121df5c8fa295c833f5ea2b66df4a70944ab4fb0c1e1eb9e44eafc872c97860580546ef839696bf91fd5bc12add81d419130d02d707e2576b9d72b6b8c1947aa
-EBUILD libchamplain-0.12.19-r1.ebuild 1656 BLAKE2B ba6110dbf4d34c105e31921eb6e007dadb9d3bd11367824ee0c6baaa30eb5b2e05bcbd453f689177cf66c9eaa3d22cc83114a73a77f4b2496d4382bcac4bb075 SHA512 ad0a999e320cb11e4cd7845365afd1cfef09c20ccfaec421b6e6ec3687cece4b6b26b958108f14d5944c92bf6c8eb57ec608fb2124c208e64214db5a75cf7284
+EBUILD libchamplain-0.12.19-r1.ebuild 1816 BLAKE2B d06c23591b0349db7109d532f06fba85ed1110493096c7b15c14e191cc50da746824fb58493f4c006c6a6db4ba2bd67de6ef23e7218a721fb6a1edf5c20191c8 SHA512 3c234d13e602f99fe61ccdfe3b3126acf4559184d53a7b383c13ea4fa9dd810faa09650e72f6e932ea3de3cd0598a939eff3b4c502067ba82232a5f33c008b61
 MISC metadata.xml 621 BLAKE2B ff31085e2b6cee6e64d64161505ae026d3d6896964a0e5aa055b6052b6bc242396db2bc1bb603cfdd3b66300d65e39fa57a8556ac3cea2454ac52048eedea61e SHA512 6d2214f5f62f6deace80db56fee500efed4713be2087b6a9159594a36c503b534b8f50e728ceccfe13f17ce79614ec97baf5b56342680b9283e03096df644a64
diff --git a/media-libs/libchamplain/files/0.12.19-gdk-meson-fixes.patch b/media-libs/libchamplain/files/0.12.19-gdk-meson-fixes.patch
new file mode 100644
index 000000000000..41c7484e2a43
--- /dev/null
+++ b/media-libs/libchamplain/files/0.12.19-gdk-meson-fixes.patch
@@ -0,0 +1,123 @@
+From 17348668f16857296ac2caf32c4a503f1946e1a5 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Mon, 22 Apr 2019 15:03:06 +0300
+Subject: [PATCH 1/2] meson: Add missing gdk required dependency for champlain
+
+gdk/gdk.h header is included and gdk_cairo_set_source_pixbuf symbol
+is used from gdk, thus we need its header include path and link to it.
+If clutter is built with gtk support, this is implicitly included via
+clutter-1.0 dep, but it can also be built without gtk support, in
+which case the build of libchamplain fails due to no gdk/gdk.h header
+found.
+---
+ champlain/meson.build | 1 +
+ meson.build           | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/champlain/meson.build b/champlain/meson.build
+index 3285c65..0bf8ba5 100644
+--- a/champlain/meson.build
++++ b/champlain/meson.build
+@@ -95,6 +95,7 @@ libchamplain_requires = [
+ libchamplain_deps = libchamplain_requires + [
+   libm_dep,
+   gio_dep,
++  gdk_dep,
+   sqlite_dep,
+   libsoup_dep,
+ ]
+diff --git a/meson.build b/meson.build
+index 43e72e5..1e571c5 100644
+--- a/meson.build
++++ b/meson.build
+@@ -66,6 +66,7 @@ gtk_doc_req = '>= 1.15'
+ glib_dep = dependency('glib-2.0', version: glib_req)
+ gobject_dep = dependency('gobject-2.0', version: glib_req)
+ gio_dep = dependency('gio-2.0', version: glib_req)
++gdk_dep = dependency('gdk-3.0', version: gtk_req)
+ clutter_dep = dependency('clutter-1.0', version: clutter_req)
+ cairo_dep = dependency('cairo', version: cairo_req)
+ sqlite_dep = dependency('sqlite3', version: sqlite_req)
+-- 
+2.17.0
+
+
+From d938cb13fb13f28d18856e343ad3ee269e3cc0d9 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Mon, 22 Apr 2019 15:09:24 +0300
+Subject: [PATCH 2/2] Clean up gdk.h vs gdk-pixbuf.h includes
+
+Some source files included gdk.h without any use; others included it
+instead of gdk-pixbuf/gdk-pixbuf.h
+---
+ champlain/champlain-error-tile-renderer.c | 1 -
+ champlain/champlain-image-renderer.c      | 1 +
+ champlain/champlain-memphis-renderer.c    | 2 +-
+ champlain/champlain-network-tile-source.c | 1 -
+ champlain/champlain-tile.c                | 1 -
+ 5 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/champlain/champlain-error-tile-renderer.c b/champlain/champlain-error-tile-renderer.c
+index 2b74730..f2dc67f 100644
+--- a/champlain/champlain-error-tile-renderer.c
++++ b/champlain/champlain-error-tile-renderer.c
+@@ -25,7 +25,6 @@
+  */
+ 
+ #include "champlain-error-tile-renderer.h"
+-#include <gdk/gdk.h>
+ 
+ struct _ChamplainErrorTileRendererPrivate
+ {
+diff --git a/champlain/champlain-image-renderer.c b/champlain/champlain-image-renderer.c
+index e0d9f65..ad21971 100644
+--- a/champlain/champlain-image-renderer.c
++++ b/champlain/champlain-image-renderer.c
+@@ -26,6 +26,7 @@
+  */
+ 
+ #include "champlain-image-renderer.h"
++#include <gdk-pixbuf/gdk-pixbuf.h>
+ #include <gdk/gdk.h>
+ 
+ struct _ChamplainImageRendererPrivate
+diff --git a/champlain/champlain-memphis-renderer.c b/champlain/champlain-memphis-renderer.c
+index e62d82d..5244889 100644
+--- a/champlain/champlain-memphis-renderer.c
++++ b/champlain/champlain-memphis-renderer.c
+@@ -44,7 +44,7 @@
+ #include "champlain-memphis-renderer.h"
+ #include "champlain-bounding-box.h"
+ 
+-#include <gdk/gdk.h>
++#include <gdk-pixbuf/gdk-pixbuf.h>
+ 
+ #include <memphis/memphis.h>
+ #include <errno.h>
+diff --git a/champlain/champlain-network-tile-source.c b/champlain/champlain-network-tile-source.c
+index 873a39d..281f000 100644
+--- a/champlain/champlain-network-tile-source.c
++++ b/champlain/champlain-network-tile-source.c
+@@ -45,7 +45,6 @@
+ #include "champlain-private.h"
+ 
+ #include <errno.h>
+-#include <gdk/gdk.h>
+ #include <gio/gio.h>
+ #include <glib.h>
+ #include <glib/gstdio.h>
+diff --git a/champlain/champlain-tile.c b/champlain/champlain-tile.c
+index a218857..ea70c3f 100644
+--- a/champlain/champlain-tile.c
++++ b/champlain/champlain-tile.c
+@@ -30,7 +30,6 @@
+ 
+ #include <math.h>
+ #include <errno.h>
+-#include <gdk/gdk.h>
+ #include <libsoup/soup.h>
+ #include <gio/gio.h>
+ #include <clutter/clutter.h>
+-- 
+2.17.0
+
diff --git a/media-libs/libchamplain/libchamplain-0.12.19-r1.ebuild b/media-libs/libchamplain/libchamplain-0.12.19-r1.ebuild
index 1240a3e7c15c..c4e1ded7271a 100644
--- a/media-libs/libchamplain/libchamplain-0.12.19-r1.ebuild
+++ b/media-libs/libchamplain/libchamplain-0.12.19-r1.ebuild
@@ -41,6 +41,11 @@ BDEPEND="
 	vala? ( $(vala_depend) )
 "
 
+PATCHES=(
+	# Fix compilation against clutter[-gtk]
+	"${FILESDIR}"/${PV}-gdk-meson-fixes.patch # https://gitlab.gnome.org/GNOME/libchamplain/merge_requests/8
+)
+
 src_prepare() {
 	xdg_src_prepare
 	use vala && vala_src_prepare
diff --git a/media-libs/libclalsadrv/Manifest b/media-libs/libclalsadrv/Manifest
index 467223d4fae9..3fdc0943db5a 100644
--- a/media-libs/libclalsadrv/Manifest
+++ b/media-libs/libclalsadrv/Manifest
@@ -3,6 +3,6 @@ AUX libclalsadrv-2.0.0-makefile.patch 980 BLAKE2B 1d52c923cb57e0279e3cff4dcd9cc9
 DIST clalsadrv-1.2.2.tar.bz2 12593 BLAKE2B a01976bc2af473c6bd9689626e5e7bc22c9cae6e872f6a67aef5fc379ba437737d4ecc95e0ee3c6d54b4a5fc447a361d511a7cb422eb896178426e55c1629875 SHA512 a1b15551488d0bb597339804b36ed4cbb2459db24a3f71c1a068e3874eba10059668d358d8e0202b2964d3b80ed41d51f6db657614102a9a2b99597a7cd87106
 DIST clalsadrv-2.0.0.tar.bz2 14373 BLAKE2B 22166ac4591470cf49f9ede4be9567b33e101f0c9d24d1916376cf016c9dccdf29d94c645be95f0d02444000bc79800a22edcf97dc43ac080254f1233132e24f SHA512 6913fefa913ef50a8245541a7a1cafe76d1768bb4fa302d6ac0db86b40cc8b702ae3d257d0998809cc26f116a69db591b73f01a4ca0021bd062189438ca69ab8
 EBUILD libclalsadrv-1.2.2.ebuild 777 BLAKE2B 0df5dc638a513e3b8ab16fff6049075246d8134831ae11558f299f9c18f36a68abde009b1ed15775caf1fb7b2e7f464a0218af01c019a9dcd23aa30c95b3e71c SHA512 e7424c2de29b4876cb60cf2f45e45677db41ff4ae3f53270c94aef86bdd5e3f2ece13e3461c88fb7dd7f64768ccb3e5c0e1492e5beff663649b1722a000f8dcb
-EBUILD libclalsadrv-2.0.0-r1.ebuild 624 BLAKE2B d8fcaec4134133475ffabad20d05c307ed05d4fc733f4e2363ff52d924c1ff7f74d526f031d4a908fe0b64aba1522bdb1c6efa94dbea036c8e1b876e89288e7b SHA512 b2712c6977cd961a5cd6ee5163074f150c83090624081e78e615c513ce04516be6ff6e8eef57035bd11e90b861873fed9b4b8049689f94cf6cceb679bcdfbf82
+EBUILD libclalsadrv-2.0.0-r1.ebuild 620 BLAKE2B 8d8f01d0ee8bb17adadbc416167ddeb90644664afc1d72f1912ec3c0443a55efe24f6608f9fe5858e6105175186cd78f79b31f2662b2b29f7ed971efe6d09780 SHA512 c4db11b0e5769596a7906d6a2560b5e4fd16713c8eb0efee8ab25b70dbc6818154d3c5a6db8d8f9681bc981ba5c3c0f8168efd96bd1e76c0c79809ca97c62609
 EBUILD libclalsadrv-2.0.0.ebuild 650 BLAKE2B 190d33353fe7a24f306b045ffaf981592578ce995a00df8dc05b7fb6fb6fb1cb1241c6e73e34a41db86d91af2bffe218bc873c19cbc8a0e326e7ac121f8fd6e0 SHA512 99277fb3cca1205193a120d6960d170505cb246e81cb9a4d727c26f84b4bd7bcdf5d749a1263a452c29ee677e2a7b3b737afb1a23470b302eff8347270005b5d
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libclalsadrv/libclalsadrv-2.0.0-r1.ebuild b/media-libs/libclalsadrv/libclalsadrv-2.0.0-r1.ebuild
index 0579ddc42586..e93a49b9e1cf 100644
--- a/media-libs/libclalsadrv/libclalsadrv-2.0.0-r1.ebuild
+++ b/media-libs/libclalsadrv/libclalsadrv-2.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND="media-libs/alsa-lib"
diff --git a/media-libs/libdiscid/Manifest b/media-libs/libdiscid/Manifest
index 4ba77a2c4a4f..b0629072efa5 100644
--- a/media-libs/libdiscid/Manifest
+++ b/media-libs/libdiscid/Manifest
@@ -1,5 +1,5 @@
 DIST libdiscid-0.6.1.tar.gz 366393 BLAKE2B 551616a817922af5f90991690ea6d35523b3fb6606ab26ae7e0e4c51258fab5b653dbac96842526d9a4a51c81b5dfb63c9ec9b4fe723e88e758855cea381d46e SHA512 12808040b6bac7dd513d32b2f7a8424f0d9753a89c5703ede0454d0d8dea508a446adba20d899c3499e8621d2a752b3e8ca787b92e3ae92402c6df7bc2a3819d
 DIST libdiscid-0.6.2.tar.gz 401455 BLAKE2B 0b122f08de89af7863ed21158637e961d8cdbf4dc926e5ff641aad4f23e8b02d8e970221f51caae44d2943b894922134baeb9e99595dee74c085e31b0daefc99 SHA512 7ce9bb589f64644ef44400620bd3e65a329e52c5698b44c3dc1569fb143d9af15d540b95fbdce1b87db0263e2ff55c81133213ed1708cdb25af1b38a46c4e1ac
 EBUILD libdiscid-0.6.1.ebuild 544 BLAKE2B 19a0f87ab6c43899d626dab7e3ee83a833315cc22bfd7a30e5290b332e0fac5fbddea125411f8a314cf424afa8cdc400e1f4fdb984f78c7a7a2198681b14a4d2 SHA512 21ffcbde75c974acf5e1040aa18a279dd93a53929a2eda8094b7b5d8fa6c06f08ce01296b78c846cbeb9353be9895c8e3483b8e7d3b192aaad479d98a0076f01
-EBUILD libdiscid-0.6.2.ebuild 585 BLAKE2B 6f6423d87c3d5240152f89f55ac626d207217dda7cc3b1e9b4bd0e8b74679634826642e24f02a03de48c7f2fd9a8e8d0674a52fca344588cea340897042f9617 SHA512 8e3d0b1f0a287a53e3c08aa105e90a45d55a5825fd74d8eb5f2c8e5ecc628c66f639acfd8ef3e3ff5eb84a6e978dbcec6d00310b149a5b5748fe9f9a6efae252
+EBUILD libdiscid-0.6.2.ebuild 580 BLAKE2B 7a3e57298b9d826276b4e8d56840ab1d35a4e0e148269e46962c70fd3f2c0f5b3f74bfa27494cd0d47905ec422f64b27cbd179b2db0eaffd350b182f6a93f8bc SHA512 b52253ebcf412e321fc39fb89ffc5853e5c7e90102c6cca6f5fc9e266c92312c84c0b0f1aa799513176a6f5564dac851323bc4f644a5fb281547928e6a54e08e
 MISC metadata.xml 587 BLAKE2B e5d8e996c7015f2796f2ec687989c777e85dff7c64e14cedeb8067604841d13256d73ce81ba4601ecea644e1fa5a7ba05b18749b1233498ca193932952510c3c SHA512 02616572b6782adc2285210f4d3fcfcb1e188012eb97a322468e93755a0ccd0a6760885b345bb7845ef6aaaba114b22afcfd02ae5572fb2e4140209adc6db570
diff --git a/media-libs/libdiscid/libdiscid-0.6.2.ebuild b/media-libs/libdiscid/libdiscid-0.6.2.ebuild
index 91a541e06dd7..12e8b233e9ca 100644
--- a/media-libs/libdiscid/libdiscid-0.6.2.ebuild
+++ b/media-libs/libdiscid/libdiscid-0.6.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DOCS=( AUTHORS ChangeLog examples/discid.c README )
diff --git a/media-libs/libdvbpsi/Manifest b/media-libs/libdvbpsi/Manifest
index f632b1febf6e..6f2120c603ab 100644
--- a/media-libs/libdvbpsi/Manifest
+++ b/media-libs/libdvbpsi/Manifest
@@ -1,5 +1,5 @@
 DIST libdvbpsi-1.3.1.tar.bz2 479964 BLAKE2B a29522d39544d90b34915e2ca9fc9ca455a556097c63639d7604679275b57378822adfb4c022478884c897cdde2c0e5f84355fdecf35fd6bb305d1fc275eed8b SHA512 015d586d1ef1fd35fc4b6a5b79d1ce4570e07070840d7070938c38be64853fb987172ad225f000156166559709061de6f901237bfc0f7f26f219b5950b57c27a
 DIST libdvbpsi-1.3.2.tar.bz2 487807 BLAKE2B ea8d1e121e47d2257d8537beac792e3a420ac957dbf3ec6d89f0c4d063e249616bbc8f3e14ed37769b676ed18d5d4c3c6a33e2a706217854eb2ded91e7c503db SHA512 cb59c2e66a214cad7bb96aa1f80a178399fcd80da9fc05b22c72763f2cd818bfab3724d36eee4c6467fb8bc8bae18b1d8afec64c02e8e47cd7a6e887f0230309
 EBUILD libdvbpsi-1.3.1.ebuild 961 BLAKE2B 6fbc4e59378ee2267ceb69f740cabf84e3a2c4ce6775a93db3a890c1ecfb9219ceed8383e24323a3f9b306d2623b4266e6fde41190ba46e9eb0b5f7f779c7145 SHA512 04b0ef6a8239d868a357964bb97a54f188fd27f767ed52b0d14e6eb9932f286c1e1a2fbe134ab663461a9436afcebc781934ea0279cf4dacd2df11e0a6a16bed
-EBUILD libdvbpsi-1.3.2.ebuild 968 BLAKE2B c6c59945ea3796164158b9a8623468253f0085050f29d64e34e9e13c0791322e7a8079fcf2a8c300bbd1358aa274dcd68a28f7ba98a0cf99620408fde0984f47 SHA512 fb7484cb854a93e04aa0d199e64751127976af47d1d8f4c5f876b3fd29fa1a9cbcef310d5a42bcedce42b01a2f9d2f96f9a9d05e01b322cd261d2895f84a4ccd
+EBUILD libdvbpsi-1.3.2.ebuild 961 BLAKE2B 5c847224a706fda86718b116f0558d32ad3fc5e5ea2f5a6bcf4fb1ef1af0e145853fbdbf2b905edff243b80773bf130537a5f7e28c425d677b51243a546e1e61 SHA512 e64a21d5616f315d1e9b1216e7daf6ebff69cc69dda4952aea6e3b5666ea550e7f3da19c2a9f79e8fdc287e63703efd95106058283fcce0a79dec6633e1beef9
 MISC metadata.xml 212 BLAKE2B f25483a51eb36c195e77aee58c9f94951dbbd719edb1d088524ef3db4f2d8ffc628b6c0c01efb9d5f3083a81e6cd0edeba56af12a9dc643bc3facbf16e89c0b7 SHA512 ad3eb85555c559c56e2fc097ed106671a78bb16ea63253de1786772a1b914833c2af673da087899e1b06f5db150c283cccb81fe8591c257f91913f2ae22a039b
diff --git a/media-libs/libdvbpsi/libdvbpsi-1.3.2.ebuild b/media-libs/libdvbpsi/libdvbpsi-1.3.2.ebuild
index 2edff06bb8a6..24c92d757d58 100644
--- a/media-libs/libdvbpsi/libdvbpsi-1.3.2.ebuild
+++ b/media-libs/libdvbpsi/libdvbpsi-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 # Sublot == libdvbpsi.so major
 SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc static-libs"
 
 RDEPEND=""
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index 8a2e3c6ea616..2a45af590e81 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -1,4 +1,4 @@
 DIST libepoxy-1.5.3.tar.gz 326768 BLAKE2B 053665429a249adca4c9b3d57797949e3a0ffd0ed3f1c66cb8becfb884431e44a4cccb6b2fd3788a86ee01268ebad3cc36e67e391d2aa5cdea28837a162be9ad SHA512 e831f4f918f08fd5f799501efc0e23b8d404478651634f5e7b35f8ebcc29d91abc447ab20da062dde5be75e18cb39ffea708688e6534f7ab257b949f9c53ddc8
-EBUILD libepoxy-1.5.3.ebuild 1249 BLAKE2B 4eda9672aa42648a0fab95a810d286ff9ba593da8d0c12dd0f13a69c8385f44834b03b1efdf7c35b9fd6c5fdf558dbbf0217c83d99b3d4139d8b71a1056ff438 SHA512 6b320446249bc68ecadf9a2cc48e9885f453914484045cc991c31f30414130198ebd5593dc63a87afa8a87e0af3405e961f0d906d85d07b15dc2559331e494f5
-EBUILD libepoxy-9999.ebuild 1254 BLAKE2B d5b828ddb6f61f32165389b4ac14dcd86dd5b4cddac8a107d6b78af90b799bfb08a35ddd1c3d43d3fee49c0660e03a3a7d70cfa46315d5aa79c11353a8163d26 SHA512 92146d55794ab3b8e9f0b9a71d6f4f02b635b41624b25eb35c8a234f416d67790a076f88bcf243c113ba3791e3ce5982eb3b3d58f5568cb2b794d011cbc17eb4
+EBUILD libepoxy-1.5.3.ebuild 1245 BLAKE2B 6de1b1561df3842b3cd90ff06703ec51e5eb61a0e2e89768eeaa790f6cf71711d4760cafc4d1d75a24746281e800f71945d76424494c10aa231b57dd62f756d5 SHA512 8d22a6fc0c8ff21f70aa998c6fde33a0dc810fed00c7afe301bd19e87e80fcd3abfb4bb9ed39a51c10b758f49b718f2eb1b232de6c42ef6175ac64426b41e163
+EBUILD libepoxy-9999.ebuild 1250 BLAKE2B a6be3da9193ab6447acf3077b89a6f8fb77cb9bba6ebb9d79e1d7d5ac769b4c470b109207826973e3f988755973c0cca3ce0763ee7dff5d18e8cc6c5b2131982 SHA512 2d7308f5b86b735b0f86c215841eab78abc9a570d6427fd2482225e9d88cea960c5b73562ded9e646d94a7b1fec3710c81d13e8ce32590bd3185bf006b6709db
 MISC metadata.xml 314 BLAKE2B ff8d671379855f61b90688f26772026f83f00d3e303bcf1fc7e851c9a2e6f410beb7c9dbd115f57d8613df8ffc043b2994cbc1a134eefd160888a0ac21cac154 SHA512 5d63de65f850f14f37ed4998a3d7f7686dcd999fd6f13be9c528be6423940684e709d08042ba5cbeccad2a38f3752df2580913cdbdfbc569f576cc958cf3bc73
diff --git a/media-libs/libepoxy/libepoxy-1.5.3.ebuild b/media-libs/libepoxy/libepoxy-1.5.3.ebuild
index cec62781b845..858276b1405f 100644
--- a/media-libs/libepoxy/libepoxy-1.5.3.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.3.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 PYTHON_REQ_USE='xml(+)'
 inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1
 
diff --git a/media-libs/libepoxy/libepoxy-9999.ebuild b/media-libs/libepoxy/libepoxy-9999.ebuild
index bb809e2ad9b4..1bac611c62bd 100644
--- a/media-libs/libepoxy/libepoxy-9999.ebuild
+++ b/media-libs/libepoxy/libepoxy-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 PYTHON_REQ_USE='xml(+)'
 inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1
 
diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest
index 047289d1a965..647930a6bff4 100644
--- a/media-libs/libffado/Manifest
+++ b/media-libs/libffado/Manifest
@@ -1,4 +1,4 @@
 AUX libffado-2.4.1-python3-scons-fix.patch 982 BLAKE2B e9e6e5c8e9582db5e936d355abf8b7292c5a03d799dd3c36d567604a1f959b1b509856ee9ac1e7693a1147907ce7105841010c317d8d2981f35c1c125f4cb5a6 SHA512 5e3de46d1e9ff5d0ee0b555218d1d59deb81e87ccf3f4179c6c25fac0888abf27b96e6cd82a8815b58040b3ab949a5cf2128c709c91ea125c3194e19956817e1
 DIST libffado-2.4.1.tgz 1229295 BLAKE2B 3b42493b68fc8648e116784e04baee2278c21e01fa92b22d990340ef329f67c898e247891e76d494410a758009fcf186ba556e900598eaca539a9879664cc704 SHA512 0859f17b87c68108bbde726d1cf8ab0b99f6f7f02cbe36acd8b451e112688a4d1edc21134eb4a2edc8c92dcf5f5da52efeabb2ad0dc07804ed1aa664a3b38d74
-EBUILD libffado-2.4.1.ebuild 2807 BLAKE2B 9e7a07ea267bbb3dc1d7e894b49696752b727c343bb30061f09e502ccfc7c17f02cde8b0085efd5f832ded7a594299f8a44b2b36ca214626b17cf5d19b51a9eb SHA512 321ed77cd069d7d415054614b491c5d10ee26d153f801ac67ed8d4bb5b42f96c51d0f0ae3ee20e6b3897c10bf9f4439486cfc41b75aacec75182a2d1f1dac144
+EBUILD libffado-2.4.1.ebuild 2805 BLAKE2B 294573819dbd18cc6adab42eda7b65044e34ff174626252b88ed6f0d3705c5620cd45fdad525886fabb1b9c73ce7498d23342373ee1d389cd3d8435b52164875 SHA512 e8705c0f1cd0b0a5ce47875d7993678e3b5680bf4c1b9aa8250e5db0f31305f3ed02e980ccf42cf0396b48cc182f3bc788b711ead2c9639381983cf48e477362
 MISC metadata.xml 566 BLAKE2B 66bf590980ba18079dfc4127aad3de692e4544f93518fec98e8c337c129df35fac11ff1c8b2c5c3b606855da6020f7abf311b14a4b8b607b08ed1662ae5adc3a SHA512 f1d19db6ac852100cae4d73b8608a892bae5d4907b35601c4c751a35555111de450edf1f0373c2f81cd68e947c76e9c36c7e2b76a8c9d3aa64345fa9b9227b34
diff --git a/media-libs/libffado/libffado-2.4.1.ebuild b/media-libs/libffado/libffado-2.4.1.ebuild
index d987a24a6465..f2e545402ef3 100644
--- a/media-libs/libffado/libffado-2.4.1.ebuild
+++ b/media-libs/libffado/libffado-2.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit desktop python-single-r1 scons-utils toolchain-funcs udev multilib-minimal
 
diff --git a/media-libs/libfpx/Manifest b/media-libs/libfpx/Manifest
index 36a7196e6ba2..b2af77531b26 100644
--- a/media-libs/libfpx/Manifest
+++ b/media-libs/libfpx/Manifest
@@ -2,6 +2,6 @@ AUX libfpx-1.2.0.13-export-symbols.patch 347 BLAKE2B d0bc3b1fecba641554a549c0241
 AUX libfpx-1.3.1_p6-gcc6.patch 840 BLAKE2B 4c9a5535fe452877f4b3e0b3bf2d9923505ce97dfd2f00aad45ef35baf86dfe5a8274bbb37df98bc099fd4adcfbe7f5573b5bb55b28ee0826bce0fd312d140dd SHA512 064e9f0f69bf66a93e6560a680b8680809260f6a4a6811f9568d9ef5230382a60e9bbd76680731434a4cae2570e6dd834ca3fd51e8c356ef949c1cf75f2c5af6
 DIST libfpx-1.3.1-10.tar.bz2 2358246 BLAKE2B d67b5a38e29d8916471ced46005983427ea1e77ff1fa682b67f80e8db71bd5460aafb59753bd901aa40e955cbeb453cf017109577b8d9357e86ac3e7d988d4b4 SHA512 afa96b240ead4d3c56e8e6c66db188d1f4441e7b4d08e12e0e96359cfa2cea9eae5625105d87df65ceacd97d84a386876c62dee5bc1916c420755d9bcc4655d4
 DIST libfpx-1.3.1-6.tar.bz2 2358328 BLAKE2B d522d674af92f7a5fe00378a01e743342978290297aea26738e6077834ad8eee6afffd01b16bcec29d729d87383b2123e35a62e9d0da9f1623f79a55b413d9e5 SHA512 d33bc59f091100f4e0f7db396ba2f3a93951b348f8b175070fa23186f7ce488e71b7be43a45ebd9a3af21affe5342f63955df8549ff15582f8b29e67601531fb
-EBUILD libfpx-1.3.1_p10.ebuild 998 BLAKE2B 3b59249a6234ba6f66045712ab120742f54e44eb1be67ab3627fd4d649f80b9bf6446763fc71bbe66ec0fbeea8dd9b3ecc8db4b704a733f5b4eafc323f4861df SHA512 6699727fafa26eb54f3aa75dd1c4d88849653178bd5df3c97c0dd0a5974fc1f6562e25321af1b57b61ff948a055aa852ef52b31571ff00b2818ac3b8cd74a759
+EBUILD libfpx-1.3.1_p10.ebuild 994 BLAKE2B c8ce3f49eb4deb925a33a41ba1a875fa1f4e9a23a95586760de113173b9bcc2a1f0753f2fb1de952d241c4b8de690933899433930a88b168e7cdc0499f60880d SHA512 3db12cf05efc51d9963669de96e317209a48961242a17ef7d8c12d36eb126f3e48572085ae714b666314273d9927b3e4aa0e9540213efb7d4ae4ef44ac0ba447
 EBUILD libfpx-1.3.1_p6.ebuild 1027 BLAKE2B 89c16c6f85e16ce19bcb4a14d6d6fee17b50977344f323a82bf74caed434272df9b2e172dcd50d92de20c78df151fe6ecb74bdce1fa0f34781f10b15d839c597 SHA512 34418eb51824d3250da69eb119295b5785c4020cf05adecb6a04e62481ced8f893cdcdb5ca08e20887ef276a22baac68c0669e020d846e660714b0c025da8fe4
 MISC metadata.xml 343 BLAKE2B 87d81ba8409f0c9ad2be7cc2183ff5b7ec0bac3647f16f28e1e73acd7684de8419968eef18e524aad3a321e3f17403d4b22b762270fab419263ef5c50189ab9c SHA512 beac0e9d9adaa87113df0b38a8779ce67e35c89c54ad0d8e6b4470b82c1f41eb2fe5f2e40425cb039defa03ed7a5fc0d6f41912f6f8b98a98e79882c381d0bae
diff --git a/media-libs/libfpx/libfpx-1.3.1_p10.ebuild b/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
index 66e04eac3df1..006ee9d4936a 100644
--- a/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
+++ b/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://imagemagick/delegates/${P/_p/-}.tar.bz2"
 
 LICENSE="Flashpix"
 SLOT="0/1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="static-libs"
 
 S=${WORKDIR}/${P/_p/-}
diff --git a/media-libs/libgii/Manifest b/media-libs/libgii/Manifest
index 6d74182f167b..ea283119bb02 100644
--- a/media-libs/libgii/Manifest
+++ b/media-libs/libgii/Manifest
@@ -3,5 +3,5 @@ AUX libgii-1.0.2-configure-cpuid-pic.patch 451 BLAKE2B 2a19985eda7c5cafaf40d68b2
 AUX libgii-1.0.2-libtool_1.5_compat.patch 468 BLAKE2B 32d18ef7cfa6e14be36e8eeccf321a988990b3f48caa422ec07988dd8cde0d4c5c1ae7233700c696e45933b56f7555a1b00efd1062be1f4f5d73074b1695cea7 SHA512 c7c2d3cd91ba91cdc60778f5d599f2ee428c3b41a213193f733c4fe86b8e2a778009f8816d6314ad7519e5732065cf51016441306bb05f7ba669ef4000769312
 DIST libgii-1.0.2.src.tar.bz2 701099 BLAKE2B 29e23c4f0b0045e05dac855bba10d03e5b38cc3b2fdd494892c52954b4c4bbd990148aff98540bef73048ae26bab79db3369e7731707bfa4eab2b39d256681ad SHA512 d45b236e08bb8c6a7a7741ae694650dfc5681712a174f923c9132c41acb388d0d6dbc5589104a7a6bc73c98088f2b5967ee726d83c1f3e913602661c8d30bf07
 EBUILD libgii-1.0.2-r1.ebuild 1154 BLAKE2B a718acbc16b40036f3407fc063622cd6b26afb84e9ddb2f9bd652c6719519445054b66d8085bacb142acdf433b3a6818460ca38a6f4f28fb0b8d53ffa9b1dd01 SHA512 2113ec3bb1b239d64b167cba172e135027d575873740b6bf238f49a4db386048cefa43dcc734b3eabdf601608464b7ea7975ba50384506f140790f5fbfd29ec0
-EBUILD libgii-1.0.2-r2.ebuild 1268 BLAKE2B 4fee5252b99104efa4b6c75257b138755feab9e29c8657fe5c7a122d2647400501056406435d7b24a03d0c833919b428a979f8736a584c29f40d84bbbf4832ce SHA512 63040b95731d7f12aa63b0fe3990c5741fbe57e80132aa772c61177b420381d1777e75778c5bc1efab2def608c6d1226a3ddbef75f7a0858ad9fc84d079e6598
+EBUILD libgii-1.0.2-r2.ebuild 1262 BLAKE2B fe6267a42375aaf4291f9827b5667d2d6ae424d8e4acd9f466255f7fa9f879bc1d58a609fc49929a003ec4694435966e8b7164ae4d3c813ccd5d7b3caee456c6 SHA512 55d38240e014150e7a36970af12391b11c677b6fbd85eda2515a3c9c076247ffd9e20a828a5741458dd3b361fd9c3cb25f4412171cbf5f741b5cbde6ed512b41
 MISC metadata.xml 296 BLAKE2B 6b8887bb428a63d2f6b54f6c170ad69d9c5d41f718b6ab9cd3312748e4fa9a74a79c155343a6434525054fccd74838b93026ffad7ff30a067d0c45f683267797 SHA512 5e1f45111c1b86547646ddeb2b1c8435e10bb2743132325bfc156e560874a9871baf81e621004fc03bad3b32e7266894636916b292b096c25be80ba828c264fc
diff --git a/media-libs/libgii/libgii-1.0.2-r2.ebuild b/media-libs/libgii/libgii-1.0.2-r2.ebuild
index 6de82d2c8483..774b98cb6aab 100644
--- a/media-libs/libgii/libgii-1.0.2-r2.ebuild
+++ b/media-libs/libgii/libgii-1.0.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="X"
 
 RDEPEND="
diff --git a/media-libs/libharu/Manifest b/media-libs/libharu/Manifest
index 8cbe514f5b9a..2210847f2c50 100644
--- a/media-libs/libharu/Manifest
+++ b/media-libs/libharu/Manifest
@@ -5,5 +5,5 @@ AUX libharu-2.3.0-4-Add-support-for-free-form-triangle-Shading-objects.patch 159
 AUX libharu-2.3.0-dont-force-strip.patch 504 BLAKE2B 5450783ed2ae778d2d522a4e7157f681c12765e6493955a363187bc4032387580f121e427ad26c596a1b6da53d83bf857525a710ad3499188b8a6b7985de9067 SHA512 df72ea19a1c8da3f06c9fff5b5a9d7307baf0144b59b5f4342769027c947ef5ded4e1f5ed3e3310dae27d7f5ec0ab37d585b9dc16ef83e38b7edda4ff13fc950
 DIST libharu-2.3.0.tar.gz 1396413 BLAKE2B 7f0c819f17740f12f9bf6c7a7c749eb8c6ada326d98985daeac4d3250733cfc8e085b540e0969cb1b4c3b1055f4d1e148a2ed010d9371685fd265b62a879be9c SHA512 ebcabf1e8488e21185a231e97b4c16f9de742ae0ac2ebc7535b72b6b8e2045c2619bc6a94a820f7f923b0dfeceb217408f4e4c613ef3602104373cdf000d3f41
 EBUILD libharu-2.3.0-r1.ebuild 845 BLAKE2B fea8329a56331571253f0679e725a5ae0590ad3d7f403d3a1b5cb2831ae59f4d118d1780bef81f6ec02633d696d15029d77dc382a45840eb7d3024ee29c15f8a SHA512 a0a3efba5722bb80fc98de2726c12306382f555f19422b9c34ccdd23b9777bbf08893df15fe2aed6603a092d289c5c0bd887f6b960f4f9c82e4bba533a342820
-EBUILD libharu-2.3.0-r2.ebuild 955 BLAKE2B 79ff585e34e42889abb1ef95a0e1e5c8dc34bca421621d01ededbf3b2937b4ca083e7ab995a8094b613505a9e904a0ed926478c772d72cb78f63f2161117e500 SHA512 2b9a057c426067e76c5a538fb5003842456a0bb3fdfb5f51371cb0eb0f3efc00fb592e027e2c2c6a286545b4dbb6751f39ccc7a746497c0609b0a4448e8bc5b4
+EBUILD libharu-2.3.0-r2.ebuild 953 BLAKE2B c83c8cb0265e915b02ac7e5dba1a3034b460a881a6ce846fd7409b513219e1c6bd248ae21b94f2647c714ad08677a3257ce911f2579fa9b7226389e1d2abcc61 SHA512 03a69f1037d03ebb36a325757431b2531ad1245a86b56a922cb94a5ecc80213715fbbae11d9d4c87ff8af83d809525049c1530b2ead06fff2539e7cb5bc72ed6
 MISC metadata.xml 1001 BLAKE2B 885dfdacbde50227739f7f1e4a0b23febf988628cecc2bf67995408e978673022633d14407bdf95c29c7a1c8cce11f3c0133dba529e25a1a6df2e5cdacbd27b0 SHA512 baab0fbcff40fe0cf1ac6df68416335bf01f08a0b26d8441d76cfb0e1a6b3227aa8ed54d3f080c0ba5cbcf372f7a99c0c45c9ea215e7210c5e77805a30140d4f
diff --git a/media-libs/libharu/libharu-2.3.0-r2.ebuild b/media-libs/libharu/libharu-2.3.0-r2.ebuild
index 5a8a1a395647..093e5baba578 100644
--- a/media-libs/libharu/libharu-2.3.0-r2.ebuild
+++ b/media-libs/libharu/libharu-2.3.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${MYP}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="
diff --git a/media-libs/liblqr/Manifest b/media-libs/liblqr/Manifest
index 35eb23fe2d72..0bb27549228f 100644
--- a/media-libs/liblqr/Manifest
+++ b/media-libs/liblqr/Manifest
@@ -1,3 +1,3 @@
 DIST liblqr-1-0.4.2.tar.bz2 344739 BLAKE2B 90ae891603dc525d460b1f180342b2a998ef3081a7504c642d0ddbbc5feef1ceb512a046a5366311d2a86869c8988f24f03faaafd3e7c77b1ff1f82b8a23acc0 SHA512 57d9ed67d5a11c970262263a34b6797576088e14f2ccb01b393eff55bfd22c8bb2b2189e3ed5ff6c187f709c556225fc1fb1038bd0d7e0c03d8839ef0ce998a3
-EBUILD liblqr-0.4.2-r1.ebuild 614 BLAKE2B 2cfa4ba2f4734209cf11065cd116f1df228e559f4539513f74ac81ceb2053c6e05d2ea45e3b6bd665a677005109acae336a04664b1c06a1f296171929aebb497 SHA512 b3552ed68393c113db0bb6ebf27ba6a1e96c7917a573cd6d73acd4f48c249c2f46710d4ee6e982f61fa040fa8082d600700fcd5758f4cf88b710705fd987ea46
+EBUILD liblqr-0.4.2-r1.ebuild 610 BLAKE2B 7246b6c25183d57ebc2405e625ebd23cc5b9a9cf4358ba11b702807f9c1b3f9a096a65de914d2c0d30f60a8a1fe209baf77cc1743ac61fd5e9ce3e07a6a69567 SHA512 ae668eb2866bd1f65d50bbfcbd0ce1c0e92ec7afe6c2b84ad79d19f61511c2e8533d0b72d959ee9ace538063d6dcd9bc15a02a7b049dcf0d8ca7be586a4561aa
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-libs/liblqr/liblqr-0.4.2-r1.ebuild b/media-libs/liblqr/liblqr-0.4.2-r1.ebuild
index bf017cd79899..a069cc95cc5e 100644
--- a/media-libs/liblqr/liblqr-0.4.2-r1.ebuild
+++ b/media-libs/liblqr/liblqr-0.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="http://liblqr.wikidot.com/local--files/en:download-page/${PN}-1-${PV}.t
 
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND="dev-libs/glib:2"
 DEPEND="${RDEPEND}
diff --git a/media-libs/libmatemixer/Manifest b/media-libs/libmatemixer/Manifest
index f4949deadeb0..2e675c23ac88 100644
--- a/media-libs/libmatemixer/Manifest
+++ b/media-libs/libmatemixer/Manifest
@@ -1,5 +1,3 @@
-DIST libmatemixer-1.18.0.tar.xz 418772 BLAKE2B f37689b9929ac659c6f314f2d5751beff18304575680985f4e3b24b3032237464d2ab32e4675ca3bbb0be796d90ecca47d49925a4a6105bf50907722c4505765 SHA512 254d1ff74f036d813f9ec2b983b86a730fec0d1f2009e7d22a9d779e509aec92409225cec5ff1f7c747c468c5e40affaa67130df4bb7087d5ee61036359b4407
 DIST libmatemixer-1.22.0.tar.xz 432592 BLAKE2B 36f16c0ed516dea05368ae5b4f287cce275844b547fb7eebe7fb0604d0fddce72649dcac1c16475539dc5199f5d310b8bd19f165efd4bfa5c4f1bf31c1141df7 SHA512 6eaa006142601c077ac70739e637273288a4b9713dfc4179341c4832ae4e3b362e92104e150132ee274224d6c5dc057d812b7e1814e49a7690581de6d81e0db8
-EBUILD libmatemixer-1.18.0.ebuild 778 BLAKE2B 1f503c2e32a091cc8fd598f87d4ebe4b9dcf0666cdeeeffd2ac8bcd1f7d452fd1c18a7986fc905bbd112db0d301f12cfdea72f6eff8e1957d1e4b5b000f13260 SHA512 1c9037c115b9036c4143a2e771d80172aa84ca5475b5e84e7ac9e031656c2d067bc0fc4d0badd6abee48161f1d6faca72e682e9ba9e71da251cfa6c01150d700
-EBUILD libmatemixer-1.22.0.ebuild 775 BLAKE2B 84035ef7c5651c64642827340ab1404783af8cbc62465eed858b94efcea744b41280d0900fe637b3196058e50b79a8cb98296f68d9f7d5f109f819d35eb84b4a SHA512 c24124342d42eddd9d3bab7ffcdd985ae71fbb59ba8a599bfc8e3971608887d1ac3f3c15d84b125275211ed149c9faffc60eced91bebe7c673a6911f0f3ccaca
+EBUILD libmatemixer-1.22.0.ebuild 773 BLAKE2B 9c4bbacf5148258e41e1c29e490e37794995d304edf71a19727d9ae472ad434cebbb87f2179da03583d9ab40514d88a51dc8524ef80967800a64c65f4a261227 SHA512 16b7318b7381df18bbfb722dc79e768740cbf9568ca4b00979223d35aaa8ef2c58b8441f24d12e9eaab87fa11eee1b8fab48228273ee88f8d156c0ec1cfc2e61
 MISC metadata.xml 341 BLAKE2B e060b6c02aaaea5885ec10566d2e3b13fb2f480201b3b43144255fa1f27a93a648a9030fa02f0efd20c8f32ee93e03661f379a63576822ed5c27b094ff6d7d81 SHA512 0c6f04ebdfe4cd26e7fdad53fd184045f6d95c4b9c888883f255ddc566fc02e0cf86138d5557fb71c0e8e9ea12e0d19657b218e1d310ce414e2911470eaa9359
diff --git a/media-libs/libmatemixer/libmatemixer-1.18.0.ebuild b/media-libs/libmatemixer/libmatemixer-1.18.0.ebuild
deleted file mode 100644
index 07c33e23c573..000000000000
--- a/media-libs/libmatemixer/libmatemixer-1.18.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Mixer library for MATE Desktop"
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-
-IUSE="+alsa oss pulseaudio"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2
-	sys-devel/gettext:*
-	alsa? ( >=media-libs/alsa-lib-1.0.5 )
-	pulseaudio? ( >=media-sound/pulseaudio-2.0.0:0[alsa?,glib] )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35.0:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--disable-null \
-		$(use_enable alsa) \
-		$(use_enable oss) \
-		$(use_enable pulseaudio)
-}
diff --git a/media-libs/libmatemixer/libmatemixer-1.22.0.ebuild b/media-libs/libmatemixer/libmatemixer-1.22.0.ebuild
index bc08d21212ed..3bb4a5033c0c 100644
--- a/media-libs/libmatemixer/libmatemixer-1.22.0.ebuild
+++ b/media-libs/libmatemixer/libmatemixer-1.22.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Mixer library for MATE Desktop"
diff --git a/media-libs/libmatroska/Manifest b/media-libs/libmatroska/Manifest
index 30e86695086f..a2a821f6bbca 100644
--- a/media-libs/libmatroska/Manifest
+++ b/media-libs/libmatroska/Manifest
@@ -6,6 +6,6 @@ DIST libmatroska-1.5.0.tar.xz 64596 BLAKE2B a14f3f1aef87e2bc05989d3166b562edf852
 EBUILD libmatroska-1.4.5.ebuild 694 BLAKE2B bd3cb928ea029955ea64ca953c29df990e9f433f91f0dd08ffce3e12afd5be04256bba6447f73afe681150242a06d750f3c4bc84c51ce64defd3d1e650543d67 SHA512 58d2222582303d3b556071b46e0fc141836ebbc2b16b5d8c7120a6508e9b798b83b755fe8312f786451ba1fb08bcf62cd30453873b39a73f2c4d9ca3b7aeb353
 EBUILD libmatroska-1.4.7.ebuild 709 BLAKE2B 0cd3c996b2583541cd0db22420d46beb73aade0e6884ac4dca86341df70387d2e513f331b77c08b49dc7dcbe4f0072647996e4c4012bc40f3a2b3d6cc38a8175 SHA512 c1fd7b67325fd6895676f0391809dc71aa77b2d2b2bbfcc22b454f19ef692ae080ced026e1189d387a454723d6573831a0e9cb3d48691a1690f2235b7f98f5b5
 EBUILD libmatroska-1.4.8.ebuild 701 BLAKE2B 8db0db6e5a931f685f76fe67e9dba35ecdf54eaad1f4b4e496e2df77a8d3f468ec2ace53b7b906047cc3cb716f5919f0b37001a640233a7f853d8241a0857efa SHA512 a7a35513c071dd2f660f77dc3f2c062e183d062b913bd6d305b178ab1f9f87dd82bd6e3d0ca0a366b4133c322025f8b025bf211ef8e955770ce41a609d34d1f3
-EBUILD libmatroska-1.4.9.ebuild 668 BLAKE2B ed00494024bfe82b3db5de98f142b73413e40aec135fb7b145ebba3576b210493fc0fca29f6813bdae1186410c0bba7e2dbf203e63afcaaf3bd774b52889fa57 SHA512 3801ef7634d0ed3170e4acb6a1ab305bdfbabab58ece02c323b4f735d519ee9c13453277a6ffa575282ab31ba3823a47034b8936051c3043af366ae1f3297e61
+EBUILD libmatroska-1.4.9.ebuild 664 BLAKE2B 1231641eeedea1089c315c28ff4be133afedd5fcda0348cc3a6a4b000790461713b161484b61eed6dd9fa598c0e530b689fb0e8dc5fd9f04031e372d21ea8a23 SHA512 b261cf12d71a9ac41d77e9b0efcf74a691fdc8203f4e66c4129e72af96fcf06c253163bc4e93520730ff25eda514970530181c639b54ab1c197efd4399b33b5e
 EBUILD libmatroska-1.5.0.ebuild 670 BLAKE2B e78268605d9dbe15a367f23354efb9e284b3fefc092892c4de2956edb3ba158b12340894f4a375351aaab639a09999a54dfdc76ebcf653668e0bbd9eab6545fe SHA512 1138fb82839cbcee9a9b0438d937ff047012e88151615cfa5027b1f12adb4d4a76cea3b41cad591ed1c247479a5c269d93fbacb9bd5638a5036b771d6ac0cb5d
 MISC metadata.xml 320 BLAKE2B edd6b2e35a7833d3510edec80f3771a319cbb257cbb203e0f71f33636431496c620cb3307b2bebb44360d6932a7e4376b0d134f3f42d26fc9271423c2eed11f6 SHA512 5c1dad06e1fef24b1ec68fb6b12d0d17b4bd05f22b1953f713c25a513340cb08540eebaec32fbe7c6607ba2142a057b8e6e5743a929b7368665d91bc014f35a9
diff --git a/media-libs/libmatroska/libmatroska-1.4.9.ebuild b/media-libs/libmatroska/libmatroska-1.4.9.ebuild
index f9c654671935..d6fdadb7c1a2 100644
--- a/media-libs/libmatroska/libmatroska-1.4.9.ebuild
+++ b/media-libs/libmatroska/libmatroska-1.4.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/6" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/libebml-1.3.6:="
diff --git a/media-libs/libmikmod/Manifest b/media-libs/libmikmod/Manifest
index ade0fff45ca2..f0637e179c06 100644
--- a/media-libs/libmikmod/Manifest
+++ b/media-libs/libmikmod/Manifest
@@ -3,7 +3,7 @@ DIST libmikmod-3.3.11.1.tar.gz 1240373 BLAKE2B 9de58eea739f8f7a5c4ff482093974f67
 DIST libmikmod-3.3.11.tar.gz 1240329 BLAKE2B 7f5ceb26cae2e7e53ba5e07bd6e8f29384d9b62863b3c62e147efb1581a62d104d5abefc12eae12d97d55d672436d613679cdaef81365d34af14f240e48bd680 SHA512 61866fee68d91ff967ac2bad041e70034abbb4c095bba0475ed02cb81a467621a41a0685957cd9b5c19ec5218885ad42dc655443d67e01aa2623d91c0496dd63
 DIST libmikmod-3.3.8.tar.gz 1254702 BLAKE2B 4131dffd201061d6573cf46d78b569bbfa0e828261914bad2c278986b64aa4b9de3525e28b64eda4cebbce12a5ec512ed525b9c18e20b51166e40653f64b4e71 SHA512 033e3977d5723c42af697bf1b9ba6b1912fff1bfbef1894e2b1919d55415efa8024046579ff6a1e9ec752a3c793acc60b616c223b3cb5d79a814746c0cf55e15
 EBUILD libmikmod-3.3.10.ebuild 2047 BLAKE2B 94b45940812e21e9784217bf46d75b3f5997e0c7776238a8587af37fd50696cd268c081cb1525973e526302416d22eb1e586c3cc1224ec5f7a7f2de1f33c850e SHA512 36369710a60751bfa25646e83e8370b5a9d1a1972fc80714b374bb7a26ffc7fb1b2112a2f5dc86ff078e782bba8d3f2045cfccb6b663ee3855b4fe80995cb5a7
-EBUILD libmikmod-3.3.11.1.ebuild 2161 BLAKE2B dee3ac369ec76bb8deed9f1ac17e5fcf62bf2dbce2eebcbfb502a4a5ed0414739c1052e73998079b0beee015be2af959499993f0dd7c8839d846bc69039aedac SHA512 3eb19c0f8aeb894102528f107c2a9ff80fa8d5a43244ee86a1aadeaec475c4cd2f0524a7f4aa1edc7843bf85ba8d39cf8e01f2851fe67d3424dd9ee8a23d651e
+EBUILD libmikmod-3.3.11.1.ebuild 2156 BLAKE2B fc8e0074293d41381b452a0a4db6ea2fe15a2c9e9d1e5346cc9076c4979cf251f0ec8a51c08d4237ee2fc5f628229a12da53e21b51b2465b7ac20d9d13beca66 SHA512 0858a6fc79eb75dc92edac4783762d0a4197f35f1f81c54c3ea851c6a98d7a93c277a3dd40e9ee3fabbd7f77db5a230ec41ff7dc536df25d5152429c23dd53ec
 EBUILD libmikmod-3.3.11.ebuild 2158 BLAKE2B f746c9fbaf02bf7fdcbb23fc9ea76a1df5f5322784ed9c88bd3104cb07d129ce96ff3c9af26b46cf005aaaae35e436a851da5898da7c9bd23127ad4e49ca5a77 SHA512 749ed3eb424efbc6517bb3825f52d97048f8a48f194df3b668244521d1ac5647d72fa1b8ca08aecbb9941b7200c5fbee4dbd2e3bb71275e63ad5b1c2bbe9f46d
 EBUILD libmikmod-3.3.8.ebuild 2025 BLAKE2B 17652c792f297c2df7796a0701a90695cc66849a7ac4426ed3cc41657249c98d5c7b83732ac5a3d199f2ff7a5f47831db153fdeda8093408d5d96d9319c65afb SHA512 fb49e02feb167be764d6c0e0a92a5d9d847a0d7f0e1a639f28e0245bf2a8e569d2e03850b7b6f878252f5b0ebf4e3d4598c8bf6dccad73b7beef1a744652413d
 MISC metadata.xml 329 BLAKE2B f5950a51c451bd95614667a932e0799427831bed04505850b99dc77173b773cb8c158b50053b6c3a41755c8a1bb87077fb538207d56fbcf94fdce44ea0709093 SHA512 5deced2e8ecff6e1098f1ff339281cebfb8027bb052af10c9d95c7ae1eb80db0448cf5b350d40e5d5f76ed9948ffb5e4f8802f200f9b7f139a40992311eedb55
diff --git a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild b/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
index 713c5f9f113d..b134201129d3 100644
--- a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
 
 LICENSE="LGPL-2+ LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads"
 
 REQUIRED_USE="|| ( alsa coreaudio nas openal oss pulseaudio )"
diff --git a/media-libs/libmng/Manifest b/media-libs/libmng/Manifest
index 77b712c3698d..b3201e2de370 100644
--- a/media-libs/libmng/Manifest
+++ b/media-libs/libmng/Manifest
@@ -1,4 +1,4 @@
-AUX libmng-2.0.3-jpeg-9a.patch 1231 BLAKE2B 0b9c55af1a88d836cf753410da6299a7c19f94055175034b7c204f991b7773fbfcbd46417ac69a4dfab4078fd2ae11a811051f9e7b297081bb79cd2a3aa0633a SHA512 4b4fbfa226394a1ae8e33ff9db8f0a7c9754873d27beaf0a59a4e34b0d38794314f29c0a76b9e7b6b3d792d856ee8e040c8669367ee0f1e0d5d36000418d403f
+AUX libmng-2.0.3-jpeg-9a.patch 1378 BLAKE2B 72a3cdd738dd480bb216589bdfc1b935cf966c2e6d3e1029eaef539f67cd8e01977de71dd0c0e22321238af2963a615ca180c3efda3096cdb4fceedffc6e8db3 SHA512 d30bc5aeb586b88698695762594a238e339e5790831fea45d0ef54c8107951791c87662fa555454528ea8591dd5f42c55ff4225c1b8f83228c925eccd6f0eb71
 DIST libmng-2.0.3.tar.xz 951808 BLAKE2B 18f29d270d8c646da1eef41da094271acd5ce86094441f7f4d78dadab9dbc147619c4226bc642722639eb6d1a49567c517acaadea823f38c7bdd8ee3f498b927 SHA512 764efd94643c17c449abcb8f676ec2aa750a2461cf46bc961343f8d443a16ac2caa135c27d846deb2351b9f25d6170c42a500d21f63c13276905fdd743b8fec6
 EBUILD libmng-2.0.3.ebuild 1171 BLAKE2B 2c698f9b5f7b0e7d08a0fe0fa91b0d4036972eb66818f752b0d5b0cdada6bc727d1e6b3972f130f25113d744664c3e0ac53095e215d8e09f9c0e39fcdae36f31 SHA512 4b5bbe4ffb5163e8ae03884f770302dac29d69d47b6b424c670832cc18f8797e8c33e50360adb6704cc9af4b57e6b243d5a176517e76357a56b1b902d2edb187
 MISC metadata.xml 335 BLAKE2B d1fae8ad219bf09d9bd3588fedaaca1599c795811ea024f726dc3e37e88e5b776e05c3c40eefa6d100e393fcf439aff9d67c77d85010f6e1e8e2319067386fee SHA512 a870b439c25b0dc7d251b15c53eded27ed9a4c708dd81bb4facc7cda49b57abb4a24c013b36c11db4d8a27af2cd55ad012792fe81e8893f5c92007790c4fd8f8
diff --git a/media-libs/libmng/files/libmng-2.0.3-jpeg-9a.patch b/media-libs/libmng/files/libmng-2.0.3-jpeg-9a.patch
index 9441f00137d9..459b42e7db72 100644
--- a/media-libs/libmng/files/libmng-2.0.3-jpeg-9a.patch
+++ b/media-libs/libmng/files/libmng-2.0.3-jpeg-9a.patch
@@ -28,13 +28,17 @@ https://bugs.gentoo.org/578744
 
 --- a/libmng_types.h	2015-04-20 21:17:32.000000000 +0200
 +++ b/libmng_types.h	2018-09-06 22:56:57.153190623 +0200
-@@ -201,9 +201,6 @@
+@@ -200,13 +200,6 @@
+ #undef FAR                             /* possibly defined by zlib or lcms */
  #endif
  #define JPEG_INTERNAL_OPTIONS          /* for RGB_PIXELSIZE */
- /* There has been a change in jpeg-9 : */
+-/* There has been a change in jpeg-9 : */
 -#if !defined(HAVE_BOOLEAN) && !defined(_WIN32)
 -#define HAVE_BOOLEAN
 -#endif
- #ifndef _WIN32
- typedef int boolean;
- #endif
+-#ifndef _WIN32
+-typedef int boolean;
+-#endif
+ /* For jpegsrc.v09a: */
+ #include <stdio.h>
+ #include <jpeglib.h>
diff --git a/media-libs/libmpdclient/Manifest b/media-libs/libmpdclient/Manifest
index 132f2efeb894..30ccafa957e0 100644
--- a/media-libs/libmpdclient/Manifest
+++ b/media-libs/libmpdclient/Manifest
@@ -5,5 +5,5 @@ DIST libmpdclient-2.16.tar.xz 60480 BLAKE2B ef7a077195b08f24304e08701a303a6709f7
 EBUILD libmpdclient-2.13.ebuild 1048 BLAKE2B 6339e52139ffea93ff33196139693a87dfa7ed2346dcf8e46be6eb161e77f9da1668f37a748acb0b8ff1004a22d28f917a0ba9f8276b0b1357ff95192b0f0132 SHA512 f72f00afc0e4adf5ce732c58f0da02d13e06b44433746d9b4882e269929ee8bc95484abb12fe0062f625c58931a8d365fbef4c61c7c5e6335798a1efaf703edb
 EBUILD libmpdclient-2.14.ebuild 1054 BLAKE2B afde1ee289bd6bcb7d8ecfee925d2fe1731305d9d6503645aa855c409e0580c3ef69eff7f026a02fe82e2b89389e50a03d17912538e2df01cf966987ebc11736 SHA512 f621f7c78b0127cca2afb53f94fd6a820aadf20f3ac357bd190cc3cda74bd24d647bf710b1ec1afe5f9c49b9cd113cae4efe914ea3d4c80c9d21999c7bb9b4c8
 EBUILD libmpdclient-2.15.ebuild 1054 BLAKE2B afde1ee289bd6bcb7d8ecfee925d2fe1731305d9d6503645aa855c409e0580c3ef69eff7f026a02fe82e2b89389e50a03d17912538e2df01cf966987ebc11736 SHA512 f621f7c78b0127cca2afb53f94fd6a820aadf20f3ac357bd190cc3cda74bd24d647bf710b1ec1afe5f9c49b9cd113cae4efe914ea3d4c80c9d21999c7bb9b4c8
-EBUILD libmpdclient-2.16.ebuild 1051 BLAKE2B afaea12993515d091fbfbef4a35d20ec5297f5912bacf925fe998aaa21a86e44a05fc74f9e6d5fc06427cb7ee5ff6cc4516c11a82ddc5b11ac4875597e274e5c SHA512 afe1c98f8d2c92da1a1f68280955a464a057a5b630049bcf1f9109cb5d1fc84887df8099df85dd0b1522a694b5b132dfd13e1a4acaa4433830d759ac4811cae1
+EBUILD libmpdclient-2.16.ebuild 1047 BLAKE2B 79ef40fea1a024711e7d94b96debd714b2aa69cb8375b03b5c42ef73849d29be4b07a60b1d1fd2a3d24718c34a9d8d028a751d611e011b8cc3cb751d36fef483 SHA512 5db0d73160d8852014830f74e0a0ea63ccf781eacbcec0c9af5b8891db309160f7f1e2f04d1c1c262acaa21ee893c136dbd8122edc6f3c617143a0b05ada1a2b
 MISC metadata.xml 348 BLAKE2B 6c3a4f4924ca11d41c0c7fdcf062dbfd43f23f1181a83d4154a4a36a015999786962adb716f751e046127d37d2b88649b2ea9968330a85ae8f9307a96c7d9f96 SHA512 75efcb39f67cb2dfe31846b08e9daa02845a07006fe2002f43feabee680dcc57bd41a0fed3bbfe9e184892a5adad64efd3ed83931a91b924739355ec689f5b00
diff --git a/media-libs/libmpdclient/libmpdclient-2.16.ebuild b/media-libs/libmpdclient/libmpdclient-2.16.ebuild
index 0b5cef2b9dc9..87746d3ad4c3 100644
--- a/media-libs/libmpdclient/libmpdclient-2.16.ebuild
+++ b/media-libs/libmpdclient/libmpdclient-2.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ppc ppc64 ~sparc ~x86"
 IUSE="doc examples test"
 
 RDEPEND=""
diff --git a/media-libs/libofa/Manifest b/media-libs/libofa/Manifest
index e9cfbfea3917..a4ad436b75de 100644
--- a/media-libs/libofa/Manifest
+++ b/media-libs/libofa/Manifest
@@ -4,5 +4,5 @@ AUX libofa-0.9.3-gcc-4.7.patch 651 BLAKE2B 52a20e9242f5899ad0c08b91ae2d9169642ce
 AUX libofa-0.9.3-gcc-4.patch 818 BLAKE2B c49d0f1bc2c364a25c20792ad79d53a5a8abdc9370c272e4159c5a37844061cbc03aecf97933d0c2e2c4b18225d004fb0484456169f78f5caee0fa5ae5a1145b SHA512 7e80ddb700da74d1e2b6c5e65588e6329e8ae231534b3d74b98815bc4919964a9fad87fcdfa2bef0d4adf9d478efd5c1649d018fb347a93c7ae1685cccab8834
 DIST libofa-0.9.3.tar.gz 384043 BLAKE2B 1b4c89e1a26e3bec1b2bde16c5d2c86ae7a66cbe8e450b96974ffd8be434062ccf21779c0eed5a809012a419d65f9de327c6b94fe6ac5365270fe382dbfa2c08 SHA512 058fb43ea296325d2f7ad1762e1fd3f2ad772754b5d53dbaa1c5cd91ac5041ef82c7ea9ac580825e2391fa7db6803ff7fd5b24faf319280211a4641516126967
 EBUILD libofa-0.9.3-r1.ebuild 1225 BLAKE2B 64aa485bf1431f2998034bf693030e4340c259646fde1fb76a453f57d78bbf908197e7b6a26c9ff84314dd40cf07fcb42c9a97201d2940fc0f1cd69360e6c561 SHA512 d1fe57bcd6c8c778b4f940ccd8d8b480cdab008cb93ccd8f39ccf371e9cde85d85ee327ddb7562b72783bd3c4bb2e3e690bc2e3192f9c868abfabb19018a16b3
-EBUILD libofa-0.9.3-r2.ebuild 1118 BLAKE2B d48ec6e47393e5c0a187a1c8d9076ace79e4d30cfd2ec2d0eaf8a01981ae696a2b0c541c28735c83cd7e6ac11d128de35d63d9abcd6be896d6f0e7aab8bead5d SHA512 1c8f896e64250b7a2c5f9da477eb5ce4be76c254aad5f34f69b5f019ee96004b55333b69cf372f2a5a852e226d876c11821115a228eb878008f8a128d34dd2f8
+EBUILD libofa-0.9.3-r2.ebuild 1114 BLAKE2B afea9f75820526fb172334a1d43b4a5a368f29f4425cbf97bba77e166fcbc7afa411b8e99f39f2ec538fc923c22260df19af0ce32de4fe39eb22f2e2337c3ac8 SHA512 6f1cf4f49160cdd22fa8dc9ce1fc7c14621f1dafa84d56402e313d7265300395bcbe467235516df70ecff336dd398331b24ec30bf13841da9beae531c2ed7c0e
 MISC metadata.xml 337 BLAKE2B 3cf5fbbe6cea6c48b832cd4be4ae506a319b7d21d27b1e98c83602adf8ff4948736a7eb46e7156bb328fae2fd27886d4af194f340e06488a7f5adf266bf84e7b SHA512 ccfab3198ba95caba25340c8254d465b23aae4edff3f63a0acbc0fc7283efb45b5ad4fd250df09e1e2442b5cb2977a228375daf25ffde08004eb887f624941c8
diff --git a/media-libs/libofa/libofa-0.9.3-r2.ebuild b/media-libs/libofa/libofa-0.9.3-r2.ebuild
index 16b7c3c3968e..57e6cbfcbbc6 100644
--- a/media-libs/libofa/libofa-0.9.3-r2.ebuild
+++ b/media-libs/libofa/libofa-0.9.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://musicip-libofa.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="|| ( APL-1.0 GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libopenshot/Manifest b/media-libs/libopenshot/Manifest
index 7c4649fe6839..fc330a608331 100644
--- a/media-libs/libopenshot/Manifest
+++ b/media-libs/libopenshot/Manifest
@@ -1,4 +1,4 @@
 AUX libopenshot-0.2.2-imagemagick7.patch 3545 BLAKE2B e2fe6ae205459c69ff288f14ba2d0a2b461b761e7ff6e9e66e11e4895b10661d5fc2ab9e2011899ca983399af685a0d411aa4820c02d02b4600617bd314d7670 SHA512 06622c81253fd15440e1cf0256a0beb21e2039a5a98a8c889828898b137a9a6efeb6fb295a0646dc5aa12da9805ff73b62c29272b0037cb1ea2454de7571f59b
 DIST libopenshot-0.2.2.tar.gz 11037768 BLAKE2B c307e41bf17d40ae421a541bbdf4cd53c6ef4d97041a476c6910bd156c10815aa5a5811813b24fdc472401516f29cf8cb68fbda17a0b434767c3f3aa63d6f222 SHA512 b89189e57e82da68a063417bba9c94704c04b0546c0aed227daa23a794eee56341a05988d8e28dbd339edfcdeeaed48103b347060eccf94f32fe1a4bf23d6553
-EBUILD libopenshot-0.2.2.ebuild 2209 BLAKE2B 28574fba62134b2e811806ec9aceabf3c9774b4a10825d3784989d308937a7f8b8d6544fba82eb7691cfcb27e8c0bb1e191527d0560e922768d2acfb6462f785 SHA512 1bf1c2905474764f5fc67df38d799c1dc72fe2231edf850d98d1e9fc623038ac5acca679a1dd623848f50bc18fee9a54dabfb088c3cb7fcea062d6199d2e2029
+EBUILD libopenshot-0.2.2.ebuild 2207 BLAKE2B 31c03e9f5cb7e596930bf01efc6c1897b586a355dd1bd516e37872b0b2a37259ed83a4a1b1155e65b620554d1842ea7c71cc1ba223a542dc622c54d2c4ade00b SHA512 fa3c05436c0bbd2949ac11d8e35e763a96693dbb48d352264f5abd71d24ddaadf099b9035b2236471e07418b8533d3ff3bcbea7034660875e0f740b9bb141c69
 MISC metadata.xml 374 BLAKE2B cc763fd4cda8c70fc654d85ebaa8a3b748499308a4633c6f70aeef1cbb767f5b5eaad0f6c4402a74862e8ebe392b6862722835e92cb53ef4b88a9cc87b2315db SHA512 2a1810910f38b67624eea2d8778c095bbe884cf8a06ababaf595a295d8fbb904e13a809ccc888b8d5956e87a2ddf1295982133741596a08e713f9cbb6a6347ba
diff --git a/media-libs/libopenshot/libopenshot-0.2.2.ebuild b/media-libs/libopenshot/libopenshot-0.2.2.ebuild
index cdbd9c418001..e559f5c2384f 100644
--- a/media-libs/libopenshot/libopenshot-0.2.2.ebuild
+++ b/media-libs/libopenshot/libopenshot-0.2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit cmake-utils python-single-r1 toolchain-funcs versionator
 
diff --git a/media-libs/libopusenc/Manifest b/media-libs/libopusenc/Manifest
index 98621ef515ae..32cbb7c93c4f 100644
--- a/media-libs/libopusenc/Manifest
+++ b/media-libs/libopusenc/Manifest
@@ -1,5 +1,3 @@
 DIST libopusenc-0.2.1.tar.gz 388071 BLAKE2B de3a69aeb6bb955352e097e41b12cf0c627ce5278687124d00996f52ccf5e8e39277e7c345bb26e75dd7d29b6a70f50396fa5a157913e0906a18acd007b1621b SHA512 adf30cacea9ac2e5889a40147f53943a1bec5279c5ff3a9b09de8ca52727a6cbaeecd338417fc5856e337ae183c85b0d366d14ec4ec329de12d50709a6f6507a
-DIST libopusenc-0.2.tar.gz 388027 BLAKE2B 5822d09ec56ce9dc0182241e7182b71c9c21def5645a2ef3472af380b25af1b1f8a08311c2cfb8bacdfde845dff81ee426401f1ab098b6598e41e664ccaf9c34 SHA512 82b9a60bf6fa0c8bc485b221bc633456245f8909875fb9e86876076bc37857d53a366bbc66f2e1e331adddcf12c4d5a29f0047e21d0fae2f8bd8a3199bd6f78f
-EBUILD libopusenc-0.2.1.ebuild 611 BLAKE2B 9d294c9879802e24a3e6ef84535cad08e037e5bbee0c74c0d72491aeacc69e1363562cece1cd8479e11992398314048ca5adc5318c5cc85636fba7119e2e7aa4 SHA512 e953a21cfd3d1278327dc74d87aae431297b8205b3cf842162dc55766b3f3e87f2702a510a7df8d57b8cc9cb90cf5986b1544e46490bc9027be37082cc75e076
-EBUILD libopusenc-0.2.ebuild 629 BLAKE2B e96df2a2e4f82998005c081c499ab97c94980b89be20521a2a6a296afb2b8896dc4543817139e0a1b613e1461edbe63624598061dc02809fd31bee6da4c3bf5a SHA512 9e387028b5f40c4a0d4423eec21a6542011fdb923a9b27d9309b42874dd257a3a04c63293e965258648040ad8259ff4ce6b003844d9b7cdc3ed104de528c74de
+EBUILD libopusenc-0.2.1.ebuild 608 BLAKE2B d7522e132bf32071719e0ebb3773c03215da453aac7dd94b65059e6558ef941f8ba1c52bd9a348a58008ede8534881960b9892882b85775ebbe48bf2e5508433 SHA512 0f27f6ada515f16c41545fee6275aa14c8ce76ea66f61c4bb781cab51da3103536cdb293c6f78964de928e306dbca7f0d67ef9688051e5306990c4afcbfe5b38
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libopusenc/libopusenc-0.2.1.ebuild b/media-libs/libopusenc/libopusenc-0.2.1.ebuild
index eaa29c509519..e3775dd16e75 100644
--- a/media-libs/libopusenc/libopusenc-0.2.1.ebuild
+++ b/media-libs/libopusenc/libopusenc-0.2.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 ~x86"
 IUSE="doc"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-libs/libopusenc/libopusenc-0.2.ebuild b/media-libs/libopusenc/libopusenc-0.2.ebuild
deleted file mode 100644
index a75cfdebe970..000000000000
--- a/media-libs/libopusenc/libopusenc-0.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="High-level API for encoding .opus files"
-HOMEPAGE="https://www.opus-codec.org/"
-SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="doc"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	doc? ( app-doc/doxygen[dot] )
-"
-RDEPEND="
-	>=media-libs/opus-1.1
-"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable doc)
-	)
-
-	econf "${myeconfsargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index bfd9456eac13..6fd8e0fb6a45 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -5,8 +5,11 @@ DIST libpng-1.6.35-apng.patch.gz 10396 BLAKE2B 5f69db106909f690f3fc96dc14db3c728
 DIST libpng-1.6.35.tar.xz 1014320 BLAKE2B 2c1d8a4a1af8d5c67c8c18414fc1c32ad41b81e5300b3fe72c2bb89afece764087c7829308243e5eb24e7d685c56ba6c151b66ef64603528ac0406d89dd4cc4d SHA512 b69152bc7869e98536effa8e45e2dac7bffee26aa9e31fc90b37506a702256919bcf4dd9cadc42fa4e45143bc023ffd7c637742367e58707e8c2226b3a09eee0
 DIST libpng-1.6.36-apng.patch.gz 10329 BLAKE2B 8c97da493a1eed697d8bbba96dea992b17360f5e4844b8d43c63a73684f09094d28d0032a8311e39f633c449674e7aec7bab0e923d9df8ff2a7e17caaccdef5d SHA512 1c82e2399dd6dea14955a4e8da8d3f50bbcee42676dda5d7abdd36f27d1228924b0107d0174258adeb2eec8ba74b267d8a778b72b72f6dcef176608d5ff7c912
 DIST libpng-1.6.36.tar.xz 1012544 BLAKE2B 6b89e39e5a301e9e4d7fe93d97e4b8695a214b5b102cc1b21455baea2608b99003110f6f20beb3464e1cf62762a35917bdc07f31ba5aa041776601cc9651809c SHA512 a86ee977df69748e5039fb0ead883f1d3f88b8a701fa24cf8e62dd77c5871bb46397d794fa33ec1d0be1ac488246832ad79d0e6117ac093bdce1b2a1cfcb2bb0
+DIST libpng-1.6.37-apng.patch.gz 10334 BLAKE2B 98660f2c13a78c93f937adf2859447cb0e6fa014b2ef6f0571c910593d94cc0a50137d271dbded0b571a3bc0ce4e9f765be48130ee4ae89884fb7292a1b0cf6e SHA512 a9365257a33d67d7e7284494a37747bb1f3ab89f42a1730f2745c604538f59861828dc91d9bc1d08a5b79ab2f4eef1bb9e438dda1774b3548a1c56be77f8435f
+DIST libpng-1.6.37.tar.xz 1012272 BLAKE2B 48e8f48a88e0db6fcbc0c0f1a4d5bda6e6c8b03255bacdc60e353256ae41ccc01b5b2a7e0e7b0dea236c53a3b9d1dd89d4bb19445afbebc37bf0f92691452424 SHA512 59e8c1059013497ae616a14c3abbe239322d3873c6ded0912403fc62fb260561768230b6ab997e2cccc3b868c09f539fd13635616b9fa0dd6279a3f63ec7e074
 EBUILD libpng-1.2.59.ebuild 873 BLAKE2B e19aeca3f3b0595193b7b6ae55d0c9d4f8aa63a4475d305f764870ffa45cf7adf2b18c9203794d4516b2acbe1f10b7a1856fd09203078ee922bc60aceb559a61 SHA512 8b178d6afd6588e14225260442d63082aec001ad187e6acc9a8192140b5e8dac321ac3ea18d36f2194c885120b3c5a71a6daaa1d020a270bb1cd5199f918321f
 EBUILD libpng-1.5.30.ebuild 1644 BLAKE2B 059c2e421bc2955c6ebe7ca95b173f5e85e1fadd8721eb23d0964f786a5497751ee8c01de67370351e4a0b5ca99fda3dfe157d2489e194e145ed636134ef05b4 SHA512 64e8f007c376d46f9d7314b7d4bc322a9c25ca9e470f52fa607175f95e05e2c00f932a406daeab634710b0825a5a5714b4401d2e1285b3b23f0da1435142eebf
 EBUILD libpng-1.6.35-r1.ebuild 1364 BLAKE2B faddeabf1a0aee8ee88b124800bec19063239e02e78eb159328df92bc2f2f85572ebe9e30a44283f9bbac831a7c1216b4d213c6bb6314813cc469bf2862ca45d SHA512 59f6e5f5761d3d6ebd7070e2e11d6d722522b1aa0daeba61facb045f9c6e420bba5f2e0187d89fb6d5cc4860653524665c02a4d69b06d6e20b52ac7f39fad251
-EBUILD libpng-1.6.36.ebuild 1375 BLAKE2B 1e4df515db793d7fc7e7dbecb3a9b07c56a3214ce337573a9f91fd010ce20c52504d0d6367122418cfb2d21fea4f6f289036737b9fad3b52a6a0e1d6113f9788 SHA512 19f546997b31fbd6dbdf4fb4bc2cc113abda654d7c8a933e140acfd33f6627377e75bdfc7897fed5af3466a7c02ca8a63540643c7e1f8f7a655d5c1a06c03583
+EBUILD libpng-1.6.36.ebuild 1376 BLAKE2B 8568a0c815ff76fc690d8c7d1c8b82a66277b8c279ff993f8b4054eba531a2662e0de15a17a0f037b179270d2bdc03561a962d8c1955572cbfb00a233e72cbd5 SHA512 4587ce5d6a135be7c4f5d9926bc3c6bb4c5bc1a13930daea5f5d6e38cc37d318e357a8e5ab0b4241ce4a63d897bff8288ff42e2391cfd372445a31fd5c71b3b8
+EBUILD libpng-1.6.37.ebuild 1366 BLAKE2B a74a8091194629ed86277c2f2f7d07a150aec9d9e58dd8ff29a24078a042cb6a577e959dad958660c6cfd4147784dc75bae9f28244d8de4bded5114f207a8d73 SHA512 ba197d383e375fc644a0bf5c3a89197a0925cca6fa629c0aef2cb6b5d13de3af204f516a23acf5ad56e09c061ac7d993a1c040608203de791772d688fdbdb38e
 MISC metadata.xml 843 BLAKE2B e8736137db2c0e06193b3bbc9d933b1b8e2b8609d050a93a5369a8de81acf02af1d7ff6eb3c1e1967d7dbd6fec38373e389011d290cda1577203075f2f679167 SHA512 43cd4bd8981c828f2de943bb5ee90958f6a4f555d824be1325a7663219b0386ebaeb99406697affa8086b5b50f3d185e01ed12ace030557aa66a8e7b9af006b3
diff --git a/media-libs/libpng/libpng-1.6.36.ebuild b/media-libs/libpng/libpng-1.6.36.ebuild
index 1bce3c6cb23b..30db848bda4c 100644
--- a/media-libs/libpng/libpng-1.6.36.ebuild
+++ b/media-libs/libpng/libpng-1.6.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.libpng.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 	apng? ( mirror://sourceforge/apng/${P}-apng.patch.gz )"
 
-LICENSE="libpng"
+LICENSE="libpng2"
 SLOT="0/16"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng cpu_flags_x86_sse neon static-libs"
diff --git a/media-libs/libpng/libpng-1.6.37.ebuild b/media-libs/libpng/libpng-1.6.37.ebuild
new file mode 100644
index 000000000000..116b7cb6b526
--- /dev/null
+++ b/media-libs/libpng/libpng-1.6.37.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit libtool multilib-minimal
+
+DESCRIPTION="Portable Network Graphics library"
+HOMEPAGE="http://www.libpng.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+	apng? ( mirror://sourceforge/apng/${P}-apng.patch.gz )"
+
+LICENSE="libpng2"
+SLOT="0/16"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="apng cpu_flags_x86_sse neon static-libs"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+src_prepare() {
+	default
+	if use apng; then
+		eapply -p0 "${WORKDIR}"/${PN}-*-apng.patch
+		# Don't execute symbols check with apng patch wrt #378111
+		sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die
+	fi
+	elibtoolize
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable cpu_flags_x86_sse intel-sse)
+		$(use_enable static-libs static)
+		--enable-arm-neon=$(usex neon)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	DOCS=( ANNOUNCE CHANGES libpng-manual.txt README TODO )
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index 11ba0df888a2..d9119a0c57ba 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -5,5 +5,5 @@ DIST LibRaw-demosaic-pack-GPL2-0.18.8.tar.gz 30868 BLAKE2B 30cef85c49e066fa4b1d8
 DIST LibRaw-demosaic-pack-GPL3-0.18.8.tar.gz 39002 BLAKE2B 544a1eab61c825c7f2202107d623a56e1f81ad3e5111b419bf12708e2d8a9903f192c23904ab8fb274636d9262d3d89f02fa5e05a0e70d7834782c2df8ec0548 SHA512 10e8cb6694159d04deb813a88e5c3195eed6e2e438f41533db91b17997af1b9d54f286303447ca6e3d1b377922e388f6fcc8a8370254011e11b85612c914d500
 EBUILD libraw-0.18.13.ebuild 1840 BLAKE2B 7b86c52d8ae048f2287455ab34ed05a69192ceded8f8a68b97fda2647517afd90983b5b45991809d87cd7d219e11087bc6a506f00749d0a4719d2451ab85b562 SHA512 9681595927e116f9b97815745b097219c3dfac4fa3020ddaf2ff320a9315327d3e02fa2964b468dde2f981035516e2ad49e8e6cdd69221841011f54764dfa90c
 EBUILD libraw-0.19.1.ebuild 1448 BLAKE2B f1a9e7cb56b2b391a0fe84d5aaa7011c1e2f8d7dfa7b8371ea8ea50fc5d17d3d2975482fa757e161a6c095a824938db51a5bab6ee5f7720cded0441ada7c563b SHA512 6092e9ae48e3c3865312a2041f1a0a7ee1fa246e34e3f44bdba2beae8e7579a049a44f0b273cd5b49a8c3bcfa8bae5f34199bcc49243eaa75ea527794dcff8e3
-EBUILD libraw-0.19.2.ebuild 1496 BLAKE2B 99d3ec9a6ab8534a9b6346b383bf13bce394149ccf8e4a2ae1af68b373679c8e1d4f2b84e0488fd239bc9cd5386f965e84dcad77fb8ad38f91b4a2316c6446ef SHA512 0ea7c977146ba28ab92017167dade9bacd8de68f1142c14ee184bd1ca4c5364a6482eebcd832044489f3cf681d1f1f597827b81fe53e9a5a5920dc0ffd1bfaee
+EBUILD libraw-0.19.2.ebuild 1495 BLAKE2B 8d447b1613e72790cf2e3c556741b3eec0f331ebbf140416cad2595125f757d4c5ce32131b54f954e5dfba3758ab5ca4d41719e2be6bf23cc0b64d039edbc858 SHA512 658dbcdecfed69773dea274a272afa0232a080ce4e21921a528efd2de6bb43ff26a1e2b0010acfa113f3c2b631ba1800bb6ef8ed0a6e1bb4c7ee7858cfbaf28e
 MISC metadata.xml 437 BLAKE2B d43c89433ab4eff6a760dce4f7fc83253cb572ab048af7fb1df5bca74db8d7fde84cf147f5941e65407776d281edc4c0297006c75f83c285a5febc37625d6265 SHA512 b06d476afa85710b25dc7d1c1567ba30469ce6d08d278aaa64413611edf95433df315a5a77670d74ca5341be3b96fa0f4451e48f544783f031178b8cf73cd388
diff --git a/media-libs/libraw/libraw-0.19.2.ebuild b/media-libs/libraw/libraw-0.19.2.ebuild
index 90016d4f6965..e173c4608942 100644
--- a/media-libs/libraw/libraw-0.19.2.ebuild
+++ b/media-libs/libraw/libraw-0.19.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1 CDDL"
 SLOT="0/19" # subslot = libraw soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples jpeg jpeg2k +lcms openmp"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index 716ca79801c0..927867fb6bd3 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -7,6 +7,6 @@ AUX libsndfile-1.0.28-CVE-2017-8365.patch 2577 BLAKE2B 3e9af3996f9e859717281b1e5
 AUX libsndfile-1.0.28-CVE-2018-13139.patch 921 BLAKE2B 4fe567555b1c6e5a0c8098eee40441671a623f4ba91a03c059babc4a7a49eb4903bde38d52333335749fd6a0f6501bf524add119658226f6b169565a579b8f2d SHA512 33817e7c85180635fa239e4ea38973b18312878522639f43071188a995f0e1a35dbca6d133555fb0875292b4b609950ae38e747a6b1949f8ae840db9dc3a2805
 AUX libsndfile-1.0.28-arm-varargs-failure.patch 1329 BLAKE2B d8a995e6596db880d2188cfc3243b7aff2dc13ed617b0bf589e918c5a852d4fc1d69c00eec26ec8c8b258ab00eb860872e01b149254d554cd563fd6d7b532891 SHA512 4577282dc0b71d456a562d06d8b22958f24caf383c6c4c8aa2c9006614d3110b7d6bbf896ce393468455460cb8d466c09a48416cdf159e30de6d5ecaa0d4cf09
 DIST libsndfile-1.0.28.tar.gz 1202833 BLAKE2B 102735766e2c22b5278fde43feaaa664598c08fadb5264d5130e4bf1e354bd4202948db38e2912d7487bd7f8c0b9faf1616c0873eed886a56b1d7f49452bf488 SHA512 890731a6b8173f714155ce05eaf6d991b31632c8ab207fbae860968861a107552df26fcf85602df2e7f65502c7256c1b41735e1122485a3a07ddb580aa83b57f
-EBUILD libsndfile-1.0.28-r4.ebuild 1884 BLAKE2B 8897f95ccc9645ccc77bb850611565b7b33a287f04b670b0485534b380c7fcbaa167f91b6f43eb9fcca9aa5bb41601718b4155d89ed571f21f3a2cab8b9538e7 SHA512 246e861681425d93a0faf55e3e3e42d409cb4cc1215991d90901dfb9151cafcc33bd80f365a80133f2c1b177c94b70ddc9cdcabb53b79faa1c86dec9dbb8f6d0
+EBUILD libsndfile-1.0.28-r4.ebuild 1880 BLAKE2B 106215eaf3fb946137e3aba967f6d8d5a8d63bf92c46b04d75df24f0be7c6402f636af5e93ccfa46b8eeee1182e51aa2c61854b3497b93d6051d09d520d1d3aa SHA512 27e5e3e2c45f14220e77705673f05386aac3650c9c85efe6c45cae468928a6675ae6883a883e96f50c650f1efdc3ce91f364b2e585db56798f9404a1734f6c00
 EBUILD libsndfile-9999.ebuild 1781 BLAKE2B 311f58ead67a65b184cc7f3ea594a7f6145d929990d46ebc2326ac7e826555c089d76f70b749ac21cd4b375185d9140f6898502899629527dd787ee2453650a9 SHA512 6da5bb0a8ad27f93a0916caa2c1d07ffd57fc3735d520fd645d04321c35d03722880360c63c52aa4ac7e35a3d28498940dfb1423d733ed485402a9528204da35
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild b/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
index 9edee782210f..2b5b625c6236 100644
--- a/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
 
 inherit python-any-r1 multilib-minimal
 
diff --git a/media-libs/libsoundio/Manifest b/media-libs/libsoundio/Manifest
index 6c08dc3ac245..5b359dc4e1bb 100644
--- a/media-libs/libsoundio/Manifest
+++ b/media-libs/libsoundio/Manifest
@@ -1,4 +1,6 @@
 AUX libsoundio-1.1.0_missing_include.patch 610 BLAKE2B 7d545cbe90072bb125b705a0443cb73e134d5455508cd3da683ec5f2a2e716481c7db28e41c16a1c32fb14f74997b14ac83e499b019dd003787f621811447a19 SHA512 7477d305d84a9bb5482928ed600d39864e43a07790156ead7bac5c8237cbd2a1f57690cdde04d2ef19f5c19eafb47449d3579f5b57da2c59fa18b10b474db683
 DIST libsoundio-1.1.0.tar.gz 118672 BLAKE2B bafebad3a45cabca18cd1f73c4d8c2a404cacd5c1f23f333678300b4300eb1724faffd60caec7c35925f42c019d4a9bc51685892efb30cd259c2d3f84dae5d59 SHA512 3de35fa83395faea5e6f4478cd82d49615e470b09847fb076647664238e232ff3d4597ca7a07ce06012ae084f11e5d3903b42d8f4afe64c27b1a4b92d2081b5f
+DIST libsoundio-2.0.0.tar.gz 120387 BLAKE2B d4005667767633cf90fbf524cdf102c69e04e4e37cad55b4f9b1af7fb3f89f7b1a6ff47569c86bf5d86649fd34d9d080b8ed74d6da07c4155abadb3cad0797f0 SHA512 347a9be1789a41e778ea8d0efa1d00e03e725a4ab65e3aaf6c71e49138643f08a50a81bd60087d86a3b4d63beaeec617e47ba6b81f829ece8a3ac17418eb5309
 EBUILD libsoundio-1.1.0-r1.ebuild 1100 BLAKE2B c56e7ea9340115858b497ec15814337a348f2f6be7849dd610a6800b14b75bcf262df336fd9e30da7c67efb172acb81e720833f992f1a278dbd1be67591677c5 SHA512 f9a677fbfc3de77565b1a64c5b6c76025f4050a67d0c12b3ec2600fded77bbce4775e8c77a00af318093f99f2f8161344c8177b68c6b45c871eeefc3dfc512c6
+EBUILD libsoundio-2.0.0.ebuild 977 BLAKE2B 4337c4d0513d4275364ead8ef335eb57de2a7652c9bd0bbe65524905557ea8e6334eb1af3ab8cadc47b0a659891f5f8154bd68d2e0a5023fab44935eb5020c45 SHA512 e74c357b163fdd2323718b8f23e78dd0effd081e9b7b9b1f79350042e9ccaf57117866565e2bf82ad615a6108f2ff9cbb006c59bd8ec97a3d36563a52ac250c3
 MISC metadata.xml 901 BLAKE2B 8ef7fda2362a78865ad8321bb4724bd9caaf269ace631ada2bdb70fcfc6a8327637718fd1c0134445f51e127e1fe24a55a3527c8b319505bfee25e1e674b127d SHA512 156acbf89a915ba57049e365ef53abaf6c1c986d6ccb07e679bf1f7e39de8d708c8cc321aaf8588a7c529e878fea8b182f1eef60748c12287e4dd6ff16c77fb3
diff --git a/media-libs/libsoundio/libsoundio-2.0.0.ebuild b/media-libs/libsoundio/libsoundio-2.0.0.ebuild
new file mode 100644
index 000000000000..33ece577af32
--- /dev/null
+++ b/media-libs/libsoundio/libsoundio-2.0.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+DESCRIPTION="C library for cross-platform real-time audio input and output"
+HOMEPAGE="http://libsound.io/"
+SRC_URI="https://github.com/andrewrk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/2"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa coreaudio examples jack pulseaudio static-libs"
+
+DEPEND="alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_ALSA=$(usex alsa)
+		-DENABLE_COREAUDIO=$(usex coreaudio)
+		-DENABLE_JACK=$(usex jack)
+		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
+		-DENABLE_WASAPI=no
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+		-DBUILD_EXAMPLE_PROGRAMS=$(multilib_native_usex examples)
+		-DBUILD_TESTS=no
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-libs/libsoundtouch/Manifest b/media-libs/libsoundtouch/Manifest
index b1fcb3dd8a5f..7a307fc9562e 100644
--- a/media-libs/libsoundtouch/Manifest
+++ b/media-libs/libsoundtouch/Manifest
@@ -4,5 +4,5 @@ DIST soundtouch-2.1.1.tar.bz2 526206 BLAKE2B bc5d2edef5ae7d297cd017968fb1206d143
 DIST soundtouch-2.1.2.tar.bz2 526281 BLAKE2B f15f004fd6abdf4cd6fdb842c650480c670a517c6d94365633a7cc4beb95447d7a8bee965d4b258da6c31630e370e3c1c1fc73abfe8568ace465ce41a87397cf SHA512 d45cb0f94e3df32e9c76722a148f201277b2ddc3e390394c1f4ae1263f13557c6b664e90301b5f62d7561d743ab4903a44a34ab7248880b343d581cebd5f0cd9
 EBUILD libsoundtouch-2.0.0-r1.ebuild 1499 BLAKE2B 43b32e874493bdfbe22bd07a7a0f78f4952ab5cd192496d1b26bc0918f18f22f2df5b6985dd27727de5097f068897d3a612d2729392450c2f638be5344cd6536 SHA512 ec0e8a610460293f89f743f3457178475b4c4c913cb80a94cdca4ac059c60eaa079252bef940afdfb222bb2b1cb524d1c23cf2a55a2280050602c8cf00aa242b
 EBUILD libsoundtouch-2.1.1.ebuild 1526 BLAKE2B bed4c40cc3e7fddb0a98185b4086ff145515cae22c9b73401bd3b7f6f8260e7c9ca62aaa453aa36a656d7bad7cc2c236f3dc73b24a56292bae1f4d1cfb5ea338 SHA512 fece8e9f6aee68d1bbcba65280f3b578635375af1023bdcc8080eb6f945322bae924d694cfbf26caf7e81d785e4f2d75ade19dffa945091c1b9a91b86a9b84c8
-EBUILD libsoundtouch-2.1.2.ebuild 1528 BLAKE2B fd168965ebefb1ef496b30b1a224ff50551b8292356f2d05d849ccae7d6c7326462b5dd48e3197e710acd37329da8a1cf41e3448f6cd33a58c459ad56f400e49 SHA512 7716f08bf53c59f7118c6be6561ab8266fab9e0c5ee10a989eea291b4585b2f1de5015b0d24ec4ff8bdfa49483d1759690d9a996b48a60f12ee34ac7118822c4
+EBUILD libsoundtouch-2.1.2.ebuild 1524 BLAKE2B cc5857293f5b9e1e6c4360a69308a94f51c8c0517555d9494025cbafccde61533e44d82c2d94686799d2e068b493ef3668ef5b20c04296a1628d9a1c79f4ef48 SHA512 bcb347846bab8b9708e1eab1df4200b4d5d7897f2a788384e65310c7a523101c340fe4c163b5215008f04910da7ea6f30bb5bfd40b4449f8be4a39dac95c245d
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/libsoundtouch/libsoundtouch-2.1.2.ebuild b/media-libs/libsoundtouch/libsoundtouch-2.1.2.ebuild
index 4f379707630f..80e689588dc4 100644
--- a/media-libs/libsoundtouch/libsoundtouch-2.1.2.ebuild
+++ b/media-libs/libsoundtouch/libsoundtouch-2.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/${MY_PN}/${MY_PN}/-/archive/${PV}/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1"
 # subslot = libSoundTouch.so soname
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="cpu_flags_x86_sse openmp static-libs"
 
 BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libtimidity/Manifest b/media-libs/libtimidity/Manifest
index 8bdf3663bb0a..69dd83d48ae7 100644
--- a/media-libs/libtimidity/Manifest
+++ b/media-libs/libtimidity/Manifest
@@ -7,5 +7,5 @@ DIST libtimidity-0.2.4.tar.gz 421572 BLAKE2B b92a87ed0adbf00d74c482e17375fe42adb
 EBUILD libtimidity-0.1.0-r2.ebuild 803 BLAKE2B 5e71c520bfda38ff9b10b10e69d352459ad52878e9c5e88365cd903df96823946e054908d87ec0eea04efcb8508ad890957954b17b6aa2fe52f30eed5c550d24 SHA512 5ba40895e3fb107dbbc1748963d63bf6d936be966b555efe3941ab36344377b9320ae0bc14d1a12f7aeaa9293f1b8731fe8b0394da53a7fbd21972bfc289e26b
 EBUILD libtimidity-0.2.0.ebuild 673 BLAKE2B 8ef2f681c407d59a7824f7f7c3d3f245532ea62d45d497e803a2ec706b7d99a31474d2d8e6fd0d6504829356ee646d3f532684493e0dbcf7aec3aa50c07fd13d SHA512 51ec7f7f7f6904d92cd56b4eea39d7f0916454dfeec560563839badc35a468575cc92b4097e7c483f80bd4b3ebbc815e1639a8f6dc67d2e3969704462936c133
 EBUILD libtimidity-0.2.2.ebuild 658 BLAKE2B 1bc3a144e9d6888ce7b0118a160369ce3a78d3d44c764056202ee61bbc3f78826f6128e5527d4d5152a10fabbe8944ca72be2b20df677a7cf9b394964c73d0d9 SHA512 52b514ee0a2975568b1ecd5deda3b28702adea2eda82b693937bf20aebf75cf70e3463fcb4a6dfb7bd0b81c404ba994054a22f16396d4bceff7854cf7cb30c7c
-EBUILD libtimidity-0.2.4.ebuild 661 BLAKE2B de6af277d9a85aa3b55efe2c23b365fa7d06c6dbfbde18382b18f7e7d6f0518f853dbb62f7e08fbfe9bab221024d6a83d57d88a08fe567e73ff457f7c7a02e3c SHA512 89efbc3e9619ad173316a594f5cf696b7ab03cd3a0102ca254fe1382406c79189e8061323ae15b8423e27ec616b5808638e0a41508963ac6ce3057b91ff41add
+EBUILD libtimidity-0.2.4.ebuild 657 BLAKE2B 3cd2d0d6c67ed59e9305a164bea3c260b1bb609153eedcfcc4bd16c59385c32002ffaa05f501572fbbe4c6ab79445f13bc490375e16a3b23c2b4f27dabc4f94d SHA512 a15de8e10bd0bafb6af039dcaa930107e05fefd717e5c0438f8d5b663520f50ec1bcccfd57faea3e6c9150cf33de54e28b536249ffec8cb58acf3f10fb963bc0
 MISC metadata.xml 334 BLAKE2B dae2cde17ce0b3493754cd7984b7c74a937ac7694cbe125d6137fa00062fe5f8406e311502cc09400b720f0f11d233726c3061f1039408236651ebab1f1b449b SHA512 9b744ea46e81fa07fdbed4bd7b71840eeb1500bc35651e9c8461f91e8041e76567fd5b20472767d2b8ebb16967005ae025bb7a8165b14c2e33ec1a891770d91b
diff --git a/media-libs/libtimidity/libtimidity-0.2.4.ebuild b/media-libs/libtimidity/libtimidity-0.2.4.ebuild
index be839623432f..10c852bd6a52 100644
--- a/media-libs/libtimidity/libtimidity-0.2.4.ebuild
+++ b/media-libs/libtimidity/libtimidity-0.2.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/2"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="amd64 ~arm64 hppa ppc ppc64 sparc ~x86"
 IUSE="ao debug"
 
 RDEPEND="ao? ( >=media-libs/libao-1.1.0-r2[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index d3c9dd29f408..e67aed7e35ae 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -12,6 +12,6 @@ EBUILD libv4l-1.10.1.ebuild 1395 BLAKE2B 602ce585cbee9b33735055789353ff1f2296cb1
 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 1362 BLAKE2B 81e91db84ea5c8925cbcd54717c5f256c185ece1650c65dc8b14f329d5064971dacdb562937151366a99eae75898a8c519dd86ce032965e877ead3d960334215 SHA512 58f47e4a52ed2d4c496241e630e8572d77a184b4188e53c7a7a6de9499049fa93b772c0bc19bb4abdc69f67dbe3d5a015ec76b94199ff0c7ec2b58ce98f516cb
+EBUILD libv4l-1.16.3.ebuild 1361 BLAKE2B 2c12055ead5d3ff6a5ee91b99d6e82628b8c2c5fc6704e199ca43eb1c132dcbf6931c480d3ae8f861d62ae13911f04d07842783d39324143f0e67da073d20e25 SHA512 d0452e3a532b7f84efdfddec06ded78d2bcf55debcfe18c24158545abc64e75ca3b8b8e29d980279053e3fc488ac3cdc015f50339f0ec8a3b663534e0235a09f
 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 d8b2b4de598a..fbc183fbca7e 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/libwebp/Manifest b/media-libs/libwebp/Manifest
index 975d8060c6a2..5528cdb181e0 100644
--- a/media-libs/libwebp/Manifest
+++ b/media-libs/libwebp/Manifest
@@ -7,5 +7,5 @@ EBUILD libwebp-0.5.2.ebuild 1770 BLAKE2B 3ad8b99c05e38a51755fd047be8e51339dafff3
 EBUILD libwebp-0.6.1.ebuild 1780 BLAKE2B afaa8d09c4ea4ae4e7c6c9a9f58620518e46b2b9946dbb148291c507c7daa568831063db2ce1dd0e7ae4539114ee3e82ce0a0f4ad1f07a739d8e6409e39c22b7 SHA512 b258c8ab17c12ccf7c5daf68edfb6bbde1fcb32f65949ecdb6ca8df8c48fd437971e4bf4ef6890b4fe4ee5438c7ad96e772fb4f20925f4012b7a6b87d80b5115
 EBUILD libwebp-1.0.0.ebuild 1824 BLAKE2B c1d551960e915c4c6984182b1211a007373f32dbc16612a355dd7c53dc0701da7672b1e75d1ea6a1c8d4689c54684047efb553f30d3ad321524aa7ef85b68f47 SHA512 06800280eaefc56b6cb8dd8cafb7531ab24ffcb15b05163b9adc0a5509c1a7fabc5f1dedd3637a1efb0ec1b38b754ec6c4657fdd9acc6aba14cb6739f53f5e5d
 EBUILD libwebp-1.0.1.ebuild 1842 BLAKE2B acca7da3a910aac00296c93582ead28869a9e17c5abc6bd2f9b6dc978119e49a3b2dae13bad5ffe9f3dbaabfecb072e2e1bd4b1e0e6dfd777e0c1f4b3c1bcb9c SHA512 82bf2cff0dd2c8da705c0818e6e122334d56b3fbcbe57e708ee29e3d303785afb4ac71b75a9bbdb7fadecb02f69966a4799134305daecb433b905b7fd20c5598
-EBUILD libwebp-1.0.2.ebuild 1842 BLAKE2B 9e4e63d276920879e4032eff45211f25aaa3773555ed21394d1eb2b92c5a6c1d7bff4b76fd8e17f1fcefa2b612c82caca725cecd6258bacc503df22075728329 SHA512 754e71ac0afb5039b20b7e2fd7214cac47ebf66675bff7582aa0081503586c4c6f0c536a077a94188ac8ea722d246f678580f2203dc29ad820f5d2c04a95c048
+EBUILD libwebp-1.0.2.ebuild 1835 BLAKE2B ea3c21c88a338430bf89b0b6208fa75d947e31d158f2a57137d01c5eaccebb80ccab2c0e6f5c8e127cd6e467c93759342d64e3baaf23315344ee3aead0101809 SHA512 16fa1b28354d519bdeb0e7b2b54efe3a166523473abce4c6ab298212aebd74bf2b710943025e8737793ce3ac6c598b9dce4b734f21f31c066554aa00b184adc3
 MISC metadata.xml 626 BLAKE2B b3ca86f5241deb376b10d159d67eb6001b2a3d8700167b0bc512c067a6b7c72e6a53173e6f22a8a8a923097d67eec93642ed92c132743980cbf27af022f15e1a SHA512 b7348f6c830bb9537f97fcc0f3cbf8b55491913ea45020005734088e7c1aa71dfcacab9dd87bf3085e79554a3326f90b6c30543ad41f08d863639732132be78b
diff --git a/media-libs/libwebp/libwebp-1.0.2.ebuild b/media-libs/libwebp/libwebp-1.0.2.ebuild
index d561963a322a..e271eb38f101 100644
--- a/media-libs/libwebp/libwebp-1.0.2.ebuild
+++ b/media-libs/libwebp/libwebp-1.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.webmproject.org/releases/webp/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/7" # subslot = libwebp soname version
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg neon opengl +png static-libs swap-16bit-csp tiff"
 
 # TODO: dev-lang/swig bindings in swig/ subdirectory
diff --git a/media-libs/libwmf/Manifest b/media-libs/libwmf/Manifest
index 097356e1f527..dae93bd4f970 100644
--- a/media-libs/libwmf/Manifest
+++ b/media-libs/libwmf/Manifest
@@ -9,6 +9,5 @@ AUX libwmf-0.2.8.4-pngfix.patch 582 BLAKE2B 942d02776eb50d71222224f5c11fe2457fae
 AUX libwmf-0.2.8.4-use-freetype2-pkg-config.patch 2050 BLAKE2B 1ea7515753b2f3153c78d80573f219279e76021549ac85131ad9e139a5dd787c107cf83af18529429c4d250b77300a8b553d24ba9030735bac6acd68af833734 SHA512 311189d58d8bca7d91967bda84c6475ccec59fa4e11b535ff6919664cdeaa4b668ea688a021911dd7ea77393189c762c3800214acbed9f09d8591c70efa6b058
 AUX libwmf-0.2.8.4-use-system-fonts.patch 840 BLAKE2B b81b973aeb8b1e59c0fdf8a4dfbbad05285dcb3e4fe9f61002a6997c8988fc8e931dda1c2c3d6f250e287bd084f96c6ada464686ccbc22f6224edaa5fb461196 SHA512 0b5536cf6ac5812f88cada38afa94a7c51044aff44c4fa4a74b8fabd41c001aed7acf7911cebe967ad9764525aef8cbc048796b60db7b60b12bee3cfc846c50c
 DIST libwmf-0.2.8.4.tar.gz 2169375 BLAKE2B d86de4483201a07639779e024752d5c00a3dbc7399be353879b828850b74612651bbcf1851f322d62352259b73647038790580a9a4aeb43b7aeb4c1affedcabe SHA512 d98df8e76a52245487b13e5ab3d2fbba9d246f97ee04a7344c0e5861bb2d0f990fc6d662dbd849ce621768b06eaebd4270fb34bec4ee004334a98b14ba6044a5
-EBUILD libwmf-0.2.8.4-r6.ebuild 2758 BLAKE2B 3f2da42e0f8619f587962fc64bcfef793e243c478907cf3d5e3a0843a70e7a68e4a17c77ac959220ea340e83c84e4849650ffe0ff7ba66d65ee1e54118ddb2ca SHA512 0ed88a4ac51bf4c8ebca0bba2d43f936b8232b5f367012fb20e8423b2bd729a23c79931906bdc042db1789e4454d241fdca8bf49f99835bddfbeacf6a43da7b4
-EBUILD libwmf-0.2.8.4-r7.ebuild 2572 BLAKE2B c10238280ae82494c110aec7c226c67375b5a21b7de7cc235b157ae5ef567dff4b22f5997ccc0ac6f7b194df0ae390a7f087b47b43b485c8911ebac2da1f1765 SHA512 70f061e0e46da2bc354967853ad52e89aa1fde173232c1b269c6c7eb811d9af52b2f1effc875178b8ba5514bcae50539ed43dd466602966ef27b7259bc8ebf82
+EBUILD libwmf-0.2.8.4-r7.ebuild 2570 BLAKE2B c5e1248ae289ccd5928ab7a930af8b2663f8744c756d5bd058bad1940d3536677a0e7c00736b1868db7d3d751850244664cd3aff637f901d55c087bd4a996b33 SHA512 a21c5e888cd3c5dfb98bc93c9cec25a28d2437e166711e9bf736d45db020991ea3cbcbc9765d5b700bc235d92764c49b49a0e7ec882cff4eafead46a7604fd05
 MISC metadata.xml 303 BLAKE2B 6ec9acd2a49b905ced51d2fe9ebc14b8c51008bf684cab000a260db8017ef8a99a7710188a3e5e222aa4bb7bccbec3922445ca39eb07250587fa27f7e07061a3 SHA512 548f41b0b51ebf83dfded3b373434f2866fbdbd1f8a709457787d122bef05a21651adc313f63bfea58473c28b209abce34841cb0eac40c7bd8f84dd233d5bcec
diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
deleted file mode 100644
index 0418fee876c3..000000000000
--- a/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils gnome2-utils
-
-#The configure script finds the 5.50 ghostscript Fontmap file while run.
-#This will probably work, especially since the real one (6.50) in this case
-#is empty. However beware in case there is any trouble
-
-DESCRIPTION="library for converting WMF files"
-HOMEPAGE="http://wvware.sourceforge.net/"
-SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="X debug doc expat xml"
-
-RDEPEND="
-	app-text/ghostscript-gpl
-	media-fonts/urw-fonts
-	media-libs/freetype:2=
-	>=media-libs/libpng-1.4:0=
-	sys-libs/zlib
-	x11-libs/gdk-pixbuf:2[X?]
-	virtual/jpeg:0=
-	xml? (
-		expat? ( dev-libs/expat )
-		!expat? (  dev-libs/libxml2 )
-	)
-	X? ( x11-libs/libX11 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	X? (
-		x11-libs/libXt
-		x11-libs/libXpm
-	)"
-# plotutils are not really supported yet, so looks like that's it
-
-REQUIRED_USE="expat? ( xml )"
-
-DOCS=( README AUTHORS CREDITS ChangeLog NEWS TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-intoverflow.patch
-	"${FILESDIR}"/${P}-build.patch
-	"${FILESDIR}"/${P}-pngfix.patch
-	"${FILESDIR}"/${P}-libpng-1.5.patch
-	"${FILESDIR}"/${P}-use-system-fonts.patch
-	"${FILESDIR}"/${P}-gdk-pixbuf.patch
-	"${FILESDIR}"/${P}-CVE-2015-0848+CVE-2015-4588.patch
-	"${FILESDIR}"/${P}-CVE-2015-4695.patch
-	"${FILESDIR}"/${P}-CVE-2015-4696.patch
-	)
-
-AUTOTOOLS_PRUNE_LIBTOOL_FILES='modules'
-
-src_prepare() {
-	if ! use doc ; then
-		sed -e 's:doc::' -i Makefile.am || die
-	fi
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=()
-	# NOTE: The gd that is included is gd-2.0.0. Even with --with-sys-gd, that gd is built
-	# and included in libwmf. Since nothing in-tree seems to use media-libs/libwmf[gd],
-	# we're explicitly disabling gd use w.r.t. bug 268161
-	if use expat; then
-		myeconfargs+=( --without-libxml2 )
-	else
-		myeconfargs+=( $(use_with xml libxml2) )
-	fi
-
-	myeconfargs+=(
-		--disable-static
-		$(use_enable debug)
-		$(use_with X x)
-		$(use_with expat)
-		--disable-gd
-		--with-sys-gd
-		--with-gsfontdir="${EPREFIX}"/usr/share/ghostscript/fonts
-		--with-fontdir="${EPREFIX}"/usr/share/fonts/urw-fonts/
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
-		)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	MAKEOPTS+=" -j1"
-	autotools-utils_src_install
-}
-
-pkg_preinst() {
-	gnome2_gdk_pixbuf_savelist
-}
-
-pkg_postinst() {
-	gnome2_gdk_pixbuf_update
-}
-
-pkg_postrm() {
-	gnome2_gdk_pixbuf_update
-}
diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
index 76de7e12caaf..be9a5235f948 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A library for reading vector images in Microsoft's Windows Metafile
 HOMEPAGE="https://wvware.sourceforge.net/"
 SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="debug doc expat X"
diff --git a/media-libs/libxmlbird/Manifest b/media-libs/libxmlbird/Manifest
index e0dec8e4ff22..af2a884c97ef 100644
--- a/media-libs/libxmlbird/Manifest
+++ b/media-libs/libxmlbird/Manifest
@@ -1,5 +1,5 @@
 AUX libxmlbird-1.2.0-configure-valac.patch 1789 BLAKE2B 3c073ca4e985e2037f8b7775a0276ff32a1bad71550b4d4ab78ee508492e06e6f040c2cc4ab7507d157c44ae67b17a7a46c066347a1894520d567de8b92a4f5c SHA512 b3b3642b3b0a9c3c18ccdeddd67b08078473ccf4db6de6e33b41c84ef119b13e25034e2c77e958df5e9ca93eb189b89c3b542a58f2e63d039438a21ef6c19d66
 AUX libxmlbird-1.2.0-libdir.patch 7266 BLAKE2B dbed29bdfae04523e0872433f7cff41e56e7478fccb58effa3ba386a04ba853c637bbc10e904994a0f420103c5dc2371712aa33cf891ff935b9af6ccb07b6a24 SHA512 a879ca5fc70be9a9a3baa7311032b166bc88e6f655e195b57447c665fbe3241dc48235a0f849d9fed4542e09937b150cb7e93f75906668d11fead010318e42a9
 DIST libxmlbird-1.2.0.tar.xz 20004 BLAKE2B da712a82b85188b76943c105cf99f1d366d2dec24c67ce515666a1341dbeef512df62fe5c1407f8b125dd28b662877ca474d422336d789852e822066b5449e3f SHA512 0677004a79194dde87f27387ae1faeb19aa2ecd985664ad4f3f7576d39f71e0d05215c92bb15f3e3f1a4053e27025fd1a4151f1ba12774cfa789d47648097e5b
-EBUILD libxmlbird-1.2.0.ebuild 1251 BLAKE2B f7cf06e7097aeb833580d5a49d090ba217bb77499f8c3c69681bd06d83205ddec9055ea958efeaf005807f3f929ef87c24e54448e271b349820c6ec74d398033 SHA512 7ea867516a102c647c2048b56fb086ccceeb9898fc2384eacf6cbda15ffb22ef54e8d6bb37761f97e7e2df7e7934663f2c6ee762a65fe1c16dd6308b76729cc0
+EBUILD libxmlbird-1.2.0.ebuild 1247 BLAKE2B 4d4c92cc3b36cc24f2a674ae7eabf131ddb949681a74b8657054696db516c0f56684c5b20843f0ae1c3842461fde7ad6a9a7e666e3b2771a91c2905a83f93280 SHA512 0853c014fa570c66d0b102645df3b0612476f2e93a938b3810703a90b7900584526eadc39e41f6b69f72f21b0b4bebdf5dac2c6be1ee931ab8592d16d7aaecaa
 MISC metadata.xml 351 BLAKE2B bf15ddb7c39336982fa14d3de2aa0043bda64382be7a2b0ba6154839fcef9569c2b6c41d92fdff90abb87c0d7c9b0383e35d5aa402f760ed4feeff0601575bd9 SHA512 9538a6f758475b5381770ba633843b88a4d1b5e780d6822faca6e1c0f576c0e49d1eb44f152b08a89eb092adbc29541b6736362d1ac8c804a8e7f66dc4b69496
diff --git a/media-libs/libxmlbird/libxmlbird-1.2.0.ebuild b/media-libs/libxmlbird/libxmlbird-1.2.0.ebuild
index 9c8c85d43cf2..d011f660996e 100644
--- a/media-libs/libxmlbird/libxmlbird-1.2.0.ebuild
+++ b/media-libs/libxmlbird/libxmlbird-1.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit python-any-r1 vala toolchain-funcs multilib eutils multiprocessing
 
diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index feaa3960c305..d2206d3a3c7b 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -1,7 +1,7 @@
 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 1492 BLAKE2B 5a7cbdc6d7dfea55ba9f4ce9ecd82cb2c29735670ade2018c09ab59d07a2ca16fbc344a4bd47b06ae461487acf25734c9c07af17587198ad33e5330edc96ffea SHA512 8d148dbc7d2bb524a6f53a5d49350a6a5d0767b28924cbe3e1a725b15659483e571fc8f1e9ed423d8455c85cf10617d272e347e158e6c929b6b2598b6f05bdd0
-EBUILD lilv-0.24.2-r3.ebuild 1604 BLAKE2B d75b2e37a242f9de67932a9c237da850879094fe260b84ae132c5469b9e48fff8747add8b8f1963813efd0e966a8383a1ed722299a9d03e71ba2d96a14f67a4c SHA512 da62a84abd88d706b1dd7f95d0c919069877a9cbfbe999b6d38985de563430de176363f9c891dbb7f51f9cb68891a9fea6495c5044a83d3550add4f12dbc9942
-EBUILD lilv-0.24.4.ebuild 1611 BLAKE2B 64600ae9edd4361bcb65dc252c3f5668f78031965eb7a32f42bde7a81887739b969be013c260de6d0087aa157f6255543ccfee03a052a2b73b51ba506086680a SHA512 bf25a6f2aef47355f7a31dcc3618d46e09e8cbad2f1a939f60f69c2f4104eccc128d7eed57e5b36debfb6ce909beb512b3934625baf3c403b4fdd9c16861444d
+EBUILD lilv-0.24.2-r2.ebuild 1488 BLAKE2B a49966c50b2545d8d9160112b91563985d50ec858308fee5538e9d8ae2b2c3d8dff7b02107e907abca0fdb5c8075e1803d6d75d9ef220d3031af3255b2e9ca08 SHA512 0a529fdb2f0567266675ca2b9b533854560a6c1e8714bdd1195f18bd82c8c21913c3ebe9dd34d8adf14b1047320b2541734178152967ecced3efdd1a7685cf5e
+EBUILD lilv-0.24.2-r3.ebuild 1600 BLAKE2B 846b39c71656e873d1f526e8daee94bf582e988fc28a11a6d8f7a3e4c22e9e42d5d3db843af73668d40d305bd8e5cabc93f9581dcf65e1ec9d7e8b2cda54564e SHA512 872d49474b3e2f9fedac162d9feeba0650f7c057e8aafe2a68d5ae20310b5d935f3ae409359477653caf5ec187398bf1923ab74c01dada377815b9e677a60b6c
+EBUILD lilv-0.24.4.ebuild 1607 BLAKE2B 2d6dc550f657183747a895e519aa26a3e6b9d1003614a80896b000176ba72c883ce41e1a46381c9342ece1c16cfaadc3188bdcc571bc2182dae58e9871406170 SHA512 fae06ea7bfdc32b185846404cad9683e79becb7b57e9e39bcd5f26675c574485fe93310295bbef501ee88b0d3ee1b0351ed966645fe3ab9e1070cda890999751
 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
index fc03e8f9b8d9..6f7029f64c58 100644
--- a/media-libs/lilv/lilv-0.24.2-r2.ebuild
+++ b/media-libs/lilv/lilv-0.24.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_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
diff --git a/media-libs/lilv/lilv-0.24.2-r3.ebuild b/media-libs/lilv/lilv-0.24.2-r3.ebuild
index 6277d61a6d90..5ff84a5e6d4c 100644
--- a/media-libs/lilv/lilv-0.24.2-r3.ebuild
+++ b/media-libs/lilv/lilv-0.24.2-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_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
diff --git a/media-libs/lilv/lilv-0.24.4.ebuild b/media-libs/lilv/lilv-0.24.4.ebuild
index 80e6a7da7a4a..19de278eb55a 100644
--- a/media-libs/lilv/lilv-0.24.4.ebuild
+++ b/media-libs/lilv/lilv-0.24.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_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
diff --git a/media-libs/lsp-plugins/Manifest b/media-libs/lsp-plugins/Manifest
index 0c497cb98274..f2b36057f8cd 100644
--- a/media-libs/lsp-plugins/Manifest
+++ b/media-libs/lsp-plugins/Manifest
@@ -1,6 +1,6 @@
 DIST lsp-plugins-1.1.5.tar.gz 51911033 BLAKE2B ec9b6f3715f1043537ebe35d14abda85b8dfe23d52d335c54c02eb2867753c9b256a5acd71537c95d6da273d054f0e0c9439fe2f81f6d6ced3087de93bfaef60 SHA512 42b9cd102247a0165a32f82a5a7ce05928a9703c80f215783ad67020d1f975d1c334af1f86c9f17e76bea3fd90bcf5c47fff5618875038b3655621880b60a699
 DIST lsp-plugins-1.1.7.tar.gz 52408312 BLAKE2B 1763d7aaff60c4bf3185325789925dc7e5ea1052907f0d1ee3af7c09d39d1f49dfdda537c29d1d2e1ed2bd041345fb3f32a444aa403521f6d4fbd7a952f9f7cb SHA512 e98000c98464abc1db75e044bc1b7adb535b94fbe1025a52baf0a2c92bcd21039c9b330e790f0607b4747356aff3f7d4ae20e666a9135108e875057c5459c8ae
 EBUILD lsp-plugins-1.1.5-r2.ebuild 1252 BLAKE2B 2c1f932eea9632a89c4f56b9abc40cef06fd81f8e7126a6b81b4942f3a7e7c657a6967f1aa91fce4f68da6593f9b7dcbf0dc1bdaf6737cd3e3326d743a7b771c SHA512 54e4e0b0ff4eb94e1598a06ba4b5a4799e90220e12d57c53d760d585dcc7a41f71a6e26aedd1a53914b515438524e40bb5fd7667583263e018b0a5e636de2aa8
-EBUILD lsp-plugins-1.1.7-r1.ebuild 1032 BLAKE2B aa79896ebb5cd7eb2e2067268db7e67f07ba90f000a0f26d0af43cc06ec36b825db98e9aa3280dc777a9651b863ea68ab0e97ccf1093bfa3a032b77d08394a14 SHA512 c185dad8e7ca7aa71007d7f3c6a9d135c56891a8902849a463d057868fbf7a0b17ced33af49df1e8d5dace8907a29f8cbe12b9205c668d7e23dc111f0d3d29c9
+EBUILD lsp-plugins-1.1.7-r1.ebuild 1030 BLAKE2B 083c311a6afd08bf1d92b2b600dbb8da7ab2292e88d11b039781ca04cbc15b320234cbd9879a63d72846878ec6a2f42c92c471e37ac37676d78bb072b7751e8b SHA512 5d5f2ae554d6f512cbc925b602fac88b0f12a764b9aa7bda184f7d154c5dc234094673589f1bfd57899a391ef35195ad3c68d41546e633e5e640db404204c554
 EBUILD lsp-plugins-9999.ebuild 1032 BLAKE2B aa79896ebb5cd7eb2e2067268db7e67f07ba90f000a0f26d0af43cc06ec36b825db98e9aa3280dc777a9651b863ea68ab0e97ccf1093bfa3a032b77d08394a14 SHA512 c185dad8e7ca7aa71007d7f3c6a9d135c56891a8902849a463d057868fbf7a0b17ced33af49df1e8d5dace8907a29f8cbe12b9205c668d7e23dc111f0d3d29c9
 MISC metadata.xml 492 BLAKE2B 6550b2fe0e0a6bc5bece22d51b36d920284f662f1da5dbe2551fbf82ebc3416262339436ce2eddf9efbee49e57d5a28139f6ac3f1f86e20b5a74e5c4fb3bc37d SHA512 681338f3f8abbd1c103ef72c176595e10ca6bc0e6ca309e2f4d39166309329d8176aa9025056685d67d708ec1732d023c773a1e2a4cce7f019945ea112ab8f84
diff --git a/media-libs/lsp-plugins/lsp-plugins-1.1.7-r1.ebuild b/media-libs/lsp-plugins/lsp-plugins-1.1.7-r1.ebuild
index bae36037133c..f5121d8801b8 100644
--- a/media-libs/lsp-plugins/lsp-plugins-1.1.7-r1.ebuild
+++ b/media-libs/lsp-plugins/lsp-plugins-1.1.7-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
 else
 	SRC_URI="https://github.com/sadko4u/lsp-plugins/archive/${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${P}"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="LGPL-3"
diff --git a/media-libs/lv2/Manifest b/media-libs/lv2/Manifest
index 8cdaac2d1186..4dc03e5f00b2 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 1329 BLAKE2B e4771fb162d14f58ebb528a0a218773875fd92f6f01d3d17d9a34db16f82a4cde1a7a1a386530e89599e63826a48c01d62d70d68198fbf33bbac7e23b740e367 SHA512 54a53366084d4eca258c5cf4314d5f7c4883eb2b9ea094440f9bf1672687d0c68a674c23dc06e4f3bbf305aa3a416aee1cae6751421c2ed63758333ca261cdce
+EBUILD lv2-1.14.0-r1.ebuild 1325 BLAKE2B c374bff768ae6cb3e4f7edb5069690b36d556711dfd32f6d687e0ca3d49906a4589067b2caa2d8e0b5977b9a97ccd04ddf46de3cb0328d33ef06758b0df2ec0a SHA512 c024d967536c125254a24ef9c77cba3a71394507b60d0ad2d1cbab3f106fe895be470f2217c1c9fc8f6aa9ff6e6fb01bf1be98622dd04c6912a9d883014101f9
 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 9ad136d8841d..e5aff379a1eb 100644
--- a/media-libs/lv2/lv2-1.14.0-r1.ebuild
+++ b/media-libs/lv2/lv2-1.14.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit python-single-r1 waf-utils multilib-build multilib-minimal
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 18a618fd3082..ffb7b7ccb2f1 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,14 +1,8 @@
-DIST mesa-18.2.8.tar.xz 11385224 BLAKE2B c6fbf71e2ab6837f91dfa996cf7e89e9cae22e219cac56bd4201f7a62c787ddd2f65e7d162a329971018f0b1a796ee1a5b252ee6b43bb3b27a233d67b6cdf615 SHA512 04d5ada9ba3acea853def3ebcbb53ee76936a4cd4229ae753d2ce1b5cf543bea1e5764f2ef2b19735d47d041ba6b0582841bc89e2c9331fdfbd89386f599a1f7
-DIST mesa-18.3.4.tar.xz 11875224 BLAKE2B 81d34349c644cc93b3ca525046cdd63a5aa2a16d8f6b841830a138c8e9e375fb0f75a17bd80b4c48ed573f4976dd6612b0773305a3bec982540914365c9925ff SHA512 e4ead944ba053aa05425e9e199d633f576dfa424976253fc32438e8db6da5e8d381122e4c4b7fb18f94177421f208bab5567cfec8d2692d104e266483ca02a99
-DIST mesa-18.3.5.tar.xz 11882012 BLAKE2B 88279fe2f24c2a47c8857ad34382b7c8b64119632f1ec7ce8d0fe2afe669e01d2e071726f01e28b001be353d8d9ec1f0ef46d3ba1e64239d63221b100745e8ee SHA512 f229ac122eafee98d1a40c54adeb019eb4458cb67063db9ba760b265da0634fe77247c3c8cb5c5de5fd40f8545e35d45000a74af9257ebf4e2028156add8644c
 DIST mesa-18.3.6.tar.xz 11882744 BLAKE2B f0f0de6d4c40cf01c6b9cb97d772c6386deb3d08f66f2731fe60eff21edfa822b6d7a293fbf9e426acddbb58445b9b0e3c0b1bc8ae05e8b19e802872571449c2 SHA512 3a6dcaba99185e28d162b130bbd760fe87e6072065958189b28f41ea287ef041397897e098d93218a64802cf11c73806f7400a866bd8e5ed69694fa15c147487
-DIST mesa-19.0.0.tar.xz 11959360 BLAKE2B e58144bb22f296175d7feb59d2c7940ca795dd417b0b014735d8842a29292cf07a6197184942febfdc85ad062267a55059e0ebd1532a886610dabf888cc68b8f SHA512 5759b85275bcd145513cf14a9ef7505595766fb33b82c53738f74ede462e5850580d48ab4af326b41209e7f4b05aab75539f2bfebf67c3098a4680ea95c37591
-DIST mesa-19.0.1.tar.xz 11962308 BLAKE2B 29abd27c4daa3b2ea3e10cbab4a0491c0bbbf6985ee39c84dd4dfa5fd5cf35ae32201b0cc312bd40cad8602ecc42b9d5ed586133bde83dd023b3d2fdb0fd8249 SHA512 13afade840dfc44198b08298c9ebeb24c626c98bfff3ec6d08daaaea690ea9d47af466c877146f9afa3b45035e02c1e21fdc4b53a79c99e38dfc6126efe8ece5
-EBUILD mesa-18.2.8.ebuild 13549 BLAKE2B fb6a17fbaf4043b16e264c46608844026751a613650fc2fb1929d7534b9fdd7e1a4efef5c90634490234e5b1a437df944afb611c0c65c81dcc735a7dbfefb100 SHA512 e36990056e9e20b6ad7fd9af6d1baf0322482e84aca03c727ebfc6686ae117640dfb208dd1b33669836a7c962b2e93f4871af5c49eaab51198942dfa2e1a1548
-EBUILD mesa-18.3.4.ebuild 13684 BLAKE2B f6628df530fd9c2985969b9de8a794147234115ac5a4bdee64d3bde10ffd2fa794bf11780131427154a19d400b490abc258fc0cc791dc0d2db5f8c89de12c576 SHA512 7d6bfc9ed513776f53bb9e76039fe13929539c385e052a767b95c4f2bace4c207b1c12a206ca22e0c2a2273a729a7b6964b6c9e87e626b5c87268f9a849061e1
-EBUILD mesa-18.3.5.ebuild 13685 BLAKE2B bed1f431a88d2ed2617e28af453100e4d044565643e86b429a15d2ed5edf4a77e14c7621d2664b0f8dbc7e3a2b8b3af6419001c00c5651fada999927f54b3e8e SHA512 89344628dd480c3efbb65857cd5f3b632d9678bedd94cad8c7c7dfff1e5440468c7ae91d84e643f9d2cec5b0fe2535d28ae93508cf25a71fe4bb74a3c43667c0
-EBUILD mesa-18.3.6.ebuild 13685 BLAKE2B bed1f431a88d2ed2617e28af453100e4d044565643e86b429a15d2ed5edf4a77e14c7621d2664b0f8dbc7e3a2b8b3af6419001c00c5651fada999927f54b3e8e SHA512 89344628dd480c3efbb65857cd5f3b632d9678bedd94cad8c7c7dfff1e5440468c7ae91d84e643f9d2cec5b0fe2535d28ae93508cf25a71fe4bb74a3c43667c0
-EBUILD mesa-19.0.0.ebuild 13823 BLAKE2B 0c7842382f1b1d09b814db7e3584765d3d4ba4b7be5113efc1b6df74f7895b86d6cf5cfe7dc7433548130d6882382b75b7c49f0a13b29ab4e353f8aa2368848d SHA512 9210ad10ad47984c58cd6f5c5b0b78fa21be54b679b8d400bf21a97963abb166d7899a38eaa389683a143bc15f5fde525e42e1537a45fdc6c844b5680a63b3f5
-EBUILD mesa-19.0.1.ebuild 13823 BLAKE2B 0c7842382f1b1d09b814db7e3584765d3d4ba4b7be5113efc1b6df74f7895b86d6cf5cfe7dc7433548130d6882382b75b7c49f0a13b29ab4e353f8aa2368848d SHA512 9210ad10ad47984c58cd6f5c5b0b78fa21be54b679b8d400bf21a97963abb166d7899a38eaa389683a143bc15f5fde525e42e1537a45fdc6c844b5680a63b3f5
-EBUILD mesa-9999.ebuild 14170 BLAKE2B 39bea99ece39ed5279157b26612b92538256573f69c6b2ff5effeeadb97efa887c2b1508b5f93d26ad6ecf8e13a69140e131c8759a7f99507b5529fcf4b40222 SHA512 dd690bad043d17860c7aad28a246866082e764d7ff0f521361fed175ef5fc87a8e49bf5d08cd09ca49c8ab2bc0bb4dd2bdfa1677bb39f34c5863040321781b05
+DIST mesa-19.0.2.tar.xz 11959876 BLAKE2B 4d82a339a1577fb156b48d330157894891326f36cb265421453a5fde5086ee05f83962fde49113f34917f750cfffb40c8bce84bd003fe9d7c1e6900c52dc4d66 SHA512 6b317205efa7d62150fae23489fbad5f062ecde99fb5b210fa7ccbed2e0ef60aee1f1e66e2c606ea5d59193c3218f732556706ab3b645b175044342d88984d51
+DIST mesa-19.0.3.tar.xz 11963844 BLAKE2B 7d8bae717c0a2a6143d3aee35852145a2032d40ad7f4edcd76eec46392f3917787592d13f9695de54a15ea5bcb3dec3181c418ddfb5b69a3e1b52fb796f04eab SHA512 aa170577252aa4157e4bd49076bbf6207e4aada9fc9f23b255de332e816f9c63e5661f752f2f276dd43e232a8926866004e2a2ff9ad4b411330969c2a9a7ffa0
+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-9999.ebuild 14184 BLAKE2B bcd4c34fb11ed167a164a0c32ea111f49133afb59c7b4f712a3cbb0e48ffe85d77aecfb6286458ab2a10f32fb4670726c76fbd9bfd914c916c04bd94bc8b902e SHA512 f1ec50382356527283948761e5555201dca490c1fb95d077cd39b02ac320003e2fcad2e88949fa4d73a09acb75178c8d228583dc01a548e84dd9448d696fce60
 MISC metadata.xml 2041 BLAKE2B dd7f78a57123408674d7ca6a8e7a455e84ac668bf9e6552502cf62dc2464f1a62765db5c22c0d4dab82e59a5325ad10d69b436aab96b5a4d5c789f0a7b671469 SHA512 f07128004b03ddfc6d235de15a95c0bd6338133b13daa31907bd2897d65eaa9c8ad1164ec5e21fb7fa6417927a8109cbf86b24bc62b09cfa29d0bb18fcd3c4b1
diff --git a/media-libs/mesa/mesa-18.2.8.ebuild b/media-libs/mesa/mesa-18.2.8.ebuild
deleted file mode 100644
index 4d646fb9ae2e..000000000000
--- a/media-libs/mesa/mesa-18.2.8.ebuild
+++ /dev/null
@@ -1,514 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_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 +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.93"
-RDEPEND="
-	!app-eselect/eselect-mesa
-	>=app-eselect/eselect-opengl-1.3.0
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	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. < 8.
-# 3. Specify LLVM_MAX_SLOT, e.g. 7.
-LLVM_MAX_SLOT="7"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:7[${MULTILIB_USEDEP}]
-		sys-devel/llvm:6[${MULTILIB_USEDEP}]
-		sys-devel/llvm:5[${MULTILIB_USEDEP}]
-		sys-devel/llvm:4[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-8:=[${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
-}
-
-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 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
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-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-18.3.4.ebuild b/media-libs/mesa/mesa-18.3.4.ebuild
deleted file mode 100644
index e7bcfac9a85b..000000000000
--- a/media-libs/mesa/mesa-18.3.4.ebuild
+++ /dev/null
@@ -1,518 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 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 +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.96"
-RDEPEND="
-	!app-eselect/eselect-mesa
-	>=app-eselect/eselect-opengl-1.3.0
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	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. < 8.
-# 3. Specify LLVM_MAX_SLOT, e.g. 7.
-LLVM_MAX_SLOT="7"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:7[${MULTILIB_USEDEP}]
-		sys-devel/llvm:6[${MULTILIB_USEDEP}]
-		sys-devel/llvm:5[${MULTILIB_USEDEP}]
-		sys-devel/llvm:4[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-8:=[${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 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
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-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-18.3.5.ebuild b/media-libs/mesa/mesa-18.3.5.ebuild
deleted file mode 100644
index b66948b6e213..000000000000
--- a/media-libs/mesa/mesa-18.3.5.ebuild
+++ /dev/null
@@ -1,518 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 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 +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.96"
-RDEPEND="
-	!app-eselect/eselect-mesa
-	>=app-eselect/eselect-opengl-1.3.0
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	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. < 8.
-# 3. Specify LLVM_MAX_SLOT, e.g. 7.
-LLVM_MAX_SLOT="7"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:7[${MULTILIB_USEDEP}]
-		sys-devel/llvm:6[${MULTILIB_USEDEP}]
-		sys-devel/llvm:5[${MULTILIB_USEDEP}]
-		sys-devel/llvm:4[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-8:=[${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 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
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-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-18.3.6.ebuild b/media-libs/mesa/mesa-18.3.6.ebuild
index b66948b6e213..307d5733e841 100644
--- a/media-libs/mesa/mesa-18.3.6.ebuild
+++ b/media-libs/mesa/mesa-18.3.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
 
 inherit llvm meson multilib-minimal pax-utils python-any-r1
 
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
@@ -485,7 +485,7 @@ multilib_src_install_all() {
 }
 
 multilib_src_test() {
-	meson_src_test
+	meson test -v -C "${BUILD_DIR}" -t 100
 }
 
 pkg_postinst() {
diff --git a/media-libs/mesa/mesa-19.0.1.ebuild b/media-libs/mesa/mesa-19.0.2.ebuild
index f3f7b57f517d..6e5cc0499b8b 100644
--- a/media-libs/mesa/mesa-19.0.1.ebuild
+++ b/media-libs/mesa/mesa-19.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
 
 inherit llvm meson multilib-minimal pax-utils python-any-r1
 
@@ -492,7 +492,7 @@ multilib_src_install_all() {
 }
 
 multilib_src_test() {
-	meson_src_test
+	meson test -v -C "${BUILD_DIR}" -t 100
 }
 
 pkg_postinst() {
diff --git a/media-libs/mesa/mesa-19.0.0.ebuild b/media-libs/mesa/mesa-19.0.3.ebuild
index f3f7b57f517d..6e5cc0499b8b 100644
--- a/media-libs/mesa/mesa-19.0.0.ebuild
+++ b/media-libs/mesa/mesa-19.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
 
 inherit llvm meson multilib-minimal pax-utils python-any-r1
 
@@ -492,7 +492,7 @@ multilib_src_install_all() {
 }
 
 multilib_src_test() {
-	meson_src_test
+	meson test -v -C "${BUILD_DIR}" -t 100
 }
 
 pkg_postinst() {
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 802aa20c7f78..b8a32420fa6a 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
 
 inherit llvm meson multilib-minimal pax-utils python-any-r1
 
@@ -504,7 +504,7 @@ multilib_src_install_all() {
 }
 
 multilib_src_test() {
-	meson_src_test
+	meson test -v -C "${BUILD_DIR}" -t 100
 }
 
 pkg_postinst() {
diff --git a/media-libs/ming/Manifest b/media-libs/ming/Manifest
index 97e75797269d..f743c45f24db 100644
--- a/media-libs/ming/Manifest
+++ b/media-libs/ming/Manifest
@@ -1,7 +1,3 @@
-AUX ming-0.4.8-CVE-2017-8782.patch 772 BLAKE2B 4425c357155b1a57b6498ffcc31119408aae3ca0de8e31160a9d449599ce94139438e55638808bb667042f0c0e3dcf3f6b5de9959314f17bed3e3f11e090f871 SHA512 69a445d41856e4a567c253d5a0a1f63128ad8f71d8c418da855d62e2f1ff13e2a19a6887a22cfdaa8682811695b79b3bc736b569756f88e8472d294d89561005
-AUX ming-0.4.8-freetype_pkgconfig.patch 2146 BLAKE2B df8c56a04cfe5d0a264402ce5636853ea53c4376999077405355ad112503e82d1b346d7219eafad3689e93a2ac66f89f9ca5f9ad03c564c76571a1919c00e9d2 SHA512 f40ccdc5b97b847ff4bffbdc6a691db8627bbf85f97089e55214f19b34f098ddf0b7eb1a65d1fdc220cb9fb90f89f7fdfa78e44b5d10de872706451be89647ed
 DIST ming-0.20181112.tar.gz 14889061 BLAKE2B a276f7aaf386f0233b9e92a95daf22b7fd192654275e99f70106b7abf2ec3963ae8d70a82addd2690e6c7038a0a52e41a27fbd5c9b38cc96d1ab617a3bfc522d SHA512 a4d3ed04c96ffc6d040ace3451f2d99a3fdda0726b45cee30913ca2dc8d9f24ff156a643eeb888d05eb199dd9f2caf4ce4f84fe40e1b95bf2f6c9e038155fdc3
-DIST ming-0_4_8.tar.gz 14908459 BLAKE2B df89beab98a7fbdcbefccad3a2fb013453405a7dba757131a61f06d9e40b7e1fe7beeadab42c113b12cff24b91cb1e76e9fabee0e1b4af58e2127eba13cc27bc SHA512 e395acde9119ad32f4cedd500bcceee70bdd563222a41dda899cc318d5e34eb580abc38ac39c6dec7821913a0a70d2f953fc81f52255b623e34f7c3aaafbc9c0
-EBUILD ming-0.20181112.ebuild 2244 BLAKE2B c704a902bdd09c15713465357bd220a61dc0f94df895c305c7c7be321a71721dd22026182cc547bbff32dd22dcd24c8811f8df2a7e96c7607b61be060b983426 SHA512 b49cc6df6b6bcba3095215386241ee0818ab194e16fa7405a67a3065aca7a7c6053e94d2a6c56e3b3110dbb341e4eb33df64f3eb8c835a5e13d6c608210a8bda
-EBUILD ming-0.4.8-r1.ebuild 2257 BLAKE2B c6134cd272270764346d8fe80ae1897ad9353a131ade67d820c4fa4f1a3dd525b4a12851c79a357daaa83c52a84b8fa82eace830836b9d10c061880708cdb90f SHA512 2c7a0af6e4792d9ffce756dac6416432543912fd86bb1c7552b3d67fedd7968a19c971a6db7ea24707d73e2970af43469678d76c0097c83e9c53c00ec1eff1aa
+EBUILD ming-0.20181112.ebuild 2235 BLAKE2B dd03b461949a5a080c55228e87a4eddef83ff0cf163c5a662aedf47f3005573ed8bd4fe2c622dbdb57619b2ec91bb0730bceea2721217a5102c0b87871b894b1 SHA512 ee714e3fd1aff9c0e453b06f7f219b440e8c6c5464777e0adf7eb0da405478eaf28a99df8fd9db22d2b65b123afaac21d350853b7c6f476269384144cfee57da
 MISC metadata.xml 388 BLAKE2B 7083db03bf7efad4015f4aa3838925123a71bae6d57ed318232622e96c8590ef1f770520da535c9efc94f33b416430dccecc9a81fa81df936d4e15933a1dd041 SHA512 0efbb0ad1eadfd764bdf6e182cf8865994ca8e96ccc6e14845829638730e1ce6ff7ac2777e9ad3d396e7e29d77e034b818c95259eb8aab53a23b3c0815f787d0
diff --git a/media-libs/ming/files/ming-0.4.8-CVE-2017-8782.patch b/media-libs/ming/files/ming-0.4.8-CVE-2017-8782.patch
deleted file mode 100644
index 223d363ae0b0..000000000000
--- a/media-libs/ming/files/ming-0.4.8-CVE-2017-8782.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/libming/libming/commit/6eca133ee9985c298186cbe05f888082c30bf2d9
-
---- a/util/read.c
-+++ b/util/read.c
-@@ -247,6 +247,11 @@ char *readString(FILE *f)
-     if(len >= buflen-2)
-     {
-       buf = (char *)realloc(buf, sizeof(char)*(buflen+256));
-+      if ( ! buf )
-+      {
-+        fprintf(stderr, "failed reallocating %d bytes\n", buflen+256);
-+        exit(-1);
-+      }
-       buflen += 256;
-       p = buf+len;
-     }
-@@ -350,6 +355,11 @@ char *readSizedString(FILE *f,int size)
-     if(len >= buflen-2)
-     {
-       buf = (char *)realloc(buf, sizeof(char)*(buflen+256));
-+      if ( ! buf )
-+      {
-+        fprintf(stderr, "failed reallocating %d bytes\n", buflen+256);
-+        exit(-1);
-+      }
-       buflen += 256;
-       p = buf+len;
-     }
diff --git a/media-libs/ming/files/ming-0.4.8-freetype_pkgconfig.patch b/media-libs/ming/files/ming-0.4.8-freetype_pkgconfig.patch
deleted file mode 100644
index 5bddf0521224..000000000000
--- a/media-libs/ming/files/ming-0.4.8-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 0d5b3bc1cc492c10072def017fe704782bc4b274 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Fri, 4 May 2018 17:40:04 +0200
-Subject: [PATCH] Use pkg-config to find freetype
-
-As of freetype-2.9.1 the freetype-config script has been deprecated and
-is no longer shipped by default.
----
- configure.in | 30 +++++++-----------------------
- 1 file changed, 7 insertions(+), 23 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 361db86c..cb9423f5 100644
---- a/configure.in
-+++ b/configure.in
-@@ -257,26 +257,10 @@ freetype_support=yes)
- 
- if test "$freetype_support" = "yes"; then
- 	dnl Check for the freetype library
--	AC_ARG_WITH(freetype-config, [  --with-freetype-config=PROG   Use FreeType configuration program PROG], freetype_config=$withval, freetype_config=yes)
--	if test "$freetype_config" = "yes"; then 
--		AC_PATH_PROG(ft_config,freetype-config,no)
--        	if test "$ft_config" = "no"; then
--			echo "To compile ming please install freetype:"
--			echo " as .deb user: sudo apt-get install libfreetype6 libfreetype6-dev"
--			echo ""
--			echo "or disable the freetype configuration option:"
--			echo " --disable-freetype"
--                	AC_MSG_ERROR([Could not detect freetype-config!])
--        	fi
--	else
--        	ft_config="$freetype_config"
--	fi
--
--	FREETYPE_CFLAGS="`$ft_config --cflags`"
--	FREETYPE_LIBS="`$ft_config --libs`"
--
--	AC_SUBST(FREETYPE_LIBS)
--	AC_SUBST(FREETYPE_CFLAGS)
-+	PKG_PROG_PKG_CONFIG
-+	PKG_CHECK_MODULES(FREETYPE, freetype2, HAS_FREETYPE=true,
-+		AC_MSG_ERROR([Could not find freetype])
-+	)
- fi
- 
- dnl Check for the ungif or gif (new or old) libraries
-@@ -334,9 +318,9 @@ if test -n "${ZLIB}" -a -n "${ZLIB_INC}"; then
- 	AC_DEFINE([USE_ZLIB], [1], [Use zlib])
- fi
- 
--AM_CONDITIONAL(USE_FREETYPE, test x${ft_config} != x)
--if test -n "${ft_config}"; then
--	AC_DEFINE(USE_FREETYPE, [1], [Use freetype library])
-+AM_CONDITIONAL(USE_FREETYPE, test x${HAS_FREETYPE} != x)
-+if test x${HAS_FREETYPE} = xtrue ; then
-+       AC_DEFINE(USE_FREETYPE, [1], [Use freetype library])
- fi
- 
- AM_CONDITIONAL(GIFLIB_GIFERRORSTRING, test x"$ac_cv_lib_gif_GifErrorString" = xyes)
--- 
-2.17.0
-
diff --git a/media-libs/ming/ming-0.20181112.ebuild b/media-libs/ming/ming-0.20181112.ebuild
index 7babd84b0d7c..b185a867bd79 100644
--- a/media-libs/ming/ming-0.20181112.ebuild
+++ b/media-libs/ming/ming-0.20181112.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/libming/libming/archive/${EGIT_COMMIT}.tar.gz -> ${P
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+perl php +python static-libs"
 
 RDEPEND="perl? ( dev-lang/perl:= )
diff --git a/media-libs/ming/ming-0.4.8-r1.ebuild b/media-libs/ming/ming-0.4.8-r1.ebuild
deleted file mode 100644
index eba066b84485..000000000000
--- a/media-libs/ming/ming-0.4.8-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PHP_EXT_NAME=ming
-PHP_EXT_OPTIONAL_USE=php
-AUTOTOOLS_AUTORECONF=yes
-GENTOO_DEPEND_ON_PERL=no
-inherit autotools distutils-r1 flag-o-matic multilib perl-module vcs-snapshot
-
-DESCRIPTION="An Open Source library for Flash movie generation"
-HOMEPAGE="http://ming.sourceforge.net/"
-SRC_URI="https://github.com/libming/libming/archive/${P//./_}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+perl php +python static-libs"
-
-RDEPEND="perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	media-libs/freetype:=
-	media-libs/libpng:0=
-	media-libs/giflib:=
-	sys-libs/zlib:=
-	!media-libs/libswf"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc"
-PDEPEND="php? ( dev-php/ming-php )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-S=${WORKDIR}/${P//./_}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.8-CVE-2017-8782.patch
-	"${FILESDIR}"/${PN}-0.4.8-freetype_pkgconfig.patch
-)
-
-# Tests only work when the package is tested on a system
-# which does not presently have any version of ming installed.
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	# Let's get rid of the TEXTRELS, link dynamic. Use gif.
-	sed -i \
-		-e 's/libming.a/libming.so/' \
-		-e 's/lungif/lgif/' \
-		perl_ext/Makefile.PL
-
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# build is sensitive to -O3 (bug #297437)
-	replace-flags -O3 -O2
-
-	# build python via distutils calls, disable here
-	# php is done in dev-php/ming-php
-	local myconf=(
-		--disable-python
-		--disable-php
-		$(use_enable static-libs static)
-		$(use_enable perl)
-	)
-	econf "${myconf[@]}"
-}
-
-run_distutils() {
-	if use python; then
-		pushd py_ext > /dev/null || die
-		distutils-r1_"${@}"
-		popd > /dev/null || die
-	fi
-}
-
-src_compile() {
-	# some parallel make issues on flex/bison
-	emake -C src/actioncompiler -j1
-	emake
-
-	run_distutils ${FUNCNAME}
-}
-
-src_install() {
-	run_distutils ${FUNCNAME}
-
-	emake DESTDIR="${D}" INSTALLDIRS="vendor" install
-	einstalldocs
-
-	perl_delete_localpod
-	find "${ED}"usr/lib* -name '*.la' -delete
-}
diff --git a/media-libs/mutagen/Manifest b/media-libs/mutagen/Manifest
index d7ee58ae9270..fd113b953044 100644
--- a/media-libs/mutagen/Manifest
+++ b/media-libs/mutagen/Manifest
@@ -4,10 +4,10 @@ DIST mutagen-1.39.tar.gz 916084 BLAKE2B e67de0f0c2b33283ea276511f5537f5f12a35d33
 DIST mutagen-1.40.0.tar.gz 917874 BLAKE2B 69405942af849a8c82d14424a242e77cd9d554155494976402c3eb5d95dcccbf14de5fd3268cb9cf12e0035dcbf88c3724d1684c21612b2f0b0a87cb48de1ec8 SHA512 ad4accccc3457d1ff7238c2941b20aeb532e9b41bf2bf1cb130e428f9af9a7dd18a0e81a4d45fbc98783d8cf90cd105de09d703c70beea7cba5eca58dab1bb69
 DIST mutagen-1.41.1.tar.gz 918398 BLAKE2B e164cdca199bd1d18703604ca67722a3bb35ef6d53d8b8be1adbb0baf103ef7e45d4871929085242778726326a927771c589836a021dbd0dfdb83c0d5836f656 SHA512 d40fd74480eedc514d7b7b1d701c0403490cffc8ed3b8aa114ffe91a40c41de0daa0c54d9ad1a89ec211fab59ec271a3b1775c9efcc5661a5e1607e1ecadbea6
 DIST mutagen-1.42.0.tar.gz 925894 BLAKE2B fe85f2c47a19276078183f426450ca50ccabab64eec39dfb1535054ee6571b01375210b164dc6c824f74631eb8393c8d5d48b7a7a29443349f30fdb627a74b6f SHA512 26c307023d1ff29c0377cdee1317732a8aba70433a3679127a3d9c8cc5df9e81d143700e7e74a42975485b0510d8bd09dc2b5ec9a737442a6e676f1f0b14c80a
-EBUILD mutagen-1.35.1.ebuild 1166 BLAKE2B 1761c7c348571b4719c5c8e6c2b79ea266b0e8a81d501152097139eaf5127852815b4104923bf6aede0a65b2bdf27c12a49aacaa9f4fee494eaa85ca63b5c746 SHA512 6ccf8d04d02dd849a0dc8a40e47e2c67c94db362a4211a88aa0b321319f5c93716859a57aff862028d82bc841be3051b70487e31456c1c1d355f9fec4a035c95
-EBUILD mutagen-1.38.ebuild 1038 BLAKE2B ac815c6a5cdbb250a1faf16c060c2e5baa12d9e3ca2ceccd653c4e9c7aa04b35eb55d242c5e6f2be7c599ed7658b721aef5d4f96f6b88a1932b31dd5c639e17a SHA512 c579883b1ec90b1c94b85e897cf744ac26ade4975ba0dc76aac0d10ea0659740eddd891c7d7c05e24356d019c1bfbec18070e35b1843e5d393e3a182e435e9cc
-EBUILD mutagen-1.39.ebuild 1083 BLAKE2B 079e0e7111f495b6b45409a28b3101663dbe1e52154860a30c16dc8e2fca5a9dae53b20ebc90271c68e7ac550f4f76c4e3a26b0fcebe769b64be17603a1e1914 SHA512 d8890394aa2f7ff82e11b3076a6909609ef0876d9572e52b889fe01677571de2cbf8859ed257c54f93262a6f3364948c94a6b11934122279a08785b0d98156e4
-EBUILD mutagen-1.40.0.ebuild 1089 BLAKE2B 4c18cc368c1e11332fb63db0255a392fa20599f0b30d8a11ab92ecea6a52a27997f5c264831d439c5cb2452413405041c7ca6ef98b82cfaf91737e5e57bf3a55 SHA512 e602d0177107ae03417474dcca22c9b65a2abb96550e6eaf68241bddcc02fc179676a3a3e9c25315c2b5f91fbc5c997be586495edac564261aa1283b518477e7
-EBUILD mutagen-1.41.1.ebuild 1097 BLAKE2B e376d8deaa5887c68bdeaa253645c57c9814af0543d01d25826633f14cabe2c97129f6b14f1568b74e83e1638be9d2445dfe33dcd49665bd1669558a2daa2688 SHA512 c829fa4b5b1551cbad6fe7a322cb3feddd464c8566db77b7b11d96c4835ecd9c88c64d3003bc7038f3f548d450904953fc6762028b2d319385c40fbe862b1d32
-EBUILD mutagen-1.42.0.ebuild 1096 BLAKE2B 0ba1aa834db5ae7212181dd2c5cbb7d2fac31805cb9937c29ba7c0ac38313841c39d0f527c32bc70edcf6d61d2568dabc147fee789cc6315a0c389fba85dc2ef SHA512 87d3101567536583d8701cf662b7e7461be57267854cbeb3bd2baa6c17da031fdf8aaa0f4181cc720c7e3cd63b94dcce768db87b63b299fbb1c2451bddaaf597
+EBUILD mutagen-1.35.1.ebuild 1159 BLAKE2B c1d8d0da10719a46e2a77e0325df7adcdc2d917d4e18ee1ba9bd1cd757c06eb91e8c8d25ac9f880eddc597595b6709707d5417a88f2548c5ed99186d0aaf3395 SHA512 08a964c493ef1b1d2f68faf9cfc5e119a553f855de2ec44aa3ea34180bc095f8a7994bc1c98b335519ab3dde6f81547ddf09c8f325672e6b1c8899b749502afc
+EBUILD mutagen-1.38.ebuild 1031 BLAKE2B eef55684a41c17d279d3e58041a1b7ae42bf4effb5fddc38ec24f442ca282b8668da560993de976c051954891218df5640528464834d4fe1ca2f6b11bdb82653 SHA512 cc019871ccbc9b2990f95ae7a281790a109009fd2e9b3dda24ea75920e9acc5b01f918475e0323da610ce6644ef170513c983cfbc9209729193f93508b9ace37
+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 1090 BLAKE2B 64a4c51a0f4ff168bc93d4f1f70c92c5891e3bd67ca489138b762d4e4799912307a09a48db09edc9eb968ca1271190a09196c4a3f97dac983c62c4a78572e631 SHA512 f0542c4f321729b4cffead13015f37ef43a67bcfd1e59e66c01a1bc03ef48ef5db5d9c773043f5b720e32521bcf30f3d717147bfa3afae8ad1b353de9972f575
 MISC metadata.xml 380 BLAKE2B 9fd70ca6ca6e8d17b66ea703f65885b87714ed0560ffe7502d85da3ee8fdf1d62545c1166b64d99f2bd2bfa6105f8f8865bc28769069c1ae3da4b1c3c174fd69 SHA512 87ce1f85bd6aff7c159fd22a412eb9ea95ac4f58fb2cc70fd4c4f470bfe9f6366b906bc9cef833ae5c10b7a3601c15edab9e8418cf78d7d9e993191873f41d59
diff --git a/media-libs/mutagen/mutagen-1.35.1.ebuild b/media-libs/mutagen/mutagen-1.35.1.ebuild
index ea192d81db19..6a033ff26f50 100644
--- a/media-libs/mutagen/mutagen-1.35.1.ebuild
+++ b/media-libs/mutagen/mutagen-1.35.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_5} )
 
 inherit distutils-r1
 
diff --git a/media-libs/mutagen/mutagen-1.38.ebuild b/media-libs/mutagen/mutagen-1.38.ebuild
index e969b8cc6380..0fada8d16940 100644
--- a/media-libs/mutagen/mutagen-1.38.ebuild
+++ b/media-libs/mutagen/mutagen-1.38.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/media-libs/mutagen/mutagen-1.39.ebuild b/media-libs/mutagen/mutagen-1.39.ebuild
index 5555b0fb0019..b7064f996baf 100644
--- a/media-libs/mutagen/mutagen-1.39.ebuild
+++ b/media-libs/mutagen/mutagen-1.39.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/media-libs/mutagen/mutagen-1.40.0.ebuild b/media-libs/mutagen/mutagen-1.40.0.ebuild
index 1f8a86a6a6f6..e8d16d7b54e0 100644
--- a/media-libs/mutagen/mutagen-1.40.0.ebuild
+++ b/media-libs/mutagen/mutagen-1.40.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/media-libs/mutagen/mutagen-1.41.1.ebuild b/media-libs/mutagen/mutagen-1.41.1.ebuild
index b4ddf5f50db8..64281a77a2ce 100644
--- a/media-libs/mutagen/mutagen-1.41.1.ebuild
+++ b/media-libs/mutagen/mutagen-1.41.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/media-libs/mutagen/mutagen-1.42.0.ebuild b/media-libs/mutagen/mutagen-1.42.0.ebuild
index 65654851c5f3..bb12ba937a66 100644
--- a/media-libs/mutagen/mutagen-1.42.0.ebuild
+++ b/media-libs/mutagen/mutagen-1.42.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit distutils-r1
 
@@ -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/nas/Manifest b/media-libs/nas/Manifest
index eada07e1f94f..67695dc45d9e 100644
--- a/media-libs/nas/Manifest
+++ b/media-libs/nas/Manifest
@@ -4,5 +4,5 @@ AUX nas-1.9.4-remove-abs-fabs.patch 1164 BLAKE2B 1fd8fb65a12cb340c47ee80929e2617
 AUX nas.conf.d 229 BLAKE2B 2ac8a6d914d02bc92258d7dfe3118e89ed6e3fe9d98e7a24eb8d72ded22dbb68a2d8129d066dc1457c0b8959f1762197b61f90502d3c60cdefd8aaeced04bbb3 SHA512 53cb9906d169b63b3592443bc0b63d59c4d0683e4b2194c60b1bc4297e6556f04b3ee9bf81da3a7f144757354de9aebe08c8445fccaa9a458a3b6537da68a2ac
 AUX nas.init.d 347 BLAKE2B 8b87c877fafd0e5993f909a4e132ed9f7042a3d8bdced8c7487afc962dfcad24a586ac754b99cbff815475f1326f44d52effb8eefd65cd0e25e6bc45991233af SHA512 556fc5d5135f789b0691de889aeaadce29319964443052787db5cb4cda480ed68c547c772de97c07ba2e0800f25cfa859376a3d80e9518995aae8136fe171468
 DIST nas-1.9.4.src.tar.gz 1464598 BLAKE2B d79ecda9f86a89d2d61bfadfeee4bb6a9feca6754bb88249b1eb3c1964e784d18098465f30f1b5bbb13d0550aebf48bb1b98aeb1b7c712f344a2eddc7720531b SHA512 3f8bd60f8ce0f25a2605af17caaadfe4f21223ba4cd3fa02078d1427b17cdf33ebda887e5dc30cd68eb7f64bfad80aafc9071ff0a26f0d3a4a93caacac03b5bb
-EBUILD nas-1.9.4-r2.ebuild 2447 BLAKE2B 39b07e57d7533e3c6c2eb5b4810b68f54a74082637aa3af64a9a715c39cbe76966251eab1e9109b9a40bc811a469b74999e831617995cb710c63699069ac9190 SHA512 38ab9d5070c364e494b517a1a3edaaf001a5e9a865911b222520d70bc0c86ccb4f80b09e809cc8c4fdae3d808ace8904d51cb5492bc7732102bfc3339d635042
+EBUILD nas-1.9.4-r2.ebuild 2443 BLAKE2B ec7c32c8675d0cf7093bbbbf9fd1760c6f2dfe7076265ef6f2bd42773144012f77b0516d9078137ea5fc44129ada9b5deaff514852c9a254f19a3c64c7254fc7 SHA512 dabd29b4a00c05619175a011096fd701b583b495e8ecaf64ac264d8fed9c64f4301ad3197a3586c6d4d607f91166f89bb0c4aa152f0d0cfcbcf57bec11248d78
 MISC metadata.xml 326 BLAKE2B 837bd2d88bfc59121d0e166ae65c8d4732b8cdc6a898183bfb1fd984b5bc3e8e3a2c3f22d763a26664da7f97c9091fc9c3af8c419b3e9e39a7410989434ed739 SHA512 7a2a048b46af5cfd9167aec79f8a4f4e8a10f8327d1aec4b59330cdfdc7e4b90d9b9ab85e73e2b0a0e5db6b71bb729e7886dc3763a4d75d8ed4602b7b6cb61e7
diff --git a/media-libs/nas/nas-1.9.4-r2.ebuild b/media-libs/nas/nas-1.9.4-r2.ebuild
index 6da098d928a0..92f6289c98c8 100644
--- a/media-libs/nas/nas-1.9.4-r2.ebuild
+++ b/media-libs/nas/nas-1.9.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
 
 LICENSE="HPND MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index a8649c9c1c72..ff0b7af11e21 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -17,5 +17,5 @@ DIST netpbm-10.70.00.tar.xz 2621612 BLAKE2B 2b07d130de0afeb3c1df32c6d267bc6bd13d
 DIST netpbm-10.76.00.tar.xz 2657184 BLAKE2B b8d82268ba50881fab10bca00ea408afa39096f4f9c079b523d8e28ce62301797ee50f55c84f85a6d832b723da7449531e725bf60a4a89975c51382b2cbc4a94 SHA512 234a5616a7631a8eb70817bb88ed509ddddfce93f71739654ef78a2735245b268c391adb49b514ed883569c9fc6ea9c3eeed10aa7898c02b797fee5249b11cf3
 EBUILD netpbm-10.66.00.ebuild 5635 BLAKE2B 67ac7c65d38383dcbb448c4f3d4ebc47e7bc290a1f5c47e394d5946fc15ab6635c2980993472da0a3ecad886414bd4ce17e9b429914fa162b84ff357350a4d99 SHA512 768b550d7dd600b849fd31ce60204c76194eaebca4de61709e1c214d7e13841f701096915d4d1357148d7533a40946598a77799378216242f9da7645113b9a15
 EBUILD netpbm-10.70.00.ebuild 5376 BLAKE2B 0bbf72c60c2c6fd4c843885b2674d3120e48c172a5932cf3d43db0334851a240038ecb3fb14e5ab31c7bbff26dff20021cc1aa429df8897e642dfc6ed3a0448b SHA512 9787fae7edf2669e450896a65c0cd99f23d2d9acefbb108fb6dd12580ce0f87d3fa0de136648c7ba681e06f9f6109d8ad1b8525cb340d01415947df75103cd34
-EBUILD netpbm-10.76.00.ebuild 5271 BLAKE2B 74897403cf67b57b3a3c920cc1e2e30f74cc7fe072845dad9706cfb314d0f6a52764eaf2142e2910c769627b2c5147514f8e6693c7dc2fe2feeba852d8ac1090 SHA512 36449cf49e69804f107124e1e222abcfbdca77e0cbc5153c56a912f1b2407bb51ce88a6e16170fd074cfef0a07b3035393a52056d8c8fe660d912d3eb7b5bd25
+EBUILD netpbm-10.76.00.ebuild 5270 BLAKE2B 74146d261d6645220c34b8fd68f51f162482ca435f76af5c853770fc72d31cb8c3a03b4605185fda7524377d6caf5c8e118986ffe607f14e0a05794a7febc8b7 SHA512 e5965cc226c1051abbedf344364427439ae34bf6335e2d4eba0596d25e691ad5feaca0735ad057bcfe6c36daee5344dda33650bc4ebaadd0f8ea045b030f52cb
 MISC metadata.xml 434 BLAKE2B 255ab7ddedd5e4558e9303c0c9fe5d1d6e13096e3ef7ba269d68908f1cb74d63af273ef9b2ceb97a7462750fa795a6d6f54dae1e70972b44cfbb749250ed65e6 SHA512 41fe0623d1efe7cff26ed9307756f045bd40f275abd38095affc9394efc2c940e63978c79328e43583d5bb466fad0d5339d158422037587cebd3b1f4c22a459f
diff --git a/media-libs/netpbm/netpbm-10.76.00.ebuild b/media-libs/netpbm/netpbm-10.76.00.ebuild
index d12e10636882..3b7f33582c58 100644
--- a/media-libs/netpbm/netpbm-10.76.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.76.00.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc jbig jpeg jpeg2k png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
 
 RDEPEND="jbig? ( media-libs/jbigkit )
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index 6c5ddbf73069..95c7ac0e754f 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -4,5 +4,5 @@ DIST openal-soft-1.19.0.tar.bz2 575163 BLAKE2B 492166cccdfb0d5f35a2d731d2194ab84
 DIST openal-soft-1.19.1.tar.bz2 577310 BLAKE2B f6ed5b2bce1bfcaa7f8085375d5d3e3323ea2f03896ba871fe3ec247e6e1bf524a9c5180399b0f0908aa69756a1f2ee8095f14a69e6a7eac55a25cc7c2ac545b SHA512 356a3f12bbe284bfac71f4f2a9f83d084083a832012222e73743042ac27812cf051c12b0ddcf53c010ff77e44ae2e9033cea9b9324d316a22a59a154307a64a4
 EBUILD openal-1.18.2-r1.ebuild 2087 BLAKE2B 21e2e6683182f2eb8779763cc46b682c01c33cb28b1a0828b5bf227eb9fd41c0f747ae136173eeb29b63f24d44de59293e3a5770d614dc7384a82f993bed6ca8 SHA512 24c1cd5cbadf059edc9554bf719e4318623412fc7f63bed1d0fdb15db75cac978072bec83ddee6480f14210008ed6cc85aadc3f4b439fdbe975fb25c1859f42f
 EBUILD openal-1.19.0.ebuild 2096 BLAKE2B cb10d181a01532d2c9872e9aa84f8f4fd00846372ec943a7ad3800aef7bc3aca306001312e2a5460f70134c9f34806a0b12380f71b2da5c0deb7af6ce2fd31c0 SHA512 abac1e5c860f6666938f47b897a1540a7ffe8dad41cc784378f8f703f51cba92376a16d02ce69dd76a20223ab4c80c5aca4edd502408f2e6b6d09d7955c4b729
-EBUILD openal-1.19.1.ebuild 2096 BLAKE2B cb10d181a01532d2c9872e9aa84f8f4fd00846372ec943a7ad3800aef7bc3aca306001312e2a5460f70134c9f34806a0b12380f71b2da5c0deb7af6ce2fd31c0 SHA512 abac1e5c860f6666938f47b897a1540a7ffe8dad41cc784378f8f703f51cba92376a16d02ce69dd76a20223ab4c80c5aca4edd502408f2e6b6d09d7955c4b729
+EBUILD openal-1.19.1.ebuild 2092 BLAKE2B 247aef02f9276220538fb1266ef1a32f9cc4f9f32832488968d0a7efa6c9487ed383abe129d3bc0d273fe0d92e67507f1d246223c46d1d94cd0a9ee0a43c193d SHA512 31842f4570a13af41178629f24400086fcb6f8f58e5be50f3f7a267795ec0178a49ff02e0ecd4b2907e234c35fffdb13a9ccdcf210afad61e71952ff8346a8aa
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/openal/openal-1.19.1.ebuild b/media-libs/openal/openal-1.19.1.ebuild
index c79250a4e7e1..c8a572924e7c 100644
--- a/media-libs/openal/openal-1.19.1.ebuild
+++ b/media-libs/openal/openal-1.19.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="
 	alsa coreaudio debug jack oss portaudio pulseaudio sdl qt5
 	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 3dfc43bb453b..62b939f7845f 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -3,5 +3,5 @@ AUX opencolorio-1.1.0-remove-building-of-bundled-programs.patch 6108 BLAKE2B dfd
 AUX opencolorio-1.1.0-use-GNUInstallDirs-and-fix-cmake-install-location.patch 4002 BLAKE2B 8cadf37f7e4ccc2f14268ef71c5765fa43493f6c93ce651d1d2a7a2d5859238ba77802907ee84b0d5efcd6bd75f4ccd13d585f7822a4c8d285be586207e58752 SHA512 37f852d4f0620dd799a7aa09f0c651c72a311656c6ecb72429a440563ca936852a1227a92dca01afd97632f401babf875796f222a82362727ff7074bbe251ac5
 AUX opencolorio-1.1.0-yaml-cpp-0.6.patch 2315 BLAKE2B eaaa69e7bd76a1c40ad823eb1be9cec93d69c0b024521e31d17aa6f5b2c1e29607cf3d238cac1aba19cec3149450b1ab15d1236332ff807bdb872db62f00b3b7 SHA512 2436a404581b26db6416b013ce9de8302c20878d1c956f5ddb40c2d590c0df7a2a8c3108590330598441db51f4aae9b6d485af8b7034b22316fa42ccdc801fa5
 DIST opencolorio-1.1.0.tar.gz 13826812 BLAKE2B 555a5ac393170503c944c3471ea482b1a22be7c98ee7b81af37f52db185c8b61c5318102c139a8711f4828d306b6c4322f5d839c4df08ce41ebbb9dcb2bda152 SHA512 909874a9f91a8d229622810fc70233680c6e75203bd8555179322de2873da00bf302432e19f189b787ffcda3157ddec1e4601c97f75a36e16f644fe7d42f6998
-EBUILD opencolorio-1.1.0-r1.ebuild 2350 BLAKE2B ffebd68258e6c0d21ef892801413a4a20e754504ca9487a6f92d7ab8c10a54f31d96a08d5452cc0632303518fb6f137478d9d81d18ab9e269e9416d501c16bf4 SHA512 2aae32b426b4955266ec5838b57838beaf36a49e07105e6afbc5c25e0744685bd73a9bf52ea8bdb3e3f4f99d8e1d68f165ea0b38988588c40427d26c5f6cd8bb
+EBUILD opencolorio-1.1.0-r1.ebuild 2343 BLAKE2B 9558c27dd6e0beef505cd938406836a6af0be776dccc4d7a4789426a7c2116446fdab88e8777078276213395d549e8f7ffb359186f8d1f495d63cec7ef7b6c9e SHA512 a7147bedc2c41a526799f55f7b3ffd70195e1b95f29ef15ba713608cba75c47d44bce70afe04a6848cd8081c34ae6b7f1811ae11d46193961fef2ce951ebcd8a
 MISC metadata.xml 551 BLAKE2B b7a648f31772a6a72121dda8736a96e5c54189b20f1eea1600222b27385b695644887a9f084ba7a01c7a530593aa28a2319353c0fdb6e549a03a85fc8a7a1cf4 SHA512 ddd9c8afeb0540e663b3e963f926247da21c72574459cb2f82dc956476fce18f5eb0e2b140ccdbadc98f71b5b855f674d227271f9ff781f689126afbc555f846
diff --git a/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild b/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild
index 9fba65db5983..2ee8b87912af 100644
--- a/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild
+++ b/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 # Compatibility with Python 3 is declared by upstream, but it is broken in fact, check on bump
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit cmake-utils python-single-r1 vcs-snapshot
 
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index b8a6c378b205..4d83d0153690 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -23,5 +23,5 @@ DIST opencv-3.4.1_contrib.tar.gz 57126844 BLAKE2B 63d9d5cb088371754eb132607789c8
 DIST tiny-dnn-1.0.0a3.tar.gz 12885646 BLAKE2B 85c0715ab6c692b77522487775e70b0db645528baed1830c83c9f44d2b67a5207e4f7ea1709b35c6a4217d287199549304e9be19f4a5cec9a1183b0b5dccc562 SHA512 5f2c1a161771efa67e85b1fea395953b7744e29f61187ac5a6c54c912fb195b3aef9a5827135c3668bd0eeea5ae04a33cc433e1f6683e2b7955010a2632d168b
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
 EBUILD opencv-2.4.13-r3.ebuild 5972 BLAKE2B e8cf37172bb279877c88e4a25564d58f0cc39e46ea185587033922083ff6f34c774f2d9dd0220831db040b8f3654f95a0cb6e28aef0cf3893392000f45c10bba SHA512 2ee9f1749172d504dafb927b9310c30c92300b9ecc19999421e0e891bc0dfb436871ad7fb35466f84275370877240a222aa71d1f6f47808726d5ba1875606e3b
-EBUILD opencv-3.4.1-r5.ebuild 18720 BLAKE2B 113f6d7813320c1f5230a55f4c160a6390cea9ab4a111e71a04db9d69b54feebadab5f700072ba5450fc03a32af669e1306c616a9805e8536b45d46ff9c4ae92 SHA512 8ef0d1de2fab5e9dca09fdd23c1c986c9738bc1b2629aa1c7cf69c950e1e4853c440d241a936649edee7f2cf1ba7107ca9649f427dedec8efd95e1407ea8debe
+EBUILD opencv-3.4.1-r5.ebuild 18716 BLAKE2B d9aecbb003f7ce23e8822f94b339ffe3b70cbc85e1d14ee1a26c06a88b5fb61be8881ba3836bff7f4318425b3c6b899bb83bc682b35e4581b2bc388a420e25c5 SHA512 621903dfa2a8f7df6aa7eee406688c76846c4df80a61cd455004fdb9a2eb55c806835dd5b1d1268790af376ef29b092ae02dabc029ee9189c04d38e21950aea2
 MISC metadata.xml 2401 BLAKE2B 3d37ef4879324890e702119fffaaf075021fb22ee0b9393a58df46cf937a60403f0f48f90483bfc078079cb9f1177f866cfcee63d592ba93915fa96a438d064c SHA512 691287c588e60df6158ea070f61100214dc54c267f9f2c7ffbeabb75595e72641ced7cc33f119fed9bbf98df8832f977557fb4a1017eb65d9081ac1350d783b8
diff --git a/media-libs/opencv/opencv-3.4.1-r5.ebuild b/media-libs/opencv/opencv-3.4.1-r5.ebuild
index cb9bc604ea9e..d6b5e9464d1c 100644
--- a/media-libs/opencv/opencv-3.4.1-r5.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 inherit java-pkg-opt-2 java-ant-2 python-r1 toolchain-funcs cmake-multilib
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 6cffb736981b..ea88b51d53d3 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -5,11 +5,16 @@ AUX openexr-2.2.0-fix-build-system.patch 17897 BLAKE2B 95f44167ce0590ee591a7b7de
 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 1933 BLAKE2B ec44faffda4f70c5a9964dc09d6ec2e3c068fcb6463524d64a3cd0613e48d9f3b8250d3a9b8f7a05414b9df506de67c90df08c24dcc1b71a83306eb4d738180a SHA512 502493e8c7793954b4255b7f6e73835c068a70287ada74f2a21bc42377830258e0420400276808d8c21a0ecb00ac5cdcae1aa4d9cc5747b492e64eb390773add
+EBUILD openexr-2.3.0.ebuild 2233 BLAKE2B 2a7644dfe44203aa435684ce454cc4dd0fddd7dc495a9c9d044e95c02194090e898b688d582fb444859935e02bd9e46eaabd00d860b4d6ebe3184daa524aa66b SHA512 28e7b5580b6d19f0584b80b8d3fadef1707412007c41a2fcb5317d6b6b4d8a5a08e5ee320529e974f0e7ccc81c561479075ec12d8f25c8cb2fd4f702b9003baa
 MISC metadata.xml 303 BLAKE2B 53fb5019bd6fe939d485f1eccb4a140ca9b7ce121b06744d8155842ccb6c5e1378ea39a9ae74c8d519be7b3926bd76040df4b8107137fcc2e25be97431e7a1be SHA512 0ab8d735dd7a8e0dc96b14cfde1ae06969d15cfbad956f4fda60b093660aee38fe98709376eedc9362a26858678d2f28eec795c1accb2560858fd804a11bb7ca
diff --git a/media-libs/openexr/files/openexr-2.3.0-bigendian.patch b/media-libs/openexr/files/openexr-2.3.0-bigendian.patch
new file mode 100644
index 000000000000..0851fe957354
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.3.0-bigendian.patch
@@ -0,0 +1,71 @@
+Description: Fix test-suite on some big-endian archs
+Author: Dennis Gilmore <dennis@ausil.us>
+Bug-Debian: https://bugs.debian.org/793040
+Origin: vendor, https://github.com/openexr/openexr/issues/81
+Reviewed-by: Mathieu Malaterre <malat@debian.org>
+
+Index: openexr/IlmImfTest/testFutureProofing.cpp
+===================================================================
+--- openexr.orig/IlmImfTest/testFutureProofing.cpp
++++ openexr/IlmImfTest/testFutureProofing.cpp
+@@ -40,6 +40,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <assert.h>
++#include <byteswap.h>
+ 
+ #include "tmpDir.h"
+ #include "testFutureProofing.h"
+@@ -64,6 +65,7 @@
+ #include <ImfNamespace.h>
+ #include <ImathNamespace.h>
+ #include <IlmThreadNamespace.h>
++#include <ImfSystemSpecific.h>
+ 
+ namespace IMF = OPENEXR_IMF_NAMESPACE;
+ using namespace IMF;
+@@ -1234,6 +1236,12 @@ modifyType (bool modify_version)
+             
+             //length of attribute
+             fread(&length,4,1,f);
++            if (!GLOBAL_SYSTEM_LITTLE_ENDIAN)
++            {
++                int tmp = bswap_32(length);
++        	length = tmp;
++            }
++
+             if(!modify_version && attrib_name=="type")
+             {
+                 // modify the type of part 1 to be 'X<whatevever>'
+Index: openexr/IlmImfTest/testMultiPartFileMixingBasic.cpp
+===================================================================
+--- openexr.orig/IlmImfTest/testMultiPartFileMixingBasic.cpp
++++ openexr/IlmImfTest/testMultiPartFileMixingBasic.cpp
+@@ -40,6 +40,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <assert.h>
++#include <byteswap.h>
+ 
+ #include "tmpDir.h"
+ #include "testMultiPartFileMixingBasic.h"
+@@ -59,6 +60,7 @@
+ #include <ImfDeepScanLineInputPart.h>
+ #include <ImfPartType.h>
+ #include <ImfMisc.h>
++#include <ImfSystemSpecific.h>
+ 
+ namespace IMF = OPENEXR_IMF_NAMESPACE;
+ using namespace IMF;
+@@ -1383,6 +1385,11 @@ killOffsetTables (const std::string & fn
+             
+             //length of attribute
+             fread(&length,4,1,f);
++    	    if (!GLOBAL_SYSTEM_LITTLE_ENDIAN)
++    	    {
++    		int tmp = bswap_32(length);
++    		length = tmp;
++    	    }
+             
+             //value of attribute
+             for(int i=0;i<length;i++) 
diff --git a/media-libs/openexr/files/openexr-2.3.0-bigendian2.patch b/media-libs/openexr/files/openexr-2.3.0-bigendian2.patch
new file mode 100644
index 000000000000..cf1ad7b09027
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.3.0-bigendian2.patch
@@ -0,0 +1,17 @@
+Description: Upstream is not interested in big endian arch
+ Seems to only affect the test suite.
+Author: Mathieu Malaterre <malat@debian.org>
+
+Index: openexr/IlmImfTest/main.cpp
+===================================================================
+--- openexr.orig/IlmImfTest/main.cpp
++++ openexr/IlmImfTest/main.cpp
+@@ -153,7 +153,7 @@ main (int argc, char *argv[])
+     TEST (testHuf, "core");
+     TEST (testWav, "core");
+     TEST (testRgba, "basic");
+-    TEST (testSharedFrameBuffer, "basic");
++    //TEST (testSharedFrameBuffer, "basic");
+     TEST (testRgbaThreading, "basic");
+     TEST (testChannels, "basic");
+     TEST (testAttributes, "core");
diff --git a/media-libs/openexr/files/openexr-2.3.0-skip-bogus-tests.patch b/media-libs/openexr/files/openexr-2.3.0-skip-bogus-tests.patch
new file mode 100644
index 000000000000..360b9609b2dc
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.3.0-skip-bogus-tests.patch
@@ -0,0 +1,31 @@
+Description: Remove bogus test from suite
+Author: Mathieu Malaterre <malat@debian.org>
+Bug-Debian: https://bugs.debian.org/790495
+Forwarded: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=790495#15
+
+--- openexr-2.2.0.orig/IlmImfTest/testSampleImages.cpp
++++ openexr-2.2.0/IlmImfTest/testSampleImages.cpp
+@@ -162,15 +162,15 @@ testSampleImages (const std::string&)
+ 	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_b44.exr",
+ 		       ILM_IMF_TEST_IMAGEDIR "comp_b44_piz.exr");
+ 
+-	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwaa_v1.exr",
+-		       ILM_IMF_TEST_IMAGEDIR "comp_dwaa_piz.exr");
+-	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwaa_v2.exr",
+-		       ILM_IMF_TEST_IMAGEDIR "comp_dwaa_piz.exr");
++//	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwaa_v1.exr",
++//		       ILM_IMF_TEST_IMAGEDIR "comp_dwaa_piz.exr");
++//	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwaa_v2.exr",
++//		       ILM_IMF_TEST_IMAGEDIR "comp_dwaa_piz.exr");
+ 
+-	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwab_v1.exr",
+-		       ILM_IMF_TEST_IMAGEDIR "comp_dwab_piz.exr");
+-	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwab_v2.exr",
+-		       ILM_IMF_TEST_IMAGEDIR "comp_dwab_piz.exr");
++//	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwab_v1.exr",
++//		       ILM_IMF_TEST_IMAGEDIR "comp_dwab_piz.exr");
++//	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwab_v2.exr",
++//		       ILM_IMF_TEST_IMAGEDIR "comp_dwab_piz.exr");
+ 
+ 
+ 	cout << "ok\n" << endl;
diff --git a/media-libs/openexr/files/openexr-2.3.0-tests-32bits-2.patch b/media-libs/openexr/files/openexr-2.3.0-tests-32bits-2.patch
new file mode 100644
index 000000000000..bb3917d79961
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.3.0-tests-32bits-2.patch
@@ -0,0 +1,17 @@
+Description: Usual double rounding issue with x87
+Author: Mathieu Malaterre <malat@debian.org>
+Bug-Debian: https://bugs.debian.org/909865
+Forwarded: https://github.com/openexr/openexr/issues/346
+Last-Update: 2018-12-19
+
+--- openexr-2.3.0.orig/IlmImfTest/Makefile.am
++++ openexr-2.3.0/IlmImfTest/Makefile.am
+@@ -54,6 +54,8 @@ IlmImfTest_SOURCES = main.cpp tmpDir.h t
+ 
+ AM_CPPFLAGS = -DILM_IMF_TEST_IMAGEDIR=\"$(srcdir)/\"
+ 
++AM_CPPFLAGS += -ffloat-store
++
+ if BUILD_IMFHUGETEST
+ IlmImfTest_SOURCES += testDeepScanLineHuge.cpp testDeepScanLineHuge.h
+ AM_CPPFLAGS += -DENABLE_IMFHUGETEST
diff --git a/media-libs/openexr/files/openexr-2.3.0-tests-32bits.patch b/media-libs/openexr/files/openexr-2.3.0-tests-32bits.patch
new file mode 100644
index 000000000000..430bb20bcfae
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.3.0-tests-32bits.patch
@@ -0,0 +1,36 @@
+Description: Fix test-suite on some 32bits archs
+Author: Mathieu Malaterre <malat@debian.org>
+Bug-Debian: https://bugs.debian.org/791478
+
+Index: openexr/IlmImfTest/Makefile.am
+===================================================================
+--- openexr.orig/IlmImfTest/Makefile.am
++++ openexr/IlmImfTest/Makefile.am
+@@ -44,7 +44,6 @@ IlmImfTest_SOURCES = main.cpp tmpDir.h t
+ 		     testDeepScanLineMultipleRead.h testDeepScanLineMultipleRead.cpp  \
+ 		     testPartHelper.h testPartHelper.cpp \
+ 		     testOptimized.cpp testOptimized.h \
+-		     testOptimizedInterleavePatterns.cpp testOptimizedInterleavePatterns.h \
+ 		     testBadTypeAttributes.cpp testBadTypeAttributes.h \
+ 		     testFutureProofing.cpp testFutureProofing.h \
+ 	             compareDwa.cpp compareDwa.h \
+Index: openexr/IlmImfTest/main.cpp
+===================================================================
+--- openexr.orig/IlmImfTest/main.cpp
++++ openexr/IlmImfTest/main.cpp
+@@ -82,7 +82,6 @@
+ #include "testCopyMultiPartFile.h"
+ #include "testPartHelper.h"
+ #include "testOptimized.h"
+-#include "testOptimizedInterleavePatterns.h"
+ #include "testBadTypeAttributes.h"
+ #include "testFutureProofing.h"
+ #include "testPartHelper.h"
+@@ -174,7 +173,6 @@ main (int argc, char *argv[])
+     TEST (testExistingStreams, "core");
+     TEST (testStandardAttributes, "core");
+     TEST (testOptimized, "basic");
+-    TEST (testOptimizedInterleavePatterns, "basic");
+     TEST (testYca, "basic");
+     TEST (testTiledYa, "basic");
+     TEST (testNativeFormat, "basic");
diff --git a/media-libs/openexr/openexr-2.3.0.ebuild b/media-libs/openexr/openexr-2.3.0.ebuild
index 99f63d05e1f9..d617628cbfa7 100644
--- a/media-libs/openexr/openexr-2.3.0.ebuild
+++ b/media-libs/openexr/openexr-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0/24" # 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"
+KEYWORDS="amd64 -arm arm64 ~hppa ia64 ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="cpu_flags_x86_avx examples static-libs"
 
 RDEPEND="
@@ -23,6 +23,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
 "
 
+RESTRICT="test" # Tests broken upstream doesn't really care about them, bug #656680
+
 DOCS=( AUTHORS ChangeLog NEWS README.md )
 MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/OpenEXRConfig.h )
 
@@ -31,6 +33,12 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.2.0-fix-config.h-collision.patch"
 	"${FILESDIR}/${PN}-2.2.0-Install-missing-header-files.patch"
 	"${FILESDIR}/${P}-fix-build-system.patch"
+	# From Debian
+	"${FILESDIR}/${PN}-2.3.0-tests-32bits.patch"
+	"${FILESDIR}/${PN}-2.3.0-skip-bogus-tests.patch"
+	"${FILESDIR}/${PN}-2.3.0-bigendian.patch"
+	"${FILESDIR}/${PN}-2.3.0-bigendian2.patch"
+	"${FILESDIR}/${PN}-2.3.0-tests-32bits-2.patch"
 )
 
 src_prepare() {
@@ -66,6 +74,5 @@ multilib_src_install_all() {
 		rm -rf "${ED%/}"/usr/share/doc/${PF}/examples || die
 	fi
 
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index a69bcfa49c68..95fbfc52ae1b 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -2,13 +2,14 @@ AUX openimageio-1.6.18-make-python-and-boost-detection-more-generic.patch 15826
 AUX openimageio-1.6.18-repair-breaks-after-boost-python-1.65-changes.patch 9877 BLAKE2B 0325e373bae367d3581343d49cda84ee27161a8a9a07e85ec00c81e6a0f11de5ce26d71ccc91153187ee79a97933d8307cbff84713524b3a5e40083dc075384c SHA512 e507ba714689a5da0f0a864804eaa0862b1aa4fc0e77f68934ae369c4de11ca566c9efd75ba5060d0294b42bf2bd7f20127eaf8e50efb4ff92497f1b60295f4c
 AUX openimageio-1.6.18-use-gnuinstalldirs.patch 11257 BLAKE2B 524d40a5ad4827743d20a259f2fd2ed094945439eef620473ff1097efb150cdfc80c66f4576b869aed6c7b9d086499d5d286c3dcaae4d891a37f6ae06f504a85 SHA512 3ca9e8474bc58b726686d1e87766d20f2cdcb2544b07b20a8a48594b442409f753c1e860219bfe948d19cdf0f5090bd04299ab6fdc6bf39f753d158d9f75a1e1
 AUX openimageio-1.7.17-make-python-and-boost-detection-more-generic.patch 15432 BLAKE2B 550a6aa0b962b6efc5c9fb01dcb781dc78bc26a42624c8d4f4be24925464d66e6cbc1a0a7d9dcececa5c5681a70e34d97bfd72ee3224158cffe8ca151a0750c9 SHA512 433dda4b999d60248fecffe0c5866c1214a2db68dedb0e63e36f9c5e0fbcd5c54d3faff3effd19d7b3bb57bce9016eca10f58ba6b3a4143391325838cb637227
+AUX openimageio-1.7.17-openexr-2.3.0.patch 2080 BLAKE2B 506b34419dd71bf68052bcbc1c8564925b8d3e490653ea265695ecf640116c4caedaf8b152fea9bc39905dd25e88c6b68ab34670aeec3da5541af686ffd7a24a SHA512 662a274c7a765cf453ac64c6c2aa614cf1cf3fff9ede7f56fc18d7646c81703c8db83f965b53c5e18233d30c1971873ebc436bf3d2c88bb79d7b09e86f5ad89a
 AUX openimageio-1.7.17-use-gnuinstalldirs.patch 11236 BLAKE2B f8adc11f949906bce9046fffb0074487962c8832b4b026a7c2a47b081d0c30ca813536462a685feb5e67b793b37cb5985c3cfc6766df65424c6921ec0bc28e60 SHA512 27d51f70406812efad10cc099a3c9cabb21f98db4bc718ec14269bea564059be40e691210537cb5609708e1ba318fb485a8e02317a34c20106b2b826200ad79f
 DIST openimageio-1.6.13.tar.gz 24846132 BLAKE2B a72b7756257d4ffd1567efd73c24bf65fc2bffff82c96c18a77211e918323e65e1c99076e272b3b77115ca30910ea4cfced222892b062e339d8e4e85bd2221f7 SHA512 8cd490b6d6a3c0b542c4bcab709897c5f35ce6844ce7465e0158ac52a1b108603ccc76439f7f2e46af2ec08be4293bda6a76ec68a959026af70a444cbbdc21d6
 DIST openimageio-1.6.18.tar.gz 24881550 BLAKE2B debd5624cf91a087cb73b88047767fe1915a5c52bf27bf3fb60b14abb572e980ea039d2626818c6b99cc5d596892aec0693226cabdc74cc2620f8221d7358f89 SHA512 b94429b77263e00c33fa79fcae1b444eab01937f6dc77168b31249204de9a31c17765a8b41bec2f7d53c3d03512ba151001607bd719cb1861a3f0231a1865d51
 DIST openimageio-1.7.17.tar.gz 27164765 BLAKE2B 8245c2573577ad681753db0cad16dfd806e869ff1f443997bcf39d9a6474c585c749e9ff26bce5f23b9d42ef035bf8ce519374261a21ca0e3c4e7e13809f1a6b SHA512 c5ee9173d3acc24a5045e6ac97657d4bf0c5ac1d3250497db51b8bd9e27e2fc48979eba3598635eb6053b87748f8827be2d2831d425459a41c893e6cb43bce94
 DIST openimageio-1.8.17.tar.gz 27835527 BLAKE2B e524d171bb918a46aed3c5f329bc8d10853d8b170c1e9b4a6edad72db66b3a03ea32eba4338577a667254e884daebf6b5b33a70090b953a5b5e269d874c91852 SHA512 e58cad9458d71a845c3214675a41e0cffe0509fd52a95ef5a44af0015ef25a1145f9ebb50ff1f5e7200ae0a46efb40e851855f53c55d058c0bc5654a072bdbf7
-EBUILD openimageio-1.6.13.ebuild 2381 BLAKE2B b8a5ff95b6acc88f1de5d12e113e9812b56f5330ee677fe470650f4077635d667071090226a51762d5c1c2e55bbae928b3c9583a8b9ae56b333ed4c16ae5b931 SHA512 e3b005728837a83100594e4fbce4ce18e5af8e24b5addb0023c0da4cc45cff66a42fd551960d6a13bc2e8342e234e5eb8f53a318cbd44a32264e57ef633f5e78
-EBUILD openimageio-1.6.18.ebuild 2884 BLAKE2B 5402981510f3886fd9a143403bacc084703c6a3898319d8f61b124111e26084bdabcb5d8cb0e085cf745d66e9e8d20a68c06ad9382319482fca17a59fd3f2ee4 SHA512 6b07dd2e6239aa9c86f1b2d7dd548dbc6501e06d41c184e99dfbf400a06bd0e4c3a02d54999017e44522c50b069e94d3539d57dce78937f84bb5fcd43a97a970
-EBUILD openimageio-1.7.17.ebuild 2946 BLAKE2B 7a40878d3fab0bf03777a4a9b45118525985bbfa1b494f0641a52a73d3fecc9bc7d76616e1c61757b8b10b93c60c2a9ba5a3066971b017271aeb5b21e4ec266b SHA512 cb9df0dade489b996818b73a62e0d4de82a485b7e7f2123c95be1a46a2405d7690913878d676477857bbda07a8877138de805f8390e0d2899f3f7a26ccbf8128
-EBUILD openimageio-1.8.17.ebuild 2936 BLAKE2B 4daf451960cb6c56c32b0910a7ec287889347b0e7476b3f945d4e3f03779444362074496d68da7c84c8763fcd850e0d9af3b8dd3536f341193d23ed06ae6f0bf SHA512 0fd614758cf2540e82dc5d51dcfae960d0a0075a56f1ffc0be2eb780e024bbff4c35aec5ba5b72113247bf16446ad5346f3341ac39e86108c7d1b1ebd624d61c
+EBUILD openimageio-1.6.13.ebuild 2374 BLAKE2B 673c04d398240d55fe684085300b47af5addea2ba60ae26538fa9af51ee7d3f5465a4155a29568b4eb3e33b260e89b48e4fcd9eea22f0e202b3e417b6f4ab729 SHA512 873b3a91ef4b5e521cf6b84daebb653854e589184ebbf12f3e6d9cd7bb43742bacdca3cd7b4b12cad3841c21435f0f6c7a04d8dfb848a78b94772b6641402cd2
+EBUILD openimageio-1.6.18.ebuild 2877 BLAKE2B 80de70165e8db192ef9749f2cdf305ea23d8bb902d8fb099ede3ccd9b7ebb02ced99f3e24262818ef0f9300459e3edc114bdb5472a4deab2af16d88ecea69a82 SHA512 bc90dddc03af90704d0c13f1f21db3825a0d20d0da1d01696313514ffbf1f846bf030a618fa22a4c11b6f79428ca0946ad2318d21039cd70f1c14c27294a87c2
+EBUILD openimageio-1.7.17.ebuild 2992 BLAKE2B db39f2b797e3b0ec9ffcc9825b5a854f1deedac007a25c5e1a3ed0de5ee976e777238975935a99f6d52e71f24634897bd0673da10f22d42588408c051f07ca8d SHA512 e80ec5440f7f9544d3ece54920d72a42bc751028c1b9ac7876e03012d0009a26612f1031e8dba5622fdef902591fe92872218f45c514f3b61b3c34eb9039d910
+EBUILD openimageio-1.8.17.ebuild 2934 BLAKE2B ac536446a34d9723883192a04fb8dbc551ab8a48cb7e9f4f3168e96181e73e17915961a8f7c7b09a2c92d42b237ac8652f23cbe66b6ab085286dafb435a7fde5 SHA512 5e5f253a0f63c34a07b85cdddc7a9559eac48230627d6fe686e6a1fcbea68c49fa22c64c83c31c3f0f7d25c1159a8f9f66f2621aab3cc90925a2ee90d72900ce
 MISC metadata.xml 940 BLAKE2B 540f2e00e2790b5e1ec7af2f9165d8a911151c9c9d2d6dbaa80f697ae91fcfe4889ec68141ed18a321550f7b9a3a14a306de5199e3cd603f4f6b5a019005f815 SHA512 ff5c1d96b3de7d144f2cd7bcf55c9953e7e385717ad49d009adef1e21ffa32843350a71f98210b724fb74af916be98eb4f5d2927c58b4a848efbffd85f39d933
diff --git a/media-libs/openimageio/files/openimageio-1.7.17-openexr-2.3.0.patch b/media-libs/openimageio/files/openimageio-1.7.17-openexr-2.3.0.patch
new file mode 100644
index 000000000000..e4bd3562adc2
--- /dev/null
+++ b/media-libs/openimageio/files/openimageio-1.7.17-openexr-2.3.0.patch
@@ -0,0 +1,51 @@
+Use PkgConfig to find OpenEXR. Otherwise, the code fails
+when OpenEXR/OpenEXRConfig.h is a multilib wrapper.
+Changes taken from openimageio-1.8.17.
+
+--- openimageio-1.7.17/src/cmake/modules/FindOpenEXR.cmake
++++ openimageio-1.7.17/src/cmake/modules/FindOpenEXR.cmake
+@@ -27,6 +27,13 @@
+     set (ILMBASE_PTHREADS ${CMAKE_THREAD_LIBS_INIT})
+ endif ()
+ 
++# Attempt to find OpenEXR with pkgconfig
++find_package(PkgConfig)
++if (PKG_CONFIG_FOUND)
++    pkg_check_modules(_ILMBASE QUIET IlmBase)
++    pkg_check_modules(_OPENEXR QUIET OpenEXR>=2.0.0)
++endif (PKG_CONFIG_FOUND)
++
+ # List of likely places to find the headers -- note priority override of
+ # OPENEXR_CUSTOM_INCLUDE_DIR and ${OPENEXR_HOME}/include.
+ # ILMBASE is needed in case ilmbase an openexr are installed in separate
+@@ -35,6 +42,8 @@
+     ${OPENEXR_CUSTOM_INCLUDE_DIR}
+     ${OPENEXR_HOME}/include
+     ${ILMBASE_HOME}/include
++    ${_ILMBASE_INCLUDEDIR}
++    ${_OPENEXR_INCLUDEDIR}
+     /usr/local/include
+     /usr/include
+     /usr/include/${CMAKE_LIBRARY_ARCHITECTURE}
+@@ -53,7 +62,11 @@
+ find_path (OPENEXR_INCLUDE_PATH OpenEXR/OpenEXRConfig.h)
+ 
+ # Try to figure out version number
+-if (EXISTS "${OPENEXR_INCLUDE_PATH}/OpenEXR/ImfMultiPartInputFile.h")
++if (DEFINED _OPENEXR_VERSION AND NOT "${_OPENEXR_VERSION}" STREQUAL "")
++    set (OPENEXR_VERSION "${_OPENEXR_VERSION}")
++    string (REGEX REPLACE "([0-9]+)\\.[0-9]+" "\\1" OPENEXR_VERSION_MAJOR "${_OPENEXR_VERSION}")
++    string (REGEX REPLACE "[0-9]+\\.([0-9]+)" "\\1" OPENEXR_VERSION_MINOR "${_OPENEXR_VERSION}")
++elseif (EXISTS "${OPENEXR_INCLUDE_PATH}/OpenEXR/ImfMultiPartInputFile.h")
+     # Must be at least 2.0
+     file(STRINGS "${OPENEXR_INCLUDE_PATH}/OpenEXR/OpenEXRConfig.h" TMP REGEX "^#define OPENEXR_VERSION_STRING .*$")
+     string (REGEX MATCHALL "[0-9]+[.0-9]+" OPENEXR_VERSION ${TMP})
+@@ -90,6 +103,8 @@
+     ${GENERIC_LIBRARY_PATHS}
+     ${OPENEXR_INCLUDE_PATH}/../lib
+     ${ILMBASE_INCLUDE_PATH}/../lib
++    ${_ILMBASE_LIBDIR}
++    ${_OPENEXR_LIBDIR}
+     /usr/local/lib
+     /usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE}
+     /usr/lib
diff --git a/media-libs/openimageio/openimageio-1.6.13.ebuild b/media-libs/openimageio/openimageio-1.6.13.ebuild
index f7a101f8a20c..80f7135f6bbc 100644
--- a/media-libs/openimageio/openimageio-1.6.13.ebuild
+++ b/media-libs/openimageio/openimageio-1.6.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_5} )
 
 inherit cmake-utils python-single-r1 vcs-snapshot
 
diff --git a/media-libs/openimageio/openimageio-1.6.18.ebuild b/media-libs/openimageio/openimageio-1.6.18.ebuild
index 7f5f2086dbf8..30b8d9ae2d08 100644
--- a/media-libs/openimageio/openimageio-1.6.18.ebuild
+++ b/media-libs/openimageio/openimageio-1.6.18.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit cmake-utils vcs-snapshot python-single-r1
 
diff --git a/media-libs/openimageio/openimageio-1.7.17.ebuild b/media-libs/openimageio/openimageio-1.7.17.ebuild
index 3738dd9c1823..2e5bb080fb59 100644
--- a/media-libs/openimageio/openimageio-1.7.17.ebuild
+++ b/media-libs/openimageio/openimageio-1.7.17.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit cmake-utils vcs-snapshot python-single-r1
 
@@ -61,6 +61,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}/${P}-use-gnuinstalldirs.patch"
 	"${FILESDIR}/${P}-make-python-and-boost-detection-more-generic.patch"
+	"${FILESDIR}/${P}-openexr-2.3.0.patch" # bug 683126
 )
 
 DOCS=( CHANGES.md CREDITS.md README.md src/doc/${PN}.pdf )
diff --git a/media-libs/openimageio/openimageio-1.8.17.ebuild b/media-libs/openimageio/openimageio-1.8.17.ebuild
index 5dd03517a4f4..0dee277d54f6 100644
--- a/media-libs/openimageio/openimageio-1.8.17.ebuild
+++ b/media-libs/openimageio/openimageio-1.8.17.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 
 inherit cmake-utils python-single-r1
 
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 877bf35f5d30..e2d0242a8eb5 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1,9 +1,12 @@
 AUX openjpeg-2.3.0-fix-disable-static-libs.patch 868 BLAKE2B c3d72cc6428467388eed401dbb07f3c66a6f53bc1d0f66934a27ec7ab3c47244c026e5d316df67a471e7888207f0128541a9c55221e4a224a788d5844229d208 SHA512 8509b256d01f11f5d9c8317d5def3dff7275ad024c83306fe658d64d42101e69bc82ef65740599e3a596c382d2f2497ef910efb8f648113de09daac793ba074b
 AUX openjpeg-2.3.0-gnuinstalldirs.patch 19232 BLAKE2B efce79a56f389008d6f90ea97319b2b87738fbdb9580d69824817e881e35311e969abf70eafb0694d7b856b039ec7e7305435ecc0ca0d79c2d9b0b87abfd57c8 SHA512 61cd1284b0d69fc42dfb4027c27ffa6573557e662b1ab646293a835b393166723fbe5a77998821a60739af17eb53af6bdc71529860bf217f91be49c076ccd564
+AUX openjpeg-2.3.1-gnuinstalldirs.patch 19036 BLAKE2B a387c87b543cf3453a6f481b50b958b721105aaadb974cd7ea1dd24bfa15d4b792bfa3b0d894abf2ce4b20c5bc15b077329c0658afd136990daea3471805833a SHA512 1a99381781beea259f96fdc4b310aac41a3c1b6c21320500c5e4642ce222eae09f7f728b7748ad627bb93fd7450ac16c5cbe33853525695576d28feaff524698
 DIST openjpeg-1.5.2.tar.gz 1385702 BLAKE2B 936ab6e0fb48f2839df13113c716c39b9572bd590206cd823dedccfd4001444d73a81ccbf82616a40a35ad8b1fae8d2f08d7c265a771d9d9ef413beac5e84ac1 SHA512 b945cf4f8b5e3227a0c07120c94b0ed5bf30c901de73059ee1d47975f46744fb62bbe84cdb2917c6431128f400020874eb07160af870b5448ced897998b08862
 DIST openjpeg-2.3.0.tar.gz 2207329 BLAKE2B b03ddb02127cc85e647cbda11423f63f2caa0abae40d5687a1b191e7857aa9b428da5afc86ce0c08cce1516c290eeac31ae1db841db56ba70afa020f126d2508 SHA512 0a9d427be4a820b1d759fca4b50e293721b45fe4885aa61ca1ae09e099f75ed93520448090c780d62f51076d575cc03618cd6d5181bdb6b34e4fc07b4cfdd568
+DIST openjpeg-2.3.1.tar.gz 2214401 BLAKE2B ecc7e573592a5302dcdbade791f6aa6e48f6791c7412fdd44976f3619c8fc0cca7d904fa42013f33ab17dd0f569a76d3c49a73eccaf0a749d34f305362367af9 SHA512 339fbc899bddf2393d214df71ed5d6070a3a76b933b1e75576c8a0ae9dfcc4adec40bdc544f599e4b8d0bc173e4e9e7352408497b5b3c9356985605830c26c03
 DIST openjpeg-data_20170814.tar.gz 497454197 BLAKE2B ea27ab763e685724dfd5c2242a93d9b93111a0516ea7a8aef9f37ec31b00cc887d84d4d0bf7f79f3636aa0ea9a0302f43df4596fc967c243a8773ccde6e79fe0 SHA512 a13c941839f0d3f3a71b3f5b36d6c2ddb789e765526ebb6aed99150991bb717363e3ce40f335451a983d44a0b047538e0870d0fe5b37d6a002497eb99a403e24
+DIST openjpeg-data_20180620.tar.gz 497894373 BLAKE2B 3a596f8f9ee56037bf567b6f2d3731b97299dba24e0c9d3562d38c15ddf58d352a918edaccb528f054cf288f87d6362d90d3450d4a5b968e9c8dfe05f54d89fe SHA512 32189a10c4d8cf00c23cda455f9e4353deb2175189d85f9b3aab1c4375a02a491ec2de89815725ebbcaea86c2c7ab274b89ee2583ffd8bf0dc32d4fc2d8f7507
 EBUILD openjpeg-1.5.2-r1.ebuild 1948 BLAKE2B 08ae38cae98a197e1bd980101b9e5938e8d29dc9a37421adb14f421a4df84b5cca4ed216d939d757e519684493b5b58c1f5273922e9fc335ee65a958ee898550 SHA512 8b18759b5eb0ca3e5446453f6f3e550a20519147af5026169b28eae43ff51a94c6522efbc07edc39438e3372b16452fce4f41f32b2ae848ec779a1ea25f6513b
 EBUILD openjpeg-2.3.0-r1.ebuild 4215 BLAKE2B 17350556cee3baf31e26d9f1bddf7a42879b088c84cf8fccad099b1316d3eb5fe469b3b7edb6d2828da3171105d873cf5f89285e2d04ea6b4c94bcde356a3b61 SHA512 3007c71e7ae8117f2ca934d0fc022646718d1f39a95fcaed671afe57092ecf40919c3f6fe913128ffee0b195c0f4d946ea319ab33485cae7fe099e21a9c2f12b
-EBUILD openjpeg-2.3.0.ebuild 4061 BLAKE2B 053eaa5be9d8fea70993aaa213bcd1cb7c295a65f1b0b0d0a486603119c1f68d853e5d54004d99e6b3c73ddb264371aeaa2bb27fd992eb08173d8f8947dd24f9 SHA512 755ce46efd8ea987b1d4cabae47b5d342955454a4a02735e9c504e19b6a0d11324caca8e20e2a97adbaf048c361833991c24cad397e31bb285be237ab2e5e3ff
+EBUILD openjpeg-2.3.1.ebuild 4183 BLAKE2B ce5cff3e194e73672461d81da8d509ca85095fabd70cb624c2da6fe2cbd60afd7f06b94580000e98b818b6565886f5ec919d6591d108de1318536af5e6873da6 SHA512 df832956e633a48ff1f5b0d2d8423fb71bc3872451b1b655bb565dd2edff4feb3758bfa7628c35d0a9cc54c78f592f691dbe9b402f9d0ca6af1ae7710a1db283
 MISC metadata.xml 455 BLAKE2B ee0da6c575d6fd05b1aa361cb11e09eaffc18f24f57010a66c31127bd1e55073262c1c0789f07779ef864d6cb27670e8653c6b1269681b5b6497185b5d0583aa SHA512 b956f115708b8afff16126117cacfa9bb51fb55660e19cb6b295081d81790c5c6e8858bc28193f3d9a5b0da66189490938c83c32124e33dedb37ea4a8c8ef99d
diff --git a/media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch b/media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch
new file mode 100644
index 000000000000..b0b2666c7220
--- /dev/null
+++ b/media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch
@@ -0,0 +1,495 @@
+From fecc8e9e23f78de94c41bc641b3e5b9e9a84560b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.com>
+Date: Thu, 11 Apr 2019 13:10:57 +0200
+Subject: [PATCH] Use GNUInstallDirs for standard installation directories
+
+Raises minimum cmake version by a little.
+---
+ CMakeLists.txt                           | 61 +++++-------------------
+ cmake/OpenJPEGConfig.cmake.in            |  2 +-
+ doc/CMakeLists.txt                       |  2 +-
+ src/bin/jp2/CMakeLists.txt               |  4 +-
+ src/bin/jp3d/CMakeLists.txt              |  2 +-
+ src/bin/jpip/CMakeLists.txt              | 10 ++--
+ src/bin/jpwl/CMakeLists.txt              |  2 +-
+ src/bin/mj2/CMakeLists.txt               |  2 +-
+ src/lib/openjp2/CMakeLists.txt           | 12 ++---
+ src/lib/openjp2/libopenjp2.pc.cmake.in   | 10 ++--
+ src/lib/openjp3d/CMakeLists.txt          |  4 +-
+ src/lib/openjp3d/libopenjp3d.pc.cmake.in | 10 ++--
+ src/lib/openjpip/CMakeLists.txt          |  8 ++--
+ src/lib/openjpip/libopenjpip.pc.cmake.in | 10 ++--
+ src/lib/openjpwl/CMakeLists.txt          |  6 +--
+ src/lib/openjpwl/libopenjpwl.pc.cmake.in | 10 ++--
+ src/lib/openmj2/CMakeLists.txt           |  4 +-
+ wrapping/java/openjp2/CMakeLists.txt     |  2 +-
+ 18 files changed, 61 insertions(+), 100 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3ea2424a..1f70226a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,7 +7,7 @@
+ # For this purpose you can define a CMake var: OPENJPEG_NAMESPACE to whatever you like
+ # e.g.:
+ # set(OPENJPEG_NAMESPACE "GDCMOPENJPEG")
+-cmake_minimum_required(VERSION 2.8.2)
++cmake_minimum_required(VERSION 2.8.5)
+ 
+ if(COMMAND CMAKE_POLICY)
+   cmake_policy(SET CMP0003 NEW)
+@@ -103,59 +103,28 @@ endif()
+ 
+ # --------------------------------------------------------------------------
+ # Install directories
++include(GNUInstallDirs)
++
+ # Build DOCUMENTATION (not in ALL target and only if Doxygen is found)
+ option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF)
+ 
+ string(TOLOWER ${PROJECT_NAME} projectname)
+ set(OPENJPEG_INSTALL_SUBDIR "${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}")
+ 
+-if(NOT OPENJPEG_INSTALL_BIN_DIR)
+-  set(OPENJPEG_INSTALL_BIN_DIR "bin")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_LIB_DIR)
+-  set(OPENJPEG_INSTALL_LIB_DIR "lib")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_SHARE_DIR)
+-  set(OPENJPEG_INSTALL_SHARE_DIR "share")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_DATA_DIR)
+-  set(OPENJPEG_INSTALL_DATA_DIR "${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
+-  set(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}")
+-endif()
+-
+-if(BUILD_DOC)
+-if(NOT OPENJPEG_INSTALL_MAN_DIR)
+-  set(OPENJPEG_INSTALL_MAN_DIR "share/man/")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_DOC_DIR)
+-  set(OPENJPEG_INSTALL_DOC_DIR "share/doc/${OPENJPEG_INSTALL_SUBDIR}")
+-endif()
+-endif()
+-
+ if(NOT OPENJPEG_INSTALL_JNI_DIR)
+   if(WIN32)
+-    set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_BIN_DIR})
++    set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_BINDIR})
+   else()
+-    set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_LIB_DIR})
++    set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_LIBDIR})
+   endif()
+ endif()
+ 
+ if(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
+-  # We could install *.cmake files in share/ however those files contains
+-  # hardcoded path to libraries on a multi-arch system (fedora/debian) those
+-  # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu)
+-  set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
++  set(OPENJPEG_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${OPENJPEG_INSTALL_SUBDIR}")
+ endif()
+ 
+ if (APPLE)
+-	list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_LIB_DIR}")
++	list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
+ 	option(OPJ_USE_DSYMUTIL "Call dsymutil on binaries after build." OFF)
+ endif()
+ 
+@@ -339,14 +308,6 @@ install( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
+ )
+ 
+ #-----------------------------------------------------------------------------
+-# install CHANGES and LICENSE
+-if(BUILD_DOC)
+-if(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES)
+-  install(FILES CHANGES DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
+-endif()
+-
+-install(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
+-endif()
+ 
+ include (cmake/OpenJPEGCPack.cmake)
+ 
+@@ -363,14 +324,14 @@ if(BUILD_PKGCONFIG_FILES)
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in
+     ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY)
+   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION
+-    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
++    ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
+ #
+   if(BUILD_JPWL)
+   # install in lib and not share (see multi-arch note above)
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpwl/libopenjpwl.pc.cmake.in
+     ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc @ONLY)
+   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc DESTINATION
+-    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
++    ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
+   endif()
+ #
+   if(BUILD_JPIP)
+@@ -378,7 +339,7 @@ if(BUILD_PKGCONFIG_FILES)
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpip/libopenjpip.pc.cmake.in
+     ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc @ONLY)
+   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc DESTINATION
+-    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
++    ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
+   endif()
+ #
+   if(BUILD_JP3D)
+@@ -386,7 +347,7 @@ if(BUILD_PKGCONFIG_FILES)
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp3d/libopenjp3d.pc.cmake.in
+     ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc @ONLY)
+   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc DESTINATION
+-    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
++    ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
+   endif()
+ endif()
+ 
+diff --git a/cmake/OpenJPEGConfig.cmake.in b/cmake/OpenJPEGConfig.cmake.in
+index 2925108a..702e2790 100644
+--- a/cmake/OpenJPEGConfig.cmake.in
++++ b/cmake/OpenJPEGConfig.cmake.in
+@@ -29,7 +29,7 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
+ 
+   # We find a relative path from the PKG directory to header files.
+   set(PKG_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_PACKAGE_DIR@")
+-  set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@")
++  set(INC_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@")
+   file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}")
+ 
+   get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE)
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index d4f3ddbe..ed5cb44c 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -44,7 +44,7 @@ if(DOXYGEN_FOUND)
+ 
+   # install HTML documentation (install png files too):
+   install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/html
+-    DESTINATION share/doc
++    DESTINATION ${CMAKE_INSTALL_DOCDIR}
+     PATTERN ".svn" EXCLUDE
+   )
+ else()
+diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt
+index 4d4bd952..29b4dd20 100644
+--- a/src/bin/jp2/CMakeLists.txt
++++ b/src/bin/jp2/CMakeLists.txt
+@@ -67,7 +67,7 @@ foreach(exe opj_decompress opj_compress opj_dump)
+   # Install exe
+   install(TARGETS ${exe}
+     EXPORT OpenJPEGTargets
+-    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
++    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
+   )
+   if(OPJ_USE_DSYMUTIL)
+     add_custom_command(TARGET ${exe} POST_BUILD
+@@ -83,6 +83,6 @@ install(
+   FILES       ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_compress.1
+               ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_decompress.1
+               ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_dump.1
+-  DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man1)
++  DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+ #
+ endif()
+diff --git a/src/bin/jp3d/CMakeLists.txt b/src/bin/jp3d/CMakeLists.txt
+index 3cac1a8f..ed62b4f3 100644
+--- a/src/bin/jp3d/CMakeLists.txt
++++ b/src/bin/jp3d/CMakeLists.txt
+@@ -36,6 +36,6 @@ foreach(exe opj_jp3d_compress opj_jp3d_decompress)
+   # Install exe
+   install(TARGETS ${exe}
+     EXPORT OpenJP3DTargets
+-    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
++    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
+   )
+ endforeach()
+diff --git a/src/bin/jpip/CMakeLists.txt b/src/bin/jpip/CMakeLists.txt
+index 301d885b..ddd867dc 100644
+--- a/src/bin/jpip/CMakeLists.txt
++++ b/src/bin/jpip/CMakeLists.txt
+@@ -13,7 +13,7 @@ add_executable(opj_jpip_addxml opj_jpip_addxml.c)
+ # Install exe
+ install(TARGETS opj_jpip_addxml
+   EXPORT OpenJPEGTargets
+-  DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
++  DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
+   )
+ 
+ if(BUILD_JPIP_SERVER)
+@@ -38,7 +38,7 @@ if(BUILD_JPIP_SERVER)
+   # Install exe
+   install(TARGETS opj_server
+     EXPORT OpenJPEGTargets
+-    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
++    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
+     )
+ endif()
+ 
+@@ -52,7 +52,7 @@ add_executable(${exe} ${exe}.c)
+   target_link_libraries(${exe} openjpip)
+   install(TARGETS ${exe}
+     EXPORT OpenJPEGTargets
+-    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
++    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
+     )
+ endforeach()
+ 
+@@ -123,7 +123,7 @@ if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE)
+       )
+ 
+     install(FILES ${LIBRARY_OUTPUT_PATH}/opj_jpip_viewer.jar
+-      DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
++      DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule
+       )
+   else()
+     # opj_viewer (simple, no xerces)
+@@ -153,7 +153,7 @@ if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE)
+       )
+ 
+     install(FILES ${LIBRARY_OUTPUT_PATH}/opj_jpip_viewer.jar
+-      DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
++      DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule
+       )
+   endif()
+ else()
+diff --git a/src/bin/jpwl/CMakeLists.txt b/src/bin/jpwl/CMakeLists.txt
+index 5df225de..8a798e61 100644
+--- a/src/bin/jpwl/CMakeLists.txt
++++ b/src/bin/jpwl/CMakeLists.txt
+@@ -57,6 +57,6 @@ foreach(exe decompress compress)
+   endif()
+ 
+   install(TARGETS ${jpwl_exe}
+-    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
++    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
+   )
+ endforeach()
+diff --git a/src/bin/mj2/CMakeLists.txt b/src/bin/mj2/CMakeLists.txt
+index 5d3e288b..6669c502 100644
+--- a/src/bin/mj2/CMakeLists.txt
++++ b/src/bin/mj2/CMakeLists.txt
+@@ -43,5 +43,5 @@ foreach(exe
+   endif()
+ 
+   install(TARGETS ${exe}
+-  	DESTINATION ${OPENJPEG_INSTALL_BIN_DIR})
++    DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endforeach()
+diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt
+index b2714858..9cbc4c3f 100644
+--- a/src/lib/openjp2/CMakeLists.txt
++++ b/src/lib/openjp2/CMakeLists.txt
+@@ -2,7 +2,7 @@ include_regular_expression("^.*$")
+ 
+ #
+ install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/opj_config.h
+- DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers)
++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers)
+ 
+ include_directories(
+   ${${OPENJPEG_NAMESPACE}_BINARY_DIR}/src/lib/openjp2 # opj_config.h and opj_config_private.h
+@@ -114,21 +114,21 @@ endif()
+ # Install library
+ install(TARGETS ${INSTALL_LIBS}
+   EXPORT OpenJPEGTargets
+-  RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
+-  LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
+-  ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
++  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
+ )
+ 
+ # Install includes files
+ install(FILES openjpeg.h opj_stdint.h
+-  DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers
++  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers
+ )
+ 
+ if(BUILD_DOC)
+ # install man page of the library
+ install(
+   FILES       ${OPENJPEG_SOURCE_DIR}/doc/man/man3/libopenjp2.3
+-  DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man3)
++  DESTINATION ${CMAKE_INSTALL_MANDIR}/man3)
+ endif()
+ 
+ if(BUILD_LUTS_GENERATOR)
+diff --git a/src/lib/openjp2/libopenjp2.pc.cmake.in b/src/lib/openjp2/libopenjp2.pc.cmake.in
+index 62159b00..ebad9578 100644
+--- a/src/lib/openjp2/libopenjp2.pc.cmake.in
++++ b/src/lib/openjp2/libopenjp2.pc.cmake.in
+@@ -1,9 +1,9 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
+-mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
+-docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
+-libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
+-includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
++bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
++mandir=${prefix}/@CMAKE_INSTALL_MANDIR@
++docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
+ 
+ Name: openjp2
+ Description: JPEG2000 library (Part 1 and 2)
+diff --git a/src/lib/openjp3d/CMakeLists.txt b/src/lib/openjp3d/CMakeLists.txt
+index b0469af1..6e251984 100644
+--- a/src/lib/openjp3d/CMakeLists.txt
++++ b/src/lib/openjp3d/CMakeLists.txt
+@@ -34,12 +34,12 @@ endif()
+ # Install library
+ install(TARGETS ${OPENJP3D_LIBRARY_NAME}
+   EXPORT OpenJP3DTargets
+-  DESTINATION ${OPENJPEG_INSTALL_LIB_DIR}
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+   COMPONENT Libraries
+ )
+ 
+ # Install includes files
+ install(FILES openjp3d.h
+-  DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}
++  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR}
+   COMPONENT Headers
+ )
+diff --git a/src/lib/openjp3d/libopenjp3d.pc.cmake.in b/src/lib/openjp3d/libopenjp3d.pc.cmake.in
+index e9b6c404..866a0174 100644
+--- a/src/lib/openjp3d/libopenjp3d.pc.cmake.in
++++ b/src/lib/openjp3d/libopenjp3d.pc.cmake.in
+@@ -1,9 +1,9 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
+-mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
+-docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
+-libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
+-includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
++bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
++mandir=${prefix}/@CMAKE_INSTALL_MANDIR@
++docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
+ 
+ Name: openjp3d
+ Description: JPEG2000 Extensions for three-dimensional data (Part 10)
+diff --git a/src/lib/openjpip/CMakeLists.txt b/src/lib/openjpip/CMakeLists.txt
+index b3cb8ce8..aace36d4 100644
+--- a/src/lib/openjpip/CMakeLists.txt
++++ b/src/lib/openjpip/CMakeLists.txt
+@@ -74,9 +74,9 @@ endif()
+ # Install library
+ install(TARGETS openjpip
+   EXPORT OpenJPEGTargets
+-  RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
+-  LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
+-  ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
++  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
+   )
+ 
+ if(BUILD_JPIP_SERVER)
+@@ -86,6 +86,6 @@ if(BUILD_JPIP_SERVER)
+     PROPERTIES COMPILE_FLAGS "-DSERVER")
+   install(TARGETS openjpip_server
+     EXPORT OpenJPEGTargets
+-    DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
++    DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
+     )
+ endif()
+diff --git a/src/lib/openjpip/libopenjpip.pc.cmake.in b/src/lib/openjpip/libopenjpip.pc.cmake.in
+index 7c3f29af..4cfa6fce 100644
+--- a/src/lib/openjpip/libopenjpip.pc.cmake.in
++++ b/src/lib/openjpip/libopenjpip.pc.cmake.in
+@@ -1,9 +1,9 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
+-mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
+-docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
+-libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
+-includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
++bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
++mandir=${prefix}/@CMAKE_INSTALL_MANDIR@
++docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
+ 
+ Name: openjpip
+ Description: JPEG2000 Interactivity tools, APIs and protocols (Part 9)
+diff --git a/src/lib/openjpwl/CMakeLists.txt b/src/lib/openjpwl/CMakeLists.txt
+index 1b33adbe..bb90c87c 100644
+--- a/src/lib/openjpwl/CMakeLists.txt
++++ b/src/lib/openjpwl/CMakeLists.txt
+@@ -58,7 +58,7 @@ endif()
+ # Install library
+ install(TARGETS openjpwl
+   EXPORT OpenJPEGTargets
+-  RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
+-  LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
+-  ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
++  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
+ )
+diff --git a/src/lib/openjpwl/libopenjpwl.pc.cmake.in b/src/lib/openjpwl/libopenjpwl.pc.cmake.in
+index b1244197..8acc1457 100644
+--- a/src/lib/openjpwl/libopenjpwl.pc.cmake.in
++++ b/src/lib/openjpwl/libopenjpwl.pc.cmake.in
+@@ -1,9 +1,9 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
+-mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
+-docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
+-libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
+-includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
++bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
++mandir=${prefix}/@CMAKE_INSTALL_MANDIR@
++docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
+ 
+ Name: openjpwl
+ Description: JPEG2000 Wireless library (Part 11)
+diff --git a/src/lib/openmj2/CMakeLists.txt b/src/lib/openmj2/CMakeLists.txt
+index 25294b20..dced53f6 100644
+--- a/src/lib/openmj2/CMakeLists.txt
++++ b/src/lib/openmj2/CMakeLists.txt
+@@ -53,12 +53,12 @@ endif()
+ # Install library
+ install(TARGETS ${OPENMJ2_LIBRARY_NAME}
+   EXPORT OpenMJ2Targets
+-  DESTINATION ${OPENJPEG_INSTALL_LIB_DIR}
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+   COMPONENT Libraries
+ )
+ 
+ # Install includes files
+ #install(FILES mj2.h
+-#  DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${subdir}
++#  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR}
+ #  COMPONENT Headers
+ #)
+diff --git a/wrapping/java/openjp2/CMakeLists.txt b/wrapping/java/openjp2/CMakeLists.txt
+index eb3da0ed..4504da5f 100644
+--- a/wrapping/java/openjp2/CMakeLists.txt
++++ b/wrapping/java/openjp2/CMakeLists.txt
+@@ -69,5 +69,5 @@ add_custom_target(OpenJPEGJavaJar ALL
+ )
+ 
+ install(FILES ${LIBRARY_OUTPUT_PATH}/openjpeg.jar
+-  DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
++  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule
+ )
+-- 
+2.21.0
+
diff --git a/media-libs/openjpeg/openjpeg-2.3.0.ebuild b/media-libs/openjpeg/openjpeg-2.3.0.ebuild
deleted file mode 100644
index e447db85d6a1..000000000000
--- a/media-libs/openjpeg/openjpeg-2.3.0.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-# Make sure that test data are not newer than release;
-# otherwise we will see "Found-But-No-Test" test failures!
-MY_TESTDATA_COMMIT="c07f38fae1e67adc288c2d6679df5d3652017fbe"
-
-DESCRIPTION="An open-source JPEG 2000 library"
-HOMEPAGE="https://www.openjpeg.org"
-SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://github.com/uclouvain/openjpeg-data/archive/${MY_TESTDATA_COMMIT}.tar.gz -> ${PN}-data_20170814.tar.gz )"
-
-LICENSE="BSD-2"
-SLOT="2/7" # based on SONAME
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs test"
-
-RDEPEND="media-libs/lcms:2=
-	media-libs/libpng:0=
-	media-libs/tiff:0=
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS.md CHANGELOG.md NEWS.md README.md THANKS.md )
-
-src_prepare() {
-	if use test; then
-		mv "${WORKDIR}"/openjpeg-data-${MY_TESTDATA_COMMIT} "${WORKDIR}"/data || die "Failed to rename test data"
-	fi
-
-	cmake-utils_src_prepare
-
-	# Stop installing LICENSE file, and install CHANGES from DOCS instead:
-	sed -i -e '/install.*FILES.*DESTINATION.*OPENJPEG_INSTALL_DOC_DIR/d' CMakeLists.txt || die
-
-	# Install doxygen docs to the right directory:
-	sed -i -e "s:DESTINATION\s*share/doc:\0/${PF}:" doc/CMakeLists.txt || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
-		-DBUILD_TESTING="$(multilib_native_usex test)"
-		-DBUILD_DOC=$(multilib_native_usex doc ON OFF)
-		-DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF)
-		)
-
-	cmake-utils_src_configure
-
-	if use static-libs; then
-		mycmakeargs=(
-			-DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
-			-DBUILD_TESTING="$(usex test)"
-			-DBUILD_CODEC="$(usex test)"
-			)
-		BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_configure
-	fi
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	if use static-libs; then
-		BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_compile
-	fi
-}
-
-multilib_src_test() {
-	if ! multilib_is_native_abi ; then
-		elog "Cannot run tests for non-multilib abi."
-		return 0
-	fi
-
-	local myctestargs=
-
-	pushd "${BUILD_DIR}" > /dev/null || die
-	[[ -e CTestTestfile.cmake ]] || die "Test suite not available! Check source!"
-
-	[[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure )
-
-	echo ctest "${myctestargs[@]}" "$@"
-	if ctest "${myctestargs[@]}" "$@" ; then
-		einfo "Tests succeeded."
-		popd > /dev/null || die
-		return 0
-	else
-		echo ""
-		einfo "Note: Upstream is maintaining a list of known test failures."
-		einfo "We will now compare our test results against this list and sort out any known failure."
-
-		local KNOWN_FAILURES_LIST="${S}/tools/travis-ci/knownfailures-all.txt"
-		local FAILEDTEST_LOG="${BUILD_DIR}/Testing/Temporary/LastTestsFailed.log"
-		local FAILURES_LOG="${BUILD_DIR}/Testing/Temporary/failures.txt"
-		local FAILEDTEST=
-		local HAS_UNKNOWN_TEST_FAILURES=0
-		if [[ -f "${KNOWN_FAILURES_LIST}" && -f "${FAILEDTEST_LOG}" ]]; then
-			# Logic copied from $S/tools/travis-ci/run.sh
-
-			echo ""
-
-			awk -F: '{ print $2 }' "${FAILEDTEST_LOG}" > "${FAILURES_LOG}"
-			while read FAILEDTEST; do
-				# Common errors
-				if grep -x "${FAILEDTEST}" "${S}/tools/travis-ci/knownfailures-all.txt" > /dev/null; then
-					ewarn "Test '${FAILEDTEST}' is known to fail, ignoring ..."
-					continue
-				fi
-				eerror "New/unknown test failure found: '${FAILEDTEST}'"
-				HAS_UNKNOWN_TEST_FAILURES=1
-			done < "${FAILURES_LOG}"
-
-			if [[ ${HAS_UNKNOWN_TEST_FAILURES} -ne 0 ]]; then
-				die "Test suite failed. New/unknown test failure(s) found!"
-			else
-				echo ""
-				einfo "Test suite passed. No new/unknown test failure(s) found!"
-			fi
-
-			return 0
-		fi
-	fi
-}
-
-multilib_src_install() {
-	if use static-libs; then
-		BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_install
-	fi
-
-	cmake-utils_src_install
-}
diff --git a/media-libs/openjpeg/openjpeg-2.3.1.ebuild b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
new file mode 100644
index 000000000000..9140607a0a34
--- /dev/null
+++ b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+# Make sure that test data are not newer than release;
+# otherwise we will see "Found-But-No-Test" test failures!
+MY_TESTDATA_COMMIT="25632d6deca2e567d30ef476b4abe63916c36f6e"
+
+DESCRIPTION="Open-source JPEG 2000 library"
+HOMEPAGE="https://www.openjpeg.org"
+SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://github.com/uclouvain/openjpeg-data/archive/${MY_TESTDATA_COMMIT}.tar.gz -> ${PN}-data_20180620.tar.gz )"
+
+LICENSE="BSD-2"
+SLOT="2/7" # based on SONAME
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs test"
+
+RDEPEND="
+	media-libs/lcms:2
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( app-doc/doxygen )"
+
+DOCS=( AUTHORS.md CHANGELOG.md NEWS.md README.md THANKS.md )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.1-gnuinstalldirs.patch" # bug 667150
+)
+
+src_prepare() {
+	if use test; then
+		mv "${WORKDIR}"/openjpeg-data-${MY_TESTDATA_COMMIT} "${WORKDIR}"/data ||
+			die "Failed to rename test data"
+	fi
+
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_PKGCONFIG_FILES=ON	# always build pkgconfig files, bug #539834
+		-DBUILD_TESTING="$(multilib_native_usex test)"
+		-DBUILD_DOC=$(multilib_native_usex doc ON OFF)
+		-DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF)
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_test() {
+	if ! multilib_is_native_abi ; then
+		elog "Cannot run tests for non-multilib abi."
+		return 0
+	fi
+
+	local myctestargs=
+
+	pushd "${BUILD_DIR}" > /dev/null || die
+	[[ -e CTestTestfile.cmake ]] || die "Test suite not available! Check source!"
+
+	[[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure )
+
+	echo ctest "${myctestargs[@]}" "$@"
+	if ctest "${myctestargs[@]}" "$@" ; then
+		einfo "Tests succeeded."
+		popd > /dev/null || die
+		return 0
+	else
+		local FAILEDTEST_LOG="${BUILD_DIR}/Testing/Temporary/LastTestsFailed.log"
+
+		if [[ ! -f "${FAILEDTEST_LOG}" ]] ; then
+			# Should never happen
+			die "Cannot analyze test failures: LastTestsFailed.log is missing!"
+		fi
+
+		echo ""
+		einfo "Note: Upstream is maintaining a list of known test failures."
+		einfo "We will now compare our test results against this list and sort out any known failure."
+
+		local KNOWN_FAILURES_LIST="${T}/known_failures_compiled.txt"
+		cat "${S}/tools/travis-ci/knownfailures-all.txt" > "${KNOWN_FAILURES_LIST}" || die
+
+		local ARCH_SPECIFIC_FAILURES=
+		if use amd64 ; then
+			ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*x86_64*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')"
+		elif use x86 || use arm || use arm64; then
+			ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*i386*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')"
+		fi
+
+		if [[ -f "${ARCH_SPECIFIC_FAILURES}" ]] ; then
+			einfo "Adding architecture specific failures (${ARCH_SPECIFIC_FAILURES}) to known failures list ..."
+			cat "${ARCH_SPECIFIC_FAILURES}" >> "${KNOWN_FAILURES_LIST}" || die
+		fi
+
+		# Logic copied from $S/tools/travis-ci/run.sh
+		local FAILEDTEST=
+		local FAILURES_LOG="${BUILD_DIR}/Testing/Temporary/failures.txt"
+		local HAS_UNKNOWN_TEST_FAILURES=0
+
+		echo ""
+
+		awk -F: '{ print $2 }' "${FAILEDTEST_LOG}" > "${FAILURES_LOG}"
+		while read FAILEDTEST; do
+			# is this failure known?
+			if grep -x "${FAILEDTEST}" "${KNOWN_FAILURES_LIST}" > /dev/null; then
+				ewarn "Test '${FAILEDTEST}' is known to fail, ignoring ..."
+				continue
+			fi
+
+			eerror "New/unknown test failure found: '${FAILEDTEST}'"
+			HAS_UNKNOWN_TEST_FAILURES=1
+		done < "${FAILURES_LOG}"
+
+		if [[ ${HAS_UNKNOWN_TEST_FAILURES} -ne 0 ]]; then
+			die "Test suite failed. New/unknown test failure(s) found!"
+		else
+			echo ""
+			einfo "Test suite passed. No new/unknown test failure(s) found!"
+		fi
+
+		return 0
+	fi
+}
diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest
index 37342493932e..ca994274d8e2 100644
--- a/media-libs/opensubdiv/Manifest
+++ b/media-libs/opensubdiv/Manifest
@@ -5,4 +5,4 @@ DIST opensubdiv-3.3.0.tar.gz 19263469 BLAKE2B f169b5c58877d1dd4ea45cb04d52567803
 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 1602 BLAKE2B 5c4758c2b2c89ac6c10f0bf07a32a20b4ee9ff6bfc0d4de292e3d32dfe06103cb5a8fbbdbc86f61096f9d946292b4c4b827ec2285242ffe9110bcd794773b3a5 SHA512 ade1a653e9d368b35bbc1b2ffeb0ae85c4bbb7c057911b2e6fe19899ec8907bb4b36e21077cd3615431d0e3ecbd1d2515cc44d5bf37dd8fd8d918e15fe365b58
-MISC metadata.xml 1233 BLAKE2B a5508cb0e3c44cdfa63d01b709a47f974eb8a97028cfc0aeee184854623ab41fc7b1419df5a755423bbbc3156175d9a0021b42db198b290cc89fce92944f7cb0 SHA512 b225ff89ab0e2c45bfc68a1932d567b474e8f44573cf2d256445600a5ffa205f210ab63eecd4dcdefa68913babe5c21255dc6f75812f76430b8484c36322797a
+MISC metadata.xml 1145 BLAKE2B 21093cf63091de9706146ce01ddacd277ac425d947260ade355825eca4b0aafd0d0c487c8f85c66e3d455b766d4c566f01dac3ec0275018fba37bc30b2bafce8 SHA512 c9dc92192cf95c30f14516635a3e656a09f080aafc4404cf506e012e8d32173fdbdca63edef8f0c2769928eb62c9900ae810cfe4e64a95a735da5744c502ceeb
diff --git a/media-libs/opensubdiv/metadata.xml b/media-libs/opensubdiv/metadata.xml
index 864dbf3fb2b6..6256d93f3128 100644
--- a/media-libs/opensubdiv/metadata.xml
+++ b/media-libs/opensubdiv/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer restrict="&gt;=media-libs/opensubdiv-3.0.5" type="person">
+	<maintainer type="person">
 		<email>dracwyrm@gentoo.org</email>
 		<name>Jonathan Scruggs</name>
 	</maintainer>
-	<maintainer restrict="&gt;=media-libs/opensubdiv-3.0.5" type="person">
+	<maintainer type="person">
 		<email>agrigo2001@yahoo.com.au</email>
 		<name>Adrian Grigo</name>
 	</maintainer>
diff --git a/media-libs/partio/Manifest b/media-libs/partio/Manifest
index 531b9277d116..42fa45b9e3a4 100644
--- a/media-libs/partio/Manifest
+++ b/media-libs/partio/Manifest
@@ -2,8 +2,8 @@ AUX partio-1.1.0-Rename-partconv.patch 2459 BLAKE2B d811f5174dd2c5e158e7985e8fde
 DIST partio-1.1.0_p20170829.tar.gz 275959 BLAKE2B 441c2d0ab9dd91fa52a826d49f7448dc4d5d0a8d6b72bdb58793dd3c97d86739b25e582bdff41160599489a2835ad8e68676012cb70ef8edff062df3205ab209 SHA512 daedb23ae2b89d3f2ef36ef13afc624a663b3fab91c22f9a454439ff3bc194b78a87e37c9133f6948567ab3b183eff960bb51951b0427cff8c1c29099b6578d6
 DIST partio-1.5.0.tar.gz 291604 BLAKE2B d0d6eab4ef541e61fe4498b4cdd8b9c60e62545a040d3f26b8a7b2d8adaa36c45f28c8a05df24c47dc504ec1dd4fb7bfec1fe5b08f6a035a0b3fdcdceacc46fc SHA512 10db9cfe691fd2341e2613132ad7f8d363007a62a5b5cb6226c53360e2e47d1be77c4d87ae31bd7537790cc8ba8bac7eef229c21fcd8227d98d2ab2154aac559
 DIST partio-1.5.4.tar.gz 291617 BLAKE2B 638fae984d392e1e6c95862ad9a8dd8b8a0d80b2c83dfd03e887af36e420d15fd67f0b2c71e5e8c335668b512660bf14f03a1329ac0d7a48431674a51043585d SHA512 967da5b648b19c45bd0c3c8ff56f891e2d54a07b2cd113f18d5d0b646cbfabd968e31ee48c0e167bf9a911d8d5af42d5291b355da305a2b9134fa78fc23e5636
-EBUILD partio-1.1.0_p20170829.ebuild 1060 BLAKE2B b235d53fa705d5e6d515ee983203ac0349c23a7b10f09093980fba0aaef4d770fcb469a0f357bf4a15f07c1017cc19b933fa0f0df6d6207def91a12677bc9bf7 SHA512 c80ff6fcc5e52201819b6477c735a51e94c72e63992c404a24e7c10ebe05955d542fce76ac4e21ff1f8e7192f5c42a968988be2cee2a9cdc4a07720bf15e9ce4
-EBUILD partio-1.5.0.ebuild 910 BLAKE2B 9191869a46ffb5971ec8afecd4aa2f703e855a34112a8eb34a5152ff25dd3efd5e5e542f93e31017f688c8a5aa9c42d49c766bf0d04bb146492c8b9c956bfbdf SHA512 3d50ed2fb8b808d78d2cc733be166d5b481388754b26740eb2f338bdd1209520a5fed34a2c24b55eac06991f01d3c43e8088660b4024dc67e73f997d5c21e3bf
-EBUILD partio-1.5.4.ebuild 910 BLAKE2B 9191869a46ffb5971ec8afecd4aa2f703e855a34112a8eb34a5152ff25dd3efd5e5e542f93e31017f688c8a5aa9c42d49c766bf0d04bb146492c8b9c956bfbdf SHA512 3d50ed2fb8b808d78d2cc733be166d5b481388754b26740eb2f338bdd1209520a5fed34a2c24b55eac06991f01d3c43e8088660b4024dc67e73f997d5c21e3bf
-EBUILD partio-9999.ebuild 1120 BLAKE2B 4d5c4d89eaacf786e2f097da917b9b78bfce8e392c8ce468f9e6042e7d2f01ff39f73b4960d3459ef834b21a98b2af984b7026d4ba94ea6ce731a09892ebcdca SHA512 f6ca5099221bdafce8704328f5f879d2a9ad569970e5618185dc95fa3c115d3a16f06ea420d8d4ff82f28fd3dab689f51f6936de91ffdaada38c7f68062bc6ba
+EBUILD partio-1.1.0_p20170829.ebuild 1053 BLAKE2B 155ea504acb3b14457a34f151b190eb6b96e5ce0c4a1046fab08c0be80c6f32bf2abdda8c678c7e1010451b0c075d59ef53b48ff847cc51dd11c1b23745f08ed SHA512 9dfd4a750fa6cb158f7ebb3d010dfc1f820962aae514ffa7a91acd8b94aeda8b85c83ef809b7d958525dbe09779a9b9863714f99fd13be2a90d778fe40a853d8
+EBUILD partio-1.5.0.ebuild 903 BLAKE2B bafbecc4326402fc541260b2bee725c5b1df02ceb9d5971bcc0fa70ac892972960a9a63359d364fd138014818e9d9f447a3713f076a8dd801858ff869e057d56 SHA512 70862becc3eb0c58423fc2e772e5842cf6882ebda71fca823da4b024c4fcf56de5367b9dc2f7f3c0364025d9c45fefa5565de7ffbbfd3cad6b86a13a0f1c2ebd
+EBUILD partio-1.5.4.ebuild 903 BLAKE2B bafbecc4326402fc541260b2bee725c5b1df02ceb9d5971bcc0fa70ac892972960a9a63359d364fd138014818e9d9f447a3713f076a8dd801858ff869e057d56 SHA512 70862becc3eb0c58423fc2e772e5842cf6882ebda71fca823da4b024c4fcf56de5367b9dc2f7f3c0364025d9c45fefa5565de7ffbbfd3cad6b86a13a0f1c2ebd
+EBUILD partio-9999.ebuild 1113 BLAKE2B 349b80f261c629eda7d27396361e363e771512ac7ede54dfbe53c59b0dbcc6717518981f2e8bc27de87dad91719c765acca1a9d0eb7fee67d30840011420261e SHA512 4ee4db5b8ae843297c5def3c9e5540ee23b90011708924057b8c19f59face92c856ca14c9c07daeb8f2ba0b31dc0e574df3583c130f25668d57e39a29a885178
 MISC metadata.xml 640 BLAKE2B 3b2c33cb14c466bd4641cc04781d1de05d01170ccc591b3caae40356f934944c4c969834bad5ccdcf9f5390d203270055863b08feb7321492a27d4d7575aced5 SHA512 7116217ccc87ab80d8cb4ee0ea20089ea1c0a5b4ea9b3f666548b37422c01a8917516a5db565fc55f779bb19613fbfb515cfae0b9f87f010f5034c14d27ed8e0
diff --git a/media-libs/partio/partio-1.1.0_p20170829.ebuild b/media-libs/partio/partio-1.1.0_p20170829.ebuild
index db631a62fd64..8a58104a26c1 100644
--- a/media-libs/partio/partio-1.1.0_p20170829.ebuild
+++ b/media-libs/partio/partio-1.1.0_p20170829.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit cmake-utils vcs-snapshot python-single-r1
 
diff --git a/media-libs/partio/partio-1.5.0.ebuild b/media-libs/partio/partio-1.5.0.ebuild
index 2aaed0b7b0be..f8604288badc 100644
--- a/media-libs/partio/partio-1.5.0.ebuild
+++ b/media-libs/partio/partio-1.5.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit cmake-utils python-single-r1
 
diff --git a/media-libs/partio/partio-1.5.4.ebuild b/media-libs/partio/partio-1.5.4.ebuild
index 2aaed0b7b0be..f8604288badc 100644
--- a/media-libs/partio/partio-1.5.4.ebuild
+++ b/media-libs/partio/partio-1.5.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit cmake-utils python-single-r1
 
diff --git a/media-libs/partio/partio-9999.ebuild b/media-libs/partio/partio-9999.ebuild
index 45be65d43fda..8c68311fbd9b 100644
--- a/media-libs/partio/partio-9999.ebuild
+++ b/media-libs/partio/partio-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit cmake-utils vcs-snapshot python-single-r1
 
diff --git a/media-libs/phonon-gstreamer/Manifest b/media-libs/phonon-gstreamer/Manifest
index 5caf4d338089..33a33e218452 100644
--- a/media-libs/phonon-gstreamer/Manifest
+++ b/media-libs/phonon-gstreamer/Manifest
@@ -1,6 +1,6 @@
 AUX phonon-gstreamer-4.9.0-no-paused-on-zero-vol.patch 998 BLAKE2B 6f659a6a6aad157ad708934a165f17ca4766dec3baf3cdd03e5b10b41201751f17008b43b6183df9afeba7303603fc9c1fcc413bb16a2e97cd571196ce2e6905 SHA512 c97a88e86ef3f56fdcdb12d3256afce34381ec1072ebbeda7c427db7a9c000feecab5f84a44d9a86fd099b26cda6a8a50a0a4c20139167e4e8b96c96368feddb
 AUX phonon-gstreamer-4.9.0-qt-5.11.patch 2144 BLAKE2B a11065fab61037e11f54ab2b3a41f55231ac2175372077b302b033bbf7483030e763e50e8dce00886394ce94feb205b75d3bf5f4ea4b0c11f3e0c0fba42f14f3 SHA512 b13fe80bf493d33ef942babf084f823e9d6314f489496007dd43e9c0efba4c8e354067cba5ccae53806156d631a8bbf115b84e654052086aeb1d5d32f15b6f08
 DIST phonon-backend-gstreamer-4.9.0.tar.xz 75960 BLAKE2B 676810dc99f3734a6932bfe355a37df1334c3460eba9a6d96e039442ce2729b61db61798c1f7207aef68a30f79355703c80e6aeb1a2ca7156f22e9fd7e07027b SHA512 9c13d37c6c7070c2bd8fcc562f743ac2f55289bc7cc82147ef0ae990e5d380d541cc1d9ce61e6ad1549ed1935d41faafaeeb0cd5463e4c656ea8fee636ff4dfe
-EBUILD phonon-gstreamer-4.9.0-r3.ebuild 1169 BLAKE2B 7781a9243077c4d290ddd3f62e0400b905ac7f925ec250f920b1d86b53b5de073e40c56056a0bfbfec16315430b008b5ec0c9e8662c57439d6a01405c90b3f91 SHA512 b4329bfe0c963bd91fc9d8a9c682bb5ca14db62454d406fb0535bfb56a4f6007f951d66ef33372862b158d8415fa4c9cf55dd44fe36245c6b82d7eebc681cd82
-EBUILD phonon-gstreamer-9999.ebuild 1076 BLAKE2B cc052d97bd49ea217e9cd98c7dd716f34e21088ac9f76c0a1816198a70a3431bec3c9e78de843523e23fa23e5eb947734b38b5958bf99393d54ad05fbe0d43db SHA512 a591c829bbbaa09bddb724956605fcb65528113769837d0232a87feb057a4f15825c7b7a0fdad7e65fd457a756c96ad372aa0ec0baf54b12d7e800c3d25ecb4d
+EBUILD phonon-gstreamer-4.9.0-r3.ebuild 1263 BLAKE2B 154bac0b193f03e113c557a30354197dd8c6546672c359a02608234a84994caf9aa57a3684acf5d89863f773e9d2d0b884ecadec9be66154fad143b6886d7d30 SHA512 1d4e74536fd35e1a04746fe6f9c9c50457ce19ec0cb056b9896a15613135ebb9d4235444dfd46fe98a612e5276e0e3055fb46f6291c1bd0b59637cf1bb59692f
+EBUILD phonon-gstreamer-9999.ebuild 1170 BLAKE2B 4490f89a367ac96fcebef6a32dbcee91aaa693066d744bed8d37540a0ff6acb4c8476d3e50f3bbb248f627179d8d79817c956539266265f3767a5a0dcdf6ade5 SHA512 3ab9128e35376d87edb61cf8bd616b7af43503781a3bbb2b1f79ed03b35139ba3c6cfabe8e57d83f49ba54492bf86cce12d21b21db66ea99af1f6df38267805e
 MISC metadata.xml 339 BLAKE2B 2e6fd710b9791c7dd1f8836dac9209a84608dcb54d5ebef458acef6651c03eb55d8733d23df0a6cd0dbe470f00d43e0413b3d18b432f8a38a765af458e5662fc SHA512 c481721ab8e7762b2b951501cc99f7e2d2263ffd682dce3731fb415b677b74f7fbfe7770e9d2b1b1ce496c10254b84bb7489ff971593dac90c151a9ff1623e9a
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild
index e2f6469b9c61..c80af05ae4f4 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild
@@ -14,7 +14,7 @@ else
 	inherit git-r3
 fi
 
-inherit cmake-utils
+inherit cmake-utils xdg-utils
 
 DESCRIPTION="Phonon GStreamer backend"
 HOMEPAGE="https://phonon.kde.org/"
@@ -52,3 +52,11 @@ src_configure() {
 	local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
 	cmake-utils_src_configure
 }
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
index 0d59d267cf77..541cae229fe1 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ else
 	inherit git-r3
 fi
 
-inherit cmake-utils
+inherit cmake-utils xdg-utils
 
 DESCRIPTION="Phonon GStreamer backend"
 HOMEPAGE="https://phonon.kde.org/"
@@ -47,3 +47,11 @@ src_configure() {
 	local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
 	cmake-utils_src_configure
 }
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-libs/ptex/Manifest b/media-libs/ptex/Manifest
index 996da0932b4d..dea76764011e 100644
--- a/media-libs/ptex/Manifest
+++ b/media-libs/ptex/Manifest
@@ -6,4 +6,4 @@ DIST ptex-2.3.0.tar.gz 306462 BLAKE2B 790e3623ce6ebae2dfd8884d8e19e62395c5443228
 EBUILD ptex-2.1.28-r1.ebuild 575 BLAKE2B 5ec37846a07464082c8863b53e523f1b046151f14cccb7b19672028560072703b303feeaac156c78c6a7006d79bed649e9a24d5dac6f2e81985e57077595850e SHA512 0289b417671552ad7400b5784f985d1b3d405b07d10e2101a06289292249d67ab88ad1c041f5641ea724de59a0285797fc7435cc68ad9f3c550bbb30b55bb967
 EBUILD ptex-2.1.28.ebuild 544 BLAKE2B 60cb8bb36eea64f38f892a91bd270eccfaae2b8f409a319688e491069e7c02739977f95663b7eb4aaadbe368ef069d444902dbf3acb13d4f256c4313a5a0fb51 SHA512 546b82932cdb673e44b6aa7e843e8f96564cb22436e274678c0910d4beda2cd483812cc5a6b4b03bab8c2dcdf028ea3ac62bcffd088bf1f51c8a974e9e58f39e
 EBUILD ptex-2.3.0.ebuild 663 BLAKE2B 6ff6a2c7e2668e6ce4dc60e666f5ed32024d9864375a27c8c060fad2baeed6c7105dbca800ed04846ef017f5042e4e75e2a6e6a072c694dc78e4ea6165b4bd81 SHA512 8d280943a293511704d4835c97f75451fa02ec0ebc4b4fb386b948a903e8c8dd7e7679264e64d0700df3cce3e2ae0973da7cef567874001f17dffe8a4520fd7e
-MISC metadata.xml 724 BLAKE2B eef5aec875f01dd70593862399d3edf26de9c9ae97848226017ea3e1f3c5834c57b1d59985d2d573196f79446971307751187adfed55c664aabc4908f93629e3 SHA512 c32578491cc729e4ac0b09e3dab84514356e8f3b03da810b6dcf93b293b8c36b86f9d7ab59ff2c6807866667a1097648c4fef118271f40a0f02f873a6275dd70
+MISC metadata.xml 646 BLAKE2B 443223f4b464d16d2e7b4ea692b080f49aeceb1ef4d599d5dccd5aab6223e8f3a562317f7dda0cddb79840f19270f65af948df153cb2064b903f80e00580ee8e SHA512 ec1b3e3f8b15023413723136125ad6a92b7a509532824fcc547bcfe147e63a60e072496cbfa2337bb180e9c718fbe9e49c198f469a9e41a252b1706cf6cd461f
diff --git a/media-libs/ptex/metadata.xml b/media-libs/ptex/metadata.xml
index 51362a39459e..343772fb0426 100644
--- a/media-libs/ptex/metadata.xml
+++ b/media-libs/ptex/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer restrict="&gt;=media-libs/ptex-2.1.10" type="person">
+	<maintainer type="person">
 		<email>dracwyrm@gentoo.org</email>
 		<name>Jonathan Scruggs</name>
 	</maintainer>
-	<maintainer restrict="&gt;=media-libs/ptex-2.1.10" type="person">
+	<maintainer type="person">
 		<email>agrigo2001@yahoo.com.au</email>
 		<name>Adrian Grigo</name>
 	</maintainer>
diff --git a/media-libs/pyliblo/Manifest b/media-libs/pyliblo/Manifest
index f52edcc0941f..07fe7f70cf10 100644
--- a/media-libs/pyliblo/Manifest
+++ b/media-libs/pyliblo/Manifest
@@ -1,3 +1,3 @@
 DIST pyliblo-0.10.0.tar.gz 29702 BLAKE2B 6120003aba9990a4c9d84050a3501e4f2bb345d7b454f47ca2689091c3dcfa1c59c85ff8c2a7b7d0e7a6b9ee87c291ebceddf09cd9a1a39a0706ae463394e407 SHA512 d2a3d47f6c52d310104256d33fbd5d652ae6bc8cde32c2d3b2f3f407b8a4aba99028e57cd466804d266f63468a6c792760f28a43dbabcfa3330e0a852ee4d4e3
-EBUILD pyliblo-0.10.0.ebuild 533 BLAKE2B 7f97a46d4e98cb3c32f53d7f31e03bd4d77f0b8cc231d063d60543212c5cfa84eeeb278774692fb8fa03eac27fc01be9ce2b0cf4da911c6399c8ba11af9c8881 SHA512 bdd2df2d697d5a2db0a37673f84768f67d938ebaf0d3b095700325d87cc7c0aa2f545e59c4b9a364394bf685436698d7a04a89e93cb76200e842d52fa879bd04
-MISC metadata.xml 367 BLAKE2B a979ddb0a7dc8bb8f1ce169cbe6471b5ad2fd30c484332ac725176ac1c45e9e3cdf3a45b648608d8f6bb402ae8054525a4c9bac491a143f070ff98bd5b8b51db SHA512 0c99d4f580f70955f94255c28a68da367f67269278520e05310e34008a663329cbfe08224ca672287d8055ddada4efbecc0d406678438109aadc87879bf05f58
+EBUILD pyliblo-0.10.0.ebuild 526 BLAKE2B f66b2141b74f72002529fe53928ad8241727640a507fa4cfccae0718ae5b9d65f0dbb72106911afc026c4fd30de3ea83465c37b90e54dfa96bce2a011a54816c SHA512 80c6b9eee1e19151df6404a9e56bef0993c840862125030ed5996189b32097262de705c9bec8e3de49c2a539f6ce94424aaf75dc3499f4f86ef6ea28d4469c17
+MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/media-libs/pyliblo/metadata.xml b/media-libs/pyliblo/metadata.xml
index 321269421243..1b2becffa26c 100644
--- a/media-libs/pyliblo/metadata.xml
+++ b/media-libs/pyliblo/metadata.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>Karl Linden</name>
-		<email>karl.j.linden@gmail.com</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+  <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-libs/pyliblo/pyliblo-0.10.0.ebuild b/media-libs/pyliblo/pyliblo-0.10.0.ebuild
index f8533b12693d..7a81790300a4 100644
--- a/media-libs/pyliblo/pyliblo-0.10.0.ebuild
+++ b/media-libs/pyliblo/pyliblo-0.10.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="A Python wrapper for the liblo OSC library"
diff --git a/media-libs/raptor/Manifest b/media-libs/raptor/Manifest
index 62ef305b85b1..4f99978dc768 100644
--- a/media-libs/raptor/Manifest
+++ b/media-libs/raptor/Manifest
@@ -2,5 +2,5 @@ AUX raptor-2.0.15-dont_use_curl-config.patch 1681 BLAKE2B 5c3b241836e04dabbcd6fd
 AUX raptor-2.0.15-heap-overflow.patch 1708 BLAKE2B cea8df63861760fe55f1320cbc0833d814c38148b3d5f2b7163348de48bd95a37ee3000d312ce76879c798182f74d60f49fcef89f5f051bd40febc0c1da68099 SHA512 f7df0ec3123ac8ec9f2852dfb54e380d210446a36ab2f74aa9d2dcb8346162046d239b4db9a0747b18e3d19f4dc1ce41d194557c5e53027a3618e81b7b251d3d
 DIST raptor2-2.0.15.tar.gz 1886657 BLAKE2B 0a39c7b5705bfbf2daa0ca633f79693953b4dfe24c144008d1646a9840a36d4d7ce153b527450647127ec2522047dbd0a6e71f307ee5656951f7e4b610adfd22 SHA512 563dd01869eb4df8524ec12e2c0a541653874dcd834bd1eb265bc2943bb616968f624121d4688579cdce11b4f00a8ab53b7099f1a0850e256bb0a2c16ba048ee
 EBUILD raptor-2.0.15-r1.ebuild 1578 BLAKE2B cf5d475a87c1805262504fd1b4a954f87a2db961bd03d507908edfaf6b128e83dee0d4a4852d5d574c0a71601fe29b772181d1302c87f6cfcaef727aee113828 SHA512 64b803714dd662028a16e66b0c802cd919ede858473d5a0c8da8d68d4218b1c9608903d86587ca40e20a424f2c984c03dcd31ca9fe2b3fad6d9f365e753555ac
-EBUILD raptor-2.0.15-r2.ebuild 1673 BLAKE2B 6cfa0b1d91efa048335d03a2359c1a3b5650f95fe0a32c96dbe0c7ad1f1af8e7018d9ba8a3a1cc6bcd4ecef9fb5357d0b11dab0dad72aa65cb9e40753e4fb6e0 SHA512 40d822db630dc865b9eb35e31152e6f3897b2378ecff9732c63189451f38e32968ff47f5b8eece52aae03c9cece0ebbf8d5ed295405f86963987401a2eb09a77
+EBUILD raptor-2.0.15-r2.ebuild 1669 BLAKE2B 5cd2a3b1be0edbee1ffd7c97203562ee4022310ce5e16a4b1e7a8d3c038ea0a644a519978161b7b252e56a17369320875effea66befd17142d0072e96d5213e0 SHA512 c37201e65104536f2ea63eb2ec5de8964eb34ac77d66d6176796f2f6863bf3ec3655c0e3d50c90ba11a7c4839b711462df163d6b98dcd69b7988642ea1104919
 MISC metadata.xml 337 BLAKE2B 6244cd4ab5d8d13437590c4bbb672cb9b5ad47f7e70d30adda368737d745daf4df249eb2166d2ab8335fe0a0fec5b8d3afa9ec091cc6ddcaaf0f2d05f9425741 SHA512 3a2c420495274cfca80f0103066b282b9f1301786a8cbde76b894fac721030bee949fc468c92841698038b991b07fa66f15891392784041a87f655d1860fd11c
diff --git a/media-libs/raptor/raptor-2.0.15-r2.ebuild b/media-libs/raptor/raptor-2.0.15-r2.ebuild
index b737787a9c5e..e03f0a25cb09 100644
--- a/media-libs/raptor/raptor-2.0.15-r2.ebuild
+++ b/media-libs/raptor/raptor-2.0.15-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.librdf.org/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+curl debug json static-libs unicode"
 
 DEPEND="
diff --git a/media-libs/rply/Manifest b/media-libs/rply/Manifest
deleted file mode 100644
index c1696eb818c1..000000000000
--- a/media-libs/rply/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX rply-1.01-lc_numeric.patch 2868 BLAKE2B 42b624e137c20485e503d0c1f0e2f1f4e1998f0959a3202c8554bc9a39ffab49141bc90a7287df74adcb6677bef8dff40337f112922481b8599afbb38015964d SHA512 f17c4a5c7106f860c68d9eb4ff9bd6f1daa0abf674f8a6130dd80e7744ee800fd74a65e7f563bd70f826b6b9af3aeb5e3f23dd37e3aea3710b6e023e9330d4a3
-AUX rply-1.01-stdint.h.patch 6326 BLAKE2B bc839f43e96923c0f2bcec7ca28b5ec548c122c2e29aaf4217207bf306981a658086e32fc2f0b2810c31ee87a1f87ba25319946307fd85ed2dfb5694a3507fab SHA512 a3611eeccd37a18ffa30ba8b9093d29386fb20169bfbb45a581f079580731e431f98a455b2f9c1433f751d77ed5cda7b7a09ef43c5561268345cb8737b7fa834
-AUX rply_CMakeLists.txt 1256 BLAKE2B fa8aab3001c3d1ea22f3b2aca8ff6447bb90019ba5d2e1efd31d7b8434965b1192bdb34ed20291f7e768759a30897776a69e20d5732429f3d30bf66b71860a36 SHA512 071e58199b832b371211f6b9de8ad517fca8dd5eda2850eef50d9166fa7f3f4ba8f579b7c82afdca34f57246a795957c800449ca8ded8c3af2217a86be634e59
-DIST rply-1.01.tar.gz 28903 BLAKE2B f6b6cef38951ed48eab58f3336501d9d3875a340b7475c6dd52f3823a126873d5f43bac9b38423ec1a89fb746e234f060e1cb4ec62bb509a79641f757d61e254 SHA512 c5d9b8b031bff24ad6ae71a0b3b2fc265cdf9db4386389d48dbe05eac48d2db289d7ca86aa4e7379f8596cf08909c647e74714775b2c699bee31d987ad355474
-EBUILD rply-1.01-r1.ebuild 1073 BLAKE2B 4744e65fbc4548866b84b5cd88ec4751e4c89ba17bdf08507124f7365cebba3de2ad79ca4730cd75c14585dace3bf00968bd1f8d3afbd71fbf1b9b62bfceae43 SHA512 e87489bd5fc108f1a1fc6be7af9f96102ee0b1643e81ffc4b7387c31efad62462444940c7b561b6638a056306b084fb5824b6809b489f52834f961b17acdb746
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-libs/rply/files/rply-1.01-lc_numeric.patch b/media-libs/rply/files/rply-1.01-lc_numeric.patch
deleted file mode 100644
index 6d98abd95d57..000000000000
--- a/media-libs/rply/files/rply-1.01-lc_numeric.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 8a7a76b7dcc94e8e71725e26a146330c73377ebd Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Mon, 26 Sep 2011 04:46:44 -0400
-Subject: [PATCH 2/2] Switch LC_NUMERIC locale to "C" for decimal point
- separator safety
-
-Make sure to switch the LC_NUMERIC locale to "C" when using strtod() and
-fpritnf("%g",...) to ensure that '.' is used as the decimal point
-separator when reading and writing .ply files.
----
- rply.c |   31 +++++++++++++++++++++++++++----
- 1 files changed, 27 insertions(+), 4 deletions(-)
-
-diff --git a/rply.c b/rply.c
-index 9eaa77f..789c002 100644
---- a/rply.c
-+++ b/rply.c
-@@ -12,6 +12,7 @@
- #include <string.h>
- #include <limits.h>
- #include <float.h>
-+#include <locale.h>
- #include <stdarg.h>
- #include <stdlib.h>
- #include <stddef.h>
-@@ -1229,13 +1230,27 @@ static int oascii_uint32(p_ply ply, double value) {
- }
- 
- static int oascii_float32(p_ply ply, double value) {
-+    char *curr_locale;
-+    int ret;
-     if (value < -FLT_MAX || value > FLT_MAX) return 0;
--    return fprintf(ply->fp, "%g ", (float) value) > 0;
-+    /* Switch locale to C to use '.' as the decimal point separator */
-+    curr_locale = setlocale(LC_NUMERIC, NULL);
-+    setlocale(LC_NUMERIC, "C");
-+    ret = fprintf(ply->fp, "%g ", (float) value);
-+    setlocale(LC_NUMERIC, curr_locale);
-+    return ret > 0;
- }
- 
- static int oascii_float64(p_ply ply, double value) {
-+    char *curr_locale;
-+    int ret;
-     if (value < -DBL_MAX || value > DBL_MAX) return 0;
--    return fprintf(ply->fp, "%g ", value) > 0;
-+    /* Switch locale to C to use '.' as the decimal point separator */
-+    curr_locale = setlocale(LC_NUMERIC, NULL);
-+    setlocale(LC_NUMERIC, "C");
-+    ret = fprintf(ply->fp, "%g ", value);
-+    setlocale(LC_NUMERIC, curr_locale);
-+    return ret > 0;
- }
- 
- static int obinary_int8(p_ply ply, double value) {
-@@ -1336,17 +1351,25 @@ static int iascii_uint32(p_ply ply, double *value) {
- }
- 
- static int iascii_float32(p_ply ply, double *value) {
--    char *end;
-+    char *end, *curr_locale;
-     if (!ply_read_word(ply)) return 0;
-+    /* Switch locale to C to use '.' as the decimal point separator */
-+    curr_locale = setlocale(LC_NUMERIC, NULL);
-+    setlocale(LC_NUMERIC, "C");
-     *value = strtod(BWORD(ply), &end);
-+    setlocale(LC_NUMERIC, curr_locale);
-     if (*end || *value < -FLT_MAX || *value > FLT_MAX) return 0;
-     return 1;
- }
- 
- static int iascii_float64(p_ply ply, double *value) {
--    char *end;
-+    char *end, *curr_locale;
-     if (!ply_read_word(ply)) return 0;
-+    /* Switch locale to C to use '.' as the decimal point separator */
-+    curr_locale = setlocale(LC_NUMERIC, NULL);
-+    setlocale(LC_NUMERIC, "C");
-     *value = strtod(BWORD(ply), &end);
-+    setlocale(LC_NUMERIC, curr_locale);
-     if (*end || *value < -DBL_MAX || *value > DBL_MAX) return 0;
-     return 1;
- }
--- 
-1.7.6.1
-
diff --git a/media-libs/rply/files/rply-1.01-stdint.h.patch b/media-libs/rply/files/rply-1.01-stdint.h.patch
deleted file mode 100644
index 45c911643bcb..000000000000
--- a/media-libs/rply/files/rply-1.01-stdint.h.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-From eeb09032068baed6d81cff01cdfcccd6d55a8152 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Mon, 26 Sep 2011 04:45:49 -0400
-Subject: [PATCH 1/2] Use stdint.h types
-
-Use stdint.h types (int16_t and int32_t) instead of assuming that short
-and long must always a specific number of bytes. Also, use strtoul for
-reading uint32_t values.
----
- rply.c |   61 ++++++++++++++++++++++++++++---------------------------------
- 1 files changed, 28 insertions(+), 33 deletions(-)
-
-diff --git a/rply.c b/rply.c
-index 042244f..9eaa77f 100644
---- a/rply.c
-+++ b/rply.c
-@@ -15,6 +15,7 @@
- #include <stdarg.h>
- #include <stdlib.h>
- #include <stddef.h>
-+#include <stdint.h>
- 
- #include "rply.h"
- 
-@@ -1183,18 +1184,12 @@ static e_ply_storage_mode ply_arch_endian(void) {
- static int ply_type_check(void) {
-     assert(sizeof(char) == 1);
-     assert(sizeof(unsigned char) == 1);
--    assert(sizeof(short) == 2);
--    assert(sizeof(unsigned short) == 2);
--    assert(sizeof(long) == 4);
--    assert(sizeof(unsigned long) == 4);
-+    assert(sizeof(long) >= 4);
-     assert(sizeof(float) == 4);
-     assert(sizeof(double) == 8);
-     if (sizeof(char) != 1) return 0;
-     if (sizeof(unsigned char) != 1) return 0;
--    if (sizeof(short) != 2) return 0;
--    if (sizeof(unsigned short) != 2) return 0;
--    if (sizeof(long) != 4) return 0;
--    if (sizeof(unsigned long) != 4) return 0;
-+    if (sizeof(long) < 4) return 0;
-     if (sizeof(float) != 4) return 0;
-     if (sizeof(double) != 8) return 0;
-     return 1;
-@@ -1214,23 +1209,23 @@ static int oascii_uint8(p_ply ply, double value) {
- }
- 
- static int oascii_int16(p_ply ply, double value) {
--    if (value > SHRT_MAX || value < SHRT_MIN) return 0;
--    return fprintf(ply->fp, "%d ", (short) value) > 0;
-+    if (value > INT16_MAX || value < INT16_MIN) return 0;
-+    return fprintf(ply->fp, "%d ", (int16_t) value) > 0;
- }
- 
- static int oascii_uint16(p_ply ply, double value) {
--    if (value > USHRT_MAX || value < 0) return 0;
--    return fprintf(ply->fp, "%d ", (unsigned short) value) > 0;
-+    if (value > UINT16_MAX || value < 0) return 0;
-+    return fprintf(ply->fp, "%d ", (uint16_t) value) > 0;
- }
- 
- static int oascii_int32(p_ply ply, double value) {
--    if (value > LONG_MAX || value < LONG_MIN) return 0;
--    return fprintf(ply->fp, "%d ", (int) value) > 0;
-+    if (value > INT32_MAX || value < INT32_MIN) return 0;
-+    return fprintf(ply->fp, "%d ", (int32_t) value) > 0;
- }
- 
- static int oascii_uint32(p_ply ply, double value) {
--    if (value > ULONG_MAX || value < 0) return 0;
--    return fprintf(ply->fp, "%d ", (unsigned int) value) > 0;
-+    if (value > UINT32_MAX || value < 0) return 0;
-+    return fprintf(ply->fp, "%d ", (uint32_t) value) > 0;
- }
- 
- static int oascii_float32(p_ply ply, double value) {
-@@ -1256,26 +1251,26 @@ static int obinary_uint8(p_ply ply, double value) {
- }
- 
- static int obinary_int16(p_ply ply, double value) {
--    short int16 = (short) value;
--    if (value > SHRT_MAX || value < SHRT_MIN) return 0;
-+    int16_t int16 = value;
-+    if (value > INT16_MAX || value < INT16_MIN) return 0;
-     return ply->odriver->ochunk(ply, &int16, sizeof(int16));
- }
- 
- static int obinary_uint16(p_ply ply, double value) {
--    unsigned short uint16 = (unsigned short) value;
--    if (value > USHRT_MAX || value < 0) return 0;
-+    uint16_t uint16 = value;
-+    if (value > UINT16_MAX || value < 0) return 0;
-     return ply->odriver->ochunk(ply, &uint16, sizeof(uint16)); 
- }
- 
- static int obinary_int32(p_ply ply, double value) {
--    long int32 = (long) value;
--    if (value > LONG_MAX || value < LONG_MIN) return 0;
-+    int32_t int32 = value;
-+    if (value > INT32_MAX || value < INT32_MIN) return 0;
-     return ply->odriver->ochunk(ply, &int32, sizeof(int32));
- }
- 
- static int obinary_uint32(p_ply ply, double value) {
--    unsigned long uint32 = (unsigned long) value;
--    if (value > ULONG_MAX || value < 0) return 0;
-+    uint32_t uint32 = value;
-+    if (value > UINT32_MAX || value < 0) return 0;
-     return ply->odriver->ochunk(ply, &uint32, sizeof(uint32));
- }
- 
-@@ -1312,7 +1307,7 @@ static int iascii_int16(p_ply ply, double *value) {
-     char *end;
-     if (!ply_read_word(ply)) return 0;
-     *value = strtol(BWORD(ply), &end, 10);
--    if (*end || *value > SHRT_MAX || *value < SHRT_MIN) return 0;
-+    if (*end || *value > INT16_MAX || *value < INT16_MIN) return 0;
-     return 1;
- }
- 
-@@ -1320,7 +1315,7 @@ static int iascii_uint16(p_ply ply, double *value) {
-     char *end;
-     if (!ply_read_word(ply)) return 0;
-     *value = strtol(BWORD(ply), &end, 10);
--    if (*end || *value > USHRT_MAX || *value < 0) return 0;
-+    if (*end || *value > UINT16_MAX || *value < 0) return 0;
-     return 1;
- }
- 
-@@ -1328,15 +1323,15 @@ static int iascii_int32(p_ply ply, double *value) {
-     char *end;
-     if (!ply_read_word(ply)) return 0;
-     *value = strtol(BWORD(ply), &end, 10);
--    if (*end || *value > LONG_MAX || *value < LONG_MIN) return 0;
-+    if (*end || *value > INT32_MAX || *value < INT32_MIN) return 0;
-     return 1;
- }
- 
- static int iascii_uint32(p_ply ply, double *value) {
-     char *end;
-     if (!ply_read_word(ply)) return 0;
--    *value = strtol(BWORD(ply), &end, 10);
--    if (*end || *value < 0) return 0;
-+    *value = strtoul(BWORD(ply), &end, 10);
-+    if (*end || *value > UINT32_MAX || *value < 0) return 0;
-     return 1;
- }
- 
-@@ -1371,28 +1366,28 @@ static int ibinary_uint8(p_ply ply, double *value) {
- }
- 
- static int ibinary_int16(p_ply ply, double *value) {
--    short int16;
-+    int16_t int16;
-     if (!ply->idriver->ichunk(ply, &int16, sizeof(int16))) return 0;
-     *value = int16;
-     return 1;
- }
- 
- static int ibinary_uint16(p_ply ply, double *value) {
--    unsigned short uint16;
-+    uint16_t uint16;
-     if (!ply->idriver->ichunk(ply, &uint16, sizeof(uint16))) return 0;
-     *value = uint16;
-     return 1;
- }
- 
- static int ibinary_int32(p_ply ply, double *value) {
--    long int32;
-+    int32_t int32;
-     if (!ply->idriver->ichunk(ply, &int32, sizeof(int32))) return 0;
-     *value = int32;
-     return 1;
- }
- 
- static int ibinary_uint32(p_ply ply, double *value) {
--    unsigned long uint32;
-+    uint32_t uint32;
-     if (!ply->idriver->ichunk(ply, &uint32, sizeof(uint32))) return 0;
-     *value = uint32;
-     return 1;
--- 
-1.7.6.1
-
diff --git a/media-libs/rply/files/rply_CMakeLists.txt b/media-libs/rply/files/rply_CMakeLists.txt
deleted file mode 100644
index 5497fffb225f..000000000000
--- a/media-libs/rply/files/rply_CMakeLists.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-# Fedora's cmake file for rply
-# http://pkgs.fedoraproject.org/gitweb/?p=rply.git;a=blob;f=rply_CMakeLists.txt
-PROJECT(rply)
-cmake_minimum_required(VERSION 2.6)
-
-SET(RPLY_LIB_MAJOR_VERSION 1)
-SET(RPLY_LIB_MINOR_VERSION 01)
-
-SET(RPLY_CMAKE_DIR ${CMAKE_SOURCE_DIR}/CMake/ )
-SET(RPLY_LIBRARY librply.so )
-
-add_library(rply SHARED rply.c )
-set_target_properties( rply PROPERTIES
-                              VERSION ${RPLY_LIB_MAJOR_VERSION}.${RPLY_LIB_MINOR_VERSION}
-                              SOVERSION ${RPLY_LIB_MAJOR_VERSION}
-                              ) 
-
-include_directories( ${CMAKE_SOURCE_DIR} )
-add_executable(rply_convert etc/convert.c )
-add_executable(rply_dump etc/dump.c )
-add_executable(rply_sconvert etc/sconvert.c )
-target_link_libraries (rply_convert rply)
-target_link_libraries (rply_dump rply)
-target_link_libraries (rply_sconvert rply)
-
-# Installs the header files
-install(FILES rply.h DESTINATION include/rply)
-
-# Installs the target file
-install(TARGETS rply LIBRARY DESTINATION lib${LIB_SUFFIX})
-install(TARGETS rply_convert RUNTIME DESTINATION bin)
-install(TARGETS rply_dump RUNTIME DESTINATION bin)
-install(TARGETS rply_sconvert RUNTIME DESTINATION bin)
-
-#This should be the last line of the project
-SUBDIRS( CMake/export )
-
-
-
diff --git a/media-libs/rply/metadata.xml b/media-libs/rply/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/media-libs/rply/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/media-libs/rply/rply-1.01-r1.ebuild b/media-libs/rply/rply-1.01-r1.ebuild
deleted file mode 100644
index b2874323bdd1..000000000000
--- a/media-libs/rply/rply-1.01-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A library to read and write PLY files"
-HOMEPAGE="http://w3.impa.br/~diego/software/rply/"
-# SRC_URI="http://w3.impa.br/~diego/software/rply/${P}.tar.gz"
-# Tarball no longer available from upstream website
-SRC_URI="https://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	# Use int16_t and int32_t instead of assuming e.g. that sizeof(long) == 4
-	"${FILESDIR}/${P}-stdint.h.patch"
-	# Switch LC_NUMERIC locale to "C" to ensure "." is the decimal separator
-	"${FILESDIR}/${P}-lc_numeric.patch"
-)
-
-pkg_setup() {
-	use doc && HTML_DOCS="manual/*"
-}
-
-src_prepare() {
-	# rply doesn't have *any* build system - not even a Makefile!
-	# For simplicity, use the cmake file that Fedora maintainers have created
-	cp "${FILESDIR}/rply_CMakeLists.txt" CMakeLists.txt || die
-	mkdir -p CMake/export || die
-
-	cmake-utils_src_prepare
-}
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index b3bfa4102471..a0d5855c5bf7 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -2,7 +2,7 @@ AUX shaderc-2017.2-fix-glslang-link-order.patch 1803 BLAKE2B b5c880d6869a3a6d704
 AUX shaderc-2018.0-fix-glslang-link-order.patch 1059 BLAKE2B e8985d1de7f6e425eabbd05201aeff854304fe227f2a83878ed41e5494e71742d46c49b86aa97c3a9b364909f5d6adcc2a3aed21128935febbc7765b90b2f2b3 SHA512 09a61e04dd68674d159c69a497ce412b924967d595526a54693e1999345fd45c88999b5e793b5bfd21a0a555b535d89d1611c44a76f81e1ce308bff821c86f87
 DIST shaderc-2018.0.tar.gz 206013 BLAKE2B b45fb6e959f621566817f8e31b1947e479b6ea392eb64f334dca9ad24cc4e8b736dd236e634de3f96342f48d8138722a2b769efb9db65025def5ed59bf5b911b SHA512 7a420fde73c9f2aae3f13558d538a1f4ae43bba19e2b4d2da8fbbd017e9e4f328ece5f330f1bbcb9fe84c91b7eb84b9158dc2e3d144c82939090a0fa6f5b4ef0
 DIST shaderc-7a23a01742b88329fb2260eda007172135ba25d4.tar.gz 186291 BLAKE2B e91f57ba5c9339fed17d409b82df284a7897ed8bcabb203a0b8aab439df1d460ff5efdaa49e9140801b1430e831bbdca6920181fd1ddd07d8d35eb17b519246b SHA512 558447bc29b0c7610fda0f6c2a6b66f3c8fc7f2f5e336ad190ae959caa8c7aa1e09d3c2efe0e197cb2cbe1fa97e0c68623ce423c658b29fcbd1f1e1ea4c85f18
-EBUILD shaderc-2017.2-r1.ebuild 2107 BLAKE2B efc8b90f83e81191da600e9904d96f2107486b82e9b79dcd889bdd24f4408b3eed407bc7a7396cede96e169610ec91e710700113296a339eedf7992e64bc2cc2 SHA512 4667b524cc19b3a06d0549e0ca122dd2dacb921ce00a1a9bbcfd5c68bba9dfd21c987ce64cfef0c664d6482b3f093378facb6c87c5161aecbc5699a6dda973e6
-EBUILD shaderc-2018.0.ebuild 1988 BLAKE2B 610b98c1d6687e865909c5cc810b41cf12868872e9e379ec9b1a2bbb5551a2fbfe46823e4a91b417250aef8813d96ccb97d6d3535b3f829bd9e099753c70c6d4 SHA512 b268a3685a3bebf20091cc5fbd48b3fe2a3da24a100d5ff8d05b11a349c211dabe432dad8d54915e4724751a2335897973909e712a220c6381cb54afc5db84dc
-EBUILD shaderc-9999.ebuild 1981 BLAKE2B ce4353c33b52a4f95f6ea65882afd5a3114e7ba6d5bb2b9dea6e2103778a809fd418fad27d4bf927e7cba7c3ee8e2b253327f3398c8ea40e414bcb0b92e3add4 SHA512 9ac2e97a909e8a00fcf540bf1695bd4937a095b758ebc116a5dfe35fc7076f223f6f1fd24a211ea31ac4cd5da3ed65ecea2c4c497cf54fda5b6870d1e05967e7
+EBUILD shaderc-2017.2-r1.ebuild 2103 BLAKE2B c49adc567edf01fef06dc5104d0eb8a71d2b90f68dc707dd762120255f3e423da5a8dca55ce4efeeba29235081bd6dca76d323bdc274b9d801ca1a2ef51f3535 SHA512 c61eac14ff14c1a3edcbe4edd0da5ca3c4b349ac7cc74212c2c16e8534ec58101a77c3c31609b5ad6e92bd051fbd794ae27ed8ae7604d6a58e159c7d1092555c
+EBUILD shaderc-2018.0.ebuild 1984 BLAKE2B 00cd26db078ce879fae3903e851d6d37b9511ed4c849fcedf60a3747f3574e1d343ee31634906bdba8c1c19aeb155e4fb3d916e3c36fe2c8d8af13a683d3d109 SHA512 0d80b7648f59a56b63eed9579cc3ce400522bccde8d149e3497584fa259db0852502acc4bdfa2c828fab9a96975508a8940bfb62f5db41daaec3050c5bcef489
+EBUILD shaderc-9999.ebuild 1977 BLAKE2B 02bea7c2871d68dbe22ac47e22d062787ab7ef084fe740eeb71b1b7fa35be38b54fa1dc9f571c033be0fc6a0b108078ef1290fcf3654f5f9275de780adcb67d6 SHA512 c8d1fda68fc6162d3fcea9b4e9f8df21852ecf5c2546e990aeff03b730b9bce02c9e39ec40c3e0dd97e0f62031ae80f00fc5f7220844e983fd2b0daf7404fe0b
 MISC metadata.xml 445 BLAKE2B 6e35c47106d6253c5895ee5e641d1481d20df16f2f2d54f0404a84b9a4a8c5d0b55b51dbe465630bfc7983e9c82b7610000cb44fe30a9d8a4b42539f19e2cea6 SHA512 adabb9a986ad200680297819c3933d22a921bf77d6c2991f360c19d8fe4131d7e78422570c4928055b6aaab69242698b8edf757c5b4d7c2876a2ef6f3a110bd5
diff --git a/media-libs/shaderc/shaderc-2017.2-r1.ebuild b/media-libs/shaderc/shaderc-2017.2-r1.ebuild
index e664c51b776d..133e87ec05e2 100644
--- a/media-libs/shaderc/shaderc-2017.2-r1.ebuild
+++ b/media-libs/shaderc/shaderc-2017.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 EGIT_COMMIT="7a23a01742b88329fb2260eda007172135ba25d4"
 MY_P="${PN}-${EGIT_COMMIT}"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit cmake-multilib python-any-r1
 
diff --git a/media-libs/shaderc/shaderc-2018.0.ebuild b/media-libs/shaderc/shaderc-2018.0.ebuild
index e0b0e435fad8..b766cee080e9 100644
--- a/media-libs/shaderc/shaderc-2018.0.ebuild
+++ b/media-libs/shaderc/shaderc-2018.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit cmake-multilib python-any-r1
 
diff --git a/media-libs/shaderc/shaderc-9999.ebuild b/media-libs/shaderc/shaderc-9999.ebuild
index d3f3963283e1..aad02e3ab3f7 100644
--- a/media-libs/shaderc/shaderc-9999.ebuild
+++ b/media-libs/shaderc/shaderc-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit cmake-multilib python-any-r1 git-r3
 
diff --git a/media-libs/sratom/Manifest b/media-libs/sratom/Manifest
index 01922a159e16..6e0d678e7956 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 1215 BLAKE2B 15ea8eb522cf796fee747e3ea2704b91f987eb65d5d57d888a7e9f932d76446f1a23b4242735a61c6250853a6cf351bd370a20f9ee63c240333a30f66f5f1991 SHA512 85fcc3e343e4fd0bf0a9367226bfedaf00c188f1cde8551574f5606940b35d419d28803beb072fa60ad3c68ed5bed0f730a3681541efca9f99016f9f06c5d5c1
+EBUILD sratom-0.6.0-r1.ebuild 1211 BLAKE2B 65ab9257c47779f14a6f581b642c7a8c298de6fac338d2d1118f332afe29250a8ca44245e49c8dcd6aa5618a85f505cf6a7063fc11d53346ee11293be993ce98 SHA512 a2c3415150c0726c2cd57b90060befc756b8a2918adb871ee41520ffcadd84d50e208ed9dfd4d33f5cf3c8ded45a32ec08859cd909d1a6c7da47761e7a3f620e
 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 a9b8f2a4c7b9..e82dc65f00e5 100644
--- a/media-libs/sratom/sratom-0.6.0-r1.ebuild
+++ b/media-libs/sratom/sratom-0.6.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 PYTHON_REQ_USE='threads(+)'
 inherit python-any-r1 waf-utils multilib-build multilib-minimal
 
diff --git a/media-libs/suil/Manifest b/media-libs/suil/Manifest
index d6c205d0c694..0706e5375bde 100644
--- a/media-libs/suil/Manifest
+++ b/media-libs/suil/Manifest
@@ -1,3 +1,3 @@
 DIST suil-0.10.0.tar.bz2 159059 BLAKE2B 1293d817df7e60cd89946c3f5b0e6689b0942284cc2f25a93bce830e9f43db1e93067d1a9e85cf201ab8bf580cafefe06c46cf100a855a590a58022f3036d3db SHA512 721b73d987c1712e82493386e5d71957002c8a713595fce4372f1a5eb306c64a559db1ca794cec96295f72e22a9c0e9193f9a68b7f5846f2db45ce16b253fbea
-EBUILD suil-0.10.0.ebuild 997 BLAKE2B d4379772286def71e0b8eea43933f67f47e8301dc7d0531a672f2588882a31852a24e468393e6f2eb187c84448f7d5b6883870235e695f66fac1db78382471d3 SHA512 af6ca2d4d515badc0ef1ef578d15609ff1813b00adc76a8717b76def502a6c7de4b76d4a27d0b70d55bbbe65636d44625b15527c75f41290766adb404e23c992
+EBUILD suil-0.10.0.ebuild 993 BLAKE2B 66f2c549bc66fa9282f8bacf7b7d9b8ee02fb946f41e521632edd35627404b370ba81d9751b7b00e6cf7d6073d74e991391348c7308ca83e0f3de6f5794d37e8 SHA512 400156652f1375ad336e98d5609323457df6df9a1faf6f9f087124c7d65435404e457685e535459460686b16222402e4893c0e2912f88b788c5e0db641f82f4f
 MISC metadata.xml 491 BLAKE2B 8d423d4bd56c2fc586cac7dfeef9ba125799795a02f8f7303d1e657e83181ad68eae5e20cc75806fefbe1296f0eabc632fee3824b9b36e7ccef0a22e04fe4081 SHA512 c56784f3b84159aaa284b5b04ce4d2110d78acb536ea9dd60d5043199a061171dfd0272f4d810e7ac68025fb906cc021b36f099ea966bc87e0de8f57464a88c3
diff --git a/media-libs/suil/suil-0.10.0.ebuild b/media-libs/suil/suil-0.10.0.ebuild
index c45a05c2483f..d9474e5a7f3d 100644
--- a/media-libs/suil/suil-0.10.0.ebuild
+++ b/media-libs/suil/suil-0.10.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit flag-o-matic python-any-r1 waf-utils
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 5b4cb24c3543..2ef423f494cc 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -1,11 +1,5 @@
 AUX tiff-4.0.7-pdfium-0006-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch 930 BLAKE2B 52d77fcdd773ce52232257da2c60f8b90417f102238df2039262e3afa7275908c74817ddd6958e430d7cfcff58d2d04ebd6ddd49f553f0f261883b67f557c599 SHA512 822ccc22304d23b4f50efe1f0fb7890fda8b9edf2075b8add814c0bac0a153fa0ed5d7ee5f47e23799b24f11678c8e0bf9c90ad59c5cc61fd9546b2dca4714a9
 AUX tiff-4.0.7-pdfium-0008-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch 924 BLAKE2B 03160ce33639620b1deb918d358f559b8bc6296d28530b440d0d770438453c25aecc393b8cfcc582ed2d0ec1decd557a212c91f43f7923c9e94387e235680021 SHA512 43973cc5512eb8fe2e0beab1a98ff0d3bd999ed1adbf7c08c344b3442559cc2cdc99a9f2e9c1bb2bffa4be027945b12b120fa27ec6c8006367932039b8d8dd37
-AUX tiff-4.0.9-CVE-2017-18013.patch 1531 BLAKE2B e0b825408ba684084153ebd19c13bc7124733ba9b84393534b57481aabb8f1de5529f0a31c997b6e4947be8f01970c711e1f23ce30919bcbcef489939a0ed31e SHA512 e0598c4702fbe22379182c78191305b3769b7cb7f927ad4372e220aad9567e43adee6baa164696852ce6fa4f1f307c666a4fc3fc2b942baca16cd2b8fe9998cb
-AUX tiff-4.0.9-CVE-2017-9935-fix-incorrect-type.patch 2443 BLAKE2B e18f4acec3dc8088eec5080272e6d759c0823cb1f8036d45bc5289cc22e8a487ff5d8761e0d2e49d4c450f407e859c00913988df9c45e51318b53c5fbec01483 SHA512 a489d4bdf5b3861fdf18107ff4a0224e2d458acf719af9d7eb6ef230285ceb5d37bc483c32800cc8180ccc69ffbc80d8887b8660265466ddd52a3447f1f44e61
-AUX tiff-4.0.9-CVE-2017-9935.patch 6636 BLAKE2B b7660dee9e379aea59f7225024697ea35b820837502e9e19157391c569c6b85473c4da5163f2e6fa8934c68cc32cbc45d025a2c336d21d79f461723a68a6e49f SHA512 ca1beda6e1550ac8a4bdf2bdefaba38f5fc40d2e842709ed1a803aeef5c34cd466f93fc6e7bb8e7ffb7e21a702d54584b84615e7c3dc3a8d2d29ceeadaeca7f6
-AUX tiff-4.0.9-CVE-2018-5784.patch 4251 BLAKE2B defd555ebc53e178439331cd04f3099c4ad77584efd0a4312802307ce90828e63513df738e992905af824f25d987d43e095d313d359c3de9eebba5bf4c843bf1 SHA512 ebff45d1ecc1fb783f806eb556ccb01316289e190786378309a51a0c4d10b53ae6c86a1310ea59bc79946e633163916700e17752d0a7add10c22b8824b000b7b
 DIST tiff-4.0.10.tar.gz 2402867 BLAKE2B 0305453f22150c31d00d2de756736f58c49a288e19b2a66bdd01319ce4688742f6eab4009eaf1817125d41f53a23de17eb6265a3ebae458ec24f5dbb3d49764e SHA512 d213e5db09fd56b8977b187c5a756f60d6e3e998be172550c2892dbdb4b2a8e8c750202bc863fe27d0d1c577ab9de1710d15e9f6ed665aadbfd857525a81eea8
-DIST tiff-4.0.9.tar.gz 2305681 BLAKE2B 3de03408d2974b9f9f5f2444029cc3018ef43beb67e9fd21be68ee400cdcc6deca1247f055d880841a18b92284ce81f112682c8b5f083ddc61e5255d73a7de3f SHA512 04f3d5eefccf9c1a0393659fe27f3dddd31108c401ba0dc587bca152a1c1f6bc844ba41622ff5572da8cc278593eff8c402b44e7af0a0090e91d326c2d79f6cd
-EBUILD tiff-4.0.10.ebuild 2320 BLAKE2B 4d31a67539f9bc1c732db69bf57446f96ec13e573ac0531ce7fa3c7be39c28dee1fb9a275593d94f8ba11f6b5c3b4a0f5a82a47588b4542d4d1502aeb2149bc1 SHA512 a208da6710cbba1ff103b6399ee3f0186ac5e756e432fe7ac3c3333d1afa090620a9452d81b08de7b2eb052977cb313c043d9a2311e84b029a84f84ad3f1b978
-EBUILD tiff-4.0.9-r4.ebuild 2354 BLAKE2B 272c6c559ca76d81689caefa8dbd66aa22b8e29fd2cf35ba0699abaf2e85fa1f542237c9eb3b85735921617b76790bdbaede55b0c113a7cc2d35b192d3821e85 SHA512 ee3c1ab75d4694bce0e9523394ed0bf9daca1de6bc276199d96b655192a59f72ddc4bbbc7981e26c6f44531da334bbaab94fb9fa72191d6c241e861b71e78e4b
-MISC metadata.xml 640 BLAKE2B faec0c1b8ddc13c849f3814532d7886a7b1fcc7aee14eb1ff26dc0265d51bd7516c779e2dba8e9dc8c1116f3be46db6dd06bfe46dd4b5dc3300f29b402bb666a SHA512 9445f36944e1018afcb83e3f5d9382d8e91d52924171786a40606ab46bfe0c0de744b40fc2adb58ece5d0168bca967d2bef73de05a81cd46615bd50502d08a29
+EBUILD tiff-4.0.10.ebuild 2323 BLAKE2B e8a1f0c734f360cbb4cde9a264be7c67d75d7e0121accb48da5c972a344b28042ab36c98a43c01b027261d0bc61849a8d9d40fd53cd0695f56696644cda49bef SHA512 ca55c5e5ff17c56489c4197b9b9d217283ab60247c4fd5d7248859b2f4d21140f7401b3868cd1b43f8705fa8be2772ba2f8dcba19db17c245575f0840b154314
+MISC metadata.xml 565 BLAKE2B 3d487835599974795ba6007439bf1d08756ab1c5dbe191509832b302f3199e4ffc05be64df3e26b4d4a1c11d1292c48cbb59ffa6e412831d16d7415e076f1062 SHA512 289043206dbb512c97e4bb703b32549ac4a77f40e212548b80ea865052b80fed9d4562f9fc94638fda54da9bc3e0c19ba303c027e66e7b75c772aeec91aebe6f
diff --git a/media-libs/tiff/files/tiff-4.0.9-CVE-2017-18013.patch b/media-libs/tiff/files/tiff-4.0.9-CVE-2017-18013.patch
deleted file mode 100644
index 2db890aef906..000000000000
--- a/media-libs/tiff/files/tiff-4.0.9-CVE-2017-18013.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://bugs.gentoo.org/645982
-https://gitlab.com/libtiff/libtiff/commit/c6f41df7b581402dfba3c19a1e3df4454c551a01
-
-From c6f41df7b581402dfba3c19a1e3df4454c551a01 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sun, 31 Dec 2017 15:09:41 +0100
-Subject: [PATCH] libtiff/tif_print.c: TIFFPrintDirectory(): fix null pointer
- dereference on corrupted file. Fixes
- http://bugzilla.maptools.org/show_bug.cgi?id=2770
-
----
- libtiff/tif_print.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/libtiff/tif_print.c b/libtiff/tif_print.c
-index 9959d353b1f9..8deceb2b054d 100644
---- a/libtiff/tif_print.c
-+++ b/libtiff/tif_print.c
-@@ -665,13 +665,13 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags)
- #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
- 			fprintf(fd, "    %3lu: [%8I64u, %8I64u]\n",
- 			    (unsigned long) s,
--			    (unsigned __int64) td->td_stripoffset[s],
--			    (unsigned __int64) td->td_stripbytecount[s]);
-+			    td->td_stripoffset ? (unsigned __int64) td->td_stripoffset[s] : 0,
-+			    td->td_stripbytecount ? (unsigned __int64) td->td_stripbytecount[s] : 0);
- #else
- 			fprintf(fd, "    %3lu: [%8llu, %8llu]\n",
- 			    (unsigned long) s,
--			    (unsigned long long) td->td_stripoffset[s],
--			    (unsigned long long) td->td_stripbytecount[s]);
-+			    td->td_stripoffset ? (unsigned long long) td->td_stripoffset[s] : 0,
-+			    td->td_stripbytecount ? (unsigned long long) td->td_stripbytecount[s] : 0);
- #endif
- 	}
- }
--- 
-2.16.1
-
diff --git a/media-libs/tiff/files/tiff-4.0.9-CVE-2017-9935-fix-incorrect-type.patch b/media-libs/tiff/files/tiff-4.0.9-CVE-2017-9935-fix-incorrect-type.patch
deleted file mode 100644
index 101618ee7d57..000000000000
--- a/media-libs/tiff/files/tiff-4.0.9-CVE-2017-9935-fix-incorrect-type.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From d4f213636b6f950498a1386083199bd7f65676b9 Mon Sep 17 00:00:00 2001
-From: Brian May <brian@linuxpenguins.xyz>
-Date: Thu, 7 Dec 2017 07:49:20 +1100
-Subject: [PATCH] tiff2pdf: Fix apparent incorrect type for transfer table
-
-The standard says the transfer table contains unsigned 16 bit values,
-I have no idea why we refer to them as floats.
----
- tools/tiff2pdf.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/tools/tiff2pdf.c b/tools/tiff2pdf.c
-index c3ec074..484776c 100644
---- a/tools/tiff2pdf.c
-+++ b/tools/tiff2pdf.c
-@@ -237,7 +237,7 @@ typedef struct {
- 	float tiff_whitechromaticities[2];
- 	float tiff_primarychromaticities[6];
- 	float tiff_referenceblackwhite[2];
--	float* tiff_transferfunction[3];
-+	uint16* tiff_transferfunction[3];
- 	int pdf_image_interpolate;	/* 0 (default) : do not interpolate,
- 					   1 : interpolate */
- 	uint16 tiff_transferfunctioncount;
-@@ -1048,7 +1048,7 @@ void t2p_read_tiff_init(T2P* t2p, TIFF* input){
- 	uint16 paged=0;
- 	uint16 xuint16=0;
- 	uint16 tiff_transferfunctioncount=0;
--	float* tiff_transferfunction[3];
-+	uint16* tiff_transferfunction[3];
- 
- 	directorycount=TIFFNumberOfDirectories(input);
- 	t2p->tiff_pages = (T2P_PAGE*) _TIFFmalloc(TIFFSafeMultiply(tmsize_t,directorycount,sizeof(T2P_PAGE)));
-@@ -1153,8 +1153,8 @@ void t2p_read_tiff_init(T2P* t2p, TIFF* input){
-                                  &(tiff_transferfunction[1]),
-                                  &(tiff_transferfunction[2]))) {
- 
--                        if((tiff_transferfunction[1] != (float*) NULL) &&
--                           (tiff_transferfunction[2] != (float*) NULL)
-+                        if((tiff_transferfunction[1] != (uint16*) NULL) &&
-+                           (tiff_transferfunction[2] != (uint16*) NULL)
-                           ) {
-                             tiff_transferfunctioncount=3;
-                         } else {
-@@ -1851,8 +1851,8 @@ void t2p_read_tiff_data(T2P* t2p, TIFF* input){
- 			 &(t2p->tiff_transferfunction[0]),
- 			 &(t2p->tiff_transferfunction[1]),
- 			 &(t2p->tiff_transferfunction[2]))) {
--		if((t2p->tiff_transferfunction[1] != (float*) NULL) &&
--                   (t2p->tiff_transferfunction[2] != (float*) NULL)
-+		if((t2p->tiff_transferfunction[1] != (uint16*) NULL) &&
-+                   (t2p->tiff_transferfunction[2] != (uint16*) NULL)
-                   ) {
- 			t2p->tiff_transferfunctioncount=3;
- 		} else {
---
-libgit2 0.26.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.9-CVE-2017-9935.patch b/media-libs/tiff/files/tiff-4.0.9-CVE-2017-9935.patch
deleted file mode 100644
index 96a10aa9b373..000000000000
--- a/media-libs/tiff/files/tiff-4.0.9-CVE-2017-9935.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-From 3dd8f6a357981a4090f126ab9025056c938b6940 Mon Sep 17 00:00:00 2001
-From: Brian May <brian@linuxpenguins.xyz>
-Date: Thu, 7 Dec 2017 07:46:47 +1100
-Subject: [PATCH] tiff2pdf: Fix CVE-2017-9935
-
-Fix for http://bugzilla.maptools.org/show_bug.cgi?id=2704
-
-This vulnerability - at least for the supplied test case - is because we
-assume that a tiff will only have one transfer function that is the same
-for all pages. This is not required by the TIFF standards.
-
-We than read the transfer function for every page.  Depending on the
-transfer function, we allocate either 2 or 4 bytes to the XREF buffer.
-We allocate this memory after we read in the transfer function for the
-page.
-
-For the first exploit - POC1, this file has 3 pages. For the first page
-we allocate 2 extra extra XREF entries. Then for the next page 2 more
-entries. Then for the last page the transfer function changes and we
-allocate 4 more entries.
-
-When we read the file into memory, we assume we have 4 bytes extra for
-each and every page (as per the last transfer function we read). Which
-is not correct, we only have 2 bytes extra for the first 2 pages. As a
-result, we end up writing past the end of the buffer.
-
-There are also some related issues that this also fixes. For example,
-TIFFGetField can return uninitalized pointer values, and the logic to
-detect a N=3 vs N=1 transfer function seemed rather strange.
-
-It is also strange that we declare the transfer functions to be of type
-float, when the standard says they are unsigned 16 bit values. This is
-fixed in another patch.
-
-This patch will check to ensure that the N value for every transfer
-function is the same for every page. If this changes, we abort with an
-error. In theory, we should perhaps check that the transfer function
-itself is identical for every page, however we don't do that due to the
-confusion of the type of the data in the transfer function.
----
- libtiff/tif_dir.c |  3 +++
- tools/tiff2pdf.c  | 65 +++++++++++++++++++++++++++++++++++++------------------
- 2 files changed, 47 insertions(+), 21 deletions(-)
-
-diff --git a/libtiff/tif_dir.c b/libtiff/tif_dir.c
-index 2ccaf448fc40..cbf2b6933a40 100644
---- a/libtiff/tif_dir.c
-+++ b/libtiff/tif_dir.c
-@@ -1065,6 +1065,9 @@ _TIFFVGetField(TIFF* tif, uint32 tag, va_list ap)
- 			if (td->td_samplesperpixel - td->td_extrasamples > 1) {
- 				*va_arg(ap, uint16**) = td->td_transferfunction[1];
- 				*va_arg(ap, uint16**) = td->td_transferfunction[2];
-+			} else {
-+				*va_arg(ap, uint16**) = NULL;
-+				*va_arg(ap, uint16**) = NULL;
- 			}
- 			break;
- 		case TIFFTAG_REFERENCEBLACKWHITE:
-diff --git a/tools/tiff2pdf.c b/tools/tiff2pdf.c
-index d1a9b0959f84..c3ec07465e5a 100644
---- a/tools/tiff2pdf.c
-+++ b/tools/tiff2pdf.c
-@@ -1047,6 +1047,8 @@ void t2p_read_tiff_init(T2P* t2p, TIFF* input){
- 	uint16 pagen=0;
- 	uint16 paged=0;
- 	uint16 xuint16=0;
-+	uint16 tiff_transferfunctioncount=0;
-+	float* tiff_transferfunction[3];
- 
- 	directorycount=TIFFNumberOfDirectories(input);
- 	t2p->tiff_pages = (T2P_PAGE*) _TIFFmalloc(TIFFSafeMultiply(tmsize_t,directorycount,sizeof(T2P_PAGE)));
-@@ -1147,26 +1149,48 @@ void t2p_read_tiff_init(T2P* t2p, TIFF* input){
-                 }
- #endif
- 		if (TIFFGetField(input, TIFFTAG_TRANSFERFUNCTION,
--                                 &(t2p->tiff_transferfunction[0]),
--                                 &(t2p->tiff_transferfunction[1]),
--                                 &(t2p->tiff_transferfunction[2]))) {
--			if((t2p->tiff_transferfunction[1] != (float*) NULL) &&
--                           (t2p->tiff_transferfunction[2] != (float*) NULL) &&
--                           (t2p->tiff_transferfunction[1] !=
--                            t2p->tiff_transferfunction[0])) {
--				t2p->tiff_transferfunctioncount = 3;
--				t2p->tiff_pages[i].page_extra += 4;
--				t2p->pdf_xrefcount += 4;
--			} else {
--				t2p->tiff_transferfunctioncount = 1;
--				t2p->tiff_pages[i].page_extra += 2;
--				t2p->pdf_xrefcount += 2;
--			}
--			if(t2p->pdf_minorversion < 2)
--				t2p->pdf_minorversion = 2;
-+                                 &(tiff_transferfunction[0]),
-+                                 &(tiff_transferfunction[1]),
-+                                 &(tiff_transferfunction[2]))) {
-+
-+                        if((tiff_transferfunction[1] != (float*) NULL) &&
-+                           (tiff_transferfunction[2] != (float*) NULL)
-+                          ) {
-+                            tiff_transferfunctioncount=3;
-+                        } else {
-+                            tiff_transferfunctioncount=1;
-+                        }
-                 } else {
--			t2p->tiff_transferfunctioncount=0;
-+			tiff_transferfunctioncount=0;
- 		}
-+
-+                if (i > 0){
-+                    if (tiff_transferfunctioncount != t2p->tiff_transferfunctioncount){
-+                        TIFFError(
-+                            TIFF2PDF_MODULE,
-+                            "Different transfer function on page %d",
-+                            i);
-+                        t2p->t2p_error = T2P_ERR_ERROR;
-+                        return;
-+                    }
-+                }
-+
-+                t2p->tiff_transferfunctioncount = tiff_transferfunctioncount;
-+                t2p->tiff_transferfunction[0] = tiff_transferfunction[0];
-+                t2p->tiff_transferfunction[1] = tiff_transferfunction[1];
-+                t2p->tiff_transferfunction[2] = tiff_transferfunction[2];
-+                if(tiff_transferfunctioncount == 3){
-+                        t2p->tiff_pages[i].page_extra += 4;
-+                        t2p->pdf_xrefcount += 4;
-+                        if(t2p->pdf_minorversion < 2)
-+                                t2p->pdf_minorversion = 2;
-+                } else if (tiff_transferfunctioncount == 1){
-+                        t2p->tiff_pages[i].page_extra += 2;
-+                        t2p->pdf_xrefcount += 2;
-+                        if(t2p->pdf_minorversion < 2)
-+                                t2p->pdf_minorversion = 2;
-+                }
-+
- 		if( TIFFGetField(
- 			input, 
- 			TIFFTAG_ICCPROFILE, 
-@@ -1828,9 +1852,8 @@ void t2p_read_tiff_data(T2P* t2p, TIFF* input){
- 			 &(t2p->tiff_transferfunction[1]),
- 			 &(t2p->tiff_transferfunction[2]))) {
- 		if((t2p->tiff_transferfunction[1] != (float*) NULL) &&
--                   (t2p->tiff_transferfunction[2] != (float*) NULL) &&
--                   (t2p->tiff_transferfunction[1] !=
--                    t2p->tiff_transferfunction[0])) {
-+                   (t2p->tiff_transferfunction[2] != (float*) NULL)
-+                  ) {
- 			t2p->tiff_transferfunctioncount=3;
- 		} else {
- 			t2p->tiff_transferfunctioncount=1;
--- 
-2.15.1
-
diff --git a/media-libs/tiff/files/tiff-4.0.9-CVE-2018-5784.patch b/media-libs/tiff/files/tiff-4.0.9-CVE-2018-5784.patch
deleted file mode 100644
index 56d0f4b06876..000000000000
--- a/media-libs/tiff/files/tiff-4.0.9-CVE-2018-5784.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From 473851d211cf8805a161820337ca74cc9615d6ef Mon Sep 17 00:00:00 2001
-From: Nathan Baker <nathanb@lenovo-chrome.com>
-Date: Tue, 6 Feb 2018 10:13:57 -0500
-Subject: [PATCH] Fix for bug 2772
-
-It is possible to craft a TIFF document where the IFD list is circular,
-leading to an infinite loop while traversing the chain. The libtiff
-directory reader has a failsafe that will break out of this loop after
-reading 65535 directory entries, but it will continue processing,
-consuming time and resources to process what is essentially a bogus TIFF
-document.
-
-This change fixes the above behavior by breaking out of processing when
-a TIFF document has >= 65535 directories and terminating with an error.
----
- contrib/addtiffo/tif_overview.c | 14 +++++++++++++-
- tools/tiff2pdf.c                | 10 ++++++++++
- tools/tiffcrop.c                | 13 +++++++++++--
- 3 files changed, 34 insertions(+), 3 deletions(-)
-
-diff --git a/contrib/addtiffo/tif_overview.c b/contrib/addtiffo/tif_overview.c
-index c61ffbb..03b3573 100644
---- a/contrib/addtiffo/tif_overview.c
-+++ b/contrib/addtiffo/tif_overview.c
-@@ -65,6 +65,8 @@
- #  define MAX(a,b)      ((a>b) ? a : b)
- #endif
- 
-+#define TIFF_DIR_MAX  65534
-+
- void TIFFBuildOverviews( TIFF *, int, int *, int, const char *,
-                          int (*)(double,void*), void * );
- 
-@@ -91,6 +93,7 @@ uint32 TIFF_WriteOverview( TIFF *hTIFF, uint32 nXSize, uint32 nYSize,
- {
-     toff_t	nBaseDirOffset;
-     toff_t	nOffset;
-+    tdir_t	iNumDir;
- 
-     (void) bUseSubIFDs;
- 
-@@ -147,7 +150,16 @@ uint32 TIFF_WriteOverview( TIFF *hTIFF, uint32 nXSize, uint32 nYSize,
-         return 0;
- 
-     TIFFWriteDirectory( hTIFF );
--    TIFFSetDirectory( hTIFF, (tdir_t) (TIFFNumberOfDirectories(hTIFF)-1) );
-+    iNumDir = TIFFNumberOfDirectories(hTIFF);
-+    if( iNumDir > TIFF_DIR_MAX )
-+    {
-+        TIFFErrorExt( TIFFClientdata(hTIFF),
-+                      "TIFF_WriteOverview",
-+                      "File `%s' has too many directories.\n",
-+                      TIFFFileName(hTIFF) );
-+        exit(-1);
-+    }
-+    TIFFSetDirectory( hTIFF, (tdir_t) (iNumDir - 1) );
- 
-     nOffset = TIFFCurrentDirOffset( hTIFF );
- 
-diff --git a/tools/tiff2pdf.c b/tools/tiff2pdf.c
-index 984ef65..832a247 100644
---- a/tools/tiff2pdf.c
-+++ b/tools/tiff2pdf.c
-@@ -68,6 +68,8 @@ extern int getopt(int, char**, char*);
- 
- #define PS_UNIT_SIZE	72.0F
- 
-+#define TIFF_DIR_MAX    65534
-+
- /* This type is of PDF color spaces. */
- typedef enum {
- 	T2P_CS_BILEVEL = 0x01,	/* Bilevel, black and white */
-@@ -1051,6 +1053,14 @@ void t2p_read_tiff_init(T2P* t2p, TIFF* input){
- 	uint16* tiff_transferfunction[3];
- 
- 	directorycount=TIFFNumberOfDirectories(input);
-+	if(directorycount > TIFF_DIR_MAX) {
-+		TIFFError(
-+			TIFF2PDF_MODULE,
-+			"TIFF contains too many directories, %s",
-+			TIFFFileName(input));
-+		t2p->t2p_error = T2P_ERR_ERROR;
-+		return;
-+	}
- 	t2p->tiff_pages = (T2P_PAGE*) _TIFFmalloc(TIFFSafeMultiply(tmsize_t,directorycount,sizeof(T2P_PAGE)));
- 	if(t2p->tiff_pages==NULL){
- 		TIFFError(
-diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c
-index 91a38f6..e466dae 100644
---- a/tools/tiffcrop.c
-+++ b/tools/tiffcrop.c
-@@ -215,6 +215,8 @@ extern int getopt(int argc, char * const argv[], const char *optstring);
- #define DUMP_TEXT   1
- #define DUMP_RAW    2
- 
-+#define TIFF_DIR_MAX  65534
-+
- /* Offsets into buffer for margins and fixed width and length segments */
- struct offset {
-   uint32  tmargin;
-@@ -2232,7 +2234,7 @@ main(int argc, char* argv[])
-     pageNum = -1;
-   else
-     total_images = 0;
--  /* read multiple input files and write to output file(s) */
-+  /* Read multiple input files and write to output file(s) */
-   while (optind < argc - 1)
-     {
-     in = TIFFOpen (argv[optind], "r");
-@@ -2240,7 +2242,14 @@ main(int argc, char* argv[])
-       return (-3);
- 
-     /* If only one input file is specified, we can use directory count */
--    total_images = TIFFNumberOfDirectories(in); 
-+    total_images = TIFFNumberOfDirectories(in);
-+    if (total_images > TIFF_DIR_MAX)
-+      {
-+      TIFFError (TIFFFileName(in), "File contains too many directories");
-+      if (out != NULL)
-+        (void) TIFFClose(out);
-+      return (1);
-+      }
-     if (image_count == 0)
-       {
-       dirnum = 0;
---
-libgit2 0.26.0
-
diff --git a/media-libs/tiff/metadata.xml b/media-libs/tiff/metadata.xml
index 0c3044903a71..815534de05d9 100644
--- a/media-libs/tiff/metadata.xml
+++ b/media-libs/tiff/metadata.xml
@@ -5,9 +5,6 @@
 		<email>graphics@gentoo.org</email>
 		<name>Gentoo Graphics Project</name>
 	</maintainer>
-	<use>
-		<flag name="zstd">Enable zstd compression support.</flag>
-	</use>
 	<longdescription>
 		TIFF image library and tools, mostly for scanner and fax
 		support, but also used by GIS and other imaging tools.
diff --git a/media-libs/tiff/tiff-4.0.10.ebuild b/media-libs/tiff/tiff-4.0.10.ebuild
index 8373253c0284..fdaa94cd70aa 100644
--- a/media-libs/tiff/tiff-4.0.10.ebuild
+++ b/media-libs/tiff/tiff-4.0.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
 
 LICENSE="libtiff"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
 
 RDEPEND="
diff --git a/media-libs/tiff/tiff-4.0.9-r4.ebuild b/media-libs/tiff/tiff-4.0.9-r4.ebuild
deleted file mode 100644
index 97a274e6ff3e..000000000000
--- a/media-libs/tiff/tiff-4.0.9-r4.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools libtool multilib-minimal
-
-DESCRIPTION="Tag Image File Format (TIFF) library"
-HOMEPAGE="http://libtiff.maptools.org"
-SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
-	ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz"
-
-LICENSE="libtiff"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cxx jbig jpeg lzma static-libs test zlib"
-
-RDEPEND="
-	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="test? ( jpeg )" #483132
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.7-pdfium-0006-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch
-	"${FILESDIR}"/${PN}-4.0.7-pdfium-0008-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch
-	"${FILESDIR}"/${P}-CVE-2017-9935.patch #624696
-	"${FILESDIR}"/${P}-CVE-2017-9935-fix-incorrect-type.patch #624696
-	"${FILESDIR}"/${P}-CVE-2017-18013.patch #645982
-	"${FILESDIR}"/${P}-CVE-2018-5784.patch #645730
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/tiffconf.h
-)
-
-src_prepare() {
-	default
-
-	# tiffcp-thumbnail.sh fails as thumbnail binary doesn't get built anymore since tiff-4.0.7
-	sed '/tiffcp-thumbnail\.sh/d' -i test/Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--without-x
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable cxx)
-		$(use_enable jbig)
-		$(use_enable jpeg)
-		$(use_enable lzma)
-		$(use_enable static-libs static)
-		$(use_enable zlib)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	# remove useless subdirs
-	if ! multilib_is_native_abi ; then
-		sed -i \
-			-e 's/ tools//' \
-			-e 's/ contrib//' \
-			-e 's/ man//' \
-			-e 's/ html//' \
-			Makefile || die
-	fi
-}
-
-multilib_src_test() {
-	if ! multilib_is_native_abi ; then
-		emake -C tools
-	fi
-	emake check
-}
-
-multilib_src_install_all() {
-	find "${D}" -name '*.la' -delete || die
-	rm "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION} || die
-}
diff --git a/media-libs/urt/Manifest b/media-libs/urt/Manifest
index fa55cd617c3a..b9383ca66b10 100644
--- a/media-libs/urt/Manifest
+++ b/media-libs/urt/Manifest
@@ -10,5 +10,5 @@ AUX urt-3.1b-solaris.patch 281 BLAKE2B 55cc8b4824624c5b9f6db6ff6e62c841950c22298
 AUX urt-3.1b-tempfile.patch 597 BLAKE2B 9f032e0b4dab232d4540a5e7043ff73ace2e6fcdc69e0b2ba1ecedc7f2b62902e0dfadaa78a2e1cddf6f0c173767afe36ee20af0a586072472c77d8f7d81212a SHA512 83784725f216d387771698b0f29c6d5b2bd5e79e5f6deb091905bbb87839824314217641df760cfb18ce87c9d58196860a4c9d12f08da6020fc80a2e7d40347f
 DIST urt-3.1b.tar.Z 1016405 BLAKE2B 68742773591e2ae28702efb4286939c4000d32edd93110548abc25ab62bfa85e36354f20de6aa74c805ea1c4c8dfa23219c9e6fb08e1c73d90d2625404583aa1 SHA512 6c9070cd106f1d696d22f862cc1c4e10325fafc7bae51e8bb1fb98f6bf8babe21a133e21b3acc0c11cf1b28a23123c8ee7bb064c9d86301b14a1c217fbe1a12d
 EBUILD urt-3.1b-r1.ebuild 2048 BLAKE2B ebc3ba7771fc3d28fa320bb582a0633967b0f66ddd338894fa2b8cf47094e8b1b445bcb761bd0fff7620c280f45b821f9915a5dabbde8bd9636c542a0a0de3be SHA512 aac4efadbcc839df66b3538fb43c0dd0659bc8f8b3c362a358763a2a911c538993fb7ab7f05eeaf96e2d325df0b977a2271202cb9aa798dfee70924538e05e2a
-EBUILD urt-3.1b-r3.ebuild 2394 BLAKE2B 0af0c58376306fc5d977988b67948ed7db37ceb19623710ef31a4cabcda5e348c6f40e74dc27707fa39144b6b75e904d0e1b6313da9a0807ada9916821d0c27d SHA512 f5e46847535a3879790470e7d1eabf5095c1beea90e4c6e738a3de86f69f5544fb5138ffdf4fde1f4baaff184c843044f6d5acfb932136f010dd27832773c1e8
+EBUILD urt-3.1b-r3.ebuild 2385 BLAKE2B 15375dcaafd22fca0cb7549a8f24cda62fb36e25b533e26f00d849091b5bc04193752adb17b00ef484e90f521915151e55f8e41ac0e28573481d105597066769 SHA512 e60f36e959f2a7f0b101a0eeb35786397878b6931fbe36efd7ba8dd4f8163c633b3390fa7025b477a851f08a3b9871cb894f512b1351c5c10bf09f9eba78b940
 MISC metadata.xml 308 BLAKE2B 6006038e97bc7af97fd7e4c95f87d19d2458452da5ba066df88aff58fd10bf0f29daef641aaf39ec14a102f4e23a0b3be30006a6aed3830322e2f148a13dc5b7 SHA512 1056a163d7f6c3f2e540e6f1b315ea23aa4e9664c14ba51d094e33ab8ac4e3888fc9b049b91e3f2596e9458efe6041a7e2c5c40979171f7fd473fa6994862ffd
diff --git a/media-libs/urt/urt-3.1b-r3.ebuild b/media-libs/urt/urt-3.1b-r3.ebuild
index d17db2efb3d0..1ac168645eb8 100644
--- a/media-libs/urt/urt-3.1b-r3.ebuild
+++ b/media-libs/urt/urt-3.1b-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.iastate.edu/pub/utah-raster/${P}.tar.Z"
 
 LICENSE="URT gif? ( free-noncomm )"
 SLOT="0/3.1b-r2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="gif postscript static-libs tiff tools X"
 
 RDEPEND="
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index c6a84c535051..f9f9408b6c00 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -1,9 +1,7 @@
-AUX vigra-1.11.0-gcc-7.patch 550 BLAKE2B c3eda6330490a4fd83ae6c0cd19ca68a71437a2acf905447864dd853fee859bbddbeeb237fda084c89b65257a644033ccd0b3a0762ff03b1c79a4f084bf94702 SHA512 fcab28aea46fd2bcc9b227611d9b8881f1492a70042fab5b7209dd855c4bcb06575ac41489d9f78be1c70937e2f77c951f6c2a60d73d9f6a84c77581810ded1a
 AUX vigra-1.11.1-fix-incorrect-template-parameter-type.patch 7890 BLAKE2B 523eec06ad9a5ef07d852e6ec8633ed480a82224a16a3028ae7f35b31518f537af94a4fa0b90ff52dc8400649928526ad391b4731aeaa948622c186d72e0a2e9 SHA512 7ea26793457eabced61470c4b25b5409cbc961443639d6c126ea479727884baf1c8b3c9808e126ae11b43675de75c510c4272e8c51fd4df111c75e88d1b24b33
-DIST vigra-1.11.0-src.tar.gz 51854568 BLAKE2B 759390546989d52ffa5447b5434bd2d09b7ceba020ff72b953e9a671514ae2969be7a9f2918b21ab80d2952892219444315ad1df46e635e90a47edde957b6f11 SHA512 3cd8fcfc8ba9a1209a37e49c7b5cb0080bc665987805deec0b92cabf8c571c2f09ba47e2850c12204d04b3c830322fc8e47efa19fc537cf78708c22e1d302d6a
+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.0.ebuild 3492 BLAKE2B 304c3a1ec38d2239999edb9088144379b0cd08f166e2c6d73e60f1c962217daaa4d3fe5e98c3a3ea5918ab199a030537902823f31cc54d5803130a9e259396ca SHA512 d006b82c2d904308da82a4bdb90860f502a509be2fb5cc0a143c8f8a88ef69fa054b15af63e7a4228d86403bf3d19fe4757f25bb123f4013ba046c70d2b1e160
-EBUILD vigra-1.11.1-r1.ebuild 3722 BLAKE2B f2ef10f7184731055e395655a423f690d51d51ef2e08859d15bccb6b0f8776e8e2dd9a805a941a8c9d528ca58a61aaf678365b20469b1faf9189fa3401fd405f SHA512 55d35757fb0065acaf7302fceb1fd32421322012f04025824c771625151f62db7479a2f01a097cbd926a93504e15eeef474b63f82c19956431d69149ff8d22b7
-EBUILD vigra-1.11.1.ebuild 3534 BLAKE2B 373b00b7edf79ebe3e9e5ca82cabaf032c87c0e3e8a96714f4f8fe2ac19bd6c6d1b5101303f0f048e1300b8f6e87807f31e6538b1af0eec25efbad0c08e769d8 SHA512 043b293c2648690780fffd19d55029ffdcfe8d8d60f80224c7fab8527e1ad75b15d3def0a2fa3ab7f8d92a905456232662ec000d94e5ea9d56dae22df0c22378
-EBUILD vigra-9999.ebuild 3616 BLAKE2B 5a3cd490a56b4995307f7b1d24234a6a02b5aa62b1ed7b7dbb5837f3a0285d96b55d69757a25cc1ca84819000ef572928e33210484b6d7e48362e87d5088e0e3 SHA512 5f8eba44053dd7a0e4ab973c88386ebddce08591be1f2ff4c80be87a740d36bee0663ac1af4086e096ae914b7a215cdc9d072781b711b4b4e93fc7d5c5be113f
+EBUILD vigra-1.11.1-r2.ebuild 3611 BLAKE2B 2997fd1e460e64d287280da3f132e94a2364bba926bc60ed34affddb03dc614d99897cdd087f1811717fce40c9da02efee18642dbc031d2f935fa44fa8f67d08 SHA512 62746b7b073c7d0b58cb1a07f421f6e7ad17f412b1ff80dda523297d5fafce392cc06632678257807251bbe53bd6be517a0365f18d1ec0d1be0840e706b6b45d
+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/files/vigra-1.11.0-gcc-7.patch b/media-libs/vigra/files/vigra-1.11.0-gcc-7.patch
deleted file mode 100644
index 4aaba64ed5e9..000000000000
--- a/media-libs/vigra/files/vigra-1.11.0-gcc-7.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/include/vigra/imagecontainer.hxx b/include/vigra/imagecontainer.hxx
-index a6f0f80..636cc64 100644
---- a/include/vigra/imagecontainer.hxx
-+++ b/include/vigra/imagecontainer.hxx
-@@ -763,7 +763,7 @@ public:
-         /** swap contents of this array with the contents of other
-             (STL-Container interface)
-          */
--    void swap(const ImagePyramid<ImageType, Alloc> &other)
-+    void swap(ImagePyramid<ImageType, Alloc> &other)
-     {
-         images_.swap(other.images_);
-         std::swap(lowestLevel_, other.lowestLevel_);
diff --git a/media-libs/vigra/files/vigra-1.11.1-lib_suffix.patch b/media-libs/vigra/files/vigra-1.11.1-lib_suffix.patch
new file mode 100644
index 000000000000..2b4b90df348f
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.11.1-lib_suffix.patch
@@ -0,0 +1,29 @@
+LIBDIR_SUFFIX is only used in one location, while LIB_SUFFIX is set already.
+
+--- a/config/vigra-config.in	2017-05-19 17:01:08.000000000 +0200
++++ b/config/vigra-config.in	2019-04-08 22:33:18.938060195 +0200
+@@ -68,7 +68,7 @@
+ if op.impex_lib: # was: --impex_lib|--impex-lib|--libs
+     ldflags = []
+ 
+-    libDir = '@CMAKE_INSTALL_PREFIX@/lib@LIBDIR_SUFFIX@'
++    libDir = '@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@'
+     if libDir not in standardLibDirs:
+         ldflags.append('-L' + libDir)
+ 
+--- a/config/VigraSetDefaults.cmake	2017-05-19 17:01:08.000000000 +0200
++++ b/config/VigraSetDefaults.cmake	2019-04-08 22:33:09.361974643 +0200
+@@ -59,13 +59,6 @@
+     CACHE BOOL "Perform valgrind memory testing upon 'make ctest' ?"
+     FORCE)
+ 
+-IF(NOT DEFINED LIBDIR_SUFFIX)
+-    SET(LIBDIR_SUFFIX "")
+-ENDIF()
+-SET(LIBDIR_SUFFIX ${LIBDIR_SUFFIX}
+-    CACHE STRING "Define suffix of lib directory name (empty string or 32 or 64)."
+-    FORCE)
+-
+ IF(NOT DEFINED DEPENDENCY_SEARCH_PREFIX)
+     SET(DEPENDENCY_SEARCH_PREFIX "")
+ ENDIF()
diff --git a/media-libs/vigra/vigra-1.11.0.ebuild b/media-libs/vigra/vigra-1.11.0.ebuild
deleted file mode 100644
index 566354ca414b..000000000000
--- a/media-libs/vigra/vigra-1.11.0.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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/"
-SRC_URI="https://github.com/ukoethe/vigra/releases/download/Version-${MY_V}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-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 )"
-
-DOCS=( README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc-7.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/vigra/vigra-1.11.1-r1.ebuild b/media-libs/vigra/vigra-1.11.1-r2.ebuild
index c5e8c814dae8..d24961a71f19 100644
--- a/media-libs/vigra/vigra-1.11.1-r1.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 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"
@@ -17,84 +17,98 @@ if [[ ${PV} == *9999 ]] ; then
 	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"
+	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"
+IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind +zlib"
+
+REQUIRED_USE="
+	doc? ( hdf5 fftw )
+	python? ( hdf5 ${PYTHON_REQUIRED_USE} )
+	test? ( hdf5 python fftw )"
 
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		>=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}]
+		valgrind? ( dev-util/valgrind )
+	)
+"
 # runtime dependency on python:2.7 is required by the vigra-config script
-RDEPEND="
+DEPEND="
 	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?] )
+	hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] )
 	jpeg? ( virtual/jpeg:0 )
-	openexr? ( media-libs/openexr:= )
+	openexr? (
+		media-libs/openexr:=
+		media-libs/ilmbase:=
+	)
 	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}] )
+	python? (
+		dev-libs/boost:=[python?,${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
 	)
-	test? ( >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] )"
-
-REQUIRED_USE="
-	doc? ( hdf5 fftw )
-	python? ( hdf5 ${PYTHON_REQUIRED_USE} )
-	test? ( hdf5 python fftw )"
+	tiff? ( media-libs/tiff:0= )
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}"
 
 # Severely broken, also disabled in Fedora, bugs #390447, #653442
 RESTRICT="test"
 
-DOCS=( README.md )
-
 PATCHES=(
 	"${FILESDIR}/${P}-fix-incorrect-template-parameter-type.patch"
+	"${FILESDIR}/${P}-lib_suffix.patch"
 )
 
 pkg_setup() {
-	use python && python_setup
+	if use python || use doc; then
+		python_setup
+	fi
 }
 
 src_prepare() {
-	einfo "Removing shipped docs and VCS files"
-	rm -rf doc || die
-	rm .git* .travis.yml || die
+	vigra_disable() {
+		if ! use ${1}; then
+			sed -e "/^VIGRA_FIND_PACKAGE.*${2:-$1}/Is/^/#disabled by USE=${1}: /" \
+				-i CMakeLists.txt || die "failed to disable ${1}"
+		fi
+	}
 
 	cmake-utils_src_prepare
 
+	if [[ ${PV} != *9999 ]]; then
+		rm -r doc || die "failed to remove shipped docs"
+	fi
+
+	vigra_disable fftw fftw3
+	vigra_disable fftw fftw3f
+	vigra_disable jpeg
+	vigra_disable png
+	vigra_disable tiff
+	vigra_disable zlib
+
 	# 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
+			-DDOCINSTALL="share/doc/${PF}"
+			-DWITH_HDF5=$(usex hdf5)
+			-DWITH_OPENEXR=$(usex openexr)
+			-DWITH_VALGRIND=$(usex valgrind)
+			-DWITH_VIGRANUMPY=$(usex python)
 		)
 		cmake-utils_src_configure
 	}
diff --git a/media-libs/vigra/vigra-1.11.1.ebuild b/media-libs/vigra/vigra-1.11.1.ebuild
index 44a25f14450a..b2db9b985bc5 100644
--- a/media-libs/vigra/vigra-1.11.1.ebuild
+++ b/media-libs/vigra/vigra-1.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,11 +11,17 @@ inherit cmake-utils python-r1
 
 DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
 HOMEPAGE="https://ukoethe.github.io/vigra/"
-SRC_URI="https://github.com/ukoethe/vigra/releases/download/Version-${MY_V}/${MY_P}.tar.gz"
+
+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"
-KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 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
@@ -48,6 +54,10 @@ RESTRICT="test"
 
 DOCS=( README.md )
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-incorrect-template-parameter-type.patch"
+)
+
 pkg_setup() {
 	use python && python_setup
 }
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index 4073587b7131..6f78ecb71516 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 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"
@@ -22,74 +22,90 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind"
+IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind +zlib"
+
+REQUIRED_USE="
+	doc? ( hdf5 fftw )
+	python? ( hdf5 ${PYTHON_REQUIRED_USE} )
+	test? ( hdf5 python fftw )"
 
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		>=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}]
+		valgrind? ( dev-util/valgrind )
+	)
+"
 # runtime dependency on python:2.7 is required by the vigra-config script
-RDEPEND="
+DEPEND="
 	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?] )
+	hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] )
 	jpeg? ( virtual/jpeg:0 )
-	openexr? ( media-libs/openexr:= )
+	openexr? (
+		media-libs/openexr:=
+		media-libs/ilmbase:=
+	)
 	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}] )
+	python? (
+		dev-libs/boost:=[python?,${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
 	)
-	test? ( >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] )"
-
-REQUIRED_USE="
-	doc? ( hdf5 fftw )
-	python? ( hdf5 ${PYTHON_REQUIRED_USE} )
-	test? ( hdf5 python fftw )"
+	tiff? ( media-libs/tiff:0= )
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}"
 
 # Severely broken, also disabled in Fedora, bugs #390447, #653442
 RESTRICT="test"
 
-DOCS=( README.md )
+PATCHES=( "${FILESDIR}/${PN}-1.11.1-lib_suffix.patch" )
 
 pkg_setup() {
-	use python && python_setup
+	if use python || use doc; then
+		python_setup
+	fi
 }
 
 src_prepare() {
-	einfo "Removing shipped docs and VCS files"
-	rm -rf doc || die
+	vigra_disable() {
+		if ! use ${1}; then
+			sed -e "/^VIGRA_FIND_PACKAGE.*${2:-$1}/Is/^/#disabled by USE=${1}: /" \
+				-i CMakeLists.txt || die "failed to disable ${1}"
+		fi
+	}
 
 	cmake-utils_src_prepare
 
+	if [[ ${PV} != *9999 ]]; then
+		rm -r doc || die "failed to remove shipped docs"
+	fi
+
+	vigra_disable fftw fftw3
+	vigra_disable fftw fftw3f
+	vigra_disable jpeg
+	vigra_disable png
+	vigra_disable tiff
+	vigra_disable zlib
+
 	# 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
+			-DDOCINSTALL="share/doc/${PF}"
+			-DWITH_HDF5=$(usex hdf5)
+			-DWITH_OPENEXR=$(usex openexr)
+			-DWITH_VALGRIND=$(usex valgrind)
+			-DWITH_VIGRANUMPY=$(usex python)
 		)
 		cmake-utils_src_configure
 	}
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index e1dd05fe94be..4d359a3ded9f 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,9 +1,11 @@
 AUX vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch 1622 BLAKE2B 573fe7c005fa7ff2930b0809071346f6b1fc40a2b6334abefc05c5a1a40e81f370c2b3dd58b7e4ff130195df4b761f4c6cee6af083ac302506c0a677af6f2dd8 SHA512 e3e3963532c100dd08109e74f49d14d073b19647493ad674f6e671a34c9fabb197c85f7c1e8497f2201d004bb1a2f9d56bfda4f4c53377d5c2db56dc46159f4b
 DIST vulkan-layers-1.1.101.tar.gz 1036750 BLAKE2B 5c59ade7826f382cfb5e56e0aa1498686e1035e69b4d51f36ffdfc179b36323850d1004759941dfaa6ae8e6a25cc909d041e840a589d102f82086f339bfaa1c6 SHA512 d962483ab7149d436ac1bafb65d26ae965e147b7bd0dfd610b35cd54598ee84cb961c472d824a33964b117a14f224c984cf73764aef4de787de13b0a1ad29c4a
+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 1400 BLAKE2B 6dad1dc55f3d64f298f265e76c7c3c7dfa9e28c790bf466af5fb30b273cbe624baab4d417eebf1ac5f908eb1f8190219b85a4ebe809aae8339914a05e16c75df SHA512 b016fcfdafe1755e6195480690ebb3bdcbbd369ee455f41432c2f5ef99e2af2e4e52105dc8218db49e666b93ce3b9d734f0b238c183cd54f7816c5bd6ca04117
-EBUILD vulkan-layers-1.1.82.0-r1.ebuild 1513 BLAKE2B 9e9d3274b3eef9197b08fa6f0a1d07439abef1774194b63d6d0b0ab60da4a1f477d6c30239c91df87317f05a0d260a6220f0bed5b949a908314ae5a469eb94a9 SHA512 f890f1ece720ba37ff414b0f1a912c27ef68c1fe8e07bea10d06eb4f156e927b517a76b7b0918d12347e9064846eb9338706a7c088c1602a71489023ff07a9df
-EBUILD vulkan-layers-1.1.92.0-r1.ebuild 1395 BLAKE2B 4c2275f707fd5a4239661640dc9babd20c6b685f572c765faacb19ab498669961940d37bb97462498b563fc6baf9464d8a1d8c215dcf38dbea6b6538afda7279 SHA512 72c9e52f422973584d598dd9f5e808de7786e6102263d2f97789e32a0081a7585f9c196318df4c59399d98bb0429c3ae42d44ca38fef12c5f9b7b4e1d5245870
-EBUILD vulkan-layers-9999.ebuild 1396 BLAKE2B d1a6e4aefabee0ade2fc3ad569aef6a9cf92a7f179f5ecc29456a7e696edff288bb180f839f15b81dccaa8df7f3630f0a8ccde724e652401f3a0afad800c2533 SHA512 0bbec65fcb36640d461bbcd9bc09930dc1c16399265f66b54164de1251e16a2d794a71276d6559373eda465dd0d4edadf9f46133158b49162aea9efdd9442423
+EBUILD vulkan-layers-1.1.101.ebuild 1398 BLAKE2B 44aeaeb5d3e711834cdb20a94b0ac7f226eeae437b474701d103786a8de056bf78f7663531319d0ed3070a8fab732bc28a44e14dcf43494c6fc884d7e118f5fe SHA512 041345ec23edede74a498d63a8bc89b4616259b929239bb052f882b4ebb74adcec4955d16e637dc1a9d6c8d4c43128ad0f73136fb2ccdc457f0a214a12491f3c
+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
+EBUILD vulkan-layers-9999.ebuild 1405 BLAKE2B 9e964a27c5a56ed5aa73d081feb5a4943d69826e6499a8e2595a352172caab45eb9d1c933c0c4471e2b9bf8b6efa798559937e3b41acbf7cc539afe444c95820 SHA512 8bb329d435bdae6e431f98649817f1a1070784e8ddf5d58b5117f821b71e302f8e1c45ea8e65a8f62432af4ebecf3e66e82063a93954cf36633e3f4b8844b620
 MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2
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 9f68781e15a1..49a1f35e671e 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.1.101.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.1.101.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers.git"
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.106.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.106.ebuild
new file mode 100644
index 000000000000..d163f27cdc46
--- /dev/null
+++ b/media-libs/vulkan-layers/vulkan-layers-1.1.106.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6} )
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	EGIT_COMMIT="21638dfbe1f15091659a722a805c9020e87ddf49"
+	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
+
+inherit python-any-r1 cmake-multilib
+
+DESCRIPTION="Vulkan Validation Layers"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="X wayland"
+
+DEPEND="${PYTHON_DEPS}
+		>=dev-util/glslang-7.11.3114_pre20190415:=[${MULTILIB_USEDEP}]
+		>=dev-util/spirv-tools-2019.1-r1:=[${MULTILIB_USEDEP}]
+		>=dev-util/vulkan-headers-1.1.106
+		wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+		X? (
+		   x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		   x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+		   )"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=True
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DBUILD_TESTS=False
+		-DGLSLANG_INSTALL_DIR="/usr"
+		-DCMAKE_INSTALL_INCLUDEDIR="/usr/include/vulkan/"
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.82.0-r1.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.82.0-r1.ebuild
index c196972139d0..bc580d746434 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.1.82.0-r1.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.1.82.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers.git"
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.92.0-r1.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.92.0-r1.ebuild
index c37c62f8b84b..00a214d89007 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.1.92.0-r1.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.1.92.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers.git"
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index 1074eb79739b..5e0a2448e380 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers.git"
@@ -25,9 +25,9 @@ SLOT="0"
 IUSE="X wayland"
 
 DEPEND="${PYTHON_DEPS}
-		>=dev-util/glslang-7.10.2984:=[${MULTILIB_USEDEP}]
+		>=dev-util/glslang-7.11.3114_pre20190415:=[${MULTILIB_USEDEP}]
 		>=dev-util/spirv-tools-2019.1-r1:=[${MULTILIB_USEDEP}]
-		>=dev-util/vulkan-headers-1.1.92.0
+		>=dev-util/vulkan-headers-1.1.106
 		wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 		X? (
 		   x11-libs/libX11:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index b104fc524510..f370eb57daf6 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,8 +1,10 @@
 DIST vulkan-loader-1.1.101.tar.gz 1346567 BLAKE2B a116df430606e4d94a94c5b307319e4f0d366353f1949c27f5dc3bcbd9997bb97e7d7dc13f141c0423ab162706399a45693da5dc5ed7e6802cc65ec55c711724 SHA512 b26a9389a90cd833c7b18a50766ee0d54ad52aa252d33eb1760ebef38305559664974198a84b0ddbe92950fffc8d2a136c23acff40f73d3cbbd183bc75489a10
+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 1548 BLAKE2B 4906bc12df3bd783e0d3a7f4c4a4e9653eeb2d991b82070357811d8d0ca10dda987ab86ab3fce270907c6bf0904555e5ca4bba64739e83d396e49266f2c07e9e SHA512 4fa72cb0189599f140544c1970ec555a1b438f2032d38a31c9040903e216a8ec88e85b719c93a65a4a52205ec2195a3df39e0e86268bc31ba5a99b0271210be9
-EBUILD vulkan-loader-1.1.82.0.ebuild 1579 BLAKE2B 05f92e8a778677a99ae5779bb6081a210502e39040705b5223365d4b6757d4f72de9a79017173181039b2c7dd096fe827b782dfe2cc673b3491f987f06536941 SHA512 a2f86faefe1870778c5232c50451dedf5e4b959f4cf9c1983ffb0a42065fcbd74429a06c12832325ab318cfa3dabd235a5680c6d34d5cdf982e8642826e543ab
-EBUILD vulkan-loader-1.1.92.1.ebuild 1543 BLAKE2B c0d6c78fdf83fad0fe0bd75a873962f2d2121d5bbd8d29b8e8e219928935d26f48ba767e9c2cf236d97faab69c5e6bc39f3adad957c6978b3f809fcd540aaa1e SHA512 258c4fa187f4c86ec3ac8bb75458cfa1ef3f5497ef28db1ab4cffc3250dfb7995fd31b5144174653e372ed69cc490cff3203afa63aa3beed22f8f750e3585f1e
-EBUILD vulkan-loader-9999.ebuild 1544 BLAKE2B b1cbf1e197db3080f9c1d2a7c14cd7e68adadd19639148a0e4ba42b17aa9c57cf237a62b659554d5072f8c84d59dd58b15112726c1a521df10e0a6c0f6cb87b9 SHA512 af081aa47ef8fc799e5c558e89d8dfc2c8ca472ede7d167842776e06b8b50b5c325d496a35467c64b84b2785e200ddbb13781d440bf6e63410c893ff35e5f695
+EBUILD vulkan-loader-1.1.101.ebuild 1546 BLAKE2B 5b1a81dbf30c73b9948dc9026e954abf30b04d2b168620562e9100e438d5891776a3a206a9989b90e7079e15d98bf15702dd71a73d83a57b1b067ae8181135f0 SHA512 7c3fa181a91338bf74c1450b6fdf2311e82376ebc65283b93adebd29eab4965ddd542ab6e20bd4e87420361a5810f2bc2f54d3a41ab8903f66196390654b16d5
+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
+EBUILD vulkan-loader-9999.ebuild 1541 BLAKE2B d3138d9e1c88b86ed2bfeba73a081a73dbb181b26ec002e1a18da0b650e678c0aeafc6d7e5ab8aac425713176f53ea6157e6ffb81619269318267555e17a2619 SHA512 8947aa69d23701acb381698f5c8f837964c2e5176a8f5535120ed08f32295fda9b24a81e223e507b73de48bbaa89f28c6e0599e8c8a6e4b309d8e4a917e83585
 MISC metadata.xml 414 BLAKE2B 53100d7021d8350e960e2b087bba612ee99f6ce960b63964aa2ba50b1172f5b9fe13fb9addb069ae74cc03292b92fc88838b41eac1083c8779dcb8e0e480d1dc SHA512 6328c52f607ed4ea3ba31430f63df84e942ea3e6726b5107c8840e3869725bd7407b446d4f905765a0c6d6dd04fda643bd2b5e06681f6ac771bbb4fbc8d4c417
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 e3068ca2bfc0..df4927b62624 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.1.101.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.1.101.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Loader.git"
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.106.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.106.ebuild
new file mode 100644
index 000000000000..de351caa9a85
--- /dev/null
+++ b/media-libs/vulkan-loader/vulkan-loader-1.1.106.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6} )
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Loader.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	EGIT_COMMIT="1df2ebd329df1ece1a5ed485573ea58e5bc6ff97"
+	SRC_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Vulkan-Loader-${EGIT_COMMIT}"
+fi
+
+inherit python-any-r1 cmake-multilib
+
+DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="layers wayland X"
+
+PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
+DEPEND="${PYTHON_DEPS}
+	>=dev-util/vulkan-headers-1.1.106
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=True
+		-DBUILD_TESTS=False
+		-DBUILD_LOADER=True
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DVULKAN_HEADERS_INSTALL_DIR="/usr"
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_install() {
+	keepdir /etc/vulkan/icd.d
+
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	einfo "USE=demos has been dropped as per upstream packaging"
+	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
+}
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.82.0.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.82.0.ebuild
index 8fdb1e92bdf8..3ee666998a58 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.1.82.0.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.1.82.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Loader.git"
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.92.1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.92.1.ebuild
index cddf66da355a..d1dc5f29ec5f 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.1.92.1.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.1.92.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Loader.git"
diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index 83d678a93fe2..256d3e244f31 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Loader.git"
@@ -26,7 +26,7 @@ IUSE="layers wayland X"
 
 PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
 DEPEND="${PYTHON_DEPS}
-	>=dev-util/vulkan-headers-1.1.92.0
+	>=dev-util/vulkan-headers-1.1.106
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
 		x11-libs/libX11:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/zita-resampler/Manifest b/media-libs/zita-resampler/Manifest
new file mode 100644
index 000000000000..dac695688c08
--- /dev/null
+++ b/media-libs/zita-resampler/Manifest
@@ -0,0 +1,4 @@
+AUX zita-resampler-1.6.2-makefile.patch 3036 BLAKE2B 595ebbae53d4c0ec344d02f4602eec599e9d301a308384f3a4d3c99a9e64111f7b183ccee92c9f7e069a00275f3304712b9644409bbe23030961aeeadf9c8b52 SHA512 a7bb5621c761ab36502303053872782cf275e55b248f0387765c1251ab43c58577862c5fc2b321f6746fd7ec0a8e7c7766bcac290cb204f2e94947aa27cb1992
+DIST zita-resampler-1.6.2.tar.bz2 125539 BLAKE2B d2e04fb5e0efbde3432ce973df59a11d2a184146d124b662712a5de2d9c243f6564899f190f7a7b68a9e01bcaab05c92b91ebcbf942473134a12a85e4e08c603 SHA512 d547419dd222c8a399d8f196efa1ec88a3f781275b696ae2fe1bb6e2fc329285affb8aace85972c304ad256becc4a155534dd5ef4ce3c57cbc9dcca0122b670c
+EBUILD zita-resampler-1.6.2.ebuild 864 BLAKE2B f4e3d81cec30c0b8c93aa7e7d878e06e5b854aee3dcfde141ef648b220a734f576c6086badff147b5532c39942ffe7ab788fceb174a5f647c3284961970d40b8 SHA512 b6189ad721dec36e6d6dcb5254762d6ce0e6ef6c88bd833784487ceae3994504d6e182a529156af42a53f00c1bdb65216ac7cd8311c67b7b182a261dca83567e
+MISC metadata.xml 692 BLAKE2B fad59853ee366f99db8e9c0dfa932c564eb0d8194808b809182ce64f286d39de2a363eb86f192d124adbbc92b1e7801a9fa5be0752fad1725f147d468484f589 SHA512 be926699e99357b49f5fe90a78c60b0fd701229fd603dca5988b40611ae5bb0c271a6a346469e0ebaff62bdc718c400954491ccc2557e5799a4fba08c67207cf
diff --git a/media-libs/zita-resampler/files/zita-resampler-1.6.2-makefile.patch b/media-libs/zita-resampler/files/zita-resampler-1.6.2-makefile.patch
new file mode 100644
index 000000000000..29735e7729a0
--- /dev/null
+++ b/media-libs/zita-resampler/files/zita-resampler-1.6.2-makefile.patch
@@ -0,0 +1,90 @@
+diff -urN zita-resampler-1.6.2.orig/apps/Makefile zita-resampler-1.6.2/apps/Makefile
+--- zita-resampler-1.6.2.orig/apps/Makefile	2018-08-24 21:41:47.000000000 +0300
++++ zita-resampler-1.6.2/apps/Makefile	2019-04-13 18:49:50.005800712 +0300
+@@ -23,18 +23,17 @@
+ MANDIR ?= /usr/share/man/man1
+ 
+ VERSION = 1.6.0
+-CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\"
+-CXXFLAGS += -O2  -ffast-math -Wall
+-CXXFLAGS += -march=native
++CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\" -I ../source
++CXXFLAGS += -ffast-math -Wall
+ 
+ 
+-all:	zresample zretune zresample.1.gz zretune.1.gz
++all:	zresample zretune zresample.1 zretune.1
+ 
+ 
+ ZRESAMPLE_O = zresample.o audiofile.o dither.o
+ zresample:	LDLIBS += -lzita-resampler -lsndfile -lrt
+ zresample:	$(ZRESAMPLE_O)
+-	$(CXX) $(LDFLAGS) -o $@ $(ZRESAMPLE_O) $(LDLIBS)
++	$(CXX) -L ../source $(LDFLAGS) -o $@ $(ZRESAMPLE_O) $(LDLIBS)
+ $(ZRESAMPLE_O):
+ -include $(ZRESAMPLE_O:%.o=%.d)
+ 
+@@ -42,25 +41,18 @@
+ ZRETUNE_O = zretune.o audiofile.o dither.o
+ zretune:	LDLIBS += -lzita-resampler -lsndfile -lrt
+ zretune:	$(ZRETUNE_O)
+-	$(CXX) $(LDFLAGS) -o $@ $(ZRETUNE_O) $(LDLIBS)
++	$(CXX) -L ../source $(LDFLAGS) -o $@ $(ZRETUNE_O) $(LDLIBS)
+ $(ZRETUNE_O):
+ -include $(ZRETUNE_O:%.o=%.d)
+ 
+ 
+-zresample.1.gz:	zresample.1
+-	gzip -c zresample.1 > zresample.1.gz
+-
+-zretune.1.gz:	zretune.1
+-	gzip -c zretune.1 > zretune.1.gz
+-
+-
+ install:	all
+-	install -d $(BINDIR)
+-	install -d $(MANDIR)
++	install -d $(DESTDIR)$(BINDIR)
++	install -d $(DESTDIR)$(MANDIR)
+ 	install -m 755 zresample $(DESTDIR)$(BINDIR)
+ 	install -m 755 zretune $(DESTDIR)$(BINDIR)
+-	install -m 644 zresample.1.gz $(DESTDIR)$(MANDIR)
+-	install -m 644 zretune.1.gz $(DESTDIR)$(MANDIR)
++	install -m 644 zresample.1 $(DESTDIR)$(MANDIR)
++	install -m 644 zretune.1 $(DESTDIR)$(MANDIR)
+ 
+ uninstall: 
+ 	/bin/rm -f $(DESTDIR)$(BINDIR)/zresample
+diff -urN zita-resampler-1.6.2.orig/source/Makefile zita-resampler-1.6.2/source/Makefile
+--- zita-resampler-1.6.2.orig/source/Makefile	2018-08-24 21:41:47.000000000 +0300
++++ zita-resampler-1.6.2/source/Makefile	2019-04-13 18:49:25.936129640 +0300
+@@ -32,8 +32,7 @@
+ 
+ 
+ CPPFLAGS += -I. -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
+-CXXFLAGS += -Wall -fPIC -O2 -ffast-math
+-CXXFLAGS += -march=native
++CXXFLAGS += -Wall -fPIC -ffast-math
+ LDFLAGS += 
+ LDLIBS +=
+ 
+@@ -47,6 +46,9 @@
+ 	zita-resampler/vresampler.h zita-resampler/cresampler.h
+ 
+ 
++$(ZITA-RESAMPLER_SO): $(ZITA-RESAMPLER_MIN)
++	ln -sf $(ZITA-RESAMPLER_MIN) $(ZITA-RESAMPLER_SO)
++
+ $(ZITA-RESAMPLER_MIN): $(ZITA-RESAMPLER_O)
+ 	$(CXX) -shared $(LDFLAGS) -Wl,-soname,$(ZITA-RESAMPLER_MAJ) -o $(ZITA-RESAMPLER_MIN) $(ZITA-RESAMPLER_O) $(ZITA-RESAMPLER_DEP)
+ 
+@@ -58,8 +60,8 @@
+ 	install -d $(DESTDIR)$(LIBDIR)
+ 	install -m 644 $(ZITA-RESAMPLER_H)   $(DESTDIR)$(INCDIR)/zita-resampler
+ 	install -m 755 $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(LIBDIR)
+-	ldconfig
+ 	ln -sf $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(LIBDIR)/$(ZITA-RESAMPLER_SO)
++	ln -sf $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(LIBDIR)/$(ZITA-RESAMPLER_MAJ)
+ 
+ uninstall:
+ 	/bin/rm -rf $(DESTDIR)$(INCDIR)/zita-resampler
diff --git a/media-libs/zita-resampler/metadata.xml b/media-libs/zita-resampler/metadata.xml
new file mode 100644
index 000000000000..d939c6084b53
--- /dev/null
+++ b/media-libs/zita-resampler/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alexander@tsoy.me</email>
+		<name>Alexander Tsoy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		Libzita-resampler is a C++ library for resampling audio signals.
+		It is designed to be used within a real-time processing context,
+		to be fast, and to provide high-quality sample rate conversion.
+	</longdescription>
+	<use>
+		<flag name="tools">Install zresample and zretune tools</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-libs/zita-resampler/zita-resampler-1.6.2.ebuild b/media-libs/zita-resampler/zita-resampler-1.6.2.ebuild
new file mode 100644
index 000000000000..754fa1dfdde9
--- /dev/null
+++ b/media-libs/zita-resampler/zita-resampler-1.6.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="C++ library for real-time resampling of audio signals"
+HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/"
+SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0/1"
+KEYWORDS="~amd64"
+IUSE="tools"
+
+RDEPEND="tools? ( media-libs/libsndfile )"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+HTML_DOCS="docs/."
+
+PATCHES=( "${FILESDIR}"/${PN}-1.6.2-makefile.patch )
+
+src_compile() {
+	tc-export CXX
+
+	emake -C source
+	if use tools; then
+		emake -C apps
+	fi
+}
+
+src_install() {
+	emake -C source DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}"/usr/$(get_libdir) install
+	if use tools; then
+		emake -C apps DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	fi
+
+	einstalldocs
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
commit	b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree	e318514216845acb8f2e49fff7a5cba4027e9d91 /media-libs
parent	dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)