gentoo resync : 05.04.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-04-05 21:17:31 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-04-05 21:17:31 +0100
commit: dc7cbdfa65fd814b3b9aa3c56257da201109e807 (patch)
tree: c85d72f6f31f21f178069c9d41d41a7c1ff4b362 /media-libs
parent: 0706fc6986773f4e4d391deff4ad5143c464ea4e (diff)
151 files changed, 2584 insertions, 2109 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 5f5addf1fba3..d75bdd61f17c 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/aalib/Manifest b/media-libs/aalib/Manifest
index b6ca75574a86..58c1a15fb138 100644
--- a/media-libs/aalib/Manifest
+++ b/media-libs/aalib/Manifest
@@ -8,5 +8,5 @@ AUX aalib-1.4_rc5-tinfo.patch 709 BLAKE2B fb7dd0eb1e39046c66de0466b0411f97fa948d
 DIST aalib-1.4rc5.tar.gz 391028 BLAKE2B fd527716c0484d45fa3b75712a24301bd485fab8191ac1d5c6d35f8af093a00e11f0f8d2797ddcc32f4d87a39649fd50145dcc557e5ba98e67336cff2bb79002 SHA512 3e4506eccce3b81ccbbb79a4a1b90abd39e2259e6043fde90f70b9ca279bd4c37758a047167267b97c4ec92f64fb17c7c8f548114f0d0c6e78ddb9463b5f1299
 EBUILD aalib-1.4_rc5-r6.ebuild 1779 BLAKE2B e89ac319629bbe00158c7b9fee75e44681a050cc30e4beb6023274268e646ed8e0e27bc27ac982d70157807f71d8238d793c3c14fde689c6ea47674666e76fca SHA512 0217cdbdaacb10eef8148600c37623f63dd9682a9f652fe1c8da17676f4841fe501b5e3e8c9bf8f32463d66ef4d6520eec4787885756f5166eae1944667c2d78
 EBUILD aalib-1.4_rc5-r7.ebuild 1844 BLAKE2B c0da2a46a489a14d24268c78789fb2a381746533910ee313067dd577155711210ca2853e572e0cb9b9903dbf10fa8e6d6300cb2b199296e761f9f6bcb0dc39f0 SHA512 b8bb79cd21dd348258e0eb6fda05b75a009497d923801a742fc2dab142194e8bd1b60c3f640ae15063735721b6f0d387c4ec613f889e460ab982e1b5c3492477
-EBUILD aalib-1.4_rc5-r8.ebuild 1988 BLAKE2B 5cae6ea9906bc9860f2334ac558a2723f96da3e88f985067babfb6343eb9baeb245e9706537d2a1fbbb3b932579c98be6b43cbf0b785a0297f6b8e05f95dc237 SHA512 c70991712d711c03e8a4731846cd746aa000e0dbed97b2d3f66021bf5670e3068c6340c32e19ddf47abb5ef65e398f9daf0a49985dac80305334b6914f3d3f46
+EBUILD aalib-1.4_rc5-r8.ebuild 1977 BLAKE2B 1676543003d13ac5dbdb270d0271fca3e5c4032b164c93193ad967dabdc4e576ac789f45391fb335c31b7511973fe00ed6d1a0dde26916ee49bc3c0a07455383 SHA512 05a771d88cbf1592f9af5a28eea6772ef267e368b271499f79c0a0ceb71a53e3f5e5fcd1107ede719a9be354a91cb8a7f0141126afb601598d3d5793ca905d80
 MISC metadata.xml 415 BLAKE2B 3f7c9a9f7118b0fc7e4134f829c28bc47e637256ad0408e7964cdf617df77e4f5c7742d05850444debc0f6ed7aeac0e756bba5d746092cd9bda69797d5540f66 SHA512 f49d1e3652e86e14a048ad6944c108bec49ba19b961ea89b171d55e789e9c42bd4f981086dc643daf1c805fec79de3831488bdc9c29c2c1a6d6e4b00bb786def
diff --git a/media-libs/aalib/aalib-1.4_rc5-r8.ebuild b/media-libs/aalib/aalib-1.4_rc5-r8.ebuild
index 240f763610ca..df8114e5ef98 100644
--- a/media-libs/aalib/aalib-1.4_rc5-r8.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc5-r8.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
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/aa-project/${MY_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"
+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 slang gpm static-libs"
 
 RDEPEND="
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 7a15066a8761..59fcc4834a85 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -6,5 +6,5 @@ DIST alsa-lib-1.1.8.tar.bz2 1002562 BLAKE2B a531ab501943924d007f7ae0e4489deea805
 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 2063 BLAKE2B 7816a80aa6070f2a05b4e850690c8d0082cb99f01b1a014059721dc7fd77ea86b1894590da2b92f4cb5452ff8e435e431207a2f7301d5f242bd34ac6c12b4c99 SHA512 8e8a3c06e347b13607a2009d826093b6e26f3d22112947d0a5a9bdcd44455cdc4941ee59430a8ac5813ecddd51d5c7fc0bbd7b71d33f7f3a783a598444a057a4
+EBUILD alsa-lib-1.1.8.ebuild 2061 BLAKE2B 79c6985e08c31256dfeb731a5bafacb22bf6c586aaf803a43f0280c009116ae56529274d54c95e3f92a97076e819cefce27746210888a4204f273184a756f1c1 SHA512 7c8874e9919139b4b4858a1250c26e3388bd6ed318a9e28d6dcd32ea2dd39aa5ff75ffc27d6e8bcb31742309c2d570a840d4a873e0cd7f120ea79871499a22fe
 MISC metadata.xml 502 BLAKE2B 06ee247fafa9de0b13dc4723279d82367bf580e8ad5216b301e23e1abf2a4ea464febaf456c31a91d223bec81603c1b65c2de0fb5fe491d464cfae754ecc6ad5 SHA512 0ca6ff20c3eda2f898d20df9e8a572b9a8d0504bf3a79bc1ef14026ea8b72e13638cbd3ef63ce2bf19efea80729ca25c27ca131d965edad4a4d3d23ac1352085
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 6bd9afc32fa0..802ee5fac83b 100644
--- a/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild
@@ -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 083d150ba4bc..c90346a61819 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 1024 BLAKE2B 4136bffa76305319db85eb3f4ddf49d0325c73f4320092b8530db6a5c11ae704eeb0670ad93b3f67b34aae1cef2fb0b1e802bd2a05e90713c606d1f1a80313bd SHA512 43cc72662ff14efbd12f42398135b3fb9d3cab0eb41ee023ee4c11f78977162ba4d3158c5179d614f1a9ae3e7874759db06e81eb5342c29a160a83e7103ea10b
+EBUILD alsa-oss-1.1.8.ebuild 1022 BLAKE2B 3346a4630e96e1ff6a0c2ad8276234be2959f6bea5384ffd94ed762ac721af2d0c0e09447519dd2e0be49ce532a547b9d89f82e579345e4bc0b862dfff7eed57 SHA512 d59bae79adc619fba32c6bf49be9ec4762cc5974937898f1aabcd6930c1c167ed91cecca6603d30265313ad7d57356e43bb21449861fee2341fba6c084e92923
 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 1ade777604ce..aa46e9a34f2b 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/compface/Manifest b/media-libs/compface/Manifest
index 4b237eb0c07b..60f35ffa1312 100644
--- a/media-libs/compface/Manifest
+++ b/media-libs/compface/Manifest
@@ -1,4 +1,4 @@
 AUX compface-1.5.2-destdir.diff 408 BLAKE2B 83798a6d80b57f29b06edc1ce931d5fe52357344693fb890cbbc1de81a7fd87a399c585de370b396d5ca180c41b7ff049a1d007c0e575306462df1a428510de0 SHA512 d9137aab3623907ee48d72f61593480f5a952dcecf794e69404b15a3b0be0b5098abd9aaff8966f82f14f797fb243e00d2b4b4a7f7951f1aef233fe24bfa543a
 DIST compface-1.5.2.tar.gz 46970 BLAKE2B d26c25a35b3a2e63ddfb50feace61930fa3be9f4150ad8f8c96a3820ccebf1422fda5703628d58ad646f1d1eeaccc5f2f08ed5f2e74b845f5d7328f2829e63d6 SHA512 0da9ee4c5fb2b5c712466d9fa6170e5687b23c038e6304baa42d7ede6d9bd50a1b84da416eb853a420c01a6b9eccd5e7d92a4ebc26295714b85254c05c9e3360
 EBUILD compface-1.5.2.ebuild 657 BLAKE2B d00b4a0e2fdf75e2b96ddede89b987066bdd22c7e9fefd9b15611794dbc30578282f3c034d35a8b47eb44742a7a2e2b80c724bab21bcb53a79f583bbbb0bb07f SHA512 d7a4cc4cb5ff48ec2eb95b34fa2f3d2732a7c3d875850c993da19b62539130c626512e55ca1bcc89260f182ce8946d57c30f5005339eb2f67d60fb2da2dfe1dc
-MISC metadata.xml 330 BLAKE2B 06b08b7e536f8ee4fd85bcfe131d0c8fbc499decf4c89ce2fd2c30d4f8e495b4a1032f688adab92509cd29bca81fe41cff82300b5b2d26c3568e3e6a1ff71f22 SHA512 dac55a3de22ade19f5412e05d4caeaaa081771fddd3ae0ad50f54e314619b3bc74d49e726b802d2a8345f16308bf4e78548354543b3d21be8e8cafbde8dd2323
+MISC metadata.xml 221 BLAKE2B 6fb71e3c82061054a0c2d88c1ce8e591d5742628fe53032c9efd2c371ce1e8b0135b00ac91fa1905df39a507d5faa5871fb3a30d167dd46cec581682ba17c8ff SHA512 a11e9bbbabc9ac96985c5dc247e601b065fa762f12bce74224896c27aee34eb908187622bfc849c39c6c722a8ef8ee72b248afc84da1b0eb72f1ff5eeb13bbf0
diff --git a/media-libs/compface/metadata.xml b/media-libs/compface/metadata.xml
index e5212aad633b..21dc8fdf43ff 100644
--- a/media-libs/compface/metadata.xml
+++ b/media-libs/compface/metadata.xml
@@ -4,8 +4,4 @@
   <maintainer type="person">
     <email>hattya@gentoo.org</email>
   </maintainer>
-<maintainer type="project">
-    <email>net-mail@gentoo.org</email>
-    <name>Net-Mail</name>
-  </maintainer>
 </pkgmetadata>
diff --git a/media-libs/dav1d/Manifest b/media-libs/dav1d/Manifest
index 250686393f77..e088ea708b02 100644
--- a/media-libs/dav1d/Manifest
+++ b/media-libs/dav1d/Manifest
@@ -1,6 +1,8 @@
 DIST dav1d-0.1.0.tar.bz2 351745 BLAKE2B 302680ddfdc8d5a3eff90541ed156e820c3322bfb93316da1b2deabeac40062103af19e99dfa810678e62ad668c4aed944ac9bf8160afb301b100063919ed2a1 SHA512 5893ad40af7c4f5c3678ecc604ad360b5d1cd3fadaa16f7183d638745097fed091aeb3456540db61a2f4f0fc8bb93f2a20f428c76a7976d3fd186cc8b8baed53
 DIST dav1d-0.2.0.tar.bz2 408361 BLAKE2B 2c5f4d7777d85ab1453a744335ee5047b2e108a70e884c5116d8d1a56b81c1f852c93666bd0bb3f4d5105f2220bbc6c92f893848f0cf1bfc0bce1ee1f551287c SHA512 378060ed6762f9f6baf7addfa7382cb0873bbc606f0389eee4ed7537dcfc851f5b159a34af0f15d9f8d345a9b2a950f38078a419144b0458aa3464e54ea5d490
+DIST dav1d-0.2.1.tar.bz2 412003 BLAKE2B 51520f355f51f7fdc8c6e7981fd29f8d5339c2c72058ea05dff6bf0c3b191cf3c077fee1b46813f229d1bee16d1b884e834a5d61bf78459d83113aafe63bca89 SHA512 38d0a9e639579bf2046d3afd7ba0d4205081d8e26955be0216acc84ee2adcc81c790c858932009965b61a66fc3df66ed6b14da9d0e61e2505418c17bc4b75004
 EBUILD dav1d-0.1.0.ebuild 1128 BLAKE2B 20202e1f79289bf576003933bfae0e417974df92f810c2a6ed873e1143af297c2af37918fed3ead030206a4d96fe22722a943b11f2b66a8e1dce210256f7f2c1 SHA512 d25a735d98e03391640d290669a69fe225d28ec3a8a3a1137919d4cd47e97e11f03e1c30f0f2123153b4c0a34f6e8539da94b100a05c0c42e98247b1aabb2d38
-EBUILD dav1d-0.2.0.ebuild 1128 BLAKE2B 9c2e43bdd88b165cff20d6e233ea7424c0443b5e581e12c863d1754a40dff78acfd561ce8e69622f407e5e7a24a6188fd07c0b88a287f9a361be6872faf3ccf7 SHA512 547f249b39a8d679d41b74a37d81fb6765c016e38642004d65d405689bf1f4646d9401378dc549ec6e2d872072d373e16029c43c186cf90d1e83fed6fe688286
-EBUILD dav1d-9999.ebuild 1128 BLAKE2B 20202e1f79289bf576003933bfae0e417974df92f810c2a6ed873e1143af297c2af37918fed3ead030206a4d96fe22722a943b11f2b66a8e1dce210256f7f2c1 SHA512 d25a735d98e03391640d290669a69fe225d28ec3a8a3a1137919d4cd47e97e11f03e1c30f0f2123153b4c0a34f6e8539da94b100a05c0c42e98247b1aabb2d38
+EBUILD dav1d-0.2.0-r1.ebuild 1135 BLAKE2B 081253071832f93fd96b216169ea0a1f29a2608ec058eebb41c1eb47922ae64134c3c027005abb56549d7b8e66d0831defc07eb95d963c37de07e730384c42d6 SHA512 35a638950d61cb3a79391f959fc8da3240dbf191f6db0ec55b8d80f08287a8ec1eefc9a611196e70449a89b0ec87aca4f304cd4ed46d6911d72e9343ec612ed4
+EBUILD dav1d-0.2.1.ebuild 1135 BLAKE2B 081253071832f93fd96b216169ea0a1f29a2608ec058eebb41c1eb47922ae64134c3c027005abb56549d7b8e66d0831defc07eb95d963c37de07e730384c42d6 SHA512 35a638950d61cb3a79391f959fc8da3240dbf191f6db0ec55b8d80f08287a8ec1eefc9a611196e70449a89b0ec87aca4f304cd4ed46d6911d72e9343ec612ed4
+EBUILD dav1d-9999.ebuild 1135 BLAKE2B 081253071832f93fd96b216169ea0a1f29a2608ec058eebb41c1eb47922ae64134c3c027005abb56549d7b8e66d0831defc07eb95d963c37de07e730384c42d6 SHA512 35a638950d61cb3a79391f959fc8da3240dbf191f6db0ec55b8d80f08287a8ec1eefc9a611196e70449a89b0ec87aca4f304cd4ed46d6911d72e9343ec612ed4
 MISC metadata.xml 536 BLAKE2B 40ec2224aed078ad4748d3182defb6813cdd34a614d40db2fbbbeb8b63e24a59ba1cbe9d458fec17516c328a89f77927d9fbeb9a1e4a2b8c296b7de7235b1af4 SHA512 74e6595ce441bb313364f375a8afa9b2a0179f350e30d075ecf99e058874450e15f4005a0712e20a4feb047d57799dffacb3903af00a3c5a8d059f7025e49de6
diff --git a/media-libs/dav1d/dav1d-0.2.0.ebuild b/media-libs/dav1d/dav1d-0.2.0-r1.ebuild
index ddb669829bc1..361df4a791a4 100644
--- a/media-libs/dav1d/dav1d-0.2.0.ebuild
+++ b/media-libs/dav1d/dav1d-0.2.0-r1.ebuild
@@ -8,7 +8,7 @@ if [[ "${PV}" == "9999" ]]; then
 	SCM="git-r3"
 	EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
 else
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
 fi
 
@@ -18,7 +18,7 @@ DESCRIPTION="dav1d is an AV1 Decoder :)"
 HOMEPAGE="https://code.videolan.org/videolan/dav1d"
 
 LICENSE="BSD-2"
-SLOT="0"
+SLOT="0/1"
 IUSE="+8bit +10bit +asm"
 
 ASM_DEPEND=">=dev-lang/nasm-2.13"
diff --git a/media-libs/dav1d/dav1d-0.2.1.ebuild b/media-libs/dav1d/dav1d-0.2.1.ebuild
new file mode 100644
index 000000000000..361df4a791a4
--- /dev/null
+++ b/media-libs/dav1d/dav1d-0.2.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SCM=""
+if [[ "${PV}" == "9999" ]]; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
+fi
+
+inherit ${SCM} meson ninja-utils multilib-minimal
+
+DESCRIPTION="dav1d is an AV1 Decoder :)"
+HOMEPAGE="https://code.videolan.org/videolan/dav1d"
+
+LICENSE="BSD-2"
+SLOT="0/1"
+IUSE="+8bit +10bit +asm"
+
+ASM_DEPEND=">=dev-lang/nasm-2.13"
+RDEPEND=""
+DEPEND="${RDEPEND}
+	asm? (
+		abi_x86_32? ( ${ASM_DEPEND} )
+		abi_x86_64? ( ${ASM_DEPEND} )
+	)"
+
+DOCS=( README.md doc/PATENTS )
+
+multilib_src_configure() {
+	local -a bits=()
+	use 8bit  && bits+=( 8 )
+	use 10bit && bits+=( 16 )
+
+	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_x32 ]]; then
+		build_asm=false
+	else
+		build_asm=$(usex asm true false)
+	fi
+
+	local emesonargs=(
+		-D bitdepths=$(IFS=,; echo "${bits[*]}")
+		-D build_asm=$build_asm
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
diff --git a/media-libs/dav1d/dav1d-9999.ebuild b/media-libs/dav1d/dav1d-9999.ebuild
index 8b2a1f361334..361df4a791a4 100644
--- a/media-libs/dav1d/dav1d-9999.ebuild
+++ b/media-libs/dav1d/dav1d-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=6
@@ -8,7 +8,7 @@ if [[ "${PV}" == "9999" ]]; then
 	SCM="git-r3"
 	EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
 else
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
 fi
 
@@ -18,7 +18,7 @@ DESCRIPTION="dav1d is an AV1 Decoder :)"
 HOMEPAGE="https://code.videolan.org/videolan/dav1d"
 
 LICENSE="BSD-2"
-SLOT="0"
+SLOT="0/1"
 IUSE="+8bit +10bit +asm"
 
 ASM_DEPEND=">=dev-lang/nasm-2.13"
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index c3ff24a0bff3..b92e738eb73b 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,11 +1,7 @@
-DIST Image-ExifTool-11.03.tar.gz 4414017 BLAKE2B 3f5abe1b6c5c43d216aa7d1774516d924cc3c325f5341153abeb51a197b3d5e2232b13ca788251a5b202aafc8a098cb4818ea2fc75ccf6830e2aab5095af18b1 SHA512 00cefe64248915fbabf2f8f5dad9b6e577455ee67b08dea59aad4551b1b0f6c876558b75cea7a0aa33ab0e29fa7c224acd88058f09f211220bc3524f39d1c0ca
-DIST Image-ExifTool-11.10.tar.gz 4428194 BLAKE2B b1085b2b4b0054026369849aec38403a4722c61f5e703d7635c9a07d1480c651398777a6113f84fe2b59a4fd5dee5a8c0fd193afd59a5dcc8f7f5b7f9f904e5d SHA512 f8aa9a7c5ef2da0958a9f48b2238d89687b6fab9c8acd8a119fec50361e86ff09940127a6593d8a1618a7554d9adad985af6806bc44ccbf117c8854713678450
-DIST Image-ExifTool-11.23.tar.gz 4492460 BLAKE2B 64032e295f510020e340f0f230c27130230809f69aa1ea6190445b8adcd27717742a33b11d5066bfe077f1746f114c08884ccae03ccc26295ef45f0fc821890e SHA512 b2ba35c903b8108123b03faa15571bfd60ee565a894c6debfb238c6c5ed04a29366d52ec9e59d0d925f599f58ca623efec22db5b894491756901295bb2ea80f7
-DIST Image-ExifTool-11.26.tar.gz 4496603 BLAKE2B 2f6b64e99941e12ffdad48d6f8812d7a012b0ac988f3bfc94d8d262f32c423b5c2db16a9a30089bf9896be669681f6bebcf325183eadd617c3f5e806e48344fc SHA512 c924e32f3cf31e9590b61f229a426c67d2dc30d032af45d95a4f1fb6202fbc0016f988317dc839ab3c1b043d8843e89656b310dac30c2163607745429e155729
 DIST Image-ExifTool-11.29.tar.gz 4503877 BLAKE2B 9afbb695edebb1be2c673abbdf32626482c81c847610840e82ca0cb1fa83d697aeb2635ad4b62a692f09ae1effb8f2261aa3968adc35d72e82f1261db393b48a SHA512 fa9a7d28ef09dcbc52e43e1f5b938fa857d4d2b949b47b36ea259bf010637852b3aa7fe8d51bbf5ab22adc6fb67f7858f38a08c2be143f0b0139960347688a3f
-EBUILD exiftool-11.03.ebuild 532 BLAKE2B 0160ae82e2faeb67b3d64ba8003825f0ff37b354d7a9472479a942b910c002b3b8444d614cd1e2c158d6967baca3e7670b7678e02c56b62da3087b03452ca826 SHA512 9035beb7ddca4eddc51df4dd2e651a52cc2c15cacaf663614ffc0589d262dffc75d46f8d59ed385f40560c4f2aaa8246d7d5b6c418e90cc1bb031e53dfaf0d62
-EBUILD exiftool-11.10.ebuild 536 BLAKE2B 8af36442ae3d7feb84e9020313981ea6f4594afe77dc3a0450b553e47cff66dbaa4f2a01ee1395fe4757c774c6cda7d8b96dd2ae8bf5277aa858840160e39961 SHA512 94669122bdd68961ba08decc6a7911403a9f5bd857b95a6a7b8cef171db592ceabf53648c7c0beacb0cadf677d77784c96fbd6fb3549c7513d00b01a7f167ca7
-EBUILD exiftool-11.23.ebuild 603 BLAKE2B 4e9579af5da38b82ac5a7082c56cc2db3ea1428ec732bcb31ae21cb4f11dcacaf9122674e47b27490faf5d3e5937ea8c125248b0db8ee7ee0de2e0fdd7dfa03c SHA512 3657350157c2455e887da46f72ba92e5b052195794f8bf083230b0f45d4caba7bc1dd5ef0ab2f99a8e21774a3aefdce7276973b709606559b4ec2f4a63642d30
-EBUILD exiftool-11.26.ebuild 603 BLAKE2B 4e9579af5da38b82ac5a7082c56cc2db3ea1428ec732bcb31ae21cb4f11dcacaf9122674e47b27490faf5d3e5937ea8c125248b0db8ee7ee0de2e0fdd7dfa03c SHA512 3657350157c2455e887da46f72ba92e5b052195794f8bf083230b0f45d4caba7bc1dd5ef0ab2f99a8e21774a3aefdce7276973b709606559b4ec2f4a63642d30
-EBUILD exiftool-11.29.ebuild 603 BLAKE2B 4e9579af5da38b82ac5a7082c56cc2db3ea1428ec732bcb31ae21cb4f11dcacaf9122674e47b27490faf5d3e5937ea8c125248b0db8ee7ee0de2e0fdd7dfa03c SHA512 3657350157c2455e887da46f72ba92e5b052195794f8bf083230b0f45d4caba7bc1dd5ef0ab2f99a8e21774a3aefdce7276973b709606559b4ec2f4a63642d30
+DIST Image-ExifTool-11.32.tar.gz 4513430 BLAKE2B cae07a83ab5c46297ce0b4a12707450b9ded1a4e7edca08413e9671105a34d82ba7ee35eaf39ca64dfbd2b4607cd672b2399a325f8a3d3a76e18e348456fa550 SHA512 9dbb0d297292051171c28cf110976557f96df7079ea7ee38a722ed6ea9efbd758849ca77d9503c7d61964da5e48ab766c8cf58b3c5dfa96d499cbe6b5fb66668
+DIST Image-ExifTool-11.33.tar.gz 4526448 BLAKE2B a286809cdfc10c4015ddca95666ea7ac294c1b4c04c36cc2895918406e2cfed005b5b194a7f2a9c66e6d8f3551553e86ccfbc22339a14b2f9b906038b5fe8a6f SHA512 96a3a2421e3849ae6a2e49b7099415c11c2f65db1a49bebaf8b0c7f4de285aff0d412fb4ac12fa3d7fb59939199fdd49d86be0e55c72cd8b2056803a16fe5eb9
+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
 MISC metadata.xml 10159 BLAKE2B 3b879f3679b07864e8e32d0223d1512919d56ede4b51bc5a550a83694c8c956c6e6e60a92309ceafef61ed738ccd0b5a6817094b4132be013560d3d7830f6349 SHA512 88662e634877bf2b67144fd37a862626e247f7df5daa82ed8d7a91a00611290d3976687221b5f58b78111a8894d45d55c8999966436f621baebf1bc7b3561484
diff --git a/media-libs/exiftool/exiftool-11.03.ebuild b/media-libs/exiftool/exiftool-11.03.ebuild
deleted file mode 100644
index faee03d12dff..000000000000
--- a/media-libs/exiftool/exiftool-11.03.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_NAME=Image-ExifTool
-inherit perl-module
-
-DESCRIPTION="Read and write meta information in image, audio and video files"
-HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
-SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x64-macos"
-IUSE="doc"
-
-SRC_TEST="do"
-
-src_install() {
-	perl-module_src_install
-	use doc && dodoc -r html/
-}
diff --git a/media-libs/exiftool/exiftool-11.10.ebuild b/media-libs/exiftool/exiftool-11.10.ebuild
deleted file mode 100644
index ec856d3619aa..000000000000
--- a/media-libs/exiftool/exiftool-11.10.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_NAME=Image-ExifTool
-inherit perl-module
-
-DESCRIPTION="Read and write meta information in image, audio and video files"
-HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
-SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
-IUSE="doc"
-
-SRC_TEST="do"
-
-src_install() {
-	perl-module_src_install
-	use doc && dodoc -r html/
-}
diff --git a/media-libs/exiftool/exiftool-11.29.ebuild b/media-libs/exiftool/exiftool-11.29.ebuild
index 91d088b681d2..a6f0fea6739f 100644
--- a/media-libs/exiftool/exiftool-11.29.ebuild
+++ b/media-libs/exiftool/exiftool-11.29.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
 SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~x64-macos"
 IUSE="doc"
 
 SRC_TEST="do"
diff --git a/media-libs/exiftool/exiftool-11.26.ebuild b/media-libs/exiftool/exiftool-11.32.ebuild
index 91d088b681d2..f6bf1a90acd6 100644
--- a/media-libs/exiftool/exiftool-11.26.ebuild
+++ b/media-libs/exiftool/exiftool-11.32.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
diff --git a/media-libs/exiftool/exiftool-11.23.ebuild b/media-libs/exiftool/exiftool-11.33.ebuild
index 91d088b681d2..f6bf1a90acd6 100644
--- a/media-libs/exiftool/exiftool-11.23.ebuild
+++ b/media-libs/exiftool/exiftool-11.33.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
diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest
index 1e55496cdd71..2c000bda8b98 100644
--- a/media-libs/freeglut/Manifest
+++ b/media-libs/freeglut/Manifest
@@ -1,6 +1,8 @@
 AUX freeglut-2.4.0-bsd-usb-joystick.patch 755 BLAKE2B 858a7f7b4845e75963855cd7d6191cb57c96da017faf50a78addd75a994a53f5adca66c33e8aa2564623a469596e443a24caefb3288b2e77e768ee13e8b3d287 SHA512 7aa28f277864357e9b2bb6e7fcd801bb9dd6e131fec8989aca26990cf59b60c3465030ea5068ca01cb7f46bf406c0f3fce2327affb7f288ee3026b5717717561
+AUX freeglut-3.0.0-bsd-usb-joystick.patch 23398 BLAKE2B a55c99083262409976a3074bdafbaf42e19ea980f7d8e3641cb65cd6d502668f1f8ec653eb7d23852276a0634ba5841e7b989f32b8a50036b6b26a69d6630988 SHA512 fe527efb2be40a87c6767e65315795efd632627503f6e43b6ba50d81b7a7d59608f4bf4387001ef1443f47dfb739d972259eb406e6f32996dd710a78a10976cf
+AUX freeglut-3.0.0-drop-unnecessary-x11-libs.patch 1158 BLAKE2B 85f025a23d1fb0e4866ffdeafcd563e6d752d5d56a5f4d0648a376e8a6b9dbc54f80f5ab6d35d4a6bd71f469e9fd7225df2f93eecd49916bd86cbca580d369aa SHA512 414ace62ec3b6db139e4667648d0af8c4ad1beb6a91ea86218aa4ef6e27bab1eb1d3749ad08bc55a028ed1d9020840763f20fe4c5a317cdf374fc8494eb8c2bf
 DIST freeglut-2.8.1.tar.gz 1005343 BLAKE2B d830f6d19659ba6bbe60fc9c981ae16582de8d90e05d58bcaee43133b7699a5f0b2507a777c11c5fcdb730b17c394dd6fc562d5e857024d99d4feb2130ff7cde SHA512 935fddfa197c5f0ec74c5f2005fe5a0ebfd39f4a402cc79363da7cfe2e8576263130e44bd7e4f6c07ea53d3137bd7ca8ee8db85c0a09f25508fcf1b9ed07052e
 DIST freeglut-3.0.0.tar.gz 419095 BLAKE2B 6065044fb2816ddfebd363189cdb897e00fa433d79c09f5a705b80ff730e1312158ed5db8d7a2cbfc2ddac0d0a9400300c5c245d967c33c937da11303fc316de SHA512 9c45d5b203b26a7ff92331b3e080a48e806c92fbbe7c65d9262dd18c39cd6efdad8a795a80f499a2d23df84b4909dbd7c1bab20d7dd3555d3d88782ce9dd15b0
 EBUILD freeglut-2.8.1-r1.ebuild 1091 BLAKE2B 6f80874ea0d55177b70898e7886a9b4f016008a8672e8fabc82ec88e4d29ecfaf7a7d7e031cbc88760056881a87db2c90342a6b4f78d9a70d634fb4544b9f451 SHA512 87fb9a6d839b74c77a2e1fcd4c51bee57d34cf57f4f4d7eb551c478a7f1ae6a714470e18b9ff7d6cade2364953a48fe77278d75a7f3b81389db7b23676ebb40c
-EBUILD freeglut-3.0.0.ebuild 1218 BLAKE2B 9a8ca641d99a2cc91fc3a78400c2380d76aaa8ecf7c3405d3bc3c8a20a9fafbc29cc360638547bd25f8dff401b096ee8ce839685db4c6047d3eb5fa8b42bbd29 SHA512 bb14cd5cc3d8e120a2ada00d6afdb469acabf348a592a910edbdc44537a5132c3a3773a7f93a38eff95ca14de3b91c3051f3cc39df6419fde7d57fcbeda0cb68
+EBUILD freeglut-3.0.0.ebuild 1326 BLAKE2B 66b2e5ca4264de2b30f231c79eb45551c188dfe23e9f52a9aef68b6aad2d516e0495ceb213cb6df2c535abb6aafb32e21036908d04b834dad3ffa05f90a87dd5 SHA512 c0dd7fe97de5627d30e621990d16e56c79318eb62bd7ac48f4b2c06795fc3aa24fa8e78dbb9741583f2c7064fb09bcb1cee2d162f7e1828f32264dee8e9abd23
 MISC metadata.xml 528 BLAKE2B ee8c09e46677ec77c1d6771b31ac1b28e75464d7e0e4405c41831e19446c5a442c782dbd32a79d0fe5e7ed85ecbd2404764f2121f5f4bff5483db4571fd89212 SHA512 94dc412f8f049bb88723fdba9f9b89645eb792547a768ea524a711ad9302c5cac38a7292ab09726154fc6829a05f41af05220f91d9f6eaed056e4cff8324370e
diff --git a/media-libs/freeglut/files/freeglut-3.0.0-bsd-usb-joystick.patch b/media-libs/freeglut/files/freeglut-3.0.0-bsd-usb-joystick.patch
new file mode 100644
index 000000000000..505b3467ec46
--- /dev/null
+++ b/media-libs/freeglut/files/freeglut-3.0.0-bsd-usb-joystick.patch
@@ -0,0 +1,753 @@
+From 5908c36a4a3964cdc8db5c7bfdfd4381ec0996df Mon Sep 17 00:00:00 2001
+From: dcnieho <dcnieho@7f0cb862-5218-0410-a997-914c9d46530a>
+Date: Wed, 12 Jul 2017 20:44:35 +0000
+Subject: [PATCH] Fix build on NetBSD.
+
+(cherry picked from commit 06e1d815cf9abda49b845754ff420734446eb95b)
+
+(cherry picked from commit c4294ad59093c27159ea6028d33e3c9581df5354)
+
+git-svn-id: http://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1829 7f0cb862-5218-0410-a997-914c9d46530a
+---
+ src/fg_joystick.c         |  5 ++---
+ src/x11/fg_joystick_x11.c | 10 +++++-----
+ 2 files changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/src/fg_joystick.c b/src/fg_joystick.c
+index 6f6771c..b73d7e7 100644
+--- a/src/fg_joystick.c
++++ b/src/fg_joystick.c
+@@ -46,21 +46,20 @@
+ 
+ #    ifdef HAVE_USB_JS
+ #        if defined(__NetBSD__)
+-/* XXX The below hack is done until freeglut's autoconf is updated. */
+-#            define HAVE_USBHID_H 1
+ #            ifdef HAVE_USBHID_H
+ #                include <usbhid.h>
+ #            else
+ #                include <usb.h>
+ #            endif
++#            include <dev/usb/usb.h>
+ #        elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #            ifdef HAVE_USBHID_H
+ #                include <usbhid.h>
+ #            else
+ #                include <libusbhid.h>
+ #            endif
++#            include <legacy/dev/usb/usb.h>
+ #        endif
+-#        include <legacy/dev/usb/usb.h>
+ #        include <dev/usb/usbhid.h>
+ 
+ /* Compatibility with older usb.h revisions */
+diff --git a/src/x11/fg_joystick_x11.c b/src/x11/fg_joystick_x11.c
+index a37388b..04bc373 100644
+--- a/src/x11/fg_joystick_x11.c
++++ b/src/x11/fg_joystick_x11.c
+@@ -50,7 +50,7 @@ void fgPlatformJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
+ {
+     int status;
+ 
+-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+     int len;
+ 
+     if ( joy->pJoystick.os->is_analog )
+@@ -215,7 +215,7 @@ void fgPlatformJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
+ 
+ void fgPlatformJoystickOpen( SFG_Joystick* joy )
+ {
+-#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
++#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__)
+ 	int i = 0;
+        char *cp;
+ #endif
+@@ -229,7 +229,7 @@ void fgPlatformJoystickOpen( SFG_Joystick* joy )
+ #  endif
+ #endif
+ 
+-#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
++#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__)
+     for( i = 0; i < _JS_MAX_AXES; i++ )
+         joy->pJoystick.os->cache_axes[ i ] = 0.0f;
+ 
+@@ -409,7 +409,7 @@ void fgPlatformJoystickOpen( SFG_Joystick* joy )
+ 
+ void fgPlatformJoystickInit( SFG_Joystick *fgJoystick[], int ident )
+ {
+-#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
++#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__)
+     fgJoystick[ ident ]->id = ident;
+     fgJoystick[ ident ]->error = GL_FALSE;
+ 
+@@ -436,7 +436,7 @@ void fgPlatformJoystickInit( SFG_Joystick *fgJoystick[], int ident )
+ 
+ void fgPlatformJoystickClose ( int ident )
+ {
+-#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
++#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__)
+     if( fgJoystick[ident]->pJoystick.os )
+     {
+         if( ! fgJoystick[ ident ]->error )
+-- 
+2.19.2
+
+From c0f0f1e0903a5dd848825db0fe1f01d5db37c4e1 Mon Sep 17 00:00:00 2001
+From: dcnieho <dcnieho@7f0cb862-5218-0410-a997-914c9d46530a>
+Date: Wed, 12 Jul 2017 20:44:47 +0000
+Subject: [PATCH] some whitespace cleanup
+
+(cherry picked from commit 2dd5aa4aa1b5c19392f9abd00e0f6893907df205)
+
+git-svn-id: http://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1830 7f0cb862-5218-0410-a997-914c9d46530a
+---
+ src/fg_init.c                 |  32 ++--
+ src/fg_joystick.c             |   8 +-
+ src/fg_main.c                 |  14 +-
+ src/freeglutdll.def.in        | 312 +++++++++++++++++-----------------
+ src/mswin/fg_joystick_mswin.c |   2 +-
+ src/mswin/fg_main_mswin.c     | 160 ++++++++---------
+ 6 files changed, 264 insertions(+), 264 deletions(-)
+
+diff --git a/src/fg_joystick.c b/src/fg_joystick.c
+index b73d7e7..2f4f6ed 100644
+--- a/src/fg_joystick.c
++++ b/src/fg_joystick.c
+@@ -581,7 +581,7 @@ void fgPlatformJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
+ 
+ void fgPlatformJoystickOpen( SFG_Joystick* joy )
+ {
+-	int i = 0;
++    int i = 0;
+     OSStatus err;
+ 
+     /* XXX FIXME: get joystick name in Mac */
+@@ -856,7 +856,7 @@ static void fghJoystickOpen( SFG_Joystick* joy )
+     joy->num_axes = joy->num_buttons = 0;
+     joy->name[ 0 ] = '\0';
+ 
+-	fgPlatformJoystickOpen ( joy );
++    fgPlatformJoystickOpen ( joy );
+ 
+ }
+ 
+@@ -878,7 +878,7 @@ static void fghJoystickInit( int ident )
+     fgJoystick[ ident ]->num_axes = fgJoystick[ ident ]->num_buttons = 0;
+     fgJoystick[ ident ]->error = GL_TRUE;
+ 
+-	fgPlatformJoystickInit( fgJoystick, ident );
++    fgPlatformJoystickInit( fgJoystick, ident );
+ 
+     fghJoystickOpen( fgJoystick[ ident  ] );
+ }
+@@ -906,7 +906,7 @@ void fgJoystickClose( void )
+     {
+         if( fgJoystick[ ident ] )
+         {
+-			fgPlatformJoystickClose ( ident );
++            fgPlatformJoystickClose ( ident );
+ 
+             free( fgJoystick[ ident ] );
+             fgJoystick[ ident ] = NULL;
+-- 
+2.19.2
+
+From 6096caf2468ad4557968b9156ea9fcab2efb3fd1 Mon Sep 17 00:00:00 2001
+From: dcnieho <dcnieho@7f0cb862-5218-0410-a997-914c9d46530a>
+Date: Wed, 12 Jul 2017 20:45:07 +0000
+Subject: [PATCH] moved static variables and functions that should not have
+ stuck behind in fg_joystick.c, but should have been in fg_joystick_x11.c
+
+(cherry picked from commit 0d98472817921dc95d070f13bba59b72d792a7b2)
+
+git-svn-id: http://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1832 7f0cb862-5218-0410-a997-914c9d46530a
+---
+ src/fg_joystick.c         | 173 ----------------------------------
+ src/x11/fg_joystick_x11.c | 190 +++++++++++++++++++++++++++++++++++++-
+ 2 files changed, 185 insertions(+), 178 deletions(-)
+
+diff --git a/src/fg_joystick.c b/src/fg_joystick.c
+index 2f4f6ed..e548c04 100644
+--- a/src/fg_joystick.c
++++ b/src/fg_joystick.c
+@@ -68,8 +68,6 @@
+ #        endif
+ #    endif
+ 
+-static int hatmap_x[9] = { 0, 0, 1, 1, 1, 0, -1, -1, -1 };
+-static int hatmap_y[9] = { 0, 1, 1, 0, -1, -1, -1, 0, 1 };
+ struct os_specific_s {
+   char             fname [128 ];
+   int              fd;
+@@ -98,178 +96,7 @@ struct os_specific_s {
+ #    define UHIDDEV "/dev/uhid"
+ #    define AJSDEV "/dev/joy"
+ 
+-#    ifdef HAVE_USB_JS
+-/*
+- * fghJoystickFindUSBdev (and its helper, fghJoystickWalkUSBdev) try to locate
+- * the full name of a USB device. If /dev/usbN isn't readable, we punt and
+- * return the uhidN device name. We warn the user of this situation once.
+- */
+-static char *fghJoystickWalkUSBdev(int f, char *dev, char *out, int outlen)
+-{
+-  struct usb_device_info di;
+-  int i, a;
+-  char *cp;
+-
+-  for (a = 1; a < USB_MAX_DEVICES; a++) {
+-    di.udi_addr = a;
+-    if (ioctl(f, USB_DEVICEINFO, &di) != 0)
+-      return NULL;
+-    for (i = 0; i < USB_MAX_DEVNAMES; i++)
+-      if (di.udi_devnames[i][0] &&
+-          strcmp(di.udi_devnames[i], dev) == 0) {
+-        cp =  calloc( 1, strlen(di.udi_vendor) + strlen(di.udi_product) + 2);
+-        strcpy(cp, di.udi_vendor);
+-        strcat(cp, " ");
+-        strcat(cp, di.udi_product);
+-        strncpy(out, cp, outlen - 1);
+-        out[outlen - 1] = 0;
+-        free( cp );
+-        return out;
+-      }
+-  }
+-  return NULL;
+-}
+-
+-static int fghJoystickFindUSBdev(char *name, char *out, int outlen)
+-{
+-  int i, f;
+-  char buf[50];
+-  char *cp;
+-  static int protection_warned = 0;
+-
+-  for (i = 0; i < 16; i++) {
+-    snprintf(buf, sizeof(buf), "%s%d", USBDEV, i);
+-    f = open(buf, O_RDONLY);
+-    if (f >= 0) {
+-      cp = fghJoystickWalkUSBdev(f, name, out, outlen);
+-      close(f);
+-      if (cp)
+-        return 1;
+-    }
+-    else if (errno == EACCES) {
+-      if (!protection_warned) {
+-        fgWarning ( "Can't open %s for read!", buf );
+-        protection_warned = 1;
+-      }
+-    }
+-  }
+-  return 0;
+-}
+ 
+-static int fghJoystickInitializeHID(struct os_specific_s *os,
+-       int *num_axes, int *num_buttons)
+-{
+-    int size, is_joystick;
+-#   ifdef HAVE_USBHID_H
+-        int report_id = 0;
+-#   endif
+-    struct hid_data *d;
+-    struct hid_item h;
+-    report_desc_t rd;
+-
+-    if ( ( rd = hid_get_report_desc( os->fd ) ) == 0 )
+-    {
+-        fgWarning ( "error: %s: %s", os->fname, strerror( errno ) );
+-        return FALSE;
+-    }
+-
+-    os->hids = NULL;
+-
+-#   ifdef HAVE_USBHID_H
+-        if( ioctl( os->fd, USB_GET_REPORT_ID, &report_id ) < 0)
+-        {
+-            /*** XXX {report_id} may not be the right variable? ***/
+-            fgWarning ( "error: %s%d: %s", UHIDDEV, report_id, strerror( errno ) );
+-            return FALSE;
+-        }
+-
+-        size = hid_report_size( rd, hid_input, report_id );
+-#   else
+-        size = hid_report_size( rd, 0, hid_input );
+-#   endif
+-    os->hid_data_buf = calloc( 1, size );
+-    os->hid_dlen = size;
+-
+-    is_joystick = 0;
+-#   ifdef HAVE_USBHID_H
+-        d = hid_start_parse( rd, 1 << hid_input, report_id );
+-#   else
+-        d = hid_start_parse( rd, 1 << hid_input );
+-#   endif
+-        while( hid_get_item( d, &h ) )
+-        {
+-            int usage, page, interesting_hid;
+-
+-            page = HID_PAGE( h.usage );
+-            usage = HID_USAGE( h.usage );
+-
+-            /* This test is somewhat too simplistic, but this is how MicroSoft
+-             * does, so I guess it works for all joysticks/game pads. */
+-            is_joystick = is_joystick ||
+-                ( h.kind == hid_collection &&
+-                  page == HUP_GENERIC_DESKTOP &&
+-                  ( usage == HUG_JOYSTICK || usage == HUG_GAME_PAD ) );
+-
+-            if( h.kind != hid_input )
+-                continue;
+-
+-            if( !is_joystick )
+-                continue;
+-
+-            interesting_hid = TRUE;
+-            if( page == HUP_GENERIC_DESKTOP )
+-            {
+-                switch( usage )
+-                {
+-                case HUG_X:
+-                case HUG_RX:
+-                case HUG_Y:
+-                case HUG_RY:
+-                case HUG_Z:
+-                case HUG_RZ:
+-                case HUG_SLIDER:
+-                    if( *num_axes < _JS_MAX_AXES )
+-                    {
+-                        os->axes_usage[ *num_axes ] = usage;
+-                        ( *num_axes )++;
+-                    }
+-                    break;
+-                case HUG_HAT_SWITCH:
+-                    /* Allocate two axes for a hat */
+-                    if( *num_axes + 1 < _JS_MAX_AXES )
+-                    {
+-                        os->axes_usage[ *num_axes ] = usage;
+-                        (*num_axes)++;
+-                        os->axes_usage[ *num_axes ] = usage;
+-                        (*num_axes)++;
+-                    }
+-                    break;
+-                default:
+-                    interesting_hid = FALSE;
+-                    break;
+-                }
+-            }
+-            else if( page == HUP_BUTTON )
+-            {
+-                interesting_hid = ( usage > 0 ) &&
+-                    ( usage <= _JS_MAX_BUTTONS );
+-
+-                if( interesting_hid && usage - 1 > *num_buttons )
+-                    *num_buttons = usage - 1;
+-            }
+-
+-            if( interesting_hid )
+-            {
+-                h.next = os->hids;
+-                os->hids = calloc( 1, sizeof ( struct hid_item ) );
+-                *os->hids = h;
+-            }
+-        }
+-        hid_end_parse( d );
+-
+-        return os->hids != NULL;
+-}
+-#    endif
+ #endif
+ 
+ /*
+diff --git a/src/x11/fg_joystick_x11.c b/src/x11/fg_joystick_x11.c
+index 04bc373..30ad4b5 100644
+--- a/src/x11/fg_joystick_x11.c
++++ b/src/x11/fg_joystick_x11.c
+@@ -42,8 +42,188 @@
+ #include <fcntl.h>
+ 
+ 
++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++
++static int hatmap_x[9] = {0, 0, 1, 1, 1, 0, -1, -1, -1};
++static int hatmap_y[9] = {0, 1, 1, 0, -1, -1, -1, 0, 1};
++
++#    ifdef HAVE_USB_JS
++/*
++* fghJoystickFindUSBdev (and its helper, fghJoystickWalkUSBdev) try to locate
++* the full name of a USB device. If /dev/usbN isn't readable, we punt and
++* return the uhidN device name. We warn the user of this situation once.
++*/
++static char *fghJoystickWalkUSBdev(int f, char *dev, char *out, int outlen)
++{
++    struct usb_device_info di;
++    int i, a;
++    char *cp;
++
++    for (a = 1; a < USB_MAX_DEVICES; a++) {
++        di.udi_addr = a;
++        if (ioctl(f, USB_DEVICEINFO, &di) != 0)
++            return NULL;
++        for (i = 0; i < USB_MAX_DEVNAMES; i++)
++            if (di.udi_devnames[i][0] &&
++                strcmp(di.udi_devnames[i], dev) == 0) {
++                cp = calloc(1, strlen(di.udi_vendor) + strlen(di.udi_product) + 2);
++                strcpy(cp, di.udi_vendor);
++                strcat(cp, " ");
++                strcat(cp, di.udi_product);
++                strncpy(out, cp, outlen - 1);
++                out[outlen - 1] = 0;
++                free(cp);
++                return out;
++            }
++    }
++    return NULL;
++}
++
++static int fghJoystickFindUSBdev(char *name, char *out, int outlen)
++{
++    int i, f;
++    char buf[50];
++    char *cp;
++    static int protection_warned = 0;
++
++    for (i = 0; i < 16; i++) {
++        snprintf(buf, sizeof(buf), "%s%d", USBDEV, i);
++        f = open(buf, O_RDONLY);
++        if (f >= 0) {
++            cp = fghJoystickWalkUSBdev(f, name, out, outlen);
++            close(f);
++            if (cp)
++                return 1;
++        }
++        else if (errno == EACCES) {
++            if (!protection_warned) {
++                fgWarning("Can't open %s for read!", buf);
++                protection_warned = 1;
++            }
++        }
++    }
++    return 0;
++}
++
++static int fghJoystickInitializeHID(struct os_specific_s *os,
++                                    int *num_axes, int *num_buttons)
++{
++    int size, is_joystick;
++#   ifdef HAVE_USBHID_H
++    int report_id = 0;
++#   endif
++    struct hid_data *d;
++    struct hid_item h;
++    report_desc_t rd;
++
++    if ((rd = hid_get_report_desc(os->fd)) == 0)
++    {
++        fgWarning("error: %s: %s", os->fname, strerror(errno));
++        return FALSE;
++    }
++
++    os->hids = NULL;
++
++#   ifdef HAVE_USBHID_H
++    if (ioctl(os->fd, USB_GET_REPORT_ID, &report_id) < 0)
++    {
++        /*** XXX {report_id} may not be the right variable? ***/
++        fgWarning("error: %s%d: %s", UHIDDEV, report_id, strerror(errno));
++        return FALSE;
++    }
++
++    size = hid_report_size(rd, hid_input, report_id);
++#   else
++    size = hid_report_size(rd, 0, hid_input);
++#   endif
++    os->hid_data_buf = calloc(1, size);
++    os->hid_dlen = size;
++
++    is_joystick = 0;
++#   ifdef HAVE_USBHID_H
++    d = hid_start_parse(rd, 1 << hid_input, report_id);
++#   else
++    d = hid_start_parse(rd, 1 << hid_input);
++#   endif
++    while (hid_get_item(d, &h))
++    {
++        int usage, page, interesting_hid;
++
++        page = HID_PAGE(h.usage);
++        usage = HID_USAGE(h.usage);
++
++        /* This test is somewhat too simplistic, but this is how MicroSoft
++        * does, so I guess it works for all joysticks/game pads. */
++        is_joystick = is_joystick ||
++            (h.kind == hid_collection &&
++             page == HUP_GENERIC_DESKTOP &&
++             (usage == HUG_JOYSTICK || usage == HUG_GAME_PAD));
++
++        if (h.kind != hid_input)
++            continue;
++
++        if (!is_joystick)
++            continue;
++
++        interesting_hid = TRUE;
++        if (page == HUP_GENERIC_DESKTOP)
++        {
++            switch (usage)
++            {
++                case HUG_X:
++                case HUG_RX:
++                case HUG_Y:
++                case HUG_RY:
++                case HUG_Z:
++                case HUG_RZ:
++                case HUG_SLIDER:
++                    if (*num_axes < _JS_MAX_AXES)
++                    {
++                        os->axes_usage[*num_axes] = usage;
++                        (*num_axes)++;
++                    }
++                    break;
++                case HUG_HAT_SWITCH:
++                    /* Allocate two axes for a hat */
++                    if (*num_axes + 1 < _JS_MAX_AXES)
++                    {
++                        os->axes_usage[*num_axes] = usage;
++                        (*num_axes)++;
++                        os->axes_usage[*num_axes] = usage;
++                        (*num_axes)++;
++                    }
++                    break;
++                default:
++                    interesting_hid = FALSE;
++                    break;
++            }
++        }
++        else if (page == HUP_BUTTON)
++        {
++            interesting_hid = (usage > 0) &&
++                (usage <= _JS_MAX_BUTTONS);
++
++            if (interesting_hid && usage - 1 > *num_buttons)
++                *num_buttons = usage - 1;
++        }
++
++        if (interesting_hid)
++        {
++            h.next = os->hids;
++            os->hids = calloc(1, sizeof(struct hid_item));
++            *os->hids = h;
++        }
++    }
++    hid_end_parse(d);
++
++    return os->hids != NULL;
++}
++#    endif
++#endif
++
++
+ /*this should be defined in a header file */
+-#define MAX_NUM_JOYSTICKS  2   
++#define MAX_NUM_JOYSTICKS  2
+ extern SFG_Joystick *fgJoystick [ MAX_NUM_JOYSTICKS ];
+ 
+ void fgPlatformJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
+@@ -216,15 +396,15 @@ void fgPlatformJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
+ void fgPlatformJoystickOpen( SFG_Joystick* joy )
+ {
+ #if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__)
+-	int i = 0;
++    int i = 0;
+        char *cp;
+ #endif
+ #ifdef JS_NEW
+        unsigned char u;
+-	int i=0;
++    int i=0;
+ #else
+ #  if defined( __linux__ ) || TARGET_HOST_SOLARIS
+-	int i = 0;
++    int i = 0;
+     int counter = 0;
+ #  endif
+ #endif
+@@ -448,7 +628,7 @@ void fgPlatformJoystickClose ( int ident )
+             free( fgJoystick[ ident ]->pJoystick.os->hid_data_buf );
+ #endif
+         free( fgJoystick[ident]->pJoystick.os );
+-	}
++    }
+ #endif
+ 
+     if( ! fgJoystick[ident]->error )
+-- 
+2.19.2
+
+From f310b56bb6f93e255cf880c8970c794e0f2efc8d Mon Sep 17 00:00:00 2001
+From: dcnieho <dcnieho@7f0cb862-5218-0410-a997-914c9d46530a>
+Date: Mon, 31 Jul 2017 20:49:26 +0000
+Subject: [PATCH] Fix build on NetBSD.
+
+(cherry picked from commit 1236c7644508227b616e97e29e123b34257e36d1)
+
+git-svn-id: http://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1835 7f0cb862-5218-0410-a997-914c9d46530a
+---
+ src/fg_joystick.c         | 59 -------------------------------------
+ src/x11/fg_joystick_x11.c | 61 +++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 61 insertions(+), 59 deletions(-)
+
+diff --git a/src/fg_joystick.c b/src/fg_joystick.c
+index e548c04..b24476a 100644
+--- a/src/fg_joystick.c
++++ b/src/fg_joystick.c
+@@ -40,65 +40,6 @@
+ #define JS_TRUE  1
+ #define JS_FALSE 0
+ 
+-/* BSD defines from "jsBSD.cxx" around lines 42-270 */
+-
+-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+-
+-#    ifdef HAVE_USB_JS
+-#        if defined(__NetBSD__)
+-#            ifdef HAVE_USBHID_H
+-#                include <usbhid.h>
+-#            else
+-#                include <usb.h>
+-#            endif
+-#            include <dev/usb/usb.h>
+-#        elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+-#            ifdef HAVE_USBHID_H
+-#                include <usbhid.h>
+-#            else
+-#                include <libusbhid.h>
+-#            endif
+-#            include <legacy/dev/usb/usb.h>
+-#        endif
+-#        include <dev/usb/usbhid.h>
+-
+-/* Compatibility with older usb.h revisions */
+-#        if !defined(USB_MAX_DEVNAMES) && defined(MAXDEVNAMES)
+-#            define USB_MAX_DEVNAMES MAXDEVNAMES
+-#        endif
+-#    endif
+-
+-struct os_specific_s {
+-  char             fname [128 ];
+-  int              fd;
+-  int              is_analog;
+-  /* The following structure members are specific to analog joysticks */
+-  struct joystick  ajs;
+-#    ifdef HAVE_USB_JS
+-  /* The following structure members are specific to USB joysticks */
+-  struct hid_item *hids;
+-  int              hid_dlen;
+-  int              hid_offset;
+-  char            *hid_data_buf;
+-  int              axes_usage [ _JS_MAX_AXES ];
+-#    endif
+-  /* We keep button and axes state ourselves, as they might not be updated
+-   * on every read of a USB device
+-   */
+-  int              cache_buttons;
+-  float            cache_axes [ _JS_MAX_AXES ];
+-};
+-
+-/* Idents lower than USB_IDENT_OFFSET are for analog joysticks. */
+-#    define USB_IDENT_OFFSET    2
+-
+-#    define USBDEV "/dev/usb"
+-#    define UHIDDEV "/dev/uhid"
+-#    define AJSDEV "/dev/joy"
+-
+-
+-#endif
+-
+ /*
+  * Functions associated with the "jsJoystick" class in PLIB
+  */
+diff --git a/src/x11/fg_joystick_x11.c b/src/x11/fg_joystick_x11.c
+index 30ad4b5..8c75bbe 100644
+--- a/src/x11/fg_joystick_x11.c
++++ b/src/x11/fg_joystick_x11.c
+@@ -42,8 +42,68 @@
+ #include <fcntl.h>
+ 
+ 
++/* BSD defines from "jsBSD.cxx" around lines 42-270 */
++
++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++
++#    ifdef HAVE_USB_JS
++#        if defined(__NetBSD__)
++#            ifdef HAVE_USBHID_H
++#                include <usbhid.h>
++#            else
++#                include <usb.h>
++#            endif
++#            include <dev/usb/usb.h>
++#        elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++#            ifdef HAVE_USBHID_H
++#                include <usbhid.h>
++#            else
++#                include <libusbhid.h>
++#            endif
++#            include <legacy/dev/usb/usb.h>
++#        endif
++#        include <dev/usb/usbhid.h>
++
++/* Compatibility with older usb.h revisions */
++#        if !defined(USB_MAX_DEVNAMES) && defined(MAXDEVNAMES)
++#            define USB_MAX_DEVNAMES MAXDEVNAMES
++#        endif
++#    endif
++
++struct os_specific_s {
++  char             fname [128 ];
++  int              fd;
++  int              is_analog;
++  /* The following structure members are specific to analog joysticks */
++  struct joystick  ajs;
++#    ifdef HAVE_USB_JS
++  /* The following structure members are specific to USB joysticks */
++  struct hid_item *hids;
++  int              hid_dlen;
++  int              hid_offset;
++  char            *hid_data_buf;
++  int              axes_usage [ _JS_MAX_AXES ];
++#    endif
++  /* We keep button and axes state ourselves, as they might not be updated
++   * on every read of a USB device
++   */
++  int              cache_buttons;
++  float            cache_axes [ _JS_MAX_AXES ];
++};
++
++/* Idents lower than USB_IDENT_OFFSET are for analog joysticks. */
++#    define USB_IDENT_OFFSET    2
++
++#    define USBDEV "/dev/usb"
++#    define UHIDDEV "/dev/uhid"
++#    define AJSDEV "/dev/joy"
++
++
++#endif
++
+ #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ 
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ static int hatmap_x[9] = {0, 0, 1, 1, 1, 0, -1, -1, -1};
+ static int hatmap_y[9] = {0, 1, 1, 0, -1, -1, -1, 0, 1};
+ 
+@@ -104,6 +164,7 @@ static int fghJoystickFindUSBdev(char *name, char *out, int outlen)
+     }
+     return 0;
+ }
++#endif
+ 
+ static int fghJoystickInitializeHID(struct os_specific_s *os,
+                                     int *num_axes, int *num_buttons)
+-- 
+2.19.2
+
diff --git a/media-libs/freeglut/files/freeglut-3.0.0-drop-unnecessary-x11-libs.patch b/media-libs/freeglut/files/freeglut-3.0.0-drop-unnecessary-x11-libs.patch
new file mode 100644
index 000000000000..761a6bfce7c2
--- /dev/null
+++ b/media-libs/freeglut/files/freeglut-3.0.0-drop-unnecessary-x11-libs.patch
@@ -0,0 +1,30 @@
+From bbdaa724ef363e34bd19fb2308739e59a9e8ddc8 Mon Sep 17 00:00:00 2001
+From: jtsiomb <jtsiomb@7f0cb862-5218-0410-a997-914c9d46530a>
+Date: Tue, 26 Mar 2019 18:55:42 +0000
+Subject: [PATCH] Applied Christian's change to drop unnecessary dependency to
+ X11 libraries we don't actually use, by asking cmake to link with X11_X11_LIB
+ instead of the catch-all X11_LIBRARIES.
+
+git-svn-id: http://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1845 7f0cb862-5218-0410-a997-914c9d46530a
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d1c20e8..e324a02 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -312,8 +312,8 @@ ENDIF(CMAKE_COMPILER_IS_GNUCC)
+ INCLUDE(CheckIncludeFiles)
+ IF(UNIX AND NOT(ANDROID OR BLACKBERRY OR FREEGLUT_WAYLAND))
+     FIND_PACKAGE(X11 REQUIRED)
+-    INCLUDE_DIRECTORIES(${X11_INCLUDE_DIR})
+-    LIST(APPEND LIBS ${X11_LIBRARIES})
++    INCLUDE_DIRECTORIES(${X11_X11_INCLUDE_PATH})
++    LIST(APPEND LIBS ${X11_X11_LIB})
+     IF(X11_Xrandr_FOUND)
+         SET(HAVE_X11_EXTENSIONS_XRANDR_H TRUE)
+         LIST(APPEND LIBS ${X11_Xrandr_LIB})
+-- 
+2.19.2
+
diff --git a/media-libs/freeglut/freeglut-3.0.0.ebuild b/media-libs/freeglut/freeglut-3.0.0.ebuild
index 2a60b23ef112..3fcb972cf759 100644
--- a/media-libs/freeglut/freeglut-3.0.0.ebuild
+++ b/media-libs/freeglut/freeglut-3.0.0.ebuild
@@ -29,6 +29,11 @@ DEPEND="${RDEPEND}
 
 HTML_DOCS=( doc/. )
 
+PATCHES=(
+	"${FILESDIR}"/${P}-drop-unnecessary-x11-libs.patch
+	"${FILESDIR}"/${P}-bsd-usb-joystick.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		"-DFREEGLUT_GLES=OFF"
diff --git a/media-libs/freeverb3/Manifest b/media-libs/freeverb3/Manifest
index ab9d9a1ca27d..e0659b6ce53d 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 1328 BLAKE2B 6f10f91750ff9cbb2f2f4f8abaf682d46a2e4fb08883f855f6d08764e202a236b2bc2105eb6b1955ca243bba1cb56bd2c759acb99e215e6a431f9e64130346b4 SHA512 6b1588ee229a8d8f37c48f7d3c9b5c9c6491fbe2938ca527eb5062896691753e7b1ed8d088f073a0199e32363baf43da83c35ea7495b9961692a088bb6f4b63d
+EBUILD freeverb3-3.2.1-r1.ebuild 1327 BLAKE2B 87201177482e9485512c824da7a7cb1828e56da276198a35ea80eab60a7ddd27bae02068e7ae76439d6d378a0dca4c13a1634fff7f9721f6dfff4db923934938 SHA512 5bbfde57c1382ae025ddef45ddac01c93d07e1391073c7b3855be1c75aca63f9776be6d0c1c064ca9f53ed77312b88babc45e7be53dcea2f521ed8515a8eaa88
 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 a579cd535830..91bbe796c8ba 100644
--- a/media-libs/freeverb3/freeverb3-3.2.1-r1.ebuild
+++ b/media-libs/freeverb3/freeverb3-3.2.1-r1.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
@@ -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/gd/Manifest b/media-libs/gd/Manifest
index eab197b4d7cb..8524796c23c1 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 3145 BLAKE2B eadfeeb142f10d6f9abaf02fe6cd8cd14c3540733256277e051d5b4c1922b99a2a4a22521f902211667bf8d1ad47153c82915c3772fa5d747696b39f44ea8ea4 SHA512 e784f73fb4af49dd9c50b35e178cd7e43cf4d2524e97d8a3b173a268ecec6f7c5c63c4a7e734a1aa07a176a3490f2bad147667b211e39a7bdd5e01d8db019402
+EBUILD gd-2.2.5-r2.ebuild 3144 BLAKE2B 6180ae05d449c9d02df55e6f7318da206cebde1d7aa2ac194df4dbc9c6a3132b2de9fc8bfea35abdb6f55fa1018db8554ee0172107e541afadaacb98aa7139fb SHA512 d5a3fa0b80c37dcbdcb0c3c2c7de42525fd4779c64375a39f625ac5064a8ca08f5e29ed0de154c4b83c566d8b1abf5603f529bff97ed2f38c72fea771be632c6
 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 00f3a5a6cf9c..6ce506513bf6 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/giflib/Manifest b/media-libs/giflib/Manifest
index 2317ff8c4858..8c461b85e42a 100644
--- a/media-libs/giflib/Manifest
+++ b/media-libs/giflib/Manifest
@@ -1,16 +1,16 @@
 AUX giflib-4.1.6-gif2rle.patch 764 BLAKE2B af377785f83dcd5c2c4382eb2d490ccc01000aa2a1ef8f306c7e0284857de02765a714fea73870ac6226331a88e422bd8afd3b0ec90b7f3e225bcabf079dc32e SHA512 6714906d49a0c285c1fb642a81c092378042ec06be6c4d7c586459e80bb010423fe4b9801124b71c945fd118d99432869bc180bfa32a6c3c29bcfb6b4c5a027f
 AUX giflib-4.1.6-giffix-null-Extension-fix.patch 693 BLAKE2B b0faee004c9cbb95839cb047de902500b1c46f6d3185fc061fb99b0759a57512cb030ca965bb927c68c642ecd72a714260c288b19d24404a6b4cb022ba41094b SHA512 9006c85529735a84afaddddbb06b25cb2b7eff64574edea693d75171c6b2bb7a666e498920a9abca2b28290e4c601b6eb6eecc6ea1b0e6b8602fd4a55863338f
-AUX giflib-5.1.6-gentoo.patch 424 BLAKE2B 2d244e7e5311506a03dde36d83f14c9ff75533b60ac8be470c73786acf652d07774d7756bb342bb5373a515db090c3a3bab3abb10a87be09e97eb81cfe59e38a SHA512 88f133e4fabcbbca9151812f9a6e1676c41301175b6637502c5c2a2b888ad31975ebf4d28d77c0adaf7a854860f9979b7a45479542ed91fa72e97c3f705f2da4
 AUX giflib-5.1.8-gentoo.patch 469 BLAKE2B f0bbb86b2fc3288860ccad7a06f4217f29dbd60bf5871e0a701e7744e37002d484046ec85109db6e9e60d72c4a227bb1d206f2a3590ab526c88fa8f82e567beb SHA512 feede4296a111d063dd2a81b9eb0552f6b4e38e5bf340e57cd6a12e83ff577b3d78be2dc2296ade57901ef8d11760dd54c721525fe157fe57e8fcac3d2baf970
+AUX giflib-5.1.9-gentoo.patch 200 BLAKE2B 0d3e9e349b8ef00a09743ac1424c0f53d293573cfbc80a1105f65041d201a0231cb7e69791b8441a5b286841b507ad6b908f4fe0a514a79b8ba6546385f2fa70 SHA512 2d899722238eecd8bdfa7412cf5778c42c58d2e93c9e02e458b5dc636933f7765fd39ceb7906200425039a6c908b47403ec306dc3c79e1402f3824a351a17081
 DIST giflib-4.1.6.tar.bz2 506050 BLAKE2B 154c95425a570a822447d1fc5bddbecf31fd81473e18d49fdeb93e72ade7541197fc6147b2d4cdf6857b3326b2f4c40e01f026041369242f4e9fbe892cc8e150 SHA512 f47954218ed7d3415cc195a1031a688fcb7dd2bc2b394491830e6b5f5332903ed7c4433b795cd3da9ac53bfc969fe94bec2a4e66b15c0385c732c01b1b7e5057
 DIST giflib-5.0.6.tar.bz2 621073 BLAKE2B ae162c281755cae4d00bcbd07273f7c7488ae67c42fef819abae1011eddf801bc4525e326417d3e8a036b18b75d7064de59ceda370e5ded956b22d319c67d3a9 SHA512 117e20319f2df32bdf094678cdececad2b6f33a40baff172d4df68ade86547825ebca81186071bff51e60126692df84dbd7bb5cc4877ba68448f7c47a2cc2491
 DIST giflib-5.1.4.tar.bz2 639703 BLAKE2B 5176fbd94c37a86a7f7a3964b6b5f2637d76ba5d40e594a0db52a3a09e22b915a0388fc9bd2f1446dcf66b3b9c0d76741583e4d5d3f7362fa3997e8b26503fc4 SHA512 32b5e342056c210e6478e9cb3b6ceec9594dcfaf34feea1eb4dad633a081ed4465bceee578c19165907cb47cb83912ac359ceea666a8e07dbbb5420f9928f96d
-DIST giflib-5.1.7.tar.gz 391525 BLAKE2B d994941f4da324f62a16af973b443660b6cf3ee764e9b7f8c165656037f11d482ccd141e9ac8a81ae1096faa4e264602191ebd039cbf5dd2f55e435aef0ab546 SHA512 b30c3707839a6d66a3e54d92607c303e5ca3d04d6a02d2037fdc8b80386f9a7fa4148727705014481c3c167bdfac2e99d7e4db1ff7f277b64bd2d9193a89f8b0
 DIST giflib-5.1.8.tar.gz 419065 BLAKE2B 4a42120758be15e765dae249d98d25164b40e64f933415412420163c0ed7fd6967d3958fff70478d5635a5bb9a6ed397f06ad6de510f2e97de5574b7c68d84d2 SHA512 d390917837a64de1912720ab8968e6b077c6be9f9a2f835faced44420f54d6d55d4e3543b9779ec65d399858856188fea93c170b253d0b83928f15548a14aba3
+DIST giflib-5.1.9.tar.gz 385068 BLAKE2B 0c6765eb9a017fee8de28c9440434f3054f87ae65139a3f9f4a41145d4d86dfbd88ece54ea6f40c58054e0ab728a1d346c2f725843bcc34bfd75825e58b8f650 SHA512 b6350b39755e3eeba58b5fccf319bbaeee2db6564e13c8ce44d3652cc32d243c391def74b6b1529bc5e0d4573eff94b2ffa5faa90fc564a049122d3e23f1d184
 EBUILD giflib-4.1.6-r2.ebuild 1383 BLAKE2B 564dfc8776afe92c076aa5bec6c8f58b985bd8b8c3b14621c9946aa8984047a6cf4ffe776a803199ac0417615dc2df270ec8b4b35683f3a657d92f4ccbd415a2 SHA512 71a6621273dd6341e25de0150aa7b194a1143b6e344ba2a77317fd72394f585fe232d9eee5dbd28242773ebaf26072119d5ebe93ae540d4054d7e1d64410059c
 EBUILD giflib-4.1.6-r3.ebuild 1482 BLAKE2B 98f35d4ceb7bafcc67b9d66d273ca0362a49e0be0e804c4665c9c723d7e04689429362611b35cf37bd2c9d5df29f422be541ef796f4cda58ec0e6877aa23f5c3 SHA512 752ba45f1c9650a9268c5c9e555f239ec8302549573f508d5c9ce0ba9a1461b8497cde8dfabf180cc6ad8aaca420931b9025188d4743c526c3bdceaa93c1c1ae
 EBUILD giflib-5.0.6.ebuild 1060 BLAKE2B 9ee4bc54795eeef8850a5a94129dfb8c73b979d8b1e2f827fe434bf5c9966b5580e4ff0d7946fab757bfcfc18bce87368c2f8ca903e4dfe6c927281c3535041f SHA512 7c0abe0f1450dbdb2b72239e7876f3d2b3e13292c0883c92af6f85a764dd4a14f3391d55b2a21313041f07eebcb086f3fb28141093794b9fbb501c650a59f5a0
 EBUILD giflib-5.1.4.ebuild 1390 BLAKE2B 5e1719539fb2ee35bfc86c64c651534bf72057080c2f7d38e15df4ed4f6d5b7c91cea3ba55a47054455f9953a25c110733bb05e5b75da793c005d779a5dd3373 SHA512 f86b46958b2e977c56dfbd8df548d540a4b1873254abf4c6e1a69c24e696b4928a8f3d56145a545be3528497965e3e4898ab56fbdaf6b9d1c88d8066c170774d
-EBUILD giflib-5.1.7.ebuild 1918 BLAKE2B 7a0219fd96c2862eb8b4087e25a03983c0f1abbfeb8321871ebc487c106b9d88a338c69231efd4561030f58c82dc65fed31b6a5204e48c86094d41f027e6c133 SHA512 b926b6da59cdbd55e3e741d808b11ac5ddc62b2756596349a1a800463e0c772baa7b36a1234591ba75b9d760abc16b1663fb70eaa5b32d57024dd8651c853d20
 EBUILD giflib-5.1.8-r1.ebuild 1875 BLAKE2B 6b12c444b885ae0a0aa321c76a47281847c92ce4a01363515d8bc3933cc474eb146cc3007221a8c9fe94a3faf7d5b5c25535b5a756a2479eecc8f8e00eec94b8 SHA512 12d8a59b6940a27ff7c0d688f8f71bb808189ad668c50392bc4842b0b119de11792bd56ec5a0b01951d5cb1f369da14cf543b7824c56ab995f525bc6f8db0572
+EBUILD giflib-5.1.9.ebuild 1875 BLAKE2B 5a966e6a683117f6264f2f55bfd2df543114a2910197e1999d104cb4ab38c225901c228cf5827bdd11971871f18b118a816377b0e78899d8eceb0ea65165fc46 SHA512 7393a4903d1aafd1287e7b7fd6b527d930079761b97d659445323309cb8387e8c301077f24873646a85245082bd3ecca8b207ef16d141fd95930421409895608
 MISC metadata.xml 444 BLAKE2B 50913e89623c9855de9b3344c4f7a9f6266b42d99ab88cd4c6be63b8fb00a984dc05b89efbac92ed2b5980e9bed163473925a88384a61b3887ef86473f89b216 SHA512 10f7b2069a73ae9d488fba9febb6b8edcab5f278e1d68ef5b998037f02de5de81d07983b66f3c4ac8a59fa9a4836b92a909c66a4c1188a97aa03174cf4f546cf
diff --git a/media-libs/giflib/files/giflib-5.1.6-gentoo.patch b/media-libs/giflib/files/giflib-5.1.6-gentoo.patch
deleted file mode 100644
index c8432c205845..000000000000
--- a/media-libs/giflib/files/giflib-5.1.6-gentoo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- giflib-5.1.6/Makefile
-+++ giflib-5.1.6/Makefile
-@@ -61,12 +61,11 @@
- LDLIBS=libgif.a -lm
- 
- all: libgif.so libgif.a $(UTILS)
--	$(MAKE) -C doc
- 
- $(UTILS):: libgif.a
- 
- libgif.so: $(OBJECTS) $(HEADERS)
--	$(CC) $(CFLAGS) -shared $(OFLAGS) -o libgif.so $(OBJECTS)
-+	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS)
- 
- libgif.a: $(OBJECTS) $(HEADERS)
- 	ar rcs libgif.a $(OBJECTS)
diff --git a/media-libs/giflib/files/giflib-5.1.9-gentoo.patch b/media-libs/giflib/files/giflib-5.1.9-gentoo.patch
new file mode 100644
index 000000000000..0cb20183bd81
--- /dev/null
+++ b/media-libs/giflib/files/giflib-5.1.9-gentoo.patch
@@ -0,0 +1,10 @@
+--- giflib-5.1.9/Makefile
++++ giflib-5.1.9/Makefile
+@@ -63,7 +63,6 @@
+ LDLIBS=libgif.a -lm
+ 
+ all: libgif.so libgif.a libutil.so libutil.a $(UTILS)
+-	$(MAKE) -C doc
+ 
+ $(UTILS):: libgif.a libutil.a
+ 
diff --git a/media-libs/giflib/giflib-5.1.7.ebuild b/media-libs/giflib/giflib-5.1.9.ebuild
index 9f1609ae182b..87eaf2bc7006 100644
--- a/media-libs/giflib/giflib-5.1.7.ebuild
+++ b/media-libs/giflib/giflib-5.1.9.ebuild
@@ -17,7 +17,7 @@ IUSE="doc static-libs"
 DEPEND="doc? ( app-text/xmlto )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-5.1.6-gentoo.patch
+	"${FILESDIR}"/${PN}-5.1.9-gentoo.patch
 )
 
 src_prepare() {
@@ -50,7 +50,6 @@ multilib_src_install() {
 		DESTDIR="${D}" \
 		PREFIX="${EPREFIX}/usr" \
 		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		MANDIR="${EPREFIX}/usr/share/man/man1" \
 		install
 
 	if ! use static-libs ; then
diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest
index aa82e80031ac..b98ccfbf7899 100644
--- a/media-libs/glm/Manifest
+++ b/media-libs/glm/Manifest
@@ -1,10 +1,10 @@
 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.8.5.tar.gz 3756809 BLAKE2B 41abc10e1c41c40ad68b7148a8ccbe9d2f4fc8a80c034c86341d12fedb17ab16f96114df28f56f52a12d8d60edecd26ecbcbffe6daa76f035711248240ef6616 SHA512 5a7e84ecc5a54320c74776c133bfdbeaf0d4496a7a7fdf2f4ccf89e66b3665a577a370a662ac97a350a2b1f717ce769cb0826057ebb3b13c9c2fee65f20ac7b4
 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
-EBUILD glm-0.9.8.5-r1.ebuild 936 BLAKE2B 3d87f95580e299e0a43032bc9b3ac3d8b50d3490d76dda38c6d5b4823923d08354ddda89c780e9e86b189006fd29ad10bc5b6a091b2f208238deeaa45a836ee2 SHA512 91e37f4b86d86514211c652e1fbe58a6fe01542c61172c32c7f1b1ad9fc042c4cd66d2f8650de9e7268a586b0c0ba89057fa0e6dde0848bbcaf21a7bcc6c4e05
-EBUILD glm-0.9.9.2.ebuild 903 BLAKE2B 0a3a6d5761f7c2a8c497c59d03094c306eeaba1d5d6d5d97b07bd67d05d92389279ffa6302a57ba86bfdeeb3bcf75d5a1daf949d677298648d43df371b01540c SHA512 fd05cc52d409c68d807193e366f01c8e44b1bd168a559c3a9548e71c634b82a0c076b974fb1c230da4bfafbdc3b4e0ea1f4483346a0bc54a897510406a57815a
+DIST glm-0.9.9.4.tar.gz 4578404 BLAKE2B 4c0bb64bb477ca46d45b4d25d7d992a39a82a7d745d4564dfac04c7f6e31ea0741b33d2d6c7832580e6f51f62a2efe269a9601c10d87f1e68b333e71e20c3d02 SHA512 50e4784fcd5f1da4ae27830948ffe4b412ec53447b89d30c6dcc2b4e0f9ec05cca4b07461d3d8a339eb103fae8dac325fabc87607b5397122ce2021d6e15a1a1
+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
 MISC metadata.xml 545 BLAKE2B 842701f1a6d1483b75f14aa99f546975b4c7de1a84d36b1e15a882d17662d98d37b491e236da73d9457706b667f0499405b5717af3ccfed73ad0518f34167c72 SHA512 637114ed9721e6d1c8f1d1ce56e9b9c208ca4dfe5f3a0c2b844d90bcdbab8344c00682c9647f7323eec7c485abcd841ef37300a8fe0bc8a5f5c12cfbb1da4971
diff --git a/media-libs/glm/glm-0.9.9.2.ebuild b/media-libs/glm/glm-0.9.9.2.ebuild
index 5dd83d7c5081..7d34ec0aba60 100644
--- a/media-libs/glm/glm-0.9.9.2.ebuild
+++ b/media-libs/glm/glm-0.9.9.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( HappyBunny MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc64 x86"
 IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2"
 
 RDEPEND="virtual/opengl"
diff --git a/media-libs/glm/glm-0.9.8.5-r1.ebuild b/media-libs/glm/glm-0.9.9.4.ebuild
index 58732d5eb6dd..169bf319fadf 100644
--- a/media-libs/glm/glm-0.9.8.5-r1.ebuild
+++ b/media-libs/glm/glm-0.9.9.4.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
 
 inherit cmake-utils
 
@@ -11,16 +11,11 @@ SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( HappyBunny MIT )"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2"
 
 RDEPEND="virtual/opengl"
 
-PATCHES=(
-	"${FILESDIR}/glm-gcc73.patch"
-	"${FILESDIR}/${P}-gcc7_tests.patch"
-)
-
 src_configure() {
 	if use test; then
 		local mycmakeargs=(
diff --git a/media-libs/graphene/Manifest b/media-libs/graphene/Manifest
index 1ed2c242212f..0466ed84864f 100644
--- a/media-libs/graphene/Manifest
+++ b/media-libs/graphene/Manifest
@@ -1,3 +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
 MISC metadata.xml 333 BLAKE2B 3d34baf2b84e2ca8cc20638b381fdb4771e94f07df133f5d997b5d7bdf3704f8b8f77d2c79815f70246affa2e399d1118e03eae7c7cf8e419fec3dae89ef0405 SHA512 aef6b787ac7f14b56e4eacd746c91671b9a115cb40b312b415c7302d4339f5d3b3a887bd52a2b30ba31b3e0f027360a9fa55f6d3065cf7baedc4bd28dbbcd056
diff --git a/media-libs/graphene/graphene-1.8.6.ebuild b/media-libs/graphene/graphene-1.8.6.ebuild
new file mode 100644
index 000000000000..ee623381f0f2
--- /dev/null
+++ b/media-libs/graphene/graphene-1.8.6.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+inherit xdg-utils meson multilib-minimal python-any-r1
+
+DESCRIPTION="A thin layer of types for graphic libraries"
+HOMEPAGE="https://ebassi.github.io/graphene/"
+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"
+IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test"
+
+RDEPEND="
+	>=dev-libs/glib-2.30.0:2[${MULTILIB_USEDEP}]
+	introspection? ( dev-libs/gobject-introspection:= )
+"
+DEPEND="${RDEPEND}"
+# Python is only needed with USE=introspection or FEATURES=test, but not bothering with conditional python_setup, as meson uses it too anyway
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_environment_reset
+	default
+	# Disable installed-tests
+	sed -e 's/install: true/install: false/g' -i src/tests/meson.build || die
+}
+
+multilib_src_configure() {
+	# TODO: Do we want G_DISABLE_ASSERT as buildtype=release would do upstream?
+	local emesonargs=(
+		-Dgtk_doc=$(multilib_native_usex doc true false)
+		-Dgobject_types=true
+		-Dintrospection=$(multilib_native_usex introspection true false)
+		-Dgcc_vector=true # if built-in support tests fail, it'll just not enable vector intrinsics; unfortunately this probably means disabled on clang too, due to it claiming to be <gcc-4.9
+		$(meson_use cpu_flags_x86_sse2 sse2)
+		$(meson_use cpu_flags_arm_neon arm_neon)
+		$(meson_use test tests)
+		-Dbenchmarks=false
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/media-libs/gupnp-dlna/Manifest b/media-libs/gupnp-dlna/Manifest
index 9e624c5bfdf7..7c71f48a2081 100644
--- a/media-libs/gupnp-dlna/Manifest
+++ b/media-libs/gupnp-dlna/Manifest
@@ -1,5 +1,3 @@
-DIST gupnp-dlna-0.10.4.tar.xz 328596 BLAKE2B e88f1f6ead000c629abc9ff36f30af6f7740d64f7c2cec19433b8279c9e18f1b9f2d204ffa88325415fa52246633b19449fae57476690b9a43212717c6b4d87c SHA512 167562dd493f6de0a7afd43337b8c191157b7903653c834c4219313e60e7725adf3d30f21f4c0655f9e6849677ecac80ea7d7e8a9786387204a387f1b9afa598
 DIST gupnp-dlna-0.10.5.tar.xz 329468 BLAKE2B 045c890bc05e7a8e8321c46b333b27ec112b470f484961b24dad5652c0d065db52187c4ac19ed392319e12d2cf7b835b43304edf1307ffc3bb5f2c5c7baded4c SHA512 060e997dc85d840722bc31c8eb2c7f986151220ac6f3de9e073f4dd62fdd57ffa049b628080832d6b96c1988f49eacc29d539f738ed61797019264f68ebf7680
-EBUILD gupnp-dlna-0.10.4.ebuild 1529 BLAKE2B 3929692022b47725bb24b792063578844daa60037499a524d243fabf4ff59d8f6f918e15b522f423ab15e564ad20edb7b763e3b3ee0c656ac72298074953d5ad SHA512 76b459b6c8ee20d0b88b72734954eb9218c2d38d62eec755accc5548dafd377f6571e907f3b68c05dda14838d40e8c9841cf460ee249be3ccf63963869e96986
 EBUILD gupnp-dlna-0.10.5.ebuild 1522 BLAKE2B 24ddc3af27cf3342545772827ba1f17844c14f0c2ab9cf7564e5d8d8988163d7582bb5e8d7872ac16443e58356d9bddde3ecfa19ccb2729ebc5c6ba689815937 SHA512 c738ba044bff0cac84ac42b29b4470118ddb69e7006d4f362f684058864a1223df9f3e4b18e5f8739c3ff0a2886c0ba3032e01658a7b4e93ddf55dd8fa096fa0
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-libs/gupnp-dlna/gupnp-dlna-0.10.4.ebuild b/media-libs/gupnp-dlna/gupnp-dlna-0.10.4.ebuild
deleted file mode 100644
index 022543d5a349..000000000000
--- a/media-libs/gupnp-dlna/gupnp-dlna-0.10.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="Library providing DLNA-related functionality for MediaServers"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
-
-LICENSE="LGPL-2"
-SLOT="2.0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.34:2
-	>=dev-libs/libxml2-2.5:2
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.11
-	virtual/pkgconfig
-	introspection? ( $(vala_depend) )
-"
-
-src_prepare() {
-	# Make doc parallel installable
-	cd "${S}"/doc/gupnp-dlna
-	sed -e "s/\(DOC_MODULE.*=\).*/\1${PN}-${SLOT}/" \
-		-e "s/\(DOC_MAIN_SGML_FILE.*=\).*/\1${PN}-docs-${SLOT}.sgml/" \
-		-i Makefile.am Makefile.in || die
-	sed -e "s/\(<book.*name=\"\)${PN}/\1${PN}-${SLOT}/" \
-		-i html/${PN}.devhelp2 || die
-	mv ${PN}-docs{,-${SLOT}}.sgml || die
-	mv ${PN}-overrides{,-${SLOT}}.txt || die
-	mv ${PN}-sections{,-${SLOT}}.txt || die
-	mv ${PN}{,-${SLOT}}.types || die
-	mv html/${PN}{,-${SLOT}}.devhelp2
-
-	cd "${S}"
-
-	use introspection && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection)
-}
-
-src_install() {
-	# Parallel install fails, upstream bug #720053
-	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
-}
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index a8be6c048aab..5e13398d3dd4 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,12 +1,8 @@
 DIST harfbuzz-2.0.2.tar.bz2 4322171 BLAKE2B c844a623de5c2be7b6fb4a2cf0d38e689a6e639e25ece971646963acbdb10be05b82c4faea33688b1a3edfda4c3fe45b97e5ef87d7ca6d9776268b43ef23a7ee SHA512 4cb605c47617dd06d4a2e8ae01e44969f5addacee47ef5212442645c6229298d5080f85b0aca6a2fbedfd2007c679acad6a4b3e9389df1b3a6232bf6ef961577
-DIST harfbuzz-2.1.3.tar.bz2 4429069 BLAKE2B d00b5e4f83e9e4b8032cd4f0a8c00d3f88176118458026de69a68f1932bf437358dcd0ecea89f40a4f610816b1709f3b0784c9a619141fa459297754d934f42d SHA512 9bf5f7b857424037a3b3ea5c286e6ba8440c265fa663cf6b6c22cc08d36d84badfed8bdc46816ad982fc810677ebecccdb669ea98a021207e1858c8c355dbf19
-DIST harfbuzz-2.2.0.tar.bz2 4506619 BLAKE2B e2ff32f4490e408a7f67b4e1dd12f266e31a8b58f4960643be45ac9574ce20da8f26e0d7261a9710114621b7f6928df030fa30c3a7672ab5e2b9d1b5c0369d2d SHA512 5e8f35c0d7634afc6f623a91d56bfde46b2a1030d439e5dec196001d49a58e409a1bf66c7f9c15a04e030dab4fe2fe2c928061839b1e985459d4f8379b8a0818
-DIST harfbuzz-2.3.0.tar.bz2 17909479 BLAKE2B 32ea08ac60ca3c6b91a41b17d857bcabfd6f13785b674ceaf7006cd0616e1799d1d5f390f5b8d37e2bb22ac5506f00a6fc5c9a6a5263c23760ffe0e0677fe44e SHA512 830c5b96384554fb6d2502713e9b2eff384dbe6aa3feb08830226944bcb07c8fb55237f389e1e6416d0942e3efba8b1ed54a49ff8c4762fec230f2404095e85a
 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.1.3-r1.ebuild 2978 BLAKE2B 62ef17e0a44743eb46f8fa181a1e94334a3b0cbe5c6ecf8ff2b2ad0ad8393dfea288cb2d4b9aa6193028f2a7cf995d38e01d25a710586d373e62377552304d83 SHA512 d52af0ac8aea38e71d09ae0e360acb4fff16394e1759bd88cb67b522afe4ab0db1ac70b7464e311274a08c0e27b623c41175e75f14f097bafaf39af71beeb788
-EBUILD harfbuzz-2.2.0-r1.ebuild 2978 BLAKE2B 62ef17e0a44743eb46f8fa181a1e94334a3b0cbe5c6ecf8ff2b2ad0ad8393dfea288cb2d4b9aa6193028f2a7cf995d38e01d25a710586d373e62377552304d83 SHA512 d52af0ac8aea38e71d09ae0e360acb4fff16394e1759bd88cb67b522afe4ab0db1ac70b7464e311274a08c0e27b623c41175e75f14f097bafaf39af71beeb788
-EBUILD harfbuzz-2.3.0-r1.ebuild 3034 BLAKE2B 7d620a2005df18eced9e5288632a102730b5531f4373289b9c584cfd2b7096ef1264f3778001a5c47f4d455f19c5dbf7f2e8ef27a1939956befe188b779ee487 SHA512 4ea2f1c1f1c4b166c5c69e735c99badf1eb88d25eb78bc9632426cb1639bd121c80016c72798087b167526a13c2748829f93134d59564a1c3e50d40974887f58
-EBUILD harfbuzz-2.3.1.ebuild 3031 BLAKE2B 9661cb45752c88e610c780ad9ec8ed27e4a639915a71c283981f9ed04cdeeb69619fd2453e95518ad2f20f064443ce997a67ec8c3a58ee6966dc40cf5dd530d4 SHA512 813d6f4e5b532681eed47e4963af490ee33982b6c3ed7f53a466496c77aab045c673c467bd2b84102dcb909f5cc7ff7faedc70be1f2bdfe325e5e700c5ca5d92
-EBUILD harfbuzz-9999.ebuild 3046 BLAKE2B afca3dbe2f59a7bf02bab5f81f00589f05080ef91ec346372a44aa7f47982a3efa70e26c61180de0517763ffde83aca10fc125997f8a1c8942520c26fcfdb511 SHA512 7b1c896402721aa66521165db457a254114d7c544fd1b67b42fc1667239d82b855f71bc04b4aa0693af26066a340bc67a196413e512defbff619ed97cc31bbe0
+EBUILD harfbuzz-2.3.1.ebuild 3025 BLAKE2B a41399029598ce6b82176a518db0be0b879d917bbab4aa1383b0f71a4947a7730991d137b3be1e79d15f7a014c431a6755ce3babba27bbbaf48144d46194e69c SHA512 8104111566f0543677059ea81776241cb6e97cbc8d06359f216319262beeb6cf1c696f7972551d7332db1abb9d66066a9129292df378922bfaa43a0d8f3e18aa
+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.1.3-r1.ebuild b/media-libs/harfbuzz/harfbuzz-2.1.3-r1.ebuild
deleted file mode 100644
index da5f35a6a967..000000000000
--- a/media-libs/harfbuzz/harfbuzz-2.1.3-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
-
-if [[ ${PV} = 9999 ]] ; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
-	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 ~x64-macos ~x86-macos ~x64-solaris"
-fi
-
-LICENSE="Old-MIT ISC icu"
-SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
-
-IUSE="+cairo debug +glib +graphite icu +introspection static-libs test +truetype"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:= )
-	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
-	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	test? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-"
-# eautoreconf requires gobject-introspection-common
-# ragel needed if regenerating *.hh files from *.rl
-if [[ ${PV} = 9999 ]] ; then
-	DEPEND+="
-		>=dev-libs/gobject-introspection-common-1.34
-		dev-util/ragel
-	"
-fi
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-	if ! use debug ; then
-		append-cppflags -DHB_NDEBUG
-	fi
-}
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
-		# on Darwin/Solaris we need to link with g++, like automake defaults
-		# to, but overridden by upstream because on Linux this is not
-		# necessary, bug #449126
-		sed -i \
-			-e 's/\<LINK\>/CXXLINK/' \
-			src/Makefile.am || die
-		sed -i \
-			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
-			src/Makefile.in || die
-		sed -i \
-			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
-			test/api/Makefile.in || die
-	fi
-
-	[[ ${PV} == 9999 ]] && eautoreconf
-	elibtoolize # for Solaris
-
-	# bug 618772
-	append-cxxflags -std=c++14
-}
-
-multilib_src_configure() {
-	# harfbuzz-gobject only used for instrospection, bug #535852
-	local myeconfargs=(
-		--without-coretext
-		--without-fontconfig #609300
-		--without-uniscribe
-		$(use_enable static-libs static)
-		$(multilib_native_use_with cairo)
-		$(use_with glib)
-		$(use_with introspection gobject)
-		$(use_with graphite graphite2)
-		$(use_with icu)
-		$(multilib_native_use_enable introspection)
-		$(use_with truetype freetype)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/html docs/html || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/media-libs/harfbuzz/harfbuzz-2.2.0-r1.ebuild b/media-libs/harfbuzz/harfbuzz-2.2.0-r1.ebuild
deleted file mode 100644
index da5f35a6a967..000000000000
--- a/media-libs/harfbuzz/harfbuzz-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
-
-if [[ ${PV} = 9999 ]] ; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
-	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 ~x64-macos ~x86-macos ~x64-solaris"
-fi
-
-LICENSE="Old-MIT ISC icu"
-SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
-
-IUSE="+cairo debug +glib +graphite icu +introspection static-libs test +truetype"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:= )
-	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
-	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	test? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-"
-# eautoreconf requires gobject-introspection-common
-# ragel needed if regenerating *.hh files from *.rl
-if [[ ${PV} = 9999 ]] ; then
-	DEPEND+="
-		>=dev-libs/gobject-introspection-common-1.34
-		dev-util/ragel
-	"
-fi
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-	if ! use debug ; then
-		append-cppflags -DHB_NDEBUG
-	fi
-}
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
-		# on Darwin/Solaris we need to link with g++, like automake defaults
-		# to, but overridden by upstream because on Linux this is not
-		# necessary, bug #449126
-		sed -i \
-			-e 's/\<LINK\>/CXXLINK/' \
-			src/Makefile.am || die
-		sed -i \
-			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
-			src/Makefile.in || die
-		sed -i \
-			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
-			test/api/Makefile.in || die
-	fi
-
-	[[ ${PV} == 9999 ]] && eautoreconf
-	elibtoolize # for Solaris
-
-	# bug 618772
-	append-cxxflags -std=c++14
-}
-
-multilib_src_configure() {
-	# harfbuzz-gobject only used for instrospection, bug #535852
-	local myeconfargs=(
-		--without-coretext
-		--without-fontconfig #609300
-		--without-uniscribe
-		$(use_enable static-libs static)
-		$(multilib_native_use_with cairo)
-		$(use_with glib)
-		$(use_with introspection gobject)
-		$(use_with graphite graphite2)
-		$(use_with icu)
-		$(multilib_native_use_enable introspection)
-		$(use_with truetype freetype)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/html docs/html || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/media-libs/harfbuzz/harfbuzz-2.3.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.3.1.ebuild
index 74fbb4200e84..b4e7019fafc4 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/harfbuzz/harfbuzz-2.3.0-r1.ebuild b/media-libs/harfbuzz/harfbuzz-2.4.0.ebuild
index 072663ae41e8..072663ae41e8 100644
--- a/media-libs/harfbuzz/harfbuzz-2.3.0-r1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.4.0.ebuild
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index cb8c95a6e525..072663ae41e8 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -15,18 +15,17 @@ 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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
 SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
 
-IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
+IUSE="+cairo debug +glib +graphite icu +introspection static-libs test +truetype"
 REQUIRED_USE="introspection? ( glib )"
 
 RDEPEND="
 	cairo? ( x11-libs/cairo:= )
-	fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
 	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
 	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
 	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
@@ -87,10 +86,10 @@ multilib_src_configure() {
 	# harfbuzz-gobject only used for instrospection, bug #535852
 	local myeconfargs=(
 		--without-coretext
+		--without-fontconfig #609300
 		--without-uniscribe
 		$(use_enable static-libs static)
 		$(multilib_native_use_with cairo)
-		$(use_with fontconfig)
 		$(use_with glib)
 		$(use_with introspection gobject)
 		$(use_with graphite graphite2)
diff --git a/media-libs/jasper/Manifest b/media-libs/jasper/Manifest
index ff200860c6a4..844e3468529f 100644
--- a/media-libs/jasper/Manifest
+++ b/media-libs/jasper/Manifest
@@ -1,5 +1,7 @@
 AUX jasper-2.0.14-fix-test-suite.patch 1097 BLAKE2B 050311299ad9e247663b045f87b022d290f30c58595c1f0b163175ef4d755e09aa956a2ec810b2239aeb1a7d9c85eadd3057c9157515e7681e6836389644c4a7 SHA512 667aa54ddd6b76af225b32c9d1cf0bb3f0d8a00c7a83695f12179778d8f08b9c910717ded58f7368384f0d925ae90ac42e91344966d01716d722625b25e90d30
 DIST jasper-2.0.14.tar.gz 1311825 BLAKE2B 0cd2feb5a73aaa2da6f1d105fefe98f57c6a5ecf92f6449891f49eca0b5926bc683a03bf933b920cad95883134cf292405f244f10b3bbe7867a41f2dde80337e SHA512 6b270cb1eb55f777f30016f3258e5e2297627e7d086334814c308464f5a4552c23241b0fdbc81ea715a6f4746294657f96c1cb6ceb320629ce57db7e81d84940
+DIST jasper-2.0.16.tar.gz 1311944 BLAKE2B 7402a3f08911e375ab51d531c8bcc57ccb3266763f2d92f45070e52697b99ca41dab4032a3d795105c05ddccd0641a6de24a6d7b148635efce37cd0be07c3e65 SHA512 b3bca227f833567c9061c4a29c0599784ed6a131b5cceddfd1696542d19add821eda445ce6d83782b454b266723b24d0f028cbc644a25c0e3a75304e615b34ee
 EBUILD jasper-2.0.14.ebuild 1899 BLAKE2B f9f034ecb4e7cb7362957b91ae6712853cefafad55d069adcc893a5094ebb91a7a35aeb75178d5002fa9ff04f41ceb89d9fc36c53c575addb99e9bf0d0142ace SHA512 0f6f272f0428aaebfe568fdc5d898f36c93df54ecb91001b1302344e67f7386fd11694ec652c57d8437436946e0c7bf8bf4203fbe285f978f067036d3fe3224b
-EBUILD jasper-9999.ebuild 1803 BLAKE2B eccda8d15f0ff80c4ccbba400c144f098736284f1fa26831ecc60c34dca36c74501907c6149849a9235c0c5720d803c316b691ad5b614d6200781a87445c76b4 SHA512 aa00138f755b8c929bdcaaeabeecb33b94dbfc69dae08d5de170ca169ca00f101bdcad13b84ac51f7fe4ff9cce9dc0d7d31567d56096b59b65271ea34be1521d
+EBUILD jasper-2.0.16.ebuild 1828 BLAKE2B 45da6d7171e35e4eed1d28e79f51e05ce652e54592dcf7553b0dc33eee6a518263557b648a59f3046c393f14e15fe905bb61e9a98dca511abd2a58aa2360164e SHA512 2b4b5c71d9177c96ff1d12cc1855b4128e9517430335584c054754d49828665bba9fbd096544cb79c0d9e65c0911c8161ed4c4ca9435cfd25f277ab0b4ab1579
+EBUILD jasper-9999.ebuild 1828 BLAKE2B 45da6d7171e35e4eed1d28e79f51e05ce652e54592dcf7553b0dc33eee6a518263557b648a59f3046c393f14e15fe905bb61e9a98dca511abd2a58aa2360164e SHA512 2b4b5c71d9177c96ff1d12cc1855b4128e9517430335584c054754d49828665bba9fbd096544cb79c0d9e65c0911c8161ed4c4ca9435cfd25f277ab0b4ab1579
 MISC metadata.xml 342 BLAKE2B 4260ac1403a844c48b72bd62c04073de06da73cecca8bbab9fdd7de36b4a462feabee08d933b0098c451691b17aa3ff7d7e3eb25052461381a37198b12225c55 SHA512 a01344f985dc6b7a24ca568fe859f2a593b55df39ba7b711c4db62eb7df5389007cb6c8dd1ab399f70bf8cb221a22681a9eab279ce8ab1ea6b198fa65f1b8a20
diff --git a/media-libs/jasper/jasper-2.0.16.ebuild b/media-libs/jasper/jasper-2.0.16.ebuild
new file mode 100644
index 000000000000..e38d99a4ea70
--- /dev/null
+++ b/media-libs/jasper/jasper-2.0.16.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+DESCRIPTION="Implementation of the codec specified in the JPEG-2000 Part-1 standard"
+HOMEPAGE="https://www.ece.uvic.ca/~mdadams/jasper/"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mdadams/jasper.git"
+else
+	SRC_URI="https://github.com/mdadams/${PN}/archive/version-${PV}.tar.gz -> ${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 ~x86-solaris"
+	S="${WORKDIR}/${PN}-version-${PV}"
+fi
+
+# We limit memory usage to 128 MiB by default, specified in bytes
+: ${JASPER_MEM_LIMIT:=134217728}
+
+LICENSE="JasPer2.0"
+SLOT="0/4"
+IUSE="doc jpeg opengl"
+
+RDEPEND="
+	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	opengl? (
+		>=virtual/opengl-7.0-r1:0[${MULTILIB_USEDEP}]
+		>=media-libs/freeglut-2.8.1:0[${MULTILIB_USEDEP}]
+		virtual/glu[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXmu[${MULTILIB_USEDEP}]
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DALLOW_IN_SOURCE_BUILD=OFF
+		-DBASH_PROGRAM="${EPREFIX}"/bin/bash
+		-DJAS_ENABLE_ASAN=OFF
+		-DJAS_ENABLE_LSAN=OFF
+		-DJAS_ENABLE_MSAN=OFF
+		-DJAS_ENABLE_SHARED=ON
+		-DJAS_ENABLE_STRICT=ON
+		-DJAS_ENABLE_USAN=OFF
+		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
+
+		# JPEG
+		-DJAS_ENABLE_LIBJPEG=$(usex jpeg)
+		-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg)
+
+		# OpenGL
+		-DJAS_ENABLE_OPENGL=$(usex opengl)
+		-DCMAKE_DISABLE_FIND_PACKAGE_OpenGL=$(usex !opengl)
+
+		# Doxygen
+		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(multilib_native_usex doc OFF ON)
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-libs/jasper/jasper-9999.ebuild b/media-libs/jasper/jasper-9999.ebuild
index ed20cb057f96..e38d99a4ea70 100644
--- a/media-libs/jasper/jasper-9999.ebuild
+++ b/media-libs/jasper/jasper-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
 
 inherit cmake-multilib
 
@@ -12,16 +12,16 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/mdadams/jasper.git"
 else
-	inherit vcs-snapshot
 	SRC_URI="https://github.com/mdadams/${PN}/archive/version-${PV}.tar.gz -> ${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 ~x86-solaris"
+	S="${WORKDIR}/${PN}-version-${PV}"
 fi
 
 # We limit memory usage to 128 MiB by default, specified in bytes
 : ${JASPER_MEM_LIMIT:=134217728}
 
 LICENSE="JasPer2.0"
-SLOT="0"
+SLOT="0/4"
 IUSE="doc jpeg opengl"
 
 RDEPEND="
@@ -33,8 +33,10 @@ RDEPEND="
 		x11-libs/libXi[${MULTILIB_USEDEP}]
 		x11-libs/libXmu[${MULTILIB_USEDEP}]
 	)"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
 
 multilib_src_configure() {
 	local mycmakeargs=(
diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index dbf806066055..66f7294dca7d 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,9 +1,10 @@
 AUX 1.77.0-gnuplot.patch 987 BLAKE2B 51f1fa225cb124fd3b078ed895234fb343ea78c06dd5d763dee71f37a0826c5c2dcb2c845cd1b47a2e6a855075ddf806cfa3ea5895077163bce2209acffe5851 SHA512 36d996202de66ffd0b241b813779c62830d688c42bc21670d277f370243636c6c0658067d806b6be3f765aa1527a4ebd4bac3fe6e0188fc5381f599f14239b51
+AUX 1.78.0-gnuplot.patch 672 BLAKE2B 85058c0eab02b289df011f3e4462d91c43e9780591c0991206523d55ce91f02fab85ff47c235522614862e14f078d5e0879fd89b88e70607167f91d57f7b63c0 SHA512 846d5488667b3a21dea81a7059505cdfd2916eff51053dadda978f1520a250ce8ebfdf7b5a820e11630dee4dfb9c0b78340aed9dc109f6fd119e01b855c16554
 AUX baseline_reg.patch 847 BLAKE2B d45b93ba00abffca157438b6140e329de2cafe95be97fafcfc60272fa821fb847984838179cff186babf8931f79decdccb1bfa0a724abc6de675b1551ff0684e SHA512 a35f518aaf384ed35130cbd509e2ae16efc1878a3528d174156105af6d6259a094d205c47084f068b1f42e07ab87e750d6b82113376e00e041e81fedf90dd541
 DIST leptonica-1.74.4.tar.gz 12349877 BLAKE2B 5c4a71c1c4f44b617f16b1b1029455badee268dc1ac459f1c7ffe6af5b8dbe702bdbaa6e5564af6e41d0881c59e1aa43dc40d5164f618f13ca2a563b2aa3bd0e SHA512 e74732c10218430463ca01f15e19d329dceb938e315586ed100c634c4d50809824f1d9bf7eeaf91654caf42ed78a5ae5de7c08e7a1d8884c580c536121627891
-DIST leptonica-1.76.0.tar.gz 12436958 BLAKE2B 3cbb581340531762090f009393b21252d6f7ecbe3dd7c30043f42e8a437f6ae16d3e95229fedcf6845ca47e4323a35ab3e72e349c6fae35f0587c21b44461ef8 SHA512 83c77bebbf739cecab997ee08f7c9abf3ca884019c559b8f77c292ea2676c464cbf9b6812d7f12aefceef86c19d04bb3bc85119de298647a641b984dcdf3b111
 DIST leptonica-1.77.0.tar.gz 12888756 BLAKE2B a1de6ff8d886c4e302faa362ad5c18ece727771e5cdbe62b33c34c950d1af9e0e97418e59485568a6386eb2a7e51fd42ffb2fd01f16591c5bc668961640f1f4d SHA512 3cf764c76d5acb6d5982c44e78c02d7a7c3b5e79937c41df193e71dd8a02dbbf965d34a2ecdf0444e907cb73c06bdb8bcae4ceafbf5ee1483c022659e897015b
+DIST leptonica-1.78.0.tar.gz 12905925 BLAKE2B 6a7b74e8aa78a3e4fa6429bbf180001e7d362ebd37d4fd179ba90df7a41993e52d708813ea5a2b30dc90516b7bec83e5386735025993d73f279ab595c39f6c9c SHA512 f059ccc8e7b5ff2c796aeb4ab18bd25e133ec4f38c36b9e2ee203db35a1e68cf45b8baf78ebc4acba4e3607328d1374ea0e8425f35cbe06c6c5728a1ec8c3f50
 EBUILD leptonica-1.74.4.ebuild 1714 BLAKE2B 0d6f7f596f2ddda2515ec95966cfdb4e9bc7c059fd88c58700a2c05139529fd550fa7a077b30da8fe0f8abee36a9d5b915ac56b5d86a8573c3e44767c2e13338 SHA512 26fcc48126498ab1d7c80f4aeaa0a263bd443e0fd72ceaefdc00e34543fc9a3a91c7cac6481bd334f58f29b920983b3b175cc9091128ce6a096530a1d808a15e
-EBUILD leptonica-1.76.0.ebuild 1912 BLAKE2B a526eae23b91e0f089db992d80280e192462328ad520831d513dcb7e0f5d025de3e0e786dc935552e53b8529ba997d71dff4fd0f5f5e8fb0519ae9947a5f1037 SHA512 ab4f22f918c8c23275b2d5a343bb9952b00a167522722b63c350effaedad0c6ab0cdbc62e5487a4d16d0cc4d2088e050d3fca139219eaa9c1991e929c79dfd6e
 EBUILD leptonica-1.77.0.ebuild 1995 BLAKE2B bc14325f908d06c6cb9d6002849d68b1a7b6844238c88103c16551bf661b45230491d50d1572d05508c1c974c0392a87412fa17100208cbf8b021731ff228fde SHA512 71f006841bbc39526b858ed09705c7835ca6dfe23c756fdaa64a8ccd3ea54e4bc633d60833e39f2277cd7d011872cb2590f2557a55961842ac1cd624420e84f5
+EBUILD leptonica-1.78.0.ebuild 1995 BLAKE2B bc14325f908d06c6cb9d6002849d68b1a7b6844238c88103c16551bf661b45230491d50d1572d05508c1c974c0392a87412fa17100208cbf8b021731ff228fde SHA512 71f006841bbc39526b858ed09705c7835ca6dfe23c756fdaa64a8ccd3ea54e4bc633d60833e39f2277cd7d011872cb2590f2557a55961842ac1cd624420e84f5
 MISC metadata.xml 518 BLAKE2B 59db99ac81e5c10275950d5c67e1c85c61c48f9eef84d533606a26beb1f3b6b3c1eb844a163687376a74dcd9561dfc91f6b85df4202a20ecf3c58f8e1201b88e SHA512 2a34197102a9d9d90faa90aa2f19e78e8a848e779ad3ad0f1bdb7d3d9d91572749ce2351c402403a0281019af1b59e0fd19c4e1809bd00836cede17647391773
diff --git a/media-libs/leptonica/files/1.78.0-gnuplot.patch b/media-libs/leptonica/files/1.78.0-gnuplot.patch
new file mode 100644
index 000000000000..758b78258dd3
--- /dev/null
+++ b/media-libs/leptonica/files/1.78.0-gnuplot.patch
@@ -0,0 +1,13 @@
+diff --git a/prog/reg_wrapper.sh b/prog/reg_wrapper.sh
+index cee1f54..f16d980 100755
+--- a/prog/reg_wrapper.sh
++++ b/prog/reg_wrapper.sh
+@@ -31,7 +31,7 @@ TEST_NAME="${TEST##*/}"
+ TEST_NAME="${TEST_NAME%_reg*}"
+ 
+ case "${TEST_NAME}" in
+-    baseline|boxa[12]|colormask|colorspace|dna|enhance|extrema|fpix1|italic|kernel|nearline|numa[12]|projection|rankbin|rankhisto|wordboxes)
++    baseline|boxa[1234]|colormask|colorspace|dna|enhance|extrema|fpix1|italic|kernel|nearline|numa[12]|projection|rankbin|rankhisto|wordboxes)
+         GNUPLOT=$(type -P gnuplot || type -P wgnuplot)
+ 
+         if [ -z "${GNUPLOT}" ] || ! "${GNUPLOT}" -e "set terminal png" 2>/dev/null ; then
diff --git a/media-libs/leptonica/leptonica-1.76.0.ebuild b/media-libs/leptonica/leptonica-1.78.0.ebuild
index 6d4921ca7594..1e8f7a678d8b 100644
--- a/media-libs/leptonica/leptonica-1.76.0.ebuild
+++ b/media-libs/leptonica/leptonica-1.78.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
+EAPI=7
 
-inherit ltprune multilib-minimal
+inherit multilib-minimal
 
 DESCRIPTION="C library for image processing and analysis"
 HOMEPAGE="http://www.leptonica.org/"
@@ -28,6 +28,10 @@ RDEPEND="gif? ( >=media-libs/giflib-5.1.3:=[${MULTILIB_USEDEP}] )
 DEPEND="${RDEPEND}
 	test? ( media-libs/tiff:0[zlib] )"
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-gnuplot.patch
+)
+
 ECONF_SOURCE="${S}"
 DOCS=( README version-notes )
 
@@ -65,7 +69,7 @@ multilib_src_test() {
 	rm -rf /tmp/lept/ || die
 }
 
-src_install() {
-	multilib-minimal_src_install
-	prune_libtool_files
+multilib_src_install_all() {
+	# libtool archives covered by pkg-config.
+	find "${D}" -name "*.la" -delete || die
 }
diff --git a/media-libs/libXcm/Manifest b/media-libs/libXcm/Manifest
index 985eebb4aa43..884e3b48ecd7 100644
--- a/media-libs/libXcm/Manifest
+++ b/media-libs/libXcm/Manifest
@@ -1,4 +1,4 @@
 DIST libXcm-0.5.4.tar.gz 397552 BLAKE2B 73fb9aa2e52f1b0a26108d6e07fc66afa9da6503aedd49a140692a467bf5665c4551ac34224f91305debb5e15384e29b93fd4a2ef9f233e0b4f5c6c0ab1bce27 SHA512 96d279aff907bbbe4e38d099b79ebbc3b3beaf242be296d10a16e36e721669086ae0b5252f5abc629cc1fd65e595e2eec70bb890ea6ca4bbd08e8ce91cb05b53
 EBUILD libXcm-0.5.4.ebuild 1051 BLAKE2B eabd2215954c8e532780cd93b6718f90453c19e3d27ea079ba3b923addfdcde626dea104fa74966e4335c7e0d2b8fcec0137cc7859ea9ddd60f0730cb7638306 SHA512 9b3280340e8618e1cb390781f58a4bd9834d6e536e7e6d6701a44a300aa0c28c0f36b4a23c8c734c1ae8916d9484de25ef599abb3cf1eb5028c09cb1dfa78c86
-EBUILD libXcm-9999.ebuild 1041 BLAKE2B 1ed9d2b456497ef69475c45cad8890fccbad63ab4cdb6fcd9b210e0c19290b2ea382344289138ed2f16f02fe6f77642f5f478c3ba66c267347113fd4d701e055 SHA512 0bb7a0c19467c9546624c9e4f279f00b634317b748a93aa2e1f316284f42e8826686d3e4aeafd453e1f56d3472d6a78486fff00e5e2a000d82841511767d4c6e
+EBUILD libXcm-9999.ebuild 875 BLAKE2B f37e5f335a04c84791cd5d967d8ff990e262cb120b6e09837876e74b41c45718f433db7a9b9f89b4241a19c1c9177fdc37761f890fdaaee6c2c9b083e3079359 SHA512 9bd5f0148c9089981df4cd48b365fe805efb650fca79a5a644c7c24a4aa26529b65a2a4839e97a89d07c2efcf055b657d6491a82780ead42366f654beafa7799
 MISC metadata.xml 302 BLAKE2B c089ace165b933d9f27e066196f28ed5b5cfad718090384a2bb49c7872f3cb3b9af85d4944b4ec9af0f596daf6fd172963ba797fc57eda5573548d74cce8bd90 SHA512 5d4afa6ae4e9df290f007c047159be9103f78e839ab183ee77b87784a3ce78ddaebb11ba8d8e29b65fd2ec1d65b0900a1162178acdd1ab796024ac06f1e60282
diff --git a/media-libs/libXcm/libXcm-9999.ebuild b/media-libs/libXcm/libXcm-9999.ebuild
index d39e3f05a318..dff600917b05 100644
--- a/media-libs/libXcm/libXcm-9999.ebuild
+++ b/media-libs/libXcm/libXcm-9999.ebuild
@@ -1,49 +1,48 @@
-# 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
+
+inherit autotools
 
 if [[ ${PV} = *9999 ]]; then
-	GITECLASS="git-r3"
 	EGIT_REPO_URI="https://github.com/oyranos-cms/libxcm.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/oyranos-cms/${PN,,}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~x86"
+	S="${WORKDIR}/${P,,}"
 fi
-inherit autotools multilib-minimal ${GITECLASS}
-unset GITECLASS
 
 DESCRIPTION="Reference implementation of the X Color Management specification"
-HOMEPAGE="http://www.oyranos.org/libxcm/"
-[[ ${PV} != *9999 ]] && \
-SRC_URI="https://github.com/oyranos-cms/${PN,,}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://www.oyranos.org/libxcm/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
 IUSE="static-libs X"
 
 RDEPEND="
 	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXmu[${MULTILIB_USEDEP}]
+		x11-libs/libX11
+		x11-libs/libXfixes
+		x11-libs/libXmu
 	)
 "
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
-[[ ${PV} != *9999 ]] && S="${WORKDIR}/${P,,}"
-
 src_prepare() {
 	default
 	eautoreconf
-	multilib_copy_sources
 }
 
-multilib_src_configure() {
+src_configure() {
 	econf \
 		$(use_enable static-libs static) \
 		$(use_with X x11)
 }
 
-multilib_src_install_all() {
-	find "${D}" -name '*.la' -delete || die
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/media-libs/libasdcp-cth/Manifest b/media-libs/libasdcp-cth/Manifest
deleted file mode 100644
index e875c0a2140c..000000000000
--- a/media-libs/libasdcp-cth/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX libasdcp-cth-0.1.1-no-ldconfig.patch 269 BLAKE2B ca93c78ba61e48f0e7de857e762d7f80390862822508610bfdf879edfac65dfd6ec427ad499ff4101c03f95a69caa99053cac63ba34db1f6777612acc16a70f1 SHA512 72bd96dd5a93c3b17b488ee67a8b5297b5f5f712e024cee17fe8c0b6669f15f267dd9ab7c7cb3b81a266d5ad3aca1cab2b9c49eaf6e9486883a61442f87786fb
-AUX libasdcp-cth-0.1.2-respect-cxxflags.patch 423 BLAKE2B 0b87a20f15e36e839893cead97f259abed082b02e5801f81d291aba1056c1868ae72102164225d25df2d933cf584a6a6a9f6c0f0fb02f4e16af577bfea3808e2 SHA512 9c363d6705f6f0b1da7387ab9366ec1f14334325958ab56bb005b3ef8cede0a67953def0033ccee098d7cde42df5ade3aad99a98fdd69ffad5ec4c8c54a287a5
-DIST libasdcp-cth-0.1.3.tar.bz2 637004 BLAKE2B 5c8a5a63f9d8b8a3e6ea245d7ad66715f4dc4f73af41bacc66d2259d25ecf52e2f1c951b240478fd674f34c8c9581a2867acd05e2bd23c5ad95609a22b5f7680 SHA512 db707a39e79ce4dcda7f20610b4fc3d1609d75dc9cc1f14a6bf7627231993882e843a3ebd9abb540a3f746c2898f94fa7bfd0617eb7c85d243585e4647e218c6
-EBUILD libasdcp-cth-0.1.3.ebuild 824 BLAKE2B 9d5189fa5ceaf6176ec48724594d659b1a187c8b11fe324aa80ad32281396654fbb2bc544d843b3082ea31efd76b61de39c6c5f9b6fbbf291bab75149cfde543 SHA512 c7aa2b52c94e20328d66f5c48336cc1aa1fec85da29ceb0790d7aef5a950c8c80ae68fea10d44ad16728e9c27d5a91a80686d3a1dea6bcd0818fbaa9aba2db6e
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-libs/libasdcp-cth/files/libasdcp-cth-0.1.1-no-ldconfig.patch b/media-libs/libasdcp-cth/files/libasdcp-cth-0.1.1-no-ldconfig.patch
deleted file mode 100644
index 097f31ecabb3..000000000000
--- a/media-libs/libasdcp-cth/files/libasdcp-cth-0.1.1-no-ldconfig.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libasdcp-cth-0.1.1/wscript
-+++ libasdcp-cth-0.1.1/wscript
-@@ -84,8 +84,7 @@
-     bld.add_post_fun(post)
- 
- def post(ctx):
--    if ctx.cmd == 'install':
--        ctx.exec_command('/sbin/ldconfig')
-+    pass
- 
- def tags(bld):
-     os.system('etags src/*.cc src/*.h')
diff --git a/media-libs/libasdcp-cth/files/libasdcp-cth-0.1.2-respect-cxxflags.patch b/media-libs/libasdcp-cth/files/libasdcp-cth-0.1.2-respect-cxxflags.patch
deleted file mode 100644
index 15eeceb58423..000000000000
--- a/media-libs/libasdcp-cth/files/libasdcp-cth-0.1.2-respect-cxxflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- libasdcp-cth-0.1.2/wscript
-+++ libasdcp-cth-0.1.2/wscript
-@@ -38,11 +38,6 @@
-     else:
-         boost_lib_suffix = ''
- 
--    if conf.options.enable_debug:
--        conf.env.append_value('CXXFLAGS', '-g')
--    else:
--        conf.env.append_value('CXXFLAGS', '-O2')
--
-     conf.check_cxx(fragment="""
-                             #include <boost/version.hpp>\n
-                             #if BOOST_VERSION < 104500\n
diff --git a/media-libs/libasdcp-cth/libasdcp-cth-0.1.3.ebuild b/media-libs/libasdcp-cth/libasdcp-cth-0.1.3.ebuild
deleted file mode 100644
index 06b2c20ea9c1..000000000000
--- a/media-libs/libasdcp-cth/libasdcp-cth-0.1.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-PYTHON_REQ_USE="threads(+)"
-inherit python-any-r1 waf-utils
-
-DESCRIPTION="implementation of SMPTE and the MXF Interop Sound & Picture Track File format"
-HOMEPAGE="http://carlh.net/asdcplib"
-SRC_URI="http://carlh.net/downloads/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-libs/boost
-	dev-libs/openssl:0"
-DEPEND="${RDEPEND}
-	dev-util/waf
-	virtual/pkgconfig
-	${PYTHON_DEPS}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.1.1-no-ldconfig.patch
-	"${FILESDIR}"/${PN}-0.1.2-respect-cxxflags.patch)
-
-src_prepare() {
-	rm -r waf aclocal.m4 m4 configure{,.ac} Makefile.{am,in} || die
-	export WAF_BINARY=${EROOT}usr/bin/waf
-
-	default
-}
diff --git a/media-libs/libasdcp-cth/metadata.xml b/media-libs/libasdcp-cth/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/media-libs/libasdcp-cth/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/libdcp/Manifest b/media-libs/libdcp/Manifest
deleted file mode 100644
index cd87d4dd3899..000000000000
--- a/media-libs/libdcp/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX libdcp-1.3.3-no-ldconfig.patch 253 BLAKE2B ad3ccf48bf1655889765ceb6e6bf1e5fcd145124cf4bbca1503381a297257f4433c55aa8f7ec165f24ce29ae490e512df50e6a07bd1f478525e42bc0fb9a7088 SHA512 23ef7c9c04e9720443f1ac9ecc1e8015d7223f69711d092dd596b5d1798deab69fb05359bb51e50c8447fb5929e278415182e61e82b327396b242afa72976a00
-AUX libdcp-1.3.4-respect-cxxflags.patch 2832 BLAKE2B dc053cf167777a8b806792c4188ce5fbc1c44cb72a0f312625242f1ca0c1d63abd7592676a1a76784ef31a61dafc4fbb51460524d0725dce8b98559d757f4f9c SHA512 453e1407eb97d4e015382ccf7184ad7ca21048da97deef7156e4b59c5bf6e736ae67276e5517378aa42c6035326a7d178fe6923a1db00e0b2553136541119b34
-DIST libdcp-1.5.2.tar.bz2 754546 BLAKE2B 69cedd7a782fe89e538b893a6f919515e87bbb24331a189cde6d16bafcc9d2a442156a5db58eb963088511ca2b233a24695d1a124a7830f955f8074b1b059d30 SHA512 717486e06af2f89795dcaff09ccea38eeba786a55bc3df01acc576749a475df4a6dbd74b3edaceb08af5615468c24f45fec0527b315e2e5842683333f9118499
-EBUILD libdcp-1.5.2.ebuild 1359 BLAKE2B 2762cd217f106acc364ad9f40bd2b2d6c381cb900eed4603b0d05cd5cec9866565c2348a2242c6dbc96840ec790e476e78d34a1635167965881bdb63cddfd34c SHA512 34ee803ab2200b3b81bea9d32ffc0e8874d5793a1368098d840b30e4eeced15933812c47b4b3ebb0bc7b69deac8086e5ca578a997bee9119b4805448724ca537
-EBUILD libdcp-9999.ebuild 1374 BLAKE2B fa1732446f031f0f7341608d72f3025f94ec822ce3540bd575822f3e9fac1642f2925acbd562539c82f1d0d9703944743bcc4074ab148609b20777b4577f5948 SHA512 05ccfdf925e37f2393994141ebb0d484a4875a3b2b99864652201fd6e592be12d75bbdaa10953d26e2691adc859e72495da748043990a643b0dd726565dca1ea
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-libs/libdcp/files/libdcp-1.3.3-no-ldconfig.patch b/media-libs/libdcp/files/libdcp-1.3.3-no-ldconfig.patch
deleted file mode 100644
index f8dbb1ba30e2..000000000000
--- a/media-libs/libdcp/files/libdcp-1.3.3-no-ldconfig.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libdcp-1.3.3/wscript
-+++ libdcp-1.3.3/wscript
-@@ -206,8 +206,7 @@
-         sys.exit(-1)
- 
- def post(ctx):
--    if ctx.cmd == 'install':
--        ctx.exec_command('/sbin/ldconfig')
-+    pass
- 
- def tags(bld):
-     os.system('etags src/*.cc src/*.h')
diff --git a/media-libs/libdcp/files/libdcp-1.3.4-respect-cxxflags.patch b/media-libs/libdcp/files/libdcp-1.3.4-respect-cxxflags.patch
deleted file mode 100644
index 0082d92391ba..000000000000
--- a/media-libs/libdcp/files/libdcp-1.3.4-respect-cxxflags.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- libdcp-1.3.4/wscript
-+++ libdcp-1.3.4/wscript
-@@ -133,13 +133,6 @@
-     else:
-         boost_lib_suffix = ''
- 
--    if conf.options.enable_debug:
--        conf.env.append_value('CXXFLAGS', '-g')
--    else:
--        # Somewhat experimental use of -O2 rather than -O3 to see if
--        # Windows builds are any more reliable
--        conf.env.append_value('CXXFLAGS', '-O2')
--
-     conf.check_cxx(fragment="""
-                             #include <boost/version.hpp>\n
-                             #if BOOST_VERSION < 104500\n
---- libdcp-1.4.4/src/wscript
-+++ libdcp-1.4.4/src/wscript
-@@ -196,7 +196,7 @@
-         obj.uselib = 'BOOST_FILESYSTEM BOOST_SIGNALS2 BOOST_DATETIME OPENSSL SIGC++ LIBXML++ OPENJPEG CXML XMLSEC1 ASDCPLIB_CTH'
-         obj.use = 'libkumu-libdcp%s libasdcp-libdcp%s' % (bld.env.API_VERSION, bld.env.API_VERSION)
-         obj.source = source
--        obj.cppflags = ['-fprofile-arcs', '-ftest-coverage', '-fno-inline', '-fno-default-inline', '-fno-elide-constructors', '-g', '-O0']
-+        obj.cppflags = ['-fprofile-arcs', '-ftest-coverage', '-fno-inline', '-fno-default-inline', '-fno-elide-constructors']
- 
-     bld.install_files('${PREFIX}/include/libdcp%s/dcp' % bld.env.API_VERSION, headers)
-     if bld.env.STATIC:
---- libdcp-1.4.4/test/wscript
-+++ libdcp-1.4.4/test/wscript
-@@ -52,7 +52,7 @@
-     obj = bld(features='cxx cxxprogram')
-     obj.name   = 'tests'
-     obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM BOOST_DATETIME OPENJPEG CXML XMLSEC1 SNDFILE OPENMP ASDCPLIB_CTH LIBXML++ OPENSSL'
--    obj.cppflags = ['-fno-inline', '-fno-default-inline', '-fno-elide-constructors', '-g', '-O0']
-+    obj.cppflags = ['-fno-inline', '-fno-default-inline', '-fno-elide-constructors']
-     if bld.is_defined('HAVE_GCOV'):
-         obj.use = 'libdcp%s_gcov' % bld.env.API_VERSION
-         obj.lib = ['gcov']
-@@ -101,7 +101,7 @@
-     obj = bld(features='cxx cxxprogram')
-     obj.name   = 'subs_in_out'
-     obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM OPENJPEG CXML OPENMP ASDCPLIB_CTH XMLSEC1 OPENSSL'
--    obj.cppflags = ['-fno-inline', '-fno-default-inline', '-fno-elide-constructors', '-g', '-O0']
-+    obj.cppflags = ['-fno-inline', '-fno-default-inline', '-fno-elide-constructors']
-     if bld.is_defined('HAVE_GCOV'):
-         obj.use = 'libdcp%s_gcov' % bld.env.API_VERSION
-         obj.lib = ['gcov']
-@@ -116,7 +116,7 @@
-     obj = bld(features='cxx cxxprogram')
-     obj.name   = 'rewrite_subs'
-     obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM OPENJPEG CXML OPENMP ASDCPLIB_CTH XMLSEC1 OPENSSL'
--    obj.cppflags = ['-fno-inline', '-fno-default-inline', '-fno-elide-constructors', '-g', '-O0']
-+    obj.cppflags = ['-fno-inline', '-fno-default-inline', '-fno-elide-constructors']
-     if bld.is_defined('HAVE_GCOV'):
-         obj.use = 'libdcp%s_gcov' % bld.env.API_VERSION
-         obj.lib = ['gcov']
diff --git a/media-libs/libdcp/libdcp-1.5.2.ebuild b/media-libs/libdcp/libdcp-1.5.2.ebuild
deleted file mode 100644
index 6df4350313eb..000000000000
--- a/media-libs/libdcp/libdcp-1.5.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} )
-PYTHON_REQ_USE="threads(+)"
-inherit python-any-r1 waf-utils
-
-DESCRIPTION="create and read Digital Cinema Packages using JPEG2000 and WAV files"
-HOMEPAGE="http://carlh.net/libdcp"
-SRC_URI="http://carlh.net/downloads/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1.0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="dev-cpp/glibmm:2
-	dev-cpp/libxmlpp:2.6
-	>=dev-libs/boost-1.61.0
-	>=dev-libs/libcxml-0.15.4
-	dev-libs/libsigc++:2
-	dev-libs/libxml2
-	dev-libs/openssl:0
-	dev-libs/xmlsec
-	>=media-libs/libasdcp-cth-0.1.3
-	media-libs/openjpeg:2
-	|| ( media-gfx/graphicsmagick media-gfx/imagemagick )"
-DEPEND="${RDEPEND}
-	dev-util/waf
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	test? ( app-text/xmldiff )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.3.3-no-ldconfig.patch
-	"${FILESDIR}"/${PN}-1.3.4-respect-cxxflags.patch )
-
-src_prepare() {
-	rm -v waf || die
-	export WAF_BINARY=${EROOT}usr/bin/waf
-
-	ewarn "Some tests failing due missing files/certs are disabled."
-	sed -e '/atmos_test.cc/d' \
-		-e '/certificates_test.cc/d' \
-		-e '/dcp_test.cc/d' \
-		-e '/decryption_test.cc/d' \
-		-e '/read_smpte_subtitle_test.cc/d' \
-		-e '/sound_frame_test.cc/d' \
-		-i test/wscript || die
-
-	default
-}
-
-src_test() {
-	./build/test/tests || die
-}
diff --git a/media-libs/libdcp/libdcp-9999.ebuild b/media-libs/libdcp/libdcp-9999.ebuild
deleted file mode 100644
index 8edf105423e6..000000000000
--- a/media-libs/libdcp/libdcp-9999.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} )
-PYTHON_REQ_USE="threads(+)"
-inherit git-r3 python-any-r1 waf-utils
-
-DESCRIPTION="create and read Digital Cinema Packages using JPEG2000 and WAV files"
-HOMEPAGE="http://carlh.net/libdcp"
-EGIT_REPO_URI="https://github.com/cth103/${PN}.git"
-EGIT_BRANCH="1.0"
-
-LICENSE="GPL-2"
-SLOT="1.0"
-KEYWORDS=""
-IUSE="test"
-
-RDEPEND="dev-cpp/glibmm:2
-	dev-cpp/libxmlpp:2.6
-	>=dev-libs/boost-1.61.0
-	>=dev-libs/libcxml-0.15.4
-	dev-libs/libsigc++:2
-	dev-libs/libxml2
-	dev-libs/openssl:0
-	dev-libs/xmlsec
-	>=media-libs/libasdcp-cth-0.1.3
-	media-libs/openjpeg:2
-	|| ( media-gfx/graphicsmagick media-gfx/imagemagick )"
-DEPEND="${RDEPEND}
-	dev-util/waf
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	test? ( app-text/xmldiff )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.3.3-no-ldconfig.patch
-	"${FILESDIR}"/${PN}-1.3.4-respect-cxxflags.patch )
-
-src_prepare() {
-	rm -v waf || die
-	export WAF_BINARY=${EROOT}usr/bin/waf
-
-	ewarn "Some tests failing due missing files/certs are disabled."
-	sed -e '/atmos_test.cc/d' \
-		-e '/certificates_test.cc/d' \
-		-e '/dcp_test.cc/d' \
-		-e '/decryption_test.cc/d' \
-		-e '/read_smpte_subtitle_test.cc/d' \
-		-e '/sound_frame_test.cc/d' \
-		-i test/wscript || die
-
-	default
-}
-
-src_test() {
-	./build/test/tests || die
-}
diff --git a/media-libs/libdcp/metadata.xml b/media-libs/libdcp/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/media-libs/libdcp/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/libdiscid/Manifest b/media-libs/libdiscid/Manifest
index 034ed478b963..4ba77a2c4a4f 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 589 BLAKE2B 704240c2506555ef99f84245658f7a8cf51eb6b7cfbc032c656cac91044a31fc003af990adaac25b2799a8c7c1e9d0077935e3395606ceac78181d806429e100 SHA512 63b8c7b482df7aa8dde5f08347c08671e6c16e6d025a7c1b7b4fc2b3304b22a31f04bf7ccc55a17c15c9798f67a8111c23ba51c141eb2fc8a3d1add8aff00cb4
+EBUILD libdiscid-0.6.2.ebuild 585 BLAKE2B 6f6423d87c3d5240152f89f55ac626d207217dda7cc3b1e9b4bd0e8b74679634826642e24f02a03de48c7f2fd9a8e8d0674a52fca344588cea340897042f9617 SHA512 8e3d0b1f0a287a53e3c08aa105e90a45d55a5825fd74d8eb5f2c8e5ecc628c66f639acfd8ef3e3ff5eb84a6e978dbcec6d00310b149a5b5748fe9f9a6efae252
 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 387386bb0bef..91a541e06dd7 100644
--- a/media-libs/libdiscid/libdiscid-0.6.2.ebuild
+++ b/media-libs/libdiscid/libdiscid-0.6.2.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
@@ -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/libemf/Manifest b/media-libs/libemf/Manifest
index fd42187e84f0..5cb8948f20f2 100644
--- a/media-libs/libemf/Manifest
+++ b/media-libs/libemf/Manifest
@@ -2,5 +2,5 @@ AUX libemf-1.0.4-amd64-alpha.patch 3194 BLAKE2B 323edc7677dda422d6a3669ee7cd117f
 DIST libEMF-1.0.4.tar.gz 818060 BLAKE2B 0abc5f478d06ebc562323a515c51c46afd2a98fd2559d8a309c4b18f16da8063cd65fa7d19a83ba360e8c53a7e9788b590e810d615000069fe7c912194a8eec1 SHA512 8abd6081e79e6045b0a4a1575fbcc19921beeefb22036164ed906a35e4dbc67b6959899acf46bb5db5996ae07cf38aaecf8eb62dd6bf5f528200a4d20b13db55
 DIST libEMF-1.0.7.tar.gz 908973 BLAKE2B cfe2c67bfae9fd7387f5332fa7b5038510d81aab942fc87b04da625ecc39c3e2b711ed14fba46eabae4a2eced4621eb580cedf1c9e67f32fb33afb9bc1ceaa5e SHA512 eff5c46a6e1008d8f581fda59355faa608a825e4832c54dbb074bf20caeee5b038ce18ed3a13181de04bd0601837db7f5c5a0913eb1b8301100dbc26a9ee5888
 EBUILD libemf-1.0.4-r1.ebuild 888 BLAKE2B 8b234f8240cfb50c30a80ef7c5a7a2fce0b5a57f9e6ce5668b80f91a7915e39df7a1f01592278aa2cfaf1bcb5fcdc414aad2d43926217b2d24728fc54e882ca0 SHA512 0954d6e0eba01dcef17513577600ccc980e1810aef7b06283dc165505e0ee32d4815c9c15fc2b3b839791885bbf6a3081d15937507c591d1508f5854b73cd362
-EBUILD libemf-1.0.7.ebuild 837 BLAKE2B b9db96b52ff107d413c45cac0bbbffa917443ca4c0109fad1712d962af8108b05f7ba55a51786777a4921e3517a90c7798fb574184651e78436f230fff41cbbe SHA512 e61560c9b450c11bf11eaa8ee53f6660e21ebe24cef2e12eda9bebc2af8f7e35465ec478fc2bb8a1be2a27e0f4d3d69539c674c21337548639ad5bb01b83ad5b
+EBUILD libemf-1.0.7.ebuild 836 BLAKE2B 146bbedd71bf6d684878da27290c8cdfde48cc1584e066a535d69c22acbb15844069687d21638994c0ac34d50ab57544eddb3aa344f2bb00ec5839d49b6b2210 SHA512 6bcdc76b4486eaa00e2d656ae2436fb84289081d1a2c1fd8d835a403ebda62797d9c61ff988daa957c604d8080fbe2262676325e1baa4c56ed9fbaf47c2caf2d
 MISC metadata.xml 248 BLAKE2B dce07ccd35cdf8117e7f05bbe068c807c381bb91d899d48834974c1d362cc25c3d114dffba55b67c669b96893cfcb7cc56451a6ad833cc5b5cf89f577e714b27 SHA512 89826cb9b2687c78bf585335d0f103d00a5c58d9e5902003e18710e9a8afff7304bc39f3909de99f2b14b4b8a6a007a1f0e3aa5f90bf31d0b8d7314a3c7edf05
diff --git a/media-libs/libemf/libemf-1.0.7.ebuild b/media-libs/libemf/libemf-1.0.7.ebuild
index c574e988b2a1..0418a409840b 100644
--- a/media-libs/libemf/libemf-1.0.7.ebuild
+++ b/media-libs/libemf/libemf-1.0.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/libemf/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 -arm ppc ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 -arm ppc ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 S=${WORKDIR}/${MY_P}
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index da33315a8488..078ec667770e 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -3,6 +3,5 @@ AUX libexif-0.6.21-CVE-2017-7544.patch 1060 BLAKE2B 130b95e5f4f44402385bb6825e87
 AUX libexif-0.6.21-CVE-2018-20030.patch 4629 BLAKE2B 574f95d21507887851da9486cbd8d263ad25e1df59dd8020f1e4b640d5cc4852667c689993e67a7d705c748b521a46cd5e187a99c9d92787bc9758631c8d7741 SHA512 c49437dffebb901209748b884d67192d2b77072b2fb96c77b95f398d3c68272b14ac4a6ddd33111df8dac49cd6ab8f38e230f8f3f0a842d4b40f2fd38f141a1d
 AUX libexif-0.6.21-fix-C89-compatibility-issue.patch 1138 BLAKE2B 5b3923a7fd82fc4c0f267684c67f329b4ff2dc43f9d088acd4a352a9f3c329b08c338c51c77b3f55654e5cf2dbb2f7ba317b10de7e963ccc7b4c1989332fd544 SHA512 a91c2f12141b7a0c399f08f038746ca44cbc468776e5b34672d38921b8a131df3938e400fea04d20c323d6d1363f8fb176a4abac7be4b1ea9bb9694aa902f19e
 DIST libexif-0.6.21.tar.bz2 1368435 BLAKE2B 151e3ddcdd45759fd70be91db27511f48a9b7d5de72c8af510e5a231e2f053f8b5d62d1269a1206e419461b07fb723788492604f1f1142edcb5ab7a0876dd307 SHA512 4e0fe2abe85d1c95b41cb3abe1f6333dc3a9eb69dba106a674a78d74a4d5b9c5a19647118fa1cc2d72b98a29853394f1519eda9e2889eb28d3be26b21c7cfc35
-EBUILD libexif-0.6.21-r2.ebuild 1270 BLAKE2B f8753e55e91ca4e35e390c326c14945a288b81dcb717476594d6299f126455de5fc5e3f1095b340140ecea93453dffff37fdf6f4061d658d28774d67de00ec65 SHA512 f1a6e41ea987e51f36e70e4078deddcbedc28c7c8931c0b8ce6e5e68fc8411a8f23319c05e6dc178d1799990ea42d223ab587452d4329445ab1605fc47ed34f6
-EBUILD libexif-0.6.21-r3.ebuild 1374 BLAKE2B 8b31dff514504dbacb510bb5a15c14064b43f233134d4ed4023d442f30076a09e04f3c8c899f045d71097f5577d8f24a4cf50f504523255cb591bb832c8fe3f0 SHA512 597660c2235e5fdcc86abcb4ed6cc7ceb960f1d7f68a5b28cce7eb6cf2ad6131df1fb3621cb7eb9953f8bf3b7c6e695ab22054cdef91ba872c1475aac77e8a07
+EBUILD libexif-0.6.21-r3.ebuild 1365 BLAKE2B f423574c76bdcbd9c9f8eb5e7716371280dc3422c2ccc60bc8aff7d74c1f4e524c763b64b04048310650b75bbd3a669ff24b6528943942a24c99dcdaff8e38e6 SHA512 328ef707b3f1d555e071edab2168b351f7ac3b4713dda375d9bb471a6b74224b2edc4bdff632e7f31d6e715679dbc62f40fe3662132586bf162266dd7540e919
 MISC metadata.xml 336 BLAKE2B 7f77063db7c0cf51903da446071dff6d4dccf66e552dd1229f01b79ab7716d02adcb146f755971d0fe96c2a04bacbd082f606c4023e6e98f9c502a3f8eda7416 SHA512 8a6e3d7c973692a37f57ce34136c863e6ad14efd064c42ea0be6c14d93beec3c7ae36ed44afd6d2454ab29f4cb633c097a0c3b2ea5c019bf06df4f306dbfced0
diff --git a/media-libs/libexif/libexif-0.6.21-r2.ebuild b/media-libs/libexif/libexif-0.6.21-r2.ebuild
deleted file mode 100644
index 6295d63c4a05..000000000000
--- a/media-libs/libexif/libexif-0.6.21-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool multilib-minimal
-
-DESCRIPTION="Library for parsing, editing, and saving EXIF data"
-HOMEPAGE="https://libexif.github.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-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 ~x86-solaris"
-IUSE="doc nls static-libs"
-
-RDEPEND="nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.13-pkgconfig.patch
-	"${FILESDIR}"/${P}-CVE-2017-7544.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e '/FLAGS=/s:-g::' configure || die #390249
-	elibtoolize # For *-bsd
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf \
-		$(use_enable doc docs) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		--with-doc-dir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	find "${D}" -name '*.la' -delete || die
-	rm -f "${ED}"/usr/share/doc/${PF}/{ABOUT-NLS,COPYING} || die
-}
diff --git a/media-libs/libexif/libexif-0.6.21-r3.ebuild b/media-libs/libexif/libexif-0.6.21-r3.ebuild
index b9af2c870d3c..77ed7b4ce609 100644
--- a/media-libs/libexif/libexif-0.6.21-r3.ebuild
+++ b/media-libs/libexif/libexif-0.6.21-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE="doc nls static-libs"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/media-libs/libmatroska/Manifest b/media-libs/libmatroska/Manifest
index ce7655b087a5..30e86695086f 100644
--- a/media-libs/libmatroska/Manifest
+++ b/media-libs/libmatroska/Manifest
@@ -2,8 +2,10 @@ DIST libmatroska-1.4.5.tar.bz2 612987 BLAKE2B 3cf0ddfdcda35a928a684d7f03abf8114d
 DIST libmatroska-1.4.7.tar.bz2 619463 BLAKE2B 5cd5adad33e327b07ded8ae042b8e2f8988339e7b5fd79026a0dd6358d8fa93c87dad641eec741d783e0ef91c9d06cd3ad881d4664544a51ecf7e901cf4b1adb SHA512 75371a94c68a472fa55e2277b90a2717dd777b506ac89fb115fa83c5093aee6609eb4b01aa65c1d5a9ce9fc597684baff2ffc330a756050b2fb746abffc2417e
 DIST libmatroska-1.4.8.tar.xz 286284 BLAKE2B 46bec9bbba97d89fe7db63715c2b3d9b648076814b206f6fe2423b09e0b9c6ab130c9cd338442eb810471773c24fe6e32dc6cc044d02bd622789e6e41f36dda1 SHA512 af3b8bfae891be77896b6afa2da3325ebba73a957cd43a4e6086b68e1237bb37b2e6d5eb57322c05ede0ad0c03464087b77fbdf06101314f09411648e1073cee
 DIST libmatroska-1.4.9.tar.xz 64556 BLAKE2B 9f2c01213edd979b325eb1dda148054bc6e0117ad41b29385f6d505108d4e2a4da643df76f957d07541bb581e71d5fed9875f1aef0804894cbab4cc39da50a98 SHA512 281224b66ce7ef39daf0f186cda1144250e190b914e64f4f2524e8bf0170a3d18dbc50f204d4ca8d7eaffe183a61f96c92ba6ec4325bacb068272d62cdbcef33
+DIST libmatroska-1.5.0.tar.xz 64596 BLAKE2B a14f3f1aef87e2bc05989d3166b562edf852c20e5a25f6bb9376cd4b5224bfc7db3f45daffa5ccff140af75a2addca2bdac024228c7512016e6568e669c639e7 SHA512 eb59b5afd9d510c2d6c7408b0053a261cee6669a9f5bbb1a939d98d96ac6c9b8f340691e95310268f59c954a1d9f72322fd0ec7b442a74c56cd2e2c22eb3a754
 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 670 BLAKE2B 63bec9d589b9d7dc20b7727c5b5676be60f93a1163ee684dc44788b91f50b44386e8f25119b916d95951b661ef2d35a1a8405a6c483d7fcaff5bbea8f197ae86 SHA512 b63a3e05ce7fa2e6682a59e20d8b98a7165a08221a8021c7c5886c2b6a7a9bb078afa5dd83aabe047f210e9dbd15f027932d741cd89bca18be3bfdaa2d4804c6
+EBUILD libmatroska-1.4.9.ebuild 668 BLAKE2B ed00494024bfe82b3db5de98f142b73413e40aec135fb7b145ebba3576b210493fc0fca29f6813bdae1186410c0bba7e2dbf203e63afcaaf3bd774b52889fa57 SHA512 3801ef7634d0ed3170e4acb6a1ab305bdfbabab58ece02c323b4f735d519ee9c13453277a6ffa575282ab31ba3823a47034b8936051c3043af366ae1f3297e61
+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 67c7f07a0a95..f9c654671935 100644
--- a/media-libs/libmatroska/libmatroska-1.4.9.ebuild
+++ b/media-libs/libmatroska/libmatroska-1.4.9.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://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/libmatroska/libmatroska-1.5.0.ebuild b/media-libs/libmatroska/libmatroska-1.5.0.ebuild
new file mode 100644
index 000000000000..960db31935ba
--- /dev/null
+++ b/media-libs/libmatroska/libmatroska-1.5.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Extensible multimedia container format based on EBML"
+HOMEPAGE="https://www.matroska.org/ https://github.com/Matroska-Org/libmatroska/"
+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"
+IUSE=""
+
+RDEPEND=">=dev-libs/libebml-1.3.7:="
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=( -DBUILD_SHARED_LIBS=YES )
+	cmake-utils_src_configure
+}
diff --git a/media-libs/libmikmod/Manifest b/media-libs/libmikmod/Manifest
index 0e32dbe2c4ff..ade0fff45ca2 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 2165 BLAKE2B c74ec37b70611249837662081e9b50a0db327158d5c7322f2f251f89b35ece6d7d72927e02c525b9f191a3ff2a9989e2a10ca2928162592f6d2a762147ba82b9 SHA512 2971ed7621ef51e91f4fc53076fe18074cf068c2e728c65834b41c1dcba0ffdcbaebebd6d8777dcd0b04dcf769467e5adb0dcebd37b41cc797bc911e36163018
+EBUILD libmikmod-3.3.11.1.ebuild 2161 BLAKE2B dee3ac369ec76bb8deed9f1ac17e5fcf62bf2dbce2eebcbfb502a4a5ed0414739c1052e73998079b0beee015be2af959499993f0dd7c8839d846bc69039aedac SHA512 3eb19c0f8aeb894102528f107c2a9ff80fa8d5a43244ee86a1aadeaec475c4cd2f0524a7f4aa1edc7843bf85ba8d39cf8e01f2851fe67d3424dd9ee8a23d651e
 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 930d2f289601..713c5f9f113d 100644
--- a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.3.11.1.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="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/libofa/Manifest b/media-libs/libofa/Manifest
index 51571d81e7dd..e9cfbfea3917 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 1119 BLAKE2B cf0a2a7d97cdf9202d7ef96b9ba92f694e37ebd94e59082e94fece34a44c2e0a5a29f2e076e5154cdb81e5c086f53b7dd4260b6f9328bd95c50b4f6a983d64c8 SHA512 dca29987815733c676384507d44d4c35d83f08580bba29b04fc733cb72f59738c003122aae725df46de11f3ac1329d0349db22f185da3d8f57d9cc631c1d123d
+EBUILD libofa-0.9.3-r2.ebuild 1118 BLAKE2B d48ec6e47393e5c0a187a1c8d9076ace79e4d30cfd2ec2d0eaf8a01981ae696a2b0c541c28735c83cd7e6ac11d128de35d63d9abcd6be896d6f0e7aab8bead5d SHA512 1c8f896e64250b7a2c5f9da477eb5ce4be76c254aad5f34f69b5f019ee96004b55333b69cf372f2a5a852e226d876c11821115a228eb878008f8a128d34dd2f8
 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 1e7197c4975e..16b7c3c3968e 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/libplacebo/Manifest b/media-libs/libplacebo/Manifest
new file mode 100644
index 000000000000..20484f698334
--- /dev/null
+++ b/media-libs/libplacebo/Manifest
@@ -0,0 +1,4 @@
+DIST libplacebo-v1.7.0.tar.gz 312154 BLAKE2B 46a807e323cce5da6362828d931daeca3eaff8475a7318dfc756c097e2edc98f064a90b36e0f6d882f95f6bb077e72127fb6f8d7643dd992c7432a13b6fdbe64 SHA512 337662e538b1d6b3d063ec18db2627619e1bd72cff6017ac19027527b07a74b0f196a428b572c9f4e3c3856c32a123b70049d7938458fb4301fdd319d756ab27
+EBUILD libplacebo-1.7.0.ebuild 1269 BLAKE2B eb4e3db0e4f23a76bb570d5a3c59727d5b882dbbf5e6d85ede981cfcfd8d82f3f1cd8ce8649380b3011050c00039c460bf1d8df8ea2507bef82c02c708f57ba2 SHA512 126c643abb16a95c173681d7626b47d805e1858408211b60cfaf0c2914beed3d50ecb270904df3a4ee61cfc7bec7c0c06ecca40108c9e52858e38dc46861c56e
+EBUILD libplacebo-9999.ebuild 1269 BLAKE2B eb4e3db0e4f23a76bb570d5a3c59727d5b882dbbf5e6d85ede981cfcfd8d82f3f1cd8ce8649380b3011050c00039c460bf1d8df8ea2507bef82c02c708f57ba2 SHA512 126c643abb16a95c173681d7626b47d805e1858408211b60cfaf0c2914beed3d50ecb270904df3a4ee61cfc7bec7c0c06ecca40108c9e52858e38dc46861c56e
+MISC metadata.xml 807 BLAKE2B f04df70a40523ad668bfa7dda7c841ce098f2105d2bc94ab6291bb194bf1fec18445b779952db33614d685ee0964c7ac6b7666b3d8cf89f8bd9391b1ccd2c553 SHA512 48d5e93ca7e964d80dc579789c6f626f9590d102b451c4f0fced538aed1301e0cb7f93fce4d03deaddb72dcad22489aa3846d8fa8ac443fcdbc4fcb90ef19040
diff --git a/media-libs/libplacebo/libplacebo-1.7.0.ebuild b/media-libs/libplacebo/libplacebo-1.7.0.ebuild
new file mode 100644
index 000000000000..d564dd10f444
--- /dev/null
+++ b/media-libs/libplacebo/libplacebo-1.7.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.gz"
+	S="${WORKDIR}/${PN}-v${PV}"
+fi
+
+inherit meson ninja-utils multilib-minimal
+
+DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
+HOMEPAGE="https://github.com/haasn/libplacebo"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="glslang lcms +shaderc +vulkan"
+REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )"
+
+RDEPEND="glslang? ( <dev-util/glslang-7.10[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] )
+	shaderc? ( >=media-libs/shaderc-2017.2[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dglslang=$(usex glslang enabled disabled)
+		-Dlcms=$(usex lcms enabled disabled)
+		-Dshaderc=$(usex shaderc enabled disabled)
+		-Dvulkan=$(usex vulkan enabled disabled)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
diff --git a/media-libs/libplacebo/libplacebo-9999.ebuild b/media-libs/libplacebo/libplacebo-9999.ebuild
new file mode 100644
index 000000000000..d564dd10f444
--- /dev/null
+++ b/media-libs/libplacebo/libplacebo-9999.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.gz"
+	S="${WORKDIR}/${PN}-v${PV}"
+fi
+
+inherit meson ninja-utils multilib-minimal
+
+DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
+HOMEPAGE="https://github.com/haasn/libplacebo"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="glslang lcms +shaderc +vulkan"
+REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )"
+
+RDEPEND="glslang? ( <dev-util/glslang-7.10[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] )
+	shaderc? ( >=media-libs/shaderc-2017.2[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dglslang=$(usex glslang enabled disabled)
+		-Dlcms=$(usex lcms enabled disabled)
+		-Dshaderc=$(usex shaderc enabled disabled)
+		-Dvulkan=$(usex vulkan enabled disabled)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
diff --git a/media-libs/libplacebo/metadata.xml b/media-libs/libplacebo/metadata.xml
new file mode 100644
index 000000000000..8538c991f885
--- /dev/null
+++ b/media-libs/libplacebo/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@haasn.xyz</email>
+		<name>Niklas Haas</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
+	<use>
+		<flag name="glslang">Use <pkg>dev-util/glslang</pkg> to compile GLSL</flag>
+		<flag name="lcms">Add support for color management via <pkg>media-libs/lcms</pkg></flag>
+		<flag name="shaderc">Use <pkg>media-libs/shaderc</pkg> to compile GLSL</flag>
+		<flag name="vulkan">Add support for the vulkan graphics API</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://code.videolan.org/videolan/libplacebo/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/media-libs/libqaccessibilityclient/Manifest b/media-libs/libqaccessibilityclient/Manifest
index 02dde5805436..f35a4d8895a9 100644
--- a/media-libs/libqaccessibilityclient/Manifest
+++ b/media-libs/libqaccessibilityclient/Manifest
@@ -1,6 +1,3 @@
-AUX libqaccessibilityclient-0.3.0-tests.patch 1117 BLAKE2B 0382b50d8244249b4b1e7cf1efd3ad301648341ae66496296d7f216dae79a7acd6641fe9d69ecd94f0e6124b92c7aed7915dcbd9f8bd217c620125437a7ecad0 SHA512 becaf6dd528f461370ec474e98aac8da33ee6803096d33137f5ea9284b65f4db2413553566def1c0615bcc920c885dc459c425afa105af02522da67f5a25859f
-DIST libqaccessibilityclient-0.3.0.tar.xz 104784 BLAKE2B a472cd2287340fbe5e5e4404fcdb4d1b6a28f39bf61117156f2e38622f10e0913f4c3818a9f7ff682eb195905e837c589d396df5fc8637a511d6e293e4b59a6a SHA512 d3c28a2dcb308e3248276c5b1ab822decb0c32afce8636ce30941320381431a8d7e064ff1451b14e64cbc83d03e3693d645d1739e64830bacefcd7fa68b0d2e1
 DIST libqaccessibilityclient-0.4.0.tar.xz 105700 BLAKE2B 30c2ebcae046480536fa2c193130b3e0e99bfeeacb40ee9fae22574d9a8ff84da4fc5d746e1ba2f369f99c9d6227fea65ef55628aeff37b455cdf730708608c9 SHA512 bd2e0d29605f222084f86664a52488a5340e0ac16433fd65c8ada195e4cb5988ebac357a991ea8ebc5af22f81825212ce07209939ad5e4a00a9daeed37b56ffb
-EBUILD libqaccessibilityclient-0.3.0.ebuild 670 BLAKE2B ec6c4e9af062116a47addb5cb595a52d23f0c7e0e20dcdd2c752b848761f8f6ad57a38da3501c7a0cfd122386507ef662ef7ac7efe5d090f58f32b5b1e6eb341 SHA512 864d17e0172c08d0026f3a8f177d53149f4bc12f781e232518fd106cf474358c312bd822f6ecc7002d9a7d69ddaee63f80473f1ebeb6863e16945bd924fde2bf
-EBUILD libqaccessibilityclient-0.4.0.ebuild 631 BLAKE2B 3724c327cf59a21cecfc9c099e36ba48d41f6890f9e3a5740a13f1eaa168e9e099845e682e5442347b95462882a0317f3882bb31b28dfeb83409e692346fe046 SHA512 1bb9dd5226df0ceb284241748a8d96c2047553d8febdec84eda35f9299dc06bc254d73f101ee2aaefa3016790397ba128eed9b4849673800ceda0450ebc83af7
+EBUILD libqaccessibilityclient-0.4.0.ebuild 629 BLAKE2B 1bf60e020ff19695eb84f7c8794c819ee45f302e1bcdec93334f2a38ca2bc3ae6feda9c41ea80d273b81a77c276f34a48baac3e07df5400a8bdca2ec9232dc48 SHA512 5bc23325808ea36235f8aecb8e2f4eb941f8e9315561aa68dcb3c5fab226a458669a7eb25d019a833c1f2b8ba9f1cee407b9160056189d7e5beeda32dcb06ebd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/libqaccessibilityclient/files/libqaccessibilityclient-0.3.0-tests.patch b/media-libs/libqaccessibilityclient/files/libqaccessibilityclient-0.3.0-tests.patch
deleted file mode 100644
index 1ec1317ea80f..000000000000
--- a/media-libs/libqaccessibilityclient/files/libqaccessibilityclient-0.3.0-tests.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From a85bce953b8a231cfe9b47d9f3fd80f6149f51f2 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 18 Nov 2018 12:13:28 +0100
-Subject: [PATCH] Use standard BUILD_TESTING instead of BUILD_TESTS
-
-Add tests subdir conditionally.
----
- CMakeLists.txt | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 73bb3cb..13531cc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -34,7 +34,7 @@ include_directories(
- find_package(Qt5Widgets QUIET)
- find_package(Qt5DBus QUIET)
- find_package(Qt5Test QUIET)
--set(BUILD_TESTS ${Qt5Test_FOUND})
-+set(BUILD_TESTING ${Qt5Test_FOUND})
- 
- add_definitions(${Qt5Core_DEFINITIONS} ${Qt5Widgets_DEFINITIONS} ${Qt5DBus_DEFINITIONS})
- include_directories(${Qt5Core_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS})
-@@ -70,7 +70,9 @@ if(APPLE)
- endif(APPLE)
- 
- add_subdirectory(src)
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+   add_subdirectory(tests)
-+endif()
- add_subdirectory(examples)
- 
- # we need the absolute directories where stuff will be installed too
--- 
-2.19.1
-
diff --git a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.3.0.ebuild b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.3.0.ebuild
deleted file mode 100644
index 37ae0d8ab71f..000000000000
--- a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ECM_KDEINSTALLDIRS="false"
-KDE_TEST="optional"
-KDE_EXAMPLES="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Library for writing accessibility clients such as screen readers"
-HOMEPAGE="https://accessibility.kde.org/ https://cgit.kde.org/libqaccessibilityclient.git"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-# tests require DBus
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${P}-tests.patch" )
diff --git a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.0.ebuild b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.0.ebuild
index 7cf95fcd3bdb..244647903c51 100644
--- a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.0.ebuild
+++ b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://accessibility.kde.org/ https://cgit.kde.org/libqaccessibilityc
 SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/media-libs/libsamplerate/Manifest b/media-libs/libsamplerate/Manifest
index eec6b87d428a..4cbf6ef5b5d5 100644
--- a/media-libs/libsamplerate/Manifest
+++ b/media-libs/libsamplerate/Manifest
@@ -1,6 +1,6 @@
 AUX libsamplerate-0.1.3-dontbuild-tests-examples.patch 1187 BLAKE2B e6acec51e3a8dcfaa50074734e55ba64d416882334e80e9fbf5a079d236e1ed358173efd84faf568c29962dc5655b11e8cf7adeb007159f8fdd0b0e14904c457 SHA512 93fce01981c831ced0fd83c315841660a7d194a706ba8b1fb775cc327d8e526c1b65abc8556dfde808672143d51b5e70f005f569034e6921e8af53af1ad45eee
 AUX libsamplerate-0.1.8-lm.patch 215 BLAKE2B 1123b4aab36476f89505daaa0d0ddf842819d8a70930469dc35140f648d71a29f3ed84eb36016c69a0738358a03d58930acc8381cacf3c047552b1fdcb7bae60 SHA512 acc63d2b6a547d9b480c4752864b474b478a753c88bd535833a5b1ca745c54d1e323bbe985f96430158307c0f1d1d1cf1171ec00bdbb31e9e888b3ed2c55019a
 DIST libsamplerate-0.1.9.tar.gz 4336641 BLAKE2B f1cf4c669315ef6a93bfa0c5c73284187068b9b049299afbfd45da5c133372cfd6fdd00fda2dbb2a6740446219203ceda8b46385c844d9ef480e8578aa0b3928 SHA512 78596657963cbf06785e3e6e1190b093df71da52ca340e75bd8246a962cd79dd1c90fa5527c607cebcb296e2c1ee605015278b274e3b768f2f3fbeb0eadfb728
-EBUILD libsamplerate-0.1.9.ebuild 1415 BLAKE2B 239e713e8cc7b601c78887aa133c1a6ccbf9be0a3c6200e0f9d42f479a0a7cdc2ab2ee6057de42c4a909cadd85c79d160bde61d089c1e02365930270f137d748 SHA512 97955e2a094b8c114c23776a08343f9c0b85647f8f512f406e74a7189a47ed51b0f4fdf748ea31cd14a62e005e0e49f61dea859cba6513efda734ac84716d2b6
+EBUILD libsamplerate-0.1.9.ebuild 1417 BLAKE2B 0cf894478276bcfd3d4972516eb38904976d9829570d0370bed12141ba3c781b815d0b22bb8faa8a5dfd184de1eed7ae8b524a1aa6362520993d079043d8e5f6 SHA512 4b87a957a4def8b39574d6e313e34a37e78f9ec9bc2813e1dbc913242fbccd834286b66a1a1f938dbb5a6b6c3dba4c3c7844fa8b0aa463e01426c57d0b0ccd8f
 EBUILD libsamplerate-9999.ebuild 1300 BLAKE2B 04ce2d1e21e31f24c0d653a41c912ea70f78fab450cd2438e7473100f67cde8238a81868437aa3e3e331df5a0959675682560f6b0d96526f349f6c8b50279820 SHA512 776bd88b30e5fba3383af725ab05648863c3168335706959532f456cbb7c2835513fdd144ea36fae6919f8ed99eeb13bb7e6fd5f66e4ac97c601297ff5d594d6
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild b/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild
index ec95a697c759..e8227340d39f 100644
--- a/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-0.1.9.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
@@ -13,7 +13,7 @@ SRC_URI="http://www.mega-nerd.com/SRC/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="sndfile static-libs"
 
 RDEPEND="sndfile? ( >=media-libs/libsndfile-1.0.2 )"
diff --git a/media-libs/libshout/Manifest b/media-libs/libshout/Manifest
index c358e769083c..2e403141e7b5 100644
--- a/media-libs/libshout/Manifest
+++ b/media-libs/libshout/Manifest
@@ -2,5 +2,5 @@ AUX libshout-2.4.1-tls-compile-with-OpenSSL-1.1.0.patch 1727 BLAKE2B d270ff05d53
 AUX libshout-2.4.1-underlinking.patch 529 BLAKE2B 993ab69f011caa49b96f28ede17bbe3fe68b304521a1d7185e865f4ac254d2bd313686e0d6a59e5aa50a0fe41a0e0214980aefe1fe3dcb8a45d827d4962fb153 SHA512 4717ee913ff50e276cca9983543a046271c34385bca2525bc64f6de90a25c7becc7e780807ff2534147dc17b1f57b57e23746948ea78288addfbeca7c495f78e
 DIST libshout-2.4.1.tar.gz 516161 BLAKE2B bedea3c043018eff4675fdb8b95e0bb8ff02a98994a4afcc76537124ebf7357f012f2e9445ebd207b576fc4166fb761d65066fe166fc8b611b96f5c5482a0e92 SHA512 4d4b958947e020de3330d49d39d59220fc89315f25f653a7456b9aa24ca9566fca30bb3d65e6348e79958656096b6b864ea8885157d24e55c8d84d6604670219
 EBUILD libshout-2.4.1-r1.ebuild 1317 BLAKE2B 34e99363db05398190a065358d1fde860372deb4750c5d22d8f128d1fe5d257881faba01e42f3b3bbc1f4094e7ec7a6576776a63712d44987e1732eb3efc4618 SHA512 d3e14eaf24dc7bc450274cb106ba2c2720318d295db20f3a9305849e53f72cd9d4d371ae64a18bd74ec90c4b854ce1c6c831e147b5c086acb62e619fff04619a
-EBUILD libshout-2.4.1-r2.ebuild 1424 BLAKE2B f31d461ba030b40474d536098365905924661887f3683ffbab2711ab7797ab8d59b65992d7d2a6d3bcc8969fbb5b3f63285a3702cb1df7af0726d342d135bc3f SHA512 ff692d639e4d9a683412d4cff0a3ced28c94d312a5e469642252ecdca90983ddc6994b45448a79365c24e70aaa4768fc0f6e7337111cc10a5f7e216a7f0b1e69
+EBUILD libshout-2.4.1-r2.ebuild 1423 BLAKE2B 323251a7b1278bb9ec851686dca303b229ce926fe8ba0859f447a59b2a8b2b4a4eefb14b87ef6755dfc4c6675422947581b5c6bbf5105ca12cb5f43940be7727 SHA512 4518940540266f2200db31a2f98bf448fd738526ef6926c8921c7a82d62503a4731b8b75e9236d26f250015c24571665a8ed7bded0731d2d67b50aadab3ec020
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libshout/libshout-2.4.1-r2.ebuild b/media-libs/libshout/libshout-2.4.1-r2.ebuild
index 335f16867f85..05aa961800ab 100644
--- a/media-libs/libshout/libshout-2.4.1-r2.ebuild
+++ b/media-libs/libshout/libshout-2.4.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="libressl speex static-libs theora"
 
 RDEPEND="
diff --git a/media-libs/libsidplayfp/Manifest b/media-libs/libsidplayfp/Manifest
index a2a31414d6e7..287cfcde67d5 100644
--- a/media-libs/libsidplayfp/Manifest
+++ b/media-libs/libsidplayfp/Manifest
@@ -1,5 +1,3 @@
-DIST libsidplayfp-1.1.0.tar.gz 620228 BLAKE2B 4e51092d84817c6c90ebb0327ba1816c6dae42868f6296f269cdeee1cdf8c226e71e799ab5d7a8609546cb07669dd80f5bd1fb70e14ef594ac128c43a5c7bf51 SHA512 fb0ce00d220772aaf97fc88b7ba3e764f1c94439c9d35713743726872cf6bc6524893489c5909be538f0630896bd328560c6b189d6d2d09932457671080ed76f
 DIST libsidplayfp-1.8.8.tar.gz 673522 BLAKE2B 2d31955e08b0b2b9558e033eff5d959acda08cdc5a3c2bb8c0aacb07c4b8c105812b4faa0af07dbc51255c72cfdf4893ce0da4d642dfc0f89ebc6ec96c51db51 SHA512 84fb24dcf6680dd0e2ec9cc39ddaf30707e4beb5136b7b496b1b85bf11580b1080fbb59b6ec3c1dc7b829fa0cd933db89ee3968518f23ef1a35d9253707d6392
-EBUILD libsidplayfp-1.1.0.ebuild 726 BLAKE2B 5886610a6039945303e0d1b4dbadf7424e0847cd110f9bfdb73a7867f75a9d5cfccfae6b0e901ec8029722e0dffadf4a9ce208a1b9621a7a68d01c78e3d41ae3 SHA512 26bbeecb97ffc460c236f33527c0be1ccaf1605192e553ffa8a45553a66903e1a5e1d90634bb974b54511f8358aaea2a626c614690968cc770db32bdf71e2c1a
-EBUILD libsidplayfp-1.8.8.ebuild 838 BLAKE2B d6f03d33642f0e458cb69b0bfbe6e59068017dcfea9e7070c51afcdc12cae91a766e3a3272eac9af53af92637fa669838601ce707361dad3dfc7883a0eb15e4f SHA512 6025d3521e6ee55bf1a7558e784e6f401561e7f652c137f1cf02584fe42f0f8a4c4f061b49d7c2d130c93f91e2e95e41a377c08b24bdd7aa6d971e7a5a4ce9ed
+EBUILD libsidplayfp-1.8.8.ebuild 837 BLAKE2B c895321c29600fd9d7a46c429606dbc1efd60c376e437a84cc5edb4c16abaf12cb02c3e3a38971be3a5684bca2ac6309c7b45d6805be36dbd71cc5a351411754 SHA512 d2452be2e98918d9fd8a694b80c5cfa60118fe9578b0b8a212b8e51deb04d22e503684865469b236a33b4db8eb0988dedf855ca0ec80d88ee5a20551ba614fe2
 MISC metadata.xml 338 BLAKE2B 8f2f847b878e42e85fed57021162ccfd8cb8b54e6c285cea2691b9dd89ab320a59e4df38ae12414eaa81d7f781f81fd6d102e37f0121f98a2d9355ac8e9c131a SHA512 8f2ffc3fd7b2b6af0143e4125cad702a68da198e0433fd3d22775ca1f64d8689acf3cc0fdbd205d7fc0815b95c1c88fa1cca71c3f5572f3aa3b25bb8b3a9b76e
diff --git a/media-libs/libsidplayfp/libsidplayfp-1.1.0.ebuild b/media-libs/libsidplayfp/libsidplayfp-1.1.0.ebuild
deleted file mode 100644
index 62ef47e39467..000000000000
--- a/media-libs/libsidplayfp/libsidplayfp-1.1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="A library for the sidplay2 fork with resid-fp"
-HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/"
-SRC_URI="mirror://sourceforge/sidplay-residfp/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="cpu_flags_x86_mmx static-libs"
-
-DOCS=( AUTHORS NEWS README TODO )
-
-src_prepare() {
-	# fix automagic. warning: modifying .ac triggers maintainer mode.
-	sed -i -e 's:doxygen:dIsAbLe&:' configure || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable cpu_flags_x86_mmx mmx)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/media-libs/libsidplayfp/libsidplayfp-1.8.8.ebuild b/media-libs/libsidplayfp/libsidplayfp-1.8.8.ebuild
index 866426a3bc3b..2de341bcba48 100644
--- a/media-libs/libsidplayfp/libsidplayfp-1.8.8.ebuild
+++ b/media-libs/libsidplayfp/libsidplayfp-1.8.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa x86"
 IUSE="cpu_flags_x86_mmx static-libs"
 
 src_prepare() {
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index dbf6b6e8fa22..716ca79801c0 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 1879 BLAKE2B f28a8b0ff65ff9ad21012760a57849f806f45304ceafc444b66266cb06fab71146fecd1dcaf1c40715f3098b0eb560c1322c43895ab21c083e4ab4ec45f0faa3 SHA512 1998091dc45edbb55c04c223f442da7b19685cb7174a0c9c539818db988d6bf45934c9cdc77919dd3e302e035186f1cca9294cc9ad15ff106606d9926a7740d3
+EBUILD libsndfile-1.0.28-r4.ebuild 1884 BLAKE2B 8897f95ccc9645ccc77bb850611565b7b33a287f04b670b0485534b380c7fcbaa167f91b6f43eb9fcca9aa5bb41601718b4155d89ed571f21f3a2cab8b9538e7 SHA512 246e861681425d93a0faf55e3e3e42d409cb4cc1215991d90901dfb9151cafcc33bd80f365a80133f2c1b177c94b70ddc9cdcabb53b79faa1c86dec9dbb8f6d0
 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 99e86b43f8eb..9edee782210f 100644
--- a/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.28-r4.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
@@ -19,7 +19,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~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 ~x64-solaris ~x86-solaris"
 IUSE="alsa minimal sqlite static-libs test"
 
 RDEPEND="
diff --git a/media-libs/libsub/Manifest b/media-libs/libsub/Manifest
deleted file mode 100644
index 92c6455b370a..000000000000
--- a/media-libs/libsub/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX libsub-1.1.13-respect-cxxflags.patch 445 BLAKE2B 883d31f736af71c6c808a970841d4fce005c7342eea1ea721865d1da22b31fc9e01338845e34e3e82f9af72c4cf4268cd09483f802d58d72fe63a83ac2b6029a SHA512 9c0d4ee9995dd91715c8e8404eb2f685849a1125133f5f13f259e89e298fe6b55b3702d6f5d0cbaa80ca9bb50fb091ed2281ae5e46b69d235d1c126deeeae8d3
-AUX libsub-1.2.4-no-ldconfig.patch 253 BLAKE2B c1df9d585d182c2d6929eaacfbef19e5393137ee5c09aff0d77fb6bc6d467d31fd51a6b5b69703e2a1dbe1ea1d2a56a5ae6d9bc8448532ecff2a29da5c57bcee SHA512 1791882bf490c01a03a799e065562ba27b65bc14ce92a6ddab910bc8a0acafafc58db64baa11267d40c4aadabd34bffb68772adbc4b2a8b5855ab38ba3965ed8
-AUX libsub-9999-boost.patch 945 BLAKE2B 32503acc4f22b7bb035884cc9dee3c1f46491fb015563bcdb6341d7a52863a633f624d7aba8e6335f2b2750712a9254e8948cea5559d3f754561117d6e773238 SHA512 44b83444dadd21db782d0ad3b7a4b139f984a7161be48f4a20c9484e489cdcdfa15b60e74da3ab9cbbbc334305a34953d9c010be63ccfb2bbd89cb7ef27f9096
-AUX libsub-9999-iostream.patch 2097 BLAKE2B d86fef50ced4f8b9e0abec65e0a85925458b76c97f0c1353ef9b24c54af26f72205d0d0099232199248fe7a92163e426116544cd3a2bab2778cea01be9a6ae11 SHA512 45937927690f847981c331423716cdae322c2bf35984028364bdf40e9d5ed8b3c7b2e09a4daa1521dc2f898916a7cbac6c5a1d25a140fc9979e7d1d5967f5ad3
-AUX libsub-9999-libcxml-9999.patch 433 BLAKE2B c2a44207ba7306101edd9a56770f5c46763b2f967ca394e950155042763cbd012cd90c8b658ea47617b0fcab88c35cc0a98d2cd8755c48be29c9854583ff631c SHA512 e24858f1cc1a46e744fcdbc3b06c775a2e04521676d000d138bc05f625e48f4b66c5a81f5cf071a4dffef0265a2df1d94cd782ad8f4ff04b2358c0aaa5389d5b
-AUX libsub-9999-no-ldconfig.patch 196 BLAKE2B 4320523c01bbd5723024c0cbb91eae17be44429b02b1b6f419e78d25a57d90c88a045a8fa34b87d23f26577c797525f0802062b8aaca0c9f572f4f3dfe5939f9 SHA512 543f8f5d0ef6e855fc43eafd594d8bf1259abc23a878108a7ec28353a05430ec05b1e05627b7a2f0a7993512bb4867066d2ca533a48950683c022d3283b0a62f
-AUX libsub-9999-respect-cxxflags.patch 418 BLAKE2B 9cd542d12ea973007b7c5e807f635bdc4b9a983e6dfb9a683bed162f2188939f0225c5a1f0b5a2792226a409803909de656c6ce534a7b01a1dcb8a78138e85c3 SHA512 1a0d6cff7c3d8bb04d4f71f7c05b1f74cd7f7b3cfed98aff1b2f5ba9b484b7a5040f26849a93eaa5d0de35dfbb22ad8d34e3038e4e3204bf2dcbcb07cd640179
-DIST libsub-1.3.1.tar.bz2 178834 BLAKE2B 3b25d16ec9578445091ae393408ff33cb8ad4f18610a8ee4fd098897306635cea8171b37c8a0d4afc5136b53fc670fbab9fd12493af33ad166ff54e35c1d09b1 SHA512 650725d1a0f1b5c4be3d1df79f4645661a33d8086e0c239847176d8725f0b522f74aa4f6e52acb90b9de9d865dc975876311f3748be63eea998f77f33299e534
-EBUILD libsub-1.3.1.ebuild 1057 BLAKE2B 752553f72594ab04e0d7751ab07e0c121ec8d174ad99be31c8f9e096a3b1da9383a877ec99c61239a43cddb8147e80f66332e80b34a94613da2fbeb8f3e2c6f0 SHA512 b87dbb76e6e74b595f636591b2ed1cbec4dbb6f2dd2b1afd2aa8c6b962de4cd2fbdaf1b7351d0ae8690fd4eb7b92d9a02a8696a1fd332939de7f410f20714c70
-EBUILD libsub-9999.ebuild 1163 BLAKE2B 464e6c3c138893d628599a5b4764bdd163b921d343b6bfb55c45b3f7966e8937320537562fe174395b7214d683a2f1339622f9306386a519224e7af43b21feb4 SHA512 7268af4529c0f9b81a56e0b82fb568fc87f95b9f30a2504ccca23d1b304a597aa6135082f26460bb9235a2ac5c61fbb350a46b3c0b7363744aeea3749df5d7e8
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-libs/libsub/files/libsub-1.1.13-respect-cxxflags.patch b/media-libs/libsub/files/libsub-1.1.13-respect-cxxflags.patch
deleted file mode 100644
index 59687755c653..000000000000
--- a/media-libs/libsub/files/libsub-1.1.13-respect-cxxflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- libsub-1.1.13/wscript
-+++ libsub-1.1.13/wscript
-@@ -24,11 +24,6 @@
-     conf.env.DISABLE_TESTS = conf.options.disable_tests
-     conf.env.API_VERSION = API_VERSION
- 
--    if conf.options.enable_debug:
--        conf.env.append_value('CXXFLAGS', '-g')
--    else:
--        conf.env.append_value('CXXFLAGS', '-O3')
--
-     # Disable libxml++ deprecation warnings for now
-     conf.env.append_value('CXXFLAGS', ['-Wno-deprecated-declarations'])
- 
diff --git a/media-libs/libsub/files/libsub-1.2.4-no-ldconfig.patch b/media-libs/libsub/files/libsub-1.2.4-no-ldconfig.patch
deleted file mode 100644
index cfb645d0d894..000000000000
--- a/media-libs/libsub/files/libsub-1.2.4-no-ldconfig.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libsub-1.2.4/wscript
-+++ libsub-1.2.4/wscript
-@@ -151,8 +151,7 @@
-         sys.exit(-1)
- 
- def post(ctx):
--    if ctx.cmd == 'install':
--        ctx.exec_command('/sbin/ldconfig')
-+    pass
- 
- def tags(bld):
-     os.system('etags src/*.cc src/*.h')
diff --git a/media-libs/libsub/files/libsub-9999-boost.patch b/media-libs/libsub/files/libsub-9999-boost.patch
deleted file mode 100644
index 347610f58545..000000000000
--- a/media-libs/libsub/files/libsub-9999-boost.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- libsub-9999/test/dcp_reader_test.cc
-+++ libsub-9999/test/dcp_reader_test.cc
-@@ -19,6 +19,7 @@
- 
- #include "interop_dcp_reader.h"
- #include "collect.h"
-+#include <boost/optional/optional_io.hpp>
- #include <boost/test/unit_test.hpp>
- #include <fstream>
- #include <iostream>
---- libsub-9999/test/wscript
-+++ libsub-9999/test/wscript
-@@ -17,7 +17,7 @@
- def build(bld):
-     obj = bld(features='cxx cxxprogram')
-     obj.name   = 'tests'
--    obj.uselib = 'BOOST_TEST DCP CXML'
-+    obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM DCP CXML'
-     obj.use    = 'libsub-1.0'
-     obj.source = """
-                  dcp_reader_test.cc
---- libsub-9999/tools/wscript
-+++ libsub-9999/tools/wscript
-@@ -1,6 +1,6 @@
- def build(bld):
-     obj = bld(features = 'cxx cxxprogram')
-     obj.use = ['libsub-1.0']
--    obj.uselib = 'OPENJPEG DCP CXML'
-+    obj.uselib = 'OPENJPEG DCP CXML BOOST_FILESYSTEM'
-     obj.source = 'dumpsubs.cc'
-     obj.target = 'dumpsubs'
diff --git a/media-libs/libsub/files/libsub-9999-iostream.patch b/media-libs/libsub/files/libsub-9999-iostream.patch
deleted file mode 100644
index 48a94c9737d4..000000000000
--- a/media-libs/libsub/files/libsub-9999-iostream.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- libsub-1.9999/src/stl_text_reader.cc
-+++ libsub-1.9999/src/stl_text_reader.cc
-@@ -22,6 +22,7 @@
- #include <boost/algorithm/string.hpp>
- #include <boost/lexical_cast.hpp>
- #include <vector>
-+#include <iostream>
- 
- using std::list;
- using std::ostream;
---- libsub-9999/src/dcp_reader.cc
-+++ libsub-9999/src/dcp_reader.cc
-@@ -26,6 +26,7 @@
- #include "dcp/subtitle.h"
- #include <libcxml/cxml.h>
- #include <libxml++/libxml++.h>
-+#include <iostream>
- 
- using std::list;
- using std::cout;
---- libsub-9999/src/sub_time.cc
-+++ libsub-9999/src/sub_time.cc
-@@ -21,6 +21,7 @@
- #include "exceptions.h"
- #include <cmath>
- #include <iomanip>
-+#include <iostream>
- 
- using std::ostream;
- using std::cout;
---- libsub-9999/test/dcp_reader_test.cc
-+++ libsub-9999/test/dcp_reader_test.cc
-@@ -21,6 +21,7 @@
- #include "collect.h"
- #include <boost/test/unit_test.hpp>
- #include <fstream>
-+#include <iostream>
- 
- using std::list;
- using std::cout;
---- libsub-9999/test/stl_binary_reader_test.cc
-+++ libsub-9999/test/stl_binary_reader_test.cc
-@@ -24,7 +24,6 @@
- #include "test.h"
- 
- using std::list;
--using std::cout;
- using std::ifstream;
- 
- /* Test reading of a binary STL file */
---- libsub-9999/test/subrip_reader_test.cc
-+++ libsub-9999/test/subrip_reader_test.cc
-@@ -24,6 +24,7 @@
- #include <boost/test/unit_test.hpp>
- #include <boost/filesystem.hpp>
- #include <fstream>
-+#include <iostream>
- 
- using std::list;
- using std::cerr;
---- libsub-9999/test/test.cc
-+++ libsub-9999/test/test.cc
-@@ -22,6 +22,7 @@
- #include <boost/test/unit_test.hpp>
- #include <boost/filesystem.hpp>
- #include <fstream>
-+#include <iostream>
- #include <string>
- #include "iso6937_tables.h"
- 
---- libsub-9999/tools/dumpsubs.cc
-+++ libsub-9999/tools/dumpsubs.cc
-@@ -23,6 +23,7 @@
- #include <getopt.h>
- #include <boost/filesystem.hpp>
- #include <map>
-+#include <iostream>
- 
- using std::string;
- using std::cerr;
---- libsub-9999/asdcplib/src/h__Writer.cpp
-+++ libsub-9999/asdcplib/src/h__Writer.cpp
-@@ -32,7 +32,6 @@
- #include "AS_DCP_internal.h"
- #include "KLV.h"
- 
--using std::cout;
- using namespace ASDCP;
- using namespace ASDCP::MXF;
- 
diff --git a/media-libs/libsub/files/libsub-9999-libcxml-9999.patch b/media-libs/libsub/files/libsub-9999-libcxml-9999.patch
deleted file mode 100644
index 9937b138742d..000000000000
--- a/media-libs/libsub/files/libsub-9999-libcxml-9999.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- libsub-9999/src/smpte_dcp_reader.cc
-+++ libsub-9999/src/smpte_dcp_reader.cc
-@@ -29,7 +29,6 @@
- 
- using std::string;
- using std::list;
--using std::stringstream;
- using boost::shared_ptr;
- using namespace sub;
- 
-@@ -46,9 +45,7 @@
- 	
- 		string s;
- 		reader.ReadTimedTextResource (s, 0, 0);
--		stringstream t;
--		t << s;
--		xml->read_stream (t);
-+		xml->read_string (s);
- 
- 		ASDCP::WriterInfo info;
- 		reader.FillWriterInfo (info);
diff --git a/media-libs/libsub/files/libsub-9999-no-ldconfig.patch b/media-libs/libsub/files/libsub-9999-no-ldconfig.patch
deleted file mode 100644
index 46851bf833ea..000000000000
--- a/media-libs/libsub/files/libsub-9999-no-ldconfig.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- libsub-1.9999/wscript
-+++ libsub-1.9999/wscript
-@@ -128,5 +128,4 @@
-         sys.exit(-1)
- 
- def post(ctx):
--    if ctx.cmd == 'install':
--        ctx.exec_command('/sbin/ldconfig')
-+    pass
diff --git a/media-libs/libsub/files/libsub-9999-respect-cxxflags.patch b/media-libs/libsub/files/libsub-9999-respect-cxxflags.patch
deleted file mode 100644
index 992ef6bccce0..000000000000
--- a/media-libs/libsub/files/libsub-9999-respect-cxxflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- libsub-9999/wscript
-+++ libsub-9999/wscript
-@@ -23,10 +23,6 @@
-     conf.env.DISABLE_TESTS = conf.options.disable_tests
-     conf.env.API_VERSION = API_VERSION
- 
--    if conf.options.enable_debug:
--        conf.env.append_value('CXXFLAGS', '-g')
--    else:
--        conf.env.append_value('CXXFLAGS', '-O3')
- 
-     conf.check_cfg(package='openssl', args='--cflags --libs', uselib_store='OPENSSL', mandatory=True)
- 
diff --git a/media-libs/libsub/libsub-1.3.1.ebuild b/media-libs/libsub/libsub-1.3.1.ebuild
deleted file mode 100644
index 57dc3eeafc23..000000000000
--- a/media-libs/libsub/libsub-1.3.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-PYTHON_REQ_USE="threads(+)"
-inherit python-any-r1 waf-utils
-
-DESCRIPTION="read and write subtitles in a few different formats"
-HOMEPAGE="http://carlh.net/libsub"
-SRC_URI="http://carlh.net/downloads/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1.0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-cpp/glibmm:2
-	dev-cpp/libxmlpp:2.6
-	dev-libs/boost:=
-	>=dev-libs/libcxml-0.15.4
-	dev-libs/openssl:0
-	>=media-libs/libasdcp-cth-0.1.3"
-DEPEND="${RDEPEND}
-	dev-util/waf
-	virtual/pkgconfig
-	${PYTHON_DEPS}"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.2.4-no-ldconfig.patch
-	"${FILESDIR}"/${PN}-1.1.13-respect-cxxflags.patch )
-
-src_prepare() {
-	rm -v waf || die
-	export WAF_BINARY=${EROOT}usr/bin/waf
-
-	ewarn "Some tests failing due missing files/certs are disabled."
-	sed -e '/ssa_reader_test.cc/d' \
-		-e '/dcp_to_stl_binary_test.cc/d' \
-		-i test/wscript || die
-
-	default
-}
-
-src_test() {
-	./run/tests || die
-}
diff --git a/media-libs/libsub/libsub-9999.ebuild b/media-libs/libsub/libsub-9999.ebuild
deleted file mode 100644
index 8772a9cff0d2..000000000000
--- a/media-libs/libsub/libsub-9999.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-PYTHON_REQ_USE="threads(+)"
-inherit git-r3 python-any-r1 waf-utils
-
-DESCRIPTION="read and write subtitles in a few different formats"
-HOMEPAGE="http://carlh.net/libsub"
-EGIT_REPO_URI="https://github.com/cth103/${PN}.git"
-EGIT_BRANCH="1.0"
-
-LICENSE="GPL-2"
-SLOT="1.0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="dev-cpp/glibmm:2
-	dev-cpp/libxmlpp:2.6
-	dev-libs/boost:=
-	>=dev-libs/libcxml-0.15.4
-	dev-libs/openssl:0
-	>=media-libs/libasdcp-cth-0.1.3"
-DEPEND="${RDEPEND}
-	dev-util/waf
-	virtual/pkgconfig
-	${PYTHON_DEPS}"
-
-PATCHES=( "${FILESDIR}"/${P}-no-ldconfig.patch
-	"${FILESDIR}"/${P}-respect-cxxflags.patch
-	"${FILESDIR}"/${P}-iostream.patch
-	"${FILESDIR}"/${P}-libcxml-9999.patch
-	"${FILESDIR}"/${P}-boost.patch )
-
-src_prepare() {
-	rm -v waf || die
-	export WAF_BINARY=${EROOT}usr/bin/waf
-
-	ewarn "Some tests failing due missing files/certs are disabled."
-	sed -e '/ssa_reader_test.cc/d' \
-		-e '/dcp_to_stl_binary_test.cc/d' \
-		-i test/wscript || die
-
-	default
-}
-
-src_test() {
-	./run/tests || die
-}
diff --git a/media-libs/libsub/metadata.xml b/media-libs/libsub/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/media-libs/libsub/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/libtimidity/Manifest b/media-libs/libtimidity/Manifest
index a7bf35352c8c..8bdf3663bb0a 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 665 BLAKE2B 15fd4566406bc20256801dd841a46f0b4359e2566306c18c905fc0bd4198bd7f5f10ccf1d8a75f2654da93fddbb93e8eef6eb36de934c6cfee5f923b68cb4c31 SHA512 dc1696de6431f0b8208dfa33463b2896301e07fd1e3bdd7e19548dfa8444040d7f188b8a28a6e884dd387d308db1a35e698075440e28ab001247dde834a79f22
+EBUILD libtimidity-0.2.4.ebuild 661 BLAKE2B de6af277d9a85aa3b55efe2c23b365fa7d06c6dbfbde18382b18f7e7d6f0518f853dbb62f7e08fbfe9bab221024d6a83d57d88a08fe567e73ff457f7c7a02e3c SHA512 89efbc3e9619ad173316a594f5cf696b7ab03cd3a0102ca254fe1382406c79189e8061323ae15b8423e27ec616b5808638e0a41508963ac6ce3057b91ff41add
 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 2387fc911b2d..be839623432f 100644
--- a/media-libs/libtimidity/libtimidity-0.2.4.ebuild
+++ b/media-libs/libtimidity/libtimidity-0.2.4.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
@@ -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/lsp-plugins/Manifest b/media-libs/lsp-plugins/Manifest
index fa154d7e16c0..0c497cb98274 100644
--- a/media-libs/lsp-plugins/Manifest
+++ b/media-libs/lsp-plugins/Manifest
@@ -1,4 +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-9999.ebuild 1031 BLAKE2B ed3d1ae24e37bcf457fdf95a53b505f409b47c364575e3204871b31ac0742652d875009ab07b0557fa91303cb88ea31874208f1d63a9ba08c8d4c01d9ddc3b15 SHA512 b9ac0f47b4ff93611766eaa8d6c0ee901b1feabc1d0040253472f5e562056d0b5e53d6ca856eef2a9d103e8641a104f18e68a14db4405340b36d4b767143f99e
+EBUILD lsp-plugins-1.1.7-r1.ebuild 1032 BLAKE2B aa79896ebb5cd7eb2e2067268db7e67f07ba90f000a0f26d0af43cc06ec36b825db98e9aa3280dc777a9651b863ea68ab0e97ccf1093bfa3a032b77d08394a14 SHA512 c185dad8e7ca7aa71007d7f3c6a9d135c56891a8902849a463d057868fbf7a0b17ced33af49df1e8d5dace8907a29f8cbe12b9205c668d7e23dc111f0d3d29c9
+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
new file mode 100644
index 000000000000..bae36037133c
--- /dev/null
+++ b/media-libs/lsp-plugins/lsp-plugins-1.1.7-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Linux Studio Plugins"
+HOMEPAGE="https://lsp-plug.in"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/sadko4u/lsp-plugins"
+	EGIT_BRANCH="devel"
+else
+	SRC_URI="https://github.com/sadko4u/lsp-plugins/archive/${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${P}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="doc jack ladspa +lv2"
+REQUIRED_USE="|| ( jack ladspa lv2 )"
+
+DEPEND="
+	dev-libs/expat
+	media-libs/libsndfile
+	doc? ( dev-lang/php:* )
+	jack? (
+		virtual/jack
+		x11-libs/cairo[X]
+	)
+	ladspa? ( media-libs/ladspa-sdk )
+	lv2? (
+		media-libs/lv2
+		x11-libs/cairo[X]
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_compile(){
+	use doc && MODULES+="doc"
+	use jack && MODULES+=" jack"
+	use ladspa && MODULES+=" ladspa"
+	use lv2 && MODULES+=" lv2"
+	emake BUILD_MODULES="${MODULES}"
+}
+
+src_install(){
+	emake PREFIX="/usr" DESTDIR="${ED}" LIB_PATH="/usr/$(get_libdir)" install
+}
diff --git a/media-libs/lsp-plugins/lsp-plugins-9999.ebuild b/media-libs/lsp-plugins/lsp-plugins-9999.ebuild
index f681f70629d3..bae36037133c 100644
--- a/media-libs/lsp-plugins/lsp-plugins-9999.ebuild
+++ b/media-libs/lsp-plugins/lsp-plugins-9999.ebuild
@@ -48,5 +48,5 @@ src_compile(){
 }
 
 src_install(){
-	emake PREFIX="/usr" DESTDIR="${D}" LIB_PATH="/usr/$(get_libdir)" install
+	emake PREFIX="/usr" DESTDIR="${ED}" LIB_PATH="/usr/$(get_libdir)" install
 }
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index a78b11b293e5..18a618fd3082 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,10 +1,14 @@
 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-9999.ebuild 14134 BLAKE2B 3612e0f4b66b09a5849f1840541b18f6e73723be0c4945878b5bccb78bc08d5618b0af1a43aa39859586c4d72c7d17974a4df34d86fd0645bf551b67df81ea60 SHA512 a626383fe69aa01d3d91100c8e2e4a90578a1b7c802699ca43b6bfa3cd3ded40109229edde0b839a9fcc298ac80c22b5b63527548a7bd84a153694b598f9d88e
+EBUILD mesa-19.0.1.ebuild 13823 BLAKE2B 0c7842382f1b1d09b814db7e3584765d3d4ba4b7be5113efc1b6df74f7895b86d6cf5cfe7dc7433548130d6882382b75b7c49f0a13b29ab4e353f8aa2368848d SHA512 9210ad10ad47984c58cd6f5c5b0b78fa21be54b679b8d400bf21a97963abb166d7899a38eaa389683a143bc15f5fde525e42e1537a45fdc6c844b5680a63b3f5
+EBUILD mesa-9999.ebuild 14170 BLAKE2B 39bea99ece39ed5279157b26612b92538256573f69c6b2ff5effeeadb97efa887c2b1508b5f93d26ad6ecf8e13a69140e131c8759a7f99507b5529fcf4b40222 SHA512 dd690bad043d17860c7aad28a246866082e764d7ff0f521361fed175ef5fc87a8e49bf5d08cd09ca49c8ab2bc0bb4dd2bdfa1677bb39f34c5863040321781b05
 MISC metadata.xml 2041 BLAKE2B dd7f78a57123408674d7ca6a8e7a455e84ac668bf9e6552502cf62dc2464f1a62765db5c22c0d4dab82e59a5325ad10d69b436aab96b5a4d5c789f0a7b671469 SHA512 f07128004b03ddfc6d235de15a95c0bd6338133b13daa31907bd2897d65eaa9c8ad1164ec5e21fb7fa6417927a8109cbf86b24bc62b09cfa29d0bb18fcd3c4b1
diff --git a/media-libs/mesa/mesa-18.3.6.ebuild b/media-libs/mesa/mesa-18.3.6.ebuild
new file mode 100644
index 000000000000..b66948b6e213
--- /dev/null
+++ b/media-libs/mesa/mesa-18.3.6.ebuild
@@ -0,0 +1,518 @@
+# 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-19.0.1.ebuild b/media-libs/mesa/mesa-19.0.1.ebuild
new file mode 100644
index 000000000000..f3f7b57f517d
--- /dev/null
+++ b/media-libs/mesa/mesa-19.0.1.ebuild
@@ -0,0 +1,525 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_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 +libglvnd +llvm
+	lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
+	vdpau vulkan wayland xa xvmc"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vulkan? ( dri3
+			  || ( video_cards_i965 video_cards_radeonsi )
+			  video_cards_radeonsi? ( llvm ) )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_imx?    ( gallium video_cards_vivante )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97"
+RDEPEND="
+	!app-eselect/eselect-mesa
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	libglvnd? (
+		media-libs/libglvnd[${MULTILIB_USEDEP}]
+		!app-eselect/eselect-opengl
+	)
+	!libglvnd? (
+		>=app-eselect/eselect-opengl-1.3.0
+	)
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 9.
+# 3. Specify LLVM_MAX_SLOT, e.g. 8.
+LLVM_MAX_SLOT="8"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:8[${MULTILIB_USEDEP}]
+		sys-devel/llvm:7[${MULTILIB_USEDEP}]
+	)
+	<sys-devel/llvm-9:=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	llvm? (
+		opencl? (
+			video_cards_r600? (
+				${CLANG_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${CLANG_DEPSTR}
+					)
+				)
+			)
+		)
+		!opencl? (
+			video_cards_r600? (
+				${LLVM_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${LLVM_DEPSTR}
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	valgrind? ( dev-util/valgrind )
+	x11-base/xorg-proto
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	!pic? (
+		usr/lib*/libglapi.so.0.0.0
+		usr/lib*/libGLESv1_CM.so.1.0.0
+		usr/lib*/libGLESv2.so.2.0.0
+		usr/lib*/libGL.so.1.2.0
+		usr/lib*/libOSMesa.so.8.0.0
+	)
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm[${flags}]"
+}
+
+pkg_pretend() {
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+}
+
+python_check_deps() {
+	has_version --host-root ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_use llvm)
+			$(meson_use lm_sensors lmsensors)
+			$(meson_use unwind libunwind)
+		)
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=false)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=false)
+		fi
+
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable video_cards_imx imx
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_radeonsi amd
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
+	fi
+
+	# on abi_x86_32 hardened we need to have asm disable
+	if [[ ${ABI} == x86* ]] && use pic; then
+		emesonargs+=( -Dasm=false )
+	fi
+
+	if use gallium; then
+		gallium_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+	else
+		dri_driver_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=dri
+		-Dshared-glapi=true
+		$(meson_use dri3)
+		$(meson_use egl)
+		$(meson_use gbm)
+		$(meson_use gles1)
+		$(meson_use gles2)
+		$(meson_use libglvnd glvnd)
+		$(meson_use selinux)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+
+	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson_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-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index ae4a7c1da5f8..802aa20c7f78 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -30,7 +30,7 @@ RESTRICT="
 "
 
 RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel iris nouveau vc4 virgl vivante vmware"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris nouveau vc4 virgl vivante vmware"
 for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
 done
@@ -54,7 +54,6 @@ REQUIRED_USE="
 	video_cards_i915?   ( || ( classic gallium ) )
 	video_cards_i965?   ( classic )
 	video_cards_iris?   ( gallium )
-	video_cards_imx?    ( gallium video_cards_vivante )
 	video_cards_nouveau? ( || ( classic gallium ) )
 	video_cards_radeon? ( || ( classic gallium )
 						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
@@ -400,11 +399,16 @@ multilib_src_configure() {
 			emesonargs+=(-Dgallium-xvmc=false)
 		fi
 
+		if use video_cards_freedreno ||
+		   use video_cards_vc4 ||
+		   use video_cards_vivante; then
+			gallium_enable -- kmsro
+		fi
+
 		gallium_enable video_cards_vc4 vc4
 		gallium_enable video_cards_vivante etnaviv
 		gallium_enable video_cards_vmware svga
 		gallium_enable video_cards_nouveau nouveau
-		gallium_enable video_cards_imx imx
 
 		# Only one i915 driver (classic vs gallium). Default to classic.
 		if ! use classic; then
diff --git a/media-libs/ming/Manifest b/media-libs/ming/Manifest
index 64c235600574..97e75797269d 100644
--- a/media-libs/ming/Manifest
+++ b/media-libs/ming/Manifest
@@ -1,5 +1,7 @@
 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
 MISC metadata.xml 388 BLAKE2B 7083db03bf7efad4015f4aa3838925123a71bae6d57ed318232622e96c8590ef1f770520da535c9efc94f33b416430dccecc9a81fa81df936d4e15933a1dd041 SHA512 0efbb0ad1eadfd764bdf6e182cf8865994ca8e96ccc6e14845829638730e1ce6ff7ac2777e9ad3d396e7e29d77e034b818c95259eb8aab53a23b3c0815f787d0
diff --git a/media-libs/ming/ming-0.20181112.ebuild b/media-libs/ming/ming-0.20181112.ebuild
new file mode 100644
index 000000000000..7babd84b0d7c
--- /dev/null
+++ b/media-libs/ming/ming-0.20181112.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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
+
+EGIT_COMMIT="50098023446a5412efcfbd40552821a8cba983a6"
+
+DESCRIPTION="An Open Source library for Flash movie generation"
+HOMEPAGE="http://ming.sourceforge.net/"
+SRC_URI="https://github.com/libming/libming/archive/${EGIT_COMMIT}.tar.gz -> ${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} )"
+
+# 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 || die "sed #1 failed"
+
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die "sed #2 failed"
+
+	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/mlt/Manifest b/media-libs/mlt/Manifest
index b5cc65ac1f98..4b1a950ae132 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -3,6 +3,7 @@ AUX mlt-6.12.0-frei0r-w-tractor.patch 1469 BLAKE2B 50cb2d6360548299bf49755f16b32
 AUX mlt-6.12.0-rgb-to-yuv-accuracy.patch 7735 BLAKE2B 122c51cb168a4c921cb180fb219795fffc98caee9d199fe8ce40b6ccf09b6be373b0eb20dcdc2d09f8674d679694018ed950fdaad7297e8a7b13e2eb4a0e0124 SHA512 4e09f0d324cb54ae638fe8281b9a7f3d4878568ac323738a9a2398c67e507e4a122fc02842f7642f895ddfba2c28a2afe79e923ebea4db8fe66dbbd460048824
 AUX mlt-6.12.0-seconds-digits.patch 829 BLAKE2B a696c33a9eb97ef5ca07a7d7e302f3b83ab07a46de61f32aa7b84c60bb8174b8683fe4f08ac6b6b8506fa0a3da84a611c9e06ab190774427bfb5372881772479 SHA512 b96f47dea8532c9b98112bfcd284dac521e5b91a2d852a4570adb26082870f27e2d32f567ee1e9b49ee315013f657c7c68ba61e2b8d2d8edfc8648e4f11800a5
 DIST mlt-6.12.0.tar.gz 1395646 BLAKE2B 18dc06c4075d8d51bc7f62d027adda92c359275b9ad2131cc015b4402b1b7a9438fe87b617075017b9fd5e9696b82c4c840fa6dd83188bd0cedb7f01d2158283 SHA512 ed2cc0eeda45558ae6f1ec8780dfd413641953dc12dc32dccf655649f68f8e6088d39fefb7bef7bae042a41096976004446019d82ea162785bc487009cb97680
-EBUILD mlt-6.12.0-r1.ebuild 5584 BLAKE2B b12fc8aaa6e9c0126450159abca3aa5613e65133c698ace0f65586e32f73172d7b54fa5670fde1c40408a2f9c54e9e5930f4f6362fcd281980f6e7aaf780c31c SHA512 742317a8fe608086202bd15fbc6ca0970beaec916efe59884b2f46870f474f0b1769eead258edec6f55577e75ea334522bbd59bef5e357fc2ddd1657b1550618
+DIST mlt-6.14.0.tar.gz 1413015 BLAKE2B 81501c0b770c0be2ccf2dfa12c4ebb893c0e9921f36722e6f5cb8f643d3eaaa4b8eaf4fd87ba05fa55d49960b7147b73ea5f2cf771a6784b587a6797466f2f73 SHA512 86b26b0c421cc881f6bebbde2c0ae9d834f190d8f878fb279ab29a1d7ac5416077b7dd91420bf63a7821fade9ca9c044a92440e02673c7b330b8ff36982a9fb9
 EBUILD mlt-6.12.0.ebuild 5545 BLAKE2B 0b8e14bc305c14ad7b100d710881ae581c9224bd9af1be0476048f2906342ba543992cf02f6cad61a19a058e93559420be51fc0ba6a6f4b8c4e4dbad41e0be20 SHA512 8822ffe4b895abf16978c06f874d34f800c4f6ef486e415432c3f06c561b5380b8d98ba69e9010487482953cf6817c65cc1c50688fbf49b31167ad73acfb3451
+EBUILD mlt-6.14.0.ebuild 5519 BLAKE2B 81859cf8c2fb62cb5250382f63b355e5e0b2b86e6865a89b6e5209ec02ed83b0beb0892524250fe693e3b5df9500c28fc2429f4e669b1990562e58ee2fbe6cea SHA512 2bbd8eb66fce86d24a94d98f8f1c4eb2162200068cce39773b6ab2d13a5774cff83accc4d70ea740abd19d880258c4f5934c62aa63e94597e2bda35ca8fe2d87
 MISC metadata.xml 1595 BLAKE2B 63b95c943ec9860db5c68d7ffcf683381bb0e859afe333263afc51f9e985a9f4263279aded8288ec03511d8d56d12415f5590529a4de0009ff21bb890bc1febe SHA512 7f7005732163a00fcd0ff1d21608c26296f87e0658fad912e35724b61c9072ceb67f1a515b0445159192f4959be87a63a01b717c8fe63a64aa8ceb3081cb11f8
diff --git a/media-libs/mlt/mlt-6.12.0-r1.ebuild b/media-libs/mlt/mlt-6.14.0.ebuild
index c4389acdc1c6..6d8840ae163c 100644
--- a/media-libs/mlt/mlt-6.12.0-r1.ebuild
+++ b/media-libs/mlt/mlt-6.14.0.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
+# TODO python3_{6,7} contrary to 6.14 changelog, still does not build.
 PYTHON_COMPAT=( python2_7 )
 # this ebuild currently only supports installing ruby bindings for a single ruby version
 # so USE_RUBY must contain only a single value (the latest stable) as the ebuild calls
@@ -18,14 +19,25 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r
-gtk jack kdenlive libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl vdpau vidstab xine xml"
+gtk jack kdenlive kernel_linux libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl
+vdpau vidstab xine xml"
 # java perl php tcl
-IUSE="${IUSE} kernel_linux"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+SWIG_DEPEND=">=dev-lang/swig-2.0"
+#	java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 )
+#	perl? ( ${SWIG_DEPEND} )
+#	php? ( ${SWIG_DEPEND} )
+#	tcl? ( ${SWIG_DEPEND} )
+BDEPEND="
+	virtual/pkgconfig
+	compressed-lumas? ( virtual/imagemagick-tools[png] )
+	lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
+	python? ( ${SWIG_DEPEND} )
+	ruby? ( ${SWIG_DEPEND} )"
 #rtaudio will use OSS on non linux OSes
-RDEPEND="
+DEPEND="
 	>=media-libs/libebur128-1.2.2
 	ffmpeg? (
 		libav? ( >=media-video/libav-12:0=[vdpau?] )
@@ -74,26 +86,11 @@ RDEPEND="
 #	php? ( dev-lang/php )
 #	sox? ( media-sound/sox )
 #	tcl? ( dev-lang/tcl:0= )
-SWIG_DEPEND=">=dev-lang/swig-2.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	compressed-lumas? ( virtual/imagemagick-tools[png] )
-	lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
-	python? ( ${SWIG_DEPEND} )
-	ruby? ( ${SWIG_DEPEND} )"
-#	java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 )
-#	perl? ( ${SWIG_DEPEND} )
-#	php? ( ${SWIG_DEPEND} )
-#	tcl? ( ${SWIG_DEPEND} )
+RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS ChangeLog NEWS README docs/{framework,melt,mlt{++,-xml}}.txt )
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch
-	"${FILESDIR}"/${P}-seconds-digits.patch
-	"${FILESDIR}"/${P}-rgb-to-yuv-accuracy.patch
-	"${FILESDIR}"/${P}-frei0r-w-tractor.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch )
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
diff --git a/media-libs/mutagen/Manifest b/media-libs/mutagen/Manifest
index c4c8fede452c..d7ee58ae9270 100644
--- a/media-libs/mutagen/Manifest
+++ b/media-libs/mutagen/Manifest
@@ -9,5 +9,5 @@ EBUILD mutagen-1.38.ebuild 1038 BLAKE2B ac815c6a5cdbb250a1faf16c060c2e5baa12d9e3
 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 1097 BLAKE2B 2d0534c023ce1cbf1814cda833d19cbbe9d1ee3382a7b54eba66e342efd897544d635025ed2cb6dec4762fa9d8fea9b4ed4219c83afe81747807e671228e6ed6 SHA512 942af0395e77b388c85cf10e125c6e5c4b7ca789eb4e97c2584720ed6f151cbef54f4cebef6be5d8ee7d4c897c49130a28a748fb6b019d9dbbb05d8bd4419b75
+EBUILD mutagen-1.42.0.ebuild 1096 BLAKE2B 0ba1aa834db5ae7212181dd2c5cbb7d2fac31805cb9937c29ba7c0ac38313841c39d0f527c32bc70edcf6d61d2568dabc147fee789cc6315a0c389fba85dc2ef SHA512 87d3101567536583d8701cf662b7e7461be57267854cbeb3bd2baa6c17da031fdf8aaa0f4181cc720c7e3cd63b94dcce768db87b63b299fbb1c2451bddaaf597
 MISC metadata.xml 380 BLAKE2B 9fd70ca6ca6e8d17b66ea703f65885b87714ed0560ffe7502d85da3ee8fdf1d62545c1166b64d99f2bd2bfa6105f8f8865bc28769069c1ae3da4b1c3c174fd69 SHA512 87ce1f85bd6aff7c159fd22a412eb9ea95ac4f58fb2cc70fd4c4f470bfe9f6366b906bc9cef833ae5c10b7a3601c15edab9e8418cf78d7d9e993191873f41d59
diff --git a/media-libs/mutagen/mutagen-1.42.0.ebuild b/media-libs/mutagen/mutagen-1.42.0.ebuild
index e450254a80cf..65654851c5f3 100644
--- a/media-libs/mutagen/mutagen-1.42.0.ebuild
+++ b/media-libs/mutagen/mutagen-1.42.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
@@ -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/nv-codec-headers/Manifest b/media-libs/nv-codec-headers/Manifest
index 788c6ab35a82..570ef6c47865 100644
--- a/media-libs/nv-codec-headers/Manifest
+++ b/media-libs/nv-codec-headers/Manifest
@@ -1,3 +1,5 @@
 DIST nv-codec-headers-8.1.24.2.tar.gz 53627 BLAKE2B 482c86824f81652b439fba1b765261de107d51a3bd780d3f0c58e1cdd53cd21ddad3fea59e8ab5d920fb34c73e43c10c007a5efe32024bfd3523ed8d4ad26f44 SHA512 daa45ae8bcc11eb6b8d671c2d720d5c3edce9e4ef68f913ed25a8c4d1a4b165e0576b03eff9ce2fe355156ab5a5d8d74573158ef190feec5cfb5ac0838e0caa7
+DIST nv-codec-headers-9.0.18.1.tar.gz 58850 BLAKE2B 8e940ffb929f67c4e459cfd55113298527cf8430b94d20e9bb7148cf532dbed798138e63801f29d168d0b4b465c0eb6ef3c58596289063f461b7d5e8832ce7e8 SHA512 4306ee3c6e72e9e3172b28c5e6166ec3fb9dfdc32578aebda0588afc682f56286dd6f616284c9892907cd413f57770be3662572207a36d6ac65c75a03d381f6f
 EBUILD nv-codec-headers-8.1.24.2.ebuild 793 BLAKE2B c6f8cbd07bb959a4644a75fd7f735cd16be873bd250ba3158d1ce9c1b04d4d0e8b69734dc3b7b78511f61512fbf68701667120e1ba1e0a33c6dc9de06bda1639 SHA512 61ae7730bd1435b33d32a932de336bda759a283726175a051cbd7a94ba2fe3277a791ec895263c0bfd8ffbdfa72243ff671e03c8b413b34708b4b4d75070d712
+EBUILD nv-codec-headers-9.0.18.1.ebuild 793 BLAKE2B 997d73669a55c2a20c137352617fbe1464abc5780292956142140564b93c2f5892ea6823e90471275f736cce50469a720f31af63f246410369659c5b7e45e1a2 SHA512 62085b502bbd0e034241c8a2c05f9535ec82908eab2cdfb634ec6286fa01be56587575518b49c6572776dfaa1d8d49b353adfc1558f0206107a48e0b2022d6a8
 MISC metadata.xml 319 BLAKE2B 227369d173003d904c042ec479371e9a483e6d7d58af0f8f1a03317e773bbbd0a06250e06583cf2cbbbe9020a1d7cd416b51467dc96649ead55f51785c79a019 SHA512 c1815f8f72b994c4f4fbd3edf1a856c89848e092b3b6515e706ef26b6b09d0096582219b7670b2b822ccecdfeefcbbbe768141acc3f4e55ca8879045a8ed51cd
diff --git a/media-libs/nv-codec-headers/nv-codec-headers-9.0.18.1.ebuild b/media-libs/nv-codec-headers/nv-codec-headers-9.0.18.1.ebuild
new file mode 100644
index 000000000000..ccb9128d4c71
--- /dev/null
+++ b/media-libs/nv-codec-headers/nv-codec-headers-9.0.18.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal
+
+DESCRIPTION="FFmpeg version of headers required to interface with Nvidias codec APIs"
+HOMEPAGE="https://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"
+SRC_URI="https://github.com/FFmpeg/nv-codec-headers/releases/download/n${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	>=x11-drivers/nvidia-drivers-390.25[${MULTILIB_USEDEP}]
+"
+
+S="${WORKDIR}/${PN}-n${PV}"
+
+src_prepare() {
+	multilib_copy_sources
+	default
+}
+
+multilib_src_compile() {
+	emake PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)"
+}
+
+multilib_src_install() {
+	emake PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)" DESTDIR="${D}" install
+}
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 21c2e37ef8f0..b8a6c378b205 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -11,6 +11,7 @@ AUX opencv-3.4.0-disable-download.patch 1050 BLAKE2B 6f39f61588d9231cc8d87762453
 AUX opencv-3.4.1-compilation-C-mode.patch 2077 BLAKE2B 78f55e49bd51ac4377a1db37125da6ca1ddfb9d723243eca7ef3df9d6d7b3922329cdd1c5915d480a9264af623c2953b4edaf81fd53afc950dc19cd49f04ea6f SHA512 203a4376728df6aa3dcaab147654139ebfd296a98d83847ac3ab0184dba828cf2ee298fedf7e7c2c64e1e8965237172fa6f1d5c7a4f6be5165a384d21b6875e7
 AUX opencv-3.4.1-cuda-add-relaxed-constexpr.patch 707 BLAKE2B 743a9c259c59fc4e3017539faef0723e0a80fb9c4bbde94811f32b3e6ae271b3db39fd35487d75078cfbe9e596604c4e37fb5c6c18619ed524c52683219dd8af SHA512 b37ce78495a3bbc439f203d9db81d9bff3e7f980c01ef5187dee537dd9c1025c5163ec3760b48d91a099a2fafb60526c9fe83f7183fc605fb3cc0f5c7a65f6bf
 AUX opencv-3.4.1-fix-build-with-va.patch 1459 BLAKE2B 20a65a5bef15fab56d277d78f747b883b5a008508c643ae877717dd0c524aa6c2ba398aff7ac8073d3ccfffdcd284223369c15de36214f62730bc62ca582cf71 SHA512 24186689afe73fd3e63d6d43073a88c65bc7cd5c0719701c8a014e5e85e179765e1b2d2adac5fcc3c8490e92aeaf65642f6d0276581d8311470328b55b74d441
+AUX opencv-3.4.1-fix-on-x86.patch 1256 BLAKE2B 785e718d7cea4bf72b03de5083d065449bad294c6bf5b6e7eb837e4c5f4ead34c1034988303410dba49e8376ca63caaaa209a4bd175d786c75ebfc548b71e271 SHA512 8ebf573e3f02b78b5769eaf828215698073096a1dade9214af0382cfbbe2353307df836a6af8c4e86246ad33fefe1f64a1087d0ff7a6dc7c5f3e231592c20b4c
 AUX opencv-3.4.1-popcnt.patch 890 BLAKE2B 553352472eaf2a2c97f148f97856a103e8a190970ef8a675d7a9b6fbf1ead0686279a4a5d961e8802164c73177da3f25cef016d40b59044f5c74b63613251512 SHA512 44f35d21c55e68b2125c5eba83c875c02c3822998d973257ab8a7d7e0baaeb5de70386b9294ff62a327732743253c588946eb8c59f87f1629b26e0f594c7b65f
 AUX opencv-3.4.1-python-lib-suffix-hack.patch 723 BLAKE2B bc4b1c68f2c73b40d20372ce4e3232b2db3b414ce2da16a8d84710fc53902211f17585c7ce6daf2d54025b53c04aa74f0c3eb3a30f26bfbc9af24e246f56b71a SHA512 54d2c8189fc1ff06ee1cacf5f375ea976faf339563ee804085feb0ec1f55cdbe10eea7335a786706b6a6152b6f9145156b3e74ce802c3d15b5a23014b25044b8
 AUX opencv-3.4.1-remove-git-autodetect.patch 1549 BLAKE2B 0ed44deddea20d5a57dded6a51d40645e5376411d9c055995fdbdbfbf4252817eaa9158925276661e4958f894898122ec273a352491be53511207345a481db52 SHA512 8496677542981c64ba9763f0d494885f71747884ae3e02de0bc8f96c1802356d917dcc7aed84ddfc2af093456c250bf2fafbdd06f7789aae8c720f5a412c07a0
@@ -22,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 18714 BLAKE2B 924a9d228d5cfb1b7aae192f0bc4fd11caf48f31487273fb476183f62e90eb5fc790988f7e5b358d970b29c4052ff7d0c8819c98b4826705eb10eec591415844 SHA512 6df0eef0c6609deff2aab9ab5e363161ebec315bbd98a9260b6214e6b6d44e609034ddfb164e8c8a7227ba57eeec2e58d32647ca2f2a8be7952c6430104b54a0
+EBUILD opencv-3.4.1-r5.ebuild 18720 BLAKE2B 113f6d7813320c1f5230a55f4c160a6390cea9ab4a111e71a04db9d69b54feebadab5f700072ba5450fc03a32af669e1306c616a9805e8536b45d46ff9c4ae92 SHA512 8ef0d1de2fab5e9dca09fdd23c1c986c9738bc1b2629aa1c7cf69c950e1e4853c440d241a936649edee7f2cf1ba7107ca9649f427dedec8efd95e1407ea8debe
 MISC metadata.xml 2401 BLAKE2B 3d37ef4879324890e702119fffaaf075021fb22ee0b9393a58df46cf937a60403f0f48f90483bfc078079cb9f1177f866cfcee63d592ba93915fa96a438d064c SHA512 691287c588e60df6158ea070f61100214dc54c267f9f2c7ffbeabb75595e72641ced7cc33f119fed9bbf98df8832f977557fb4a1017eb65d9081ac1350d783b8
diff --git a/media-libs/opencv/files/opencv-3.4.1-fix-on-x86.patch b/media-libs/opencv/files/opencv-3.4.1-fix-on-x86.patch
new file mode 100644
index 000000000000..f36d643cf731
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.4.1-fix-on-x86.patch
@@ -0,0 +1,27 @@
+From 7dc162cb4252ccf461f1c63650abde3c8807b79c Mon Sep 17 00:00:00 2001
+From: Alexander Alekhin <alexander.alekhin@intel.com>
+Date: Mon, 9 Apr 2018 18:25:51 +0300
+Subject: [PATCH] core: fix mm_pause() for non-SSE i386 builds
+
+replaced to safe binary compatible 'rep; nop' asm instruction
+---
+ modules/core/src/parallel_impl.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/modules/core/src/parallel_impl.cpp b/modules/core/src/parallel_impl.cpp
+index 78d9eb63694..bc64fce7a81 100644
+--- a/modules/core/src/parallel_impl.cpp
++++ b/modules/core/src/parallel_impl.cpp
+@@ -49,7 +49,11 @@ DECLARE_CV_YIELD
+ DECLARE_CV_PAUSE
+ #endif
+ #ifndef CV_PAUSE
+-#if defined __GNUC__ && (defined __i386__ || defined __x86_64__)
++# if defined __GNUC__ && (defined __i386__ || defined __x86_64__)
++#   if !defined(__SSE__)
++      static inline void cv_non_sse_mm_pause() { __asm__ __volatile__ ("rep; nop"); }
++#     define _mm_pause cv_non_sse_mm_pause
++#   endif
+ #   define CV_PAUSE(v) do { for (int __delay = (v); __delay > 0; --__delay) { _mm_pause(); } } while (0)
+ # elif defined __GNUC__ && defined __aarch64__
+ #   define CV_PAUSE(v) do { for (int __delay = (v); __delay > 0; --__delay) { asm volatile("yield" ::: "memory"); } } while (0)
diff --git a/media-libs/opencv/opencv-3.4.1-r5.ebuild b/media-libs/opencv/opencv-3.4.1-r5.ebuild
index c8bf140695b9..cb9bc604ea9e 100644
--- a/media-libs/opencv/opencv-3.4.1-r5.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r5.ebuild
@@ -234,6 +234,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-remove-git-autodetect.patch"
 	"${FILESDIR}/${P}-fix-build-with-va.patch" # bug https://bugs.gentoo.org/656576
 	"${FILESDIR}/${P}-popcnt.patch" # https://bugs.gentoo.org/633900
+	"${FILESDIR}/${P}-fix-on-x86.patch" # https://bugs.gentoo.org/682104
 )
 
 pkg_pretend() {
@@ -472,10 +473,9 @@ python_module_compile() {
 
 	# Set all python variables to load the correct Gentoo paths
 	mycmakeargs+=(
-		# cheap trick: python_setup sets one of them as a symlink
-		# to the correct interpreter, and the other to fail-wrapper
-		-DPYTHON2_EXECUTABLE=$(type -P python2)
-		-DPYTHON3_EXECUTABLE=$(type -P python3)
+		# python_setup alters PATH and sets this as wrapper
+		# to the correct interpreter we are building for
+		-DPYTHON_DEFAULT_EXECUTABLE=python
 		-DINSTALL_PYTHON_EXAMPLES=$(usex examples)
 		-DLIBPY_SUFFIX=64
 	)
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 87fa5a85786f..6cffb736981b 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -6,14 +6,10 @@ AUX openexr-2.2.0-fix-config.h-collision.patch 1556 BLAKE2B d7366aeae2a4d5b54968
 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-fix-build-system.patch 2381 BLAKE2B 37fd9c6ae5357ffb93fd47344137b4c91110a79ab2b685ac048109192f87e41f01aaa0a0fbee222bfa10ffdc58340d7c803b3068bca8bf99c323dfe46252597d SHA512 36889880813acf75a77d3d34ea3f0a6535ca45194ad491bec17df3701d1eabd2bb03d81c525ba96cf695e91ec67abeb1b2395cfa45ff0767d90b4600d63e768a
-DIST openexr-2.0.1.tar.gz 12609335 BLAKE2B 25adcf5a679a0419a7ff0ddd29d4d1c5f1c28cd3fd6c81b0a5c0cc63d907e741eaea378f4ebaa9a66afce0349edf7231ebd2bb3e493aee484860c89f05f45960 SHA512 b35e3e795496f9d4a56352c907bcffef14ae062b189c4e1df35f3ab08c5e9abf829fa9149db3198d60088fa9633816650011e5f7871e07324801b95549d6695b
 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.0.1-r1.ebuild 1255 BLAKE2B 23d26effb4996d82e843a5811fbbf2e609ba93a5383eb3844e4c53253c9748a915a08df1cfcedfa4393d695e000ec201eb92cd022b9fe9d607f3b78ea993dfdf SHA512 e46119eb545d174f1565746600df038e0028340f59f7670e1c0975a9b7a4c4a266a80970dccba054041b0bad31a98763b8aa5d4b9db32f83e65679e3fb0bab83
 EBUILD openexr-2.1.0.ebuild 1256 BLAKE2B 0c8154e2bf910e9d3994c28f9a29f725efc1c677d1a587162e6766d24e6f6ac7d0ab7fd98b46d5ea3103321d12de217678d4de97ab555733af8e99cb1aed97fb SHA512 c5a8158b4ebb432479f7edfb39b41d3742d0bcd3cca4782dac1bfa1b4aaa6191355dc0a4b2a5c643874c19829c2118052ef1841975b6f7c97ee23542dd3063fd
-EBUILD openexr-2.2.0-r1.ebuild 1578 BLAKE2B fd0dc90294f80362a6575e445a6510efa7f218566b97869dbc9f12c6187e3b0be0cfb24aebb2460925b40bced9bdb42b058974a9789d4c775494a6257f16cc2f SHA512 830f0c476b53b59bec9e65e0859c1623425a0b3a5bdd5081c1cf62be9f274b452c373e8ed2e7b4d6b92d8a20c9f477bdac9a80f604d3d8866ccdfac3a924849c
 EBUILD openexr-2.2.0-r2.ebuild 1862 BLAKE2B 2ddcfb899e3213db76211cbacf9fe7afa597ac0fece9ec4655e390fd6501a5cb15f3553d374408d748c2a4364b519f15f71e82af7d93402736b9c1c245b50266 SHA512 028067478c69a1eade6bda177b734f6530de91e6350e9057aadef4028c0a5c3cc5ca8989186fe59c9b9075d9d17e119e7b53d3713acc29228af52100250a9fda
-EBUILD openexr-2.2.0.ebuild 1248 BLAKE2B e4926afffcbf1f64891ed5ebdae8d4ab5895ffde3d79e3a29eeef121d8214c4c1528ccaaef62e35830b09bd1f54d1ceafd0b62d3652cff76160d7ce155e26955 SHA512 1af7a2a6c95ddd32b1688495b65954982974fa5cb3c0374ee16d6f89f049191a14a7e79fd6fdbefc8cf25ba67e0450e684015798325f2258982528909ee2ed9d
 EBUILD openexr-2.3.0.ebuild 1933 BLAKE2B ec44faffda4f70c5a9964dc09d6ec2e3c068fcb6463524d64a3cd0613e48d9f3b8250d3a9b8f7a05414b9df506de67c90df08c24dcc1b71a83306eb4d738180a SHA512 502493e8c7793954b4255b7f6e73835c068a70287ada74f2a21bc42377830258e0420400276808d8c21a0ecb00ac5cdcae1aa4d9cc5747b492e64eb390773add
 MISC metadata.xml 303 BLAKE2B 53fb5019bd6fe939d485f1eccb4a140ca9b7ce121b06744d8155842ccb6c5e1378ea39a9ae74c8d519be7b3926bd76040df4b8107137fcc2e25be97431e7a1be SHA512 0ab8d735dd7a8e0dc96b14cfde1ae06969d15cfbad956f4fda60b093660aee38fe98709376eedc9362a26858678d2f28eec795c1accb2560858fd804a11bb7ca
diff --git a/media-libs/openexr/openexr-2.0.1-r1.ebuild b/media-libs/openexr/openexr-2.0.1-r1.ebuild
deleted file mode 100644
index ef20bade0aea..000000000000
--- a/media-libs/openexr/openexr-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools-multilib
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="http://openexr.com/"
-SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/2.0.1" # 2.0.1 for the namespace off -> on switch, caused library renaming
-KEYWORDS="~amd64 -arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="examples static-libs"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	>=media-libs/ilmbase-${PV}:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_prepare() {
-	# Fix path for testsuite
-	sed -i -e "s:/var/tmp/:${T}:" IlmImfTest/tmpDir.h || die
-	autotools-multilib_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable examples imfexamples)
-	)
-	autotools-multilib_src_configure
-}
-
-src_install() {
-	autotools-multilib_src_install \
-		docdir=/usr/share/doc/${PF}/pdf \
-		examplesdir=/usr/share/doc/${PF}/examples
-
-	docompress -x /usr/share/doc/${PF}/examples
-
-	if ! use examples; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/media-libs/openexr/openexr-2.2.0-r1.ebuild b/media-libs/openexr/openexr-2.2.0-r1.ebuild
deleted file mode 100644
index 257ac2303b6a..000000000000
--- a/media-libs/openexr/openexr-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="http://openexr.com/"
-SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/22" # based on SONAME
-KEYWORDS="~amd64 -arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="cpu_flags_x86_avx examples static-libs"
-
-RDEPEND="
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	>=media-libs/ilmbase-${PV}:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/autoconf-archive-2016.09.16"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-cpuid-on-abi_x86_32.patch"
-	"${FILESDIR}/${P}-use-ull-for-64-bit-literals.patch"
-	"${FILESDIR}/${P}-fix-build-system.patch"
-	"${FILESDIR}/${P}-fix-config.h-collision.patch"
-)
-
-src_prepare() {
-	default
-	# Fix path for testsuite
-	sed -i -e "s:/var/tmp/:${T}:" IlmImfTest/tmpDir.h || die
-
-	# delete stray config files causing havoc
-	rm -f config*/OpenEXRConfig.h* || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--enable-threading \
-		$(use_enable cpu_flags_x86_avx avx) \
-		$(use_enable static-libs static) \
-		$(use_enable examples imfexamples)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	docompress -x /usr/share/doc/${PF}/examples
-	if ! use examples; then
-		rm -rf "${ED%/}"/usr/share/doc/${PF}/examples || die
-	fi
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/openexr/openexr-2.2.0.ebuild b/media-libs/openexr/openexr-2.2.0.ebuild
deleted file mode 100644
index 0e33854ab294..000000000000
--- a/media-libs/openexr/openexr-2.2.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools-multilib
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="http://openexr.com/"
-SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/22" # based on SONAME
-KEYWORDS="~amd64 -arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="examples static-libs"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	>=media-libs/ilmbase-${PV}:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_prepare() {
-	# Fix path for testsuite
-	sed -i -e "s:/var/tmp/:${T}:" IlmImfTest/tmpDir.h || die
-	autotools-multilib_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable examples imfexamples)
-	)
-	autotools-multilib_src_configure
-}
-
-src_install() {
-	autotools-multilib_src_install \
-		docdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \
-		examplesdir="${EPREFIX}"/usr/share/doc/${PF}/examples
-
-	docompress -x /usr/share/doc/${PF}/examples
-	use examples || rm -rf "${ED}"/usr/share/doc/${PF}/examples
-}
diff --git a/media-libs/opus/Manifest b/media-libs/opus/Manifest
index 158ad6b999dd..5faa611d5582 100644
--- a/media-libs/opus/Manifest
+++ b/media-libs/opus/Manifest
@@ -1,5 +1,5 @@
 DIST opus-1.2.1.tar.gz 1011070 BLAKE2B eff3e20c22cd5370a6a3aabf90cfe6f950a3a8d33cbaed8e053ff637c3c45d1d007a10da2f7983564c0bfcc3768f79ffbc041489fc8835f1faaa2fb6c0ef3800 SHA512 4a98d0a7dbd1a313e89407576805fd733c1192e8ef7e1137e3260025478a1cf1c5a8b71b48c372a0cffe6340524137fe47f181651888284f8221fb4d673f7cd5
 DIST opus-1.3.tar.gz 1032750 BLAKE2B 7c79cecb957b0353e35758989b07502f2d4531869985639a069dec8737c15061b56ebff5babe31ad316afa9f7787bde6a7c544fa5be10c1e02ccfdff1a80d5c7 SHA512 438635667e72c326d6d06a30e0b3a5564ba6cf5d484066456e1118e1c2fe3a61b959d0afa77a1084b177b72f9230618b6b55c78bc4e24e9127a09fd345b42518
 EBUILD opus-1.2.1.ebuild 1092 BLAKE2B b20442c5544e25e21f2b1236876a68a697cfbe9108ded8df77727c9cc8b98184f180a7b902f5324ed8e17232e7843d861ee89cc71baac657542c77f2bd67295f SHA512 adc7b0ba8cc8c6b8a44925b744cce35f31cc3702597e17820f9e894013ec9d75ba2578f101ea283f7e32321ea67033d60d856cb890d8c585a16b90108e147605
-EBUILD opus-1.3.ebuild 1189 BLAKE2B 978f0beb0f7e15fce177f158243d6ddff78b0a32ce44bc5f00334f5763f54a7e542937d3999f93a18b6c675fde7e85bcb71d249e080f80365691ec06d33d6dad SHA512 4fbcdf951db98ec38e080f03c04ee9b19c3bd59d3be1c25bdf5d1c9f1f83dc97b452462ecff282de019573e06cf656b24def6477879cbe1910cbd809ad06b243
+EBUILD opus-1.3.ebuild 1181 BLAKE2B 4c24f4c62da72f599539218a74944ec84aa290c04fa214be495f2de33b24a4b4d33049708e1b76ce201a704d86ede27642e725a73cb1a66488daf98095e72a9c SHA512 4cb1b2d38ad55ade24161a202a918ceb6d7c1ec0c9c825d7057bdd762d15cd9989b94c96bbcf174878a1f731a69211b8f921b99150da16db7dceed4b29944a28
 MISC metadata.xml 415 BLAKE2B 17b08c77ce2fde1c129cbbe276fc1ffe28d7f200769ac2e811c3923d3c069a00c359f42a1aecc01d13fff5ee78e8c786935d1234ac49557be55028daf3136bac SHA512 0138063170ab15d60dace8a720fbde24bbc6c8406835dc5098a70c78b21b39a2d8046844652014734c2121f03200fcaa25a22418c864aa22999a1dc1a6023800
diff --git a/media-libs/opus/opus-1.3.ebuild b/media-libs/opus/opus-1.3.ebuild
index d2eb187e3cfb..3e052eeae51c 100644
--- a/media-libs/opus/opus-1.3.ebuild
+++ b/media-libs/opus/opus-1.3.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
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://archive.mozilla.org/pub/opus/${MY_P}.tar.gz"
 	if [[ "${PV}" != *_alpha* ]] && [[ "${PV}" != *_beta* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+		KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
 	fi
 fi
 
diff --git a/media-libs/opusfile/Manifest b/media-libs/opusfile/Manifest
index 5fe55807bcd0..1d1c20f5bccd 100644
--- a/media-libs/opusfile/Manifest
+++ b/media-libs/opusfile/Manifest
@@ -3,6 +3,6 @@ DIST opusfile-0.10.tar.gz 467700 BLAKE2B eab1c5eadd13ad574590c5b6a4bf8cc7f82ec0d
 DIST opusfile-0.11.tar.gz 467420 BLAKE2B e3e6ee2d1d4c7030bdd5f7ec14503d46ebbfcbc4481ab4652a0be9171d45fe2e855e0f17801cf28fda66f44496ba9f9a2996af7e5aaf5b008e4c3b14263f3160 SHA512 ec3e282310cc4f25475c27b7bc8d1652dcb25d3ac6badf87bd1b4e5397fbe106a0dab81c60d88d198003a23d8a2c9bae8b661edc9b31433effeca438ce56a349
 DIST opusfile-0.6.tar.gz 437980 BLAKE2B 13250d08f9cc9564541bbe116c5482e5b9a0de1c28a8a9e9509b1019cb75d40caefc2b8eb0ad444bb67e05cc4d0813b7b3f1783e4d136201c71200b04f7690c2 SHA512 6fee48f3da21eeffed1ee5a3852234032aa559335225b07383c1104f5efba2f88aebe41c453ab2de472a69766e0fa9b48bec2f97d2a096b27afa96901802ba02
 EBUILD opusfile-0.10.ebuild 890 BLAKE2B 35e7a73420a5aac646805f1175d627c6e3227b7ae5bea191cbc102da955b3ff319099994d440853e9094d33e02a9307729da28be38ad82a04aa0c6df524f90d9 SHA512 36d9df9967f117c7a65354e949eff47e5e78ae681004c1d5f4a287d39fafe4d943c2b9390eb98a1aeb6c4f142911ec2d83271c477e0da3bf3e4cd8f1641fe6d6
-EBUILD opusfile-0.11.ebuild 1019 BLAKE2B 9c41da1fdcaeb08db323cadc7de2fb9056c55be5610ab449ef801bc766f4334a70ff6ae29b20236c2658936646058d5ea44221ee2b165213021341f0b8000ee7 SHA512 1f4be44ee2a17b45749effd514ab67d59dac12cd6b3cf06b959bf53739af4b600eb1c641581af45dd4d8cf01434ffcab5b0d4fe8e499317c673786b30a48f3cc
+EBUILD opusfile-0.11.ebuild 1018 BLAKE2B 6d7837450a3520d05413694b3659edb42cde1e91a7a59a3198256af70b99c8c4b1c531eb55a76ae32160e60e391422f1d1f8b457a2375823261fbcc3f9cdebee SHA512 04c2eb4a284b689b078ddb2a812a59251613cac8d6345e7e68a15b25ce61b7cf50be259240889f6a507208c3711a55592cf15c86f55488df3da77b15ddbf8aec
 EBUILD opusfile-0.6.ebuild 774 BLAKE2B 524fdfebca63b5cc98d8306131210453659d905c8528952f6fe245910f84504216a6514194ffc3790f57853479e6a0eef2a515a4ffabf2b3bb3fefc2b5a8522c SHA512 8cd751db321e6e25c4ddd3028503d2621af55130a89106b44823385aedb07101c4f30d6a00d395641102bdb3efa90dd3c5b0e31269dc12fa498ee7fc12e16c79
 MISC metadata.xml 584 BLAKE2B da2277516b7f14b1a800d3b511ff10579b9544679e5d71535598d2e4a476f0f7cc9bce41247363ee7c50384e5d678379ab0a42fb6172013f873bc1e727d2b5db SHA512 4a4a0c3766de010ae39d0ee2339c21df051e082a36fefa9b8c53ef3ecb184072c1f8cf42aed0e4baa70f5b93d507e942a052a02a6a53ce4ed90496eb445f74c3
diff --git a/media-libs/opusfile/opusfile-0.11.ebuild b/media-libs/opusfile/opusfile-0.11.ebuild
index 0cc03a2fcb4f..1a1222ef8021 100644
--- a/media-libs/opusfile/opusfile-0.11.ebuild
+++ b/media-libs/opusfile/opusfile-0.11.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.xiph.org/releases/opus/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="doc fixed-point +float +http libressl static-libs"
 
 RDEPEND="media-libs/libogg
diff --git a/media-libs/raptor/Manifest b/media-libs/raptor/Manifest
index eefff1043799..62ef305b85b1 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 1674 BLAKE2B caca795ddeabbff0c1db5258db7ee0707d468c3596ee6dd30ce6c2f3d05d621c2dc6c3a6dba7db2369bc49401519e5e5935ac5f41afd4a8f6cce4d9ccc000dca SHA512 695f805ccf8a0f32421c5271c0d2468fa9cadd9a5525c2d00bd86025519469aa6eec392e7ea5283a0ef9ee416d79d35355f51fbc728dbeeaad06744db8b969c6
+EBUILD raptor-2.0.15-r2.ebuild 1673 BLAKE2B 6cfa0b1d91efa048335d03a2359c1a3b5650f95fe0a32c96dbe0c7ad1f1af8e7018d9ba8a3a1cc6bcd4ecef9fb5357d0b11dab0dad72aa65cb9e40753e4fb6e0 SHA512 40d822db630dc865b9eb35e31152e6f3897b2378ecff9732c63189451f38e32968ff47f5b8eece52aae03c9cece0ebbf8d5ed295405f86963987401a2eb09a77
 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 4f20b71f8157..b737787a9c5e 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/raspberrypi-userland/Manifest b/media-libs/raspberrypi-userland/Manifest
index 8a80af0c3fff..c9bd7bfa9200 100644
--- a/media-libs/raspberrypi-userland/Manifest
+++ b/media-libs/raspberrypi-userland/Manifest
@@ -4,8 +4,7 @@ AUX bcm_host.pc 338 BLAKE2B 2afdd23a6b200a04650c4ea0b669b14e4f6aac9f2fbcbc77a606
 AUX egl.pc 227 BLAKE2B e3b205358a0891f58d95fbd0494e6d6a07c550363b60373c0f3b14686b5c3967dfa7e76fb2a65ca703c770f7bd9e5ba2232e1932ebebdd799fb99555afa55402 SHA512 15e2cdf73be35640a951a7e841963902bb056d96025b52c1551359ec7671baf710699c642a08a5543d52d27f424d900e2fd1d584976a056a54a20116b59a21f6
 AUX glesv2.pc 230 BLAKE2B eb3405f7e867b7e8d1ecde9498ac396c11931dac0bb03ae1e78a3bb6ed376b468917ed6363f08341934f1b97ed3df00bfc9c0af22e6e5aa7c91def517df586e7 SHA512 a821afcf22d52ea48b4b94b3f4317553bed2ed2e1aadee2862b4d925ee3c78cc0d3a023c62842758de5c2b168dfc8b1ba6838ccb9b0749aef9fc782aa33fa8ec
 AUX next-resource-handle.patch 12535 BLAKE2B b7dbf4152f92ce7bbbf9d2b8b72fddc8cf2f32e576b2d8096b0b17ac89a4cc8ab2cfd0e11137b8da3b2c7b7414d02855a14e1dbffd77d26e087989184ab88001 SHA512 f0368ffff54f989f2541f1891fe3b244d9ff4f2fc464adf2387c04045aca2f1e1f35622d2bd6c6d42e9581c45c417d1961e235b063d892b17e7dbe3e4724f5c5
-AUX raspberrypi-userland-9999-gentoo.patch 679 BLAKE2B fa66854456d2399bf74c93c29504284ebb6dccb17362beeb6d811c3d3d06ce3c495590769f916ca38ecf59f672f430ae2587e8e1d0c6fbf06877fcc3a1523e21 SHA512 b655256358338ad2c1504953d219dac6cae4bde50c376fb64813f7f62a0197474cad3ce3ae9f6b9c8eeb3b0582f368be6eaaa66b94030eb5a099cab758c4dc4e
 DIST raspberrypi-userland-0_pre20160424.tar.gz 32933952 BLAKE2B 4a2d40200a6a4d673be277a0958f768342a2777c28b14b4c7fcac1dbc9c59f2ef2485234f11fbd228aea6bbcf4982a3fd1d4825268af60be91665ea6fee6922d SHA512 04a71837b1247ecbbe479b3b09b5705638a9e576dc99a1ab2200727509195a4a2f2a9b184e3c23ce3933a3236b260afc8bd2b75bc218567b386445bdd8208a5b
 EBUILD raspberrypi-userland-0_pre20160424.ebuild 3280 BLAKE2B 74a7ac7e2fdaa85c45c7a6352f8d30024e33d0b6c10740082447d874bab8e59d7a04d31351b7fe8a69d89cece234709e8444207c4d9960ab20ff08f12b2c1cc2 SHA512 f1fca6c1cf73336d482c4cd400667e22d6493402fa23389e62e40af86dc605af98dddee39b5f553fc33cc03c766f40b8009f41c8af004d540e28b01a8bb24ac1
-EBUILD raspberrypi-userland-9999.ebuild 829 BLAKE2B 6f04a3456e65509ece3434ba20dd3f8d8fdcd5a0497467842a89aaa5dac7c6287b86b132087a9423b1cc37c8669762a80c8cecf4ed92ad666b46a784b8f210c8 SHA512 0d070ec48cfc746c315f49a75c59bbe9bbb597ec73682e91a7f829984924e4cc637c4a38d97ea4803e0960872499a711fd93653cbc745a83dae86015caae9632
-MISC metadata.xml 459 BLAKE2B 5a2f8e56dbffa03855f84b92576b1c76dea2df5eed854fc99d020df6ac304c59da09135b5b6d9ba23ce23cbe23db2760ef22bde7fc80ab5a05c1728559b47eb0 SHA512 0424eda38137b1e4b2b74645e83cc8ea6038dc59f6d6a9b51043a81543283bc25cc8e82ca85d9a97f20423af095c5516f8c9c72f84bd1b1d63c3beb3e3f000b9
+EBUILD raspberrypi-userland-9999.ebuild 784 BLAKE2B a088f6dce3d0df70c06b3c78e699ca6779925225439331f4802199a556d8c4e3f6479346bdf03edf73623999c50034ab0b18eae104d98415ea4c9b214e6c489e SHA512 2688a1ec3bb75618593ca6770cf18c6289b6cf0498b4d147ab596fe3cb886176a01fb4d95113125289470ad131a27abbc9b7fb7092c91bfe41c01b8d24b6ceaf
+MISC metadata.xml 351 BLAKE2B ba576d7f61b104574b6a6691584dd75e632a637ded0bce055a267822a86574e35a6d71f5bb3616939af1a964aa007cbe49fd5cf3b64939b387dc0d46d356fc82 SHA512 f0d9ddcb8e1e7df5ff767f33824c5f2b6ab5a9afc508e1d39864a046f2ffc05665011a1a08e2624dd41d6e1c150ed0d14ce888401cb5c52069eb4a8958d167e2
diff --git a/media-libs/raspberrypi-userland/files/raspberrypi-userland-9999-gentoo.patch b/media-libs/raspberrypi-userland/files/raspberrypi-userland-9999-gentoo.patch
deleted file mode 100644
index a5e60554cd13..000000000000
--- a/media-libs/raspberrypi-userland/files/raspberrypi-userland-9999-gentoo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- raspberrypi-userland-9999/host_applications/linux/apps/dtoverlay/CMakeLists.txt.old	2017-02-04 19:01:38.944537134 +0100
-+++ raspberrypi-userland-9999/host_applications/linux/apps/dtoverlay/CMakeLists.txt	2017-02-04 19:02:09.634401479 +0100
-@@ -22,12 +22,4 @@
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dtparam DESTINATION bin)
- 
- set(DTOVERLAY_SCRIPTS dtoverlay-pre dtoverlay-post)
--foreach(_script ${DTOVERLAY_SCRIPTS})
--   add_custom_command(
--     TARGET dtoverlay
--     COMMAND ${CMAKE_COMMAND}
--     -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${_script}
--     ${CMAKE_BINARY_DIR}/../../bin/${_script}
--   )
--endforeach()
- install(PROGRAMS ${DTOVERLAY_SCRIPTS} DESTINATION bin)
diff --git a/media-libs/raspberrypi-userland/metadata.xml b/media-libs/raspberrypi-userland/metadata.xml
index 3f36d197951a..6bc276860724 100644
--- a/media-libs/raspberrypi-userland/metadata.xml
+++ b/media-libs/raspberrypi-userland/metadata.xml
@@ -5,10 +5,6 @@
 		<email>chithanh@gentoo.org</email>
 		<name>Chí-Thanh Christopher Nguyễn</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>tupone@gentoo.org</email>
-		<name>Tupone Alfredo</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">raspberrypi/userland</remote-id>
 	</upstream>
diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild
index 99b348863247..6906bbc70397 100644
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild
@@ -18,8 +18,6 @@ RDEPEND=""
 
 EGIT_REPO_URI="https://github.com/raspberrypi/userland"
 
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
 pkg_setup() {
 	append-ldflags $(no-as-needed)
 }
diff --git a/media-libs/sbc/Manifest b/media-libs/sbc/Manifest
index 48052b80a1b1..04d944b9b802 100644
--- a/media-libs/sbc/Manifest
+++ b/media-libs/sbc/Manifest
@@ -1,5 +1,5 @@
 DIST sbc-1.3.tar.xz 246292 BLAKE2B 6d628f4f5fe592b04255a965b08a85736c75d16e4caa3a5fda1dad57a5a47a82accd5e61ae48adfaf9ac1a478e20b5fa02e7a34c87fda0ac79666f616c4356e6 SHA512 c11cb1ede8abdb226d404ce34307d217b716b91cbe550ed90cb5387b062b7b97a6b7a81371de6f462d8c1429cb3299869a1bda347fa175e9d81cfa2bc2056c8b
 DIST sbc-1.4.tar.xz 250656 BLAKE2B a5b59a0ac209b44843af49e63f7b6a6b397b3905f0efc52c18a3b92785d297d39dad80f5b124e97c50a9535f892f1451bf0a2945ba223a522eafbcad46eaad9d SHA512 f35250c202034e93ce4046d29883d76b162164d42fb59e6af8ff5e57f197244238f5f8087309cef2d44755c179e7f0869cf096735c8de510b1ac7e0f6c29d84f
 EBUILD sbc-1.3.ebuild 865 BLAKE2B 4f889f142268ddb390da6485a3a2d413a37a2d850f8624bf095b1d4abe57def3754431608b23144ca94b4742b4f11d201f6e3f5d0fac0e366e2a6b6387520adf SHA512 eb366a5d5e5497c5d650c365b31334bd1a528f85d2ec7940d524f0786b92927e2d2f6a2a61bcf61a14b34d8fb54f3facbf64a3637484ad8ff65aace88def2737
-EBUILD sbc-1.4.ebuild 871 BLAKE2B 26ef75f09f29f947967ebd2901ae6ba183eb05035234008ae4906dfdce44660241ba0da2165bc44df5c712112a5751da4bc00e80fa7a72788832a15df76ff1c9 SHA512 664ab105d6b668137a3e75cd359a5300316c06a22ff9384bc1a3ffe2e1f09077225141c00e2c0a000517f66d6574c516baec6e4413814f9f9defbca6f6f6e190
+EBUILD sbc-1.4.ebuild 863 BLAKE2B 207e0776f78b76eb2669c93f98a8a302a0a2be783f1d0f63489af6c1c80876998a704134161d3f9e2c98dd0ae04d29ee7d4065ad8d766062b9ce08ffaad6b65b SHA512 74e49bee9284b2d896db233cd9835ddef81577d4774fd50c24fa96ba0df3989da45726bb6dea15d16eb569c84c47e7900d0fac548173def22de2a3b93bf756ad
 MISC metadata.xml 356 BLAKE2B 37e1eb09d0de357b5f84cc88a36d602c1522fb5e1a80542390297eca08bef82e30a85af697c5bcf1e042b98a63943f49b3e7902ef866207998583ff0c1a96c00 SHA512 c9b1f0a337ecc94fb295f536d18166b9bae68ca96e27f96a17b38b2374203bc6979e9f168e423e2eb87520919ba76c433a6b60c866b82c449b48d84e92165524
diff --git a/media-libs/sbc/sbc-1.4.ebuild b/media-libs/sbc/sbc-1.4.ebuild
index 5da8220a4970..5540703abc41 100644
--- a/media-libs/sbc/sbc-1.4.ebuild
+++ b/media-libs/sbc/sbc-1.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 # --enable-tester is building src/sbctester but the tarball is missing required
diff --git a/media-libs/sdl-pango/Manifest b/media-libs/sdl-pango/Manifest
index 5a9baba7fe4f..dbef157ad0f2 100644
--- a/media-libs/sdl-pango/Manifest
+++ b/media-libs/sdl-pango/Manifest
@@ -1,4 +1,4 @@
 DIST SDL_Pango-0.1.2-API-adds.patch 3624 BLAKE2B 17d619c65f126968b2613c9ceb3430037b5c62a08d07fddccfef9c1489751637d85000471d60f68b814799e469b8aab907b1ec3bcd42b34946532b555e38dd62 SHA512 cfda28cd9334989abf7d99a36a15d6d4aac0ee5e9315b21bd5999d106bcd671717328b53cd58c2fa406f61f1728860c2ef7e1cf15bf53b44da4b3cc902a7f7ad
 DIST SDL_Pango-0.1.2.tar.gz 405967 BLAKE2B 310dc47ba8030248a856b9f1c077f04f16ae3e0209afb0051a478d07c7d694bf3d16bd3e507c56d9fbec6bf24b55c6c20da5785b3de547463eee3c858d56f98a SHA512 081ec57e0f55ce541c35393d6db7ea48b662a5008760781076d70c0a645d47f7e994f695c459ed51f8cb71494911a04cd416733fb57934321b806a1ac9878440
 EBUILD sdl-pango-0.1.2-r1.ebuild 927 BLAKE2B 06439ccec5c459fcea3593484e79eb3b01d783937e47c2db4ba0eec9ace13f5b402e7c176ef8934084f2b04536519eb752b1f56fca364c9ef528bde52d113897 SHA512 b03637e63bf9bdcdb40cc76116c4546f70f129952cdccb8467707eaa5e3bd749bbd48892dcab67a43975aa0e29908d43991c5c98d4755ced5c23ccce1cb6bc22
-MISC metadata.xml 445 BLAKE2B c6a9c35c0363965ce75144a09086bde5cd98efbdb03667d1e135949c203b9070cd97a604e94bf2237c0f3feb21c486f21e5d160743a7a649a1283cd606defde8 SHA512 7d3c70cc8de075c07dfa492ae525c7f0a61bbb81dd14d2ccd106fd81cf4fe5d4289ca03831f8989fe27355ebd0144191471cd233793184c001c2b406420ea7f4
+MISC metadata.xml 331 BLAKE2B 13e38fb8cbbcd1e8a121d89f4c4e3c550db15aeded5860febd9721c780bca51b68580ab36ea935ef30215e57a1ed8d11e3f6e8c14776f3df2a05cf13140978cf SHA512 91d76f2594645081afcfa9f7f08843d21af3083e0308fb2e87c9cf2d7e460420e13bc0e9811bc841efd2dc0e1f26e6af8dba373d12b2e7b6a327600c263192f2
diff --git a/media-libs/sdl-pango/metadata.xml b/media-libs/sdl-pango/metadata.xml
index 7adbdeb642f1..303ae2411c75 100644
--- a/media-libs/sdl-pango/metadata.xml
+++ b/media-libs/sdl-pango/metadata.xml
@@ -5,10 +5,6 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sdlpango</remote-id>
 	</upstream>
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index a52da9aa6fa3..5b4cb24c3543 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -1,18 +1,11 @@
-AUX tiff-3.9.7-CVE-2012-4447.patch 5706 BLAKE2B a72c6e4f643906273bd89689dcefa5696fe00536ad84329320bb8719bd37b07fa35e00c25e51998be6eeda2436ef93673dfbe6eda063f7d293df64e60c27c524 SHA512 defb8251401b7d65c2cd8f60df30d35551c1b1d0a1dcf514dd95da89572873177ea116e9373dd07cd260e00434235090e1d8864199d5fdfa84c445cb6905ddd6
-AUX tiff-3.9.7-CVE-2012-4564.patch 1987 BLAKE2B a56084760a03fc70e42d4ccff14b7f45d2c24f120515f7e23e8a5a6ada58f9325df1dfcc54327bb1324060aa91a4e497d83c74bbb62bc85daae5c6642aea14d5 SHA512 24ebe60ce6361561c15c8c5fb46b47942e58912de5efbf128374defc4382a7e800fae3dc0a9fe04876a5e2f61a109edc1c9533be2f8a15b4b0ed7215d7b08c9b
-AUX tiff-3.9.7-CVE-2012-5581.patch 8156 BLAKE2B 39457d90041b04014970c8b0bb9275353eca34fef6660810537294348ff33103b735523f5b84f0de2b1003014ace561a2c3bb498ff771b5c4101fef6fd89adf6 SHA512 2e215edeb6f4f5d6e14753874a67d76cfec34b3f6ffc420e1c7ede2007a6b2f64c09505e879e83db1de87f28c82c806c4379b38bf7f8735bb2bae675543683f0
-AUX tiff-3.9.7-printdir-width.patch 1523 BLAKE2B a0bfeda833e604137529537bed29dcb50308e3f6493d2985390c4528a4ac38f432104d796ec3368462d331017db4393f58622d17e1f068811913df78e98c7444 SHA512 9bf2edcbda2ed5dba01839cf1bb34316801b4c5a2b6c71ed46f8777518cf1bc77084db94eaf1ebde84583fa2e1749a5fc5151e321b4d83975b13c3e9ebe96436
-AUX tiff-3.9.7-tiffinfo-exif.patch 1847 BLAKE2B c6e55e92ebe86558cfabec730d2f15836390fa1789d57ada01fb1c6037699898706a051dab415db35e1ac2d39902301c1639e944f177b4b098227279c98c00c5 SHA512 6f211dc864bfb314a1c7edb8855b68cfbbdbbde1ba9422c1c578acbb15e5769323eec366bef618a8100b0ccb8057b2997762ebbd0f943be10882411861ec72fb
 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-3.9.7.tar.gz 1468097 BLAKE2B 303339acf9bb48558695b13fcc2b41acacbbf2ce6d2ec497067761895cb2de7674108e8ca2f35f845dcd2e45801777fe25d234af1c308acf59846c2f5617ab53 SHA512 ca89584a9ffa33b4986e4bc2165043cec239896f1f0ab73db00818d0442b570efaa6345b2ed422e884202324d359713df849bf14782bb0cf3b959655febddd77
 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-3.9.7-r1.ebuild 1941 BLAKE2B 38e7fc7b06adec30d32dce66390c5174fa8ca514d8fdc12d6486ed3b8a78b95ea2efb3e083c959892ea65e46853b4c5b7236508c9812736ff0bebce26961d64f SHA512 659c879ae594501bb3a88dde00797d67fd004cbbefbb4403a2374876a6c909cb38f4a7d56256325c5d53fd7ed107849e7c2862f9de777ab6b6d996ec279fe997
-EBUILD tiff-4.0.10.ebuild 2324 BLAKE2B 798ebc306c03368078da1d24d28c61fe3d69376fbbaf95238ecc92b73cfa62c1db54900895bd83ae890be231322a91a9f238fc69b4cc85f0db3e1b8abb1f38b1 SHA512 2886e2136317e5576847297dff4fdee2f1b8ef459f9d0f4cb4ac168d09119b3c4b12c0aacd4fc4b7dd9078938abe36ec5890325d9d3534d0b78d2ac3be79c910
+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
diff --git a/media-libs/tiff/files/tiff-3.9.7-CVE-2012-4447.patch b/media-libs/tiff/files/tiff-3.9.7-CVE-2012-4447.patch
deleted file mode 100644
index 6c28dc6ec9a8..000000000000
--- a/media-libs/tiff/files/tiff-3.9.7-CVE-2012-4447.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-Upstream patch for CVE-2012-4447.  This also covers an out-of-bounds-read
-possibility in the same file, which wasn't given a separate CVE.
-
-
-diff -Naur tiff-3.9.4.orig/libtiff/tif_pixarlog.c tiff-3.9.4/libtiff/tif_pixarlog.c
---- tiff-3.9.4.orig/libtiff/tif_pixarlog.c	2010-06-08 14:50:42.000000000 -0400
-+++ tiff-3.9.4/libtiff/tif_pixarlog.c	2012-12-10 15:50:14.421538317 -0500
-@@ -117,9 +117,9 @@
-     if (n >= stride) {
- 	mask = CODE_MASK;
- 	if (stride == 3) {
--	    t0 = ToLinearF[cr = wp[0]];
--	    t1 = ToLinearF[cg = wp[1]];
--	    t2 = ToLinearF[cb = wp[2]];
-+	    t0 = ToLinearF[cr = (wp[0] & mask)];
-+	    t1 = ToLinearF[cg = (wp[1] & mask)];
-+	    t2 = ToLinearF[cb = (wp[2] & mask)];
- 	    op[0] = t0;
- 	    op[1] = t1;
- 	    op[2] = t2;
-@@ -136,10 +136,10 @@
- 		op[2] = t2;
- 	    }
- 	} else if (stride == 4) {
--	    t0 = ToLinearF[cr = wp[0]];
--	    t1 = ToLinearF[cg = wp[1]];
--	    t2 = ToLinearF[cb = wp[2]];
--	    t3 = ToLinearF[ca = wp[3]];
-+	    t0 = ToLinearF[cr = (wp[0] & mask)];
-+	    t1 = ToLinearF[cg = (wp[1] & mask)];
-+	    t2 = ToLinearF[cb = (wp[2] & mask)];
-+	    t3 = ToLinearF[ca = (wp[3] & mask)];
- 	    op[0] = t0;
- 	    op[1] = t1;
- 	    op[2] = t2;
-@@ -183,9 +183,9 @@
-     if (n >= stride) {
- 	mask = CODE_MASK;
- 	if (stride == 3) {
--	    t0 = ToLinearF[cr = wp[0]] * SCALE12;
--	    t1 = ToLinearF[cg = wp[1]] * SCALE12;
--	    t2 = ToLinearF[cb = wp[2]] * SCALE12;
-+	    t0 = ToLinearF[cr = (wp[0] & mask)] * SCALE12;
-+	    t1 = ToLinearF[cg = (wp[1] & mask)] * SCALE12;
-+	    t2 = ToLinearF[cb = (wp[2] & mask)] * SCALE12;
- 	    op[0] = CLAMP12(t0);
- 	    op[1] = CLAMP12(t1);
- 	    op[2] = CLAMP12(t2);
-@@ -202,10 +202,10 @@
- 		op[2] = CLAMP12(t2);
- 	    }
- 	} else if (stride == 4) {
--	    t0 = ToLinearF[cr = wp[0]] * SCALE12;
--	    t1 = ToLinearF[cg = wp[1]] * SCALE12;
--	    t2 = ToLinearF[cb = wp[2]] * SCALE12;
--	    t3 = ToLinearF[ca = wp[3]] * SCALE12;
-+	    t0 = ToLinearF[cr = (wp[0] & mask)] * SCALE12;
-+	    t1 = ToLinearF[cg = (wp[1] & mask)] * SCALE12;
-+	    t2 = ToLinearF[cb = (wp[2] & mask)] * SCALE12;
-+	    t3 = ToLinearF[ca = (wp[3] & mask)] * SCALE12;
- 	    op[0] = CLAMP12(t0);
- 	    op[1] = CLAMP12(t1);
- 	    op[2] = CLAMP12(t2);
-@@ -247,9 +247,9 @@
-     if (n >= stride) {
- 	mask = CODE_MASK;
- 	if (stride == 3) {
--	    op[0] = ToLinear16[cr = wp[0]];
--	    op[1] = ToLinear16[cg = wp[1]];
--	    op[2] = ToLinear16[cb = wp[2]];
-+	    op[0] = ToLinear16[cr = (wp[0] & mask)];
-+	    op[1] = ToLinear16[cg = (wp[1] & mask)];
-+	    op[2] = ToLinear16[cb = (wp[2] & mask)];
- 	    n -= 3;
- 	    while (n > 0) {
- 		wp += 3;
-@@ -260,10 +260,10 @@
- 		op[2] = ToLinear16[(cb += wp[2]) & mask];
- 	    }
- 	} else if (stride == 4) {
--	    op[0] = ToLinear16[cr = wp[0]];
--	    op[1] = ToLinear16[cg = wp[1]];
--	    op[2] = ToLinear16[cb = wp[2]];
--	    op[3] = ToLinear16[ca = wp[3]];
-+	    op[0] = ToLinear16[cr = (wp[0] & mask)];
-+	    op[1] = ToLinear16[cg = (wp[1] & mask)];
-+	    op[2] = ToLinear16[cb = (wp[2] & mask)];
-+	    op[3] = ToLinear16[ca = (wp[3] & mask)];
- 	    n -= 4;
- 	    while (n > 0) {
- 		wp += 4;
-@@ -342,9 +342,9 @@
-     if (n >= stride) {
- 	mask = CODE_MASK;
- 	if (stride == 3) {
--	    op[0] = ToLinear8[cr = wp[0]];
--	    op[1] = ToLinear8[cg = wp[1]];
--	    op[2] = ToLinear8[cb = wp[2]];
-+	    op[0] = ToLinear8[cr = (wp[0] & mask)];
-+	    op[1] = ToLinear8[cg = (wp[1] & mask)];
-+	    op[2] = ToLinear8[cb = (wp[2] & mask)];
- 	    n -= 3;
- 	    while (n > 0) {
- 		n -= 3;
-@@ -355,10 +355,10 @@
- 		op[2] = ToLinear8[(cb += wp[2]) & mask];
- 	    }
- 	} else if (stride == 4) {
--	    op[0] = ToLinear8[cr = wp[0]];
--	    op[1] = ToLinear8[cg = wp[1]];
--	    op[2] = ToLinear8[cb = wp[2]];
--	    op[3] = ToLinear8[ca = wp[3]];
-+	    op[0] = ToLinear8[cr = (wp[0] & mask)];
-+	    op[1] = ToLinear8[cg = (wp[1] & mask)];
-+	    op[2] = ToLinear8[cb = (wp[2] & mask)];
-+	    op[3] = ToLinear8[ca = (wp[3] & mask)];
- 	    n -= 4;
- 	    while (n > 0) {
- 		n -= 4;
-@@ -393,9 +393,9 @@
- 	mask = CODE_MASK;
- 	if (stride == 3) {
- 	    op[0] = 0;
--	    t1 = ToLinear8[cb = wp[2]];
--	    t2 = ToLinear8[cg = wp[1]];
--	    t3 = ToLinear8[cr = wp[0]];
-+	    t1 = ToLinear8[cb = (wp[2] & mask)];
-+	    t2 = ToLinear8[cg = (wp[1] & mask)];
-+	    t3 = ToLinear8[cr = (wp[0] & mask)];
- 	    op[1] = t1;
- 	    op[2] = t2;
- 	    op[3] = t3;
-@@ -413,10 +413,10 @@
- 		op[3] = t3;
- 	    }
- 	} else if (stride == 4) {
--	    t0 = ToLinear8[ca = wp[3]];
--	    t1 = ToLinear8[cb = wp[2]];
--	    t2 = ToLinear8[cg = wp[1]];
--	    t3 = ToLinear8[cr = wp[0]];
-+	    t0 = ToLinear8[ca = (wp[3] & mask)];
-+	    t1 = ToLinear8[cb = (wp[2] & mask)];
-+	    t2 = ToLinear8[cg = (wp[1] & mask)];
-+	    t3 = ToLinear8[cr = (wp[0] & mask)];
- 	    op[0] = t0;
- 	    op[1] = t1;
- 	    op[2] = t2;
-@@ -630,10 +630,10 @@
- 	return guess;
- }
- 
--static uint32
--multiply(size_t m1, size_t m2)
-+static tsize_t
-+multiply(tsize_t m1, tsize_t m2)
- {
--	uint32	bytes = m1 * m2;
-+	tsize_t	bytes = m1 * m2;
- 
- 	if (m1 && bytes / m1 != m2)
- 		bytes = 0;
-@@ -641,6 +641,20 @@
- 	return bytes;
- }
- 
-+static tsize_t
-+add_ms(tsize_t m1, tsize_t m2)
-+{
-+	tsize_t bytes = m1 + m2;
-+
-+	/* if either input is zero, assume overflow already occurred */
-+	if (m1 == 0 || m2 == 0)
-+		bytes = 0;
-+	else if (bytes <= m1 || bytes <= m2)
-+		bytes = 0;
-+
-+	return bytes;
-+}
-+
- static int
- PixarLogSetupDecode(TIFF* tif)
- {
-@@ -661,6 +675,8 @@
- 	    td->td_samplesperpixel : 1);
- 	tbuf_size = multiply(multiply(multiply(sp->stride, td->td_imagewidth),
- 				      td->td_rowsperstrip), sizeof(uint16));
-+	/* add one more stride in case input ends mid-stride */
-+	tbuf_size = add_ms(tbuf_size, sizeof(uint16) * sp->stride);
- 	if (tbuf_size == 0)
- 		return (0);
- 	sp->tbuf = (uint16 *) _TIFFmalloc(tbuf_size);
diff --git a/media-libs/tiff/files/tiff-3.9.7-CVE-2012-4564.patch b/media-libs/tiff/files/tiff-3.9.7-CVE-2012-4564.patch
deleted file mode 100644
index 98a6e6c4409d..000000000000
--- a/media-libs/tiff/files/tiff-3.9.7-CVE-2012-4564.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Upstream patch for CVE-2012-4564.
-
-
-diff -Naur tiff-3.9.4.orig/tools/ppm2tiff.c tiff-3.9.4/tools/ppm2tiff.c
---- tiff-3.9.4.orig/tools/ppm2tiff.c	2010-06-08 14:50:44.000000000 -0400
-+++ tiff-3.9.4/tools/ppm2tiff.c	2012-12-10 16:16:05.154045877 -0500
-@@ -68,6 +68,17 @@
- 	exit(-2);
- }
- 
-+static tsize_t
-+multiply_ms(tsize_t m1, tsize_t m2)
-+{
-+	tsize_t bytes = m1 * m2;
-+
-+	if (m1 && bytes / m1 != m2)
-+		bytes = 0;
-+
-+	return bytes;
-+}
-+
- int
- main(int argc, char* argv[])
- {
-@@ -85,6 +96,7 @@
- 	int c;
- 	extern int optind;
- 	extern char* optarg;
-+	tsize_t scanline_size;
- 
- 	if (argc < 2) {
- 	    fprintf(stderr, "%s: Too few arguments\n", argv[0]);
-@@ -217,7 +229,8 @@
- 	}
- 	switch (bpp) {
- 		case 1:
--			linebytes = (spp * w + (8 - 1)) / 8;
-+			/* if round-up overflows, result will be zero, OK */
-+			linebytes = (multiply_ms(spp, w) + (8 - 1)) / 8;
- 			if (rowsperstrip == (uint32) -1) {
- 				TIFFSetField(out, TIFFTAG_ROWSPERSTRIP, h);
- 			} else {
-@@ -226,15 +239,31 @@
- 			}
- 			break;
- 		case 8:
--			linebytes = spp * w;
-+			linebytes = multiply_ms(spp, w);
- 			TIFFSetField(out, TIFFTAG_ROWSPERSTRIP,
- 			    TIFFDefaultStripSize(out, rowsperstrip));
- 			break;
- 	}
--	if (TIFFScanlineSize(out) > linebytes)
-+	if (linebytes == 0) {
-+		fprintf(stderr, "%s: scanline size overflow\n", infile);
-+		(void) TIFFClose(out);
-+		exit(-2);					
-+	}
-+	scanline_size = TIFFScanlineSize(out);
-+	if (scanline_size == 0) {
-+		/* overflow - TIFFScanlineSize already printed a message */
-+		(void) TIFFClose(out);
-+		exit(-2);					
-+	}
-+	if (scanline_size < linebytes)
- 		buf = (unsigned char *)_TIFFmalloc(linebytes);
- 	else
--		buf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(out));
-+		buf = (unsigned char *)_TIFFmalloc(scanline_size);
-+	if (buf == NULL) {
-+		fprintf(stderr, "%s: Not enough memory\n", infile);
-+		(void) TIFFClose(out);
-+		exit(-2);
-+	}
- 	if (resolution > 0) {
- 		TIFFSetField(out, TIFFTAG_XRESOLUTION, resolution);
- 		TIFFSetField(out, TIFFTAG_YRESOLUTION, resolution);
diff --git a/media-libs/tiff/files/tiff-3.9.7-CVE-2012-5581.patch b/media-libs/tiff/files/tiff-3.9.7-CVE-2012-5581.patch
deleted file mode 100644
index a6bdca137029..000000000000
--- a/media-libs/tiff/files/tiff-3.9.7-CVE-2012-5581.patch
+++ /dev/null
@@ -1,245 +0,0 @@
-Fix unsafe handling of DotRange and related tags.  Back-port of upstream
-patch for CVE-2012-5581.  (Note: I have not pushed this into upstream CVS
-for the 3.9 branch, because I'm not entirely convinced that it won't create
-application compatibility issues --- tgl)
-
-
-diff -Naur tiff-3.9.7.orig/libtiff/tif_dir.c tiff-3.9.7/libtiff/tif_dir.c
---- tiff-3.9.7.orig/libtiff/tif_dir.c	2012-09-22 10:48:09.000000000 -0400
-+++ tiff-3.9.7/libtiff/tif_dir.c	2012-12-13 13:39:20.448864070 -0500
-@@ -494,32 +494,28 @@
- 		    goto end;
- 		}
- 
--		if ((fip->field_passcount
-+		if (fip->field_tag == TIFFTAG_DOTRANGE 
-+		    && strcmp(fip->field_name,"DotRange") == 0) {
-+			/* TODO: This is an evil exception and should not have been
-+			   handled this way ... likely best if we move it into
-+			   the directory structure with an explicit field in 
-+			   libtiff 4.1 and assign it a FIELD_ value */
-+			uint16 v[2];
-+			v[0] = (uint16)va_arg(ap, int);
-+			v[1] = (uint16)va_arg(ap, int);
-+			_TIFFmemcpy(tv->value, v, 4);
-+		}
-+		else if (fip->field_passcount
- 		    || fip->field_writecount == TIFF_VARIABLE
- 		    || fip->field_writecount == TIFF_VARIABLE2
- 		    || fip->field_writecount == TIFF_SPP
--		    || tv->count > 1)
--		    && fip->field_tag != TIFFTAG_PAGENUMBER
--		    && fip->field_tag != TIFFTAG_HALFTONEHINTS
--		    && fip->field_tag != TIFFTAG_YCBCRSUBSAMPLING
--		    && fip->field_tag != TIFFTAG_DOTRANGE
--		    && fip->field_tag != TIFFTAG_WHITELEVEL) {
-+		    || tv->count > 1) {
-                     _TIFFmemcpy(tv->value, va_arg(ap, void *),
- 				tv->count * tv_size);
- 		} else {
--		    /*
--		     * XXX: The following loop required to handle
--		     * TIFFTAG_PAGENUMBER, TIFFTAG_HALFTONEHINTS,
--		     * TIFFTAG_YCBCRSUBSAMPLING and TIFFTAG_DOTRANGE tags.
--		     * These tags are actually arrays and should be passed as
--		     * array pointers to TIFFSetField() function, but actually
--		     * passed as a list of separate values. This behaviour
--		     * must be changed in the future!
--		     */
--		    int i;
- 		    char *val = (char *)tv->value;
- 
--		    for (i = 0; i < tv->count; i++, val += tv_size) {
-+		    assert( tv->count == 1 );
- 			    switch (fip->field_type) {
- 				case TIFF_BYTE:
- 				case TIFF_UNDEFINED:
-@@ -578,7 +574,6 @@
- 				    status = 0;
- 				    break;
- 			    }
--		    }
- 		}
- 	    }
-           }
-@@ -869,24 +864,27 @@
- 				*va_arg(ap, uint16*) = (uint16)tv->count;
- 			*va_arg(ap, void **) = tv->value;
- 			ret_val = 1;
--                } else {
--			if ((fip->field_type == TIFF_ASCII
-+		} else if (fip->field_tag == TIFFTAG_DOTRANGE
-+			   && strcmp(fip->field_name,"DotRange") == 0) {
-+			/* TODO: This is an evil exception and should not have been
-+			   handled this way ... likely best if we move it into
-+			   the directory structure with an explicit field in 
-+			   libtiff 4.1 and assign it a FIELD_ value */
-+			*va_arg(ap, uint16*) = ((uint16 *)tv->value)[0];
-+			*va_arg(ap, uint16*) = ((uint16 *)tv->value)[1];
-+			ret_val = 1;
-+		} else {
-+			if (fip->field_type == TIFF_ASCII
- 			    || fip->field_readcount == TIFF_VARIABLE
- 			    || fip->field_readcount == TIFF_VARIABLE2
- 			    || fip->field_readcount == TIFF_SPP
--			    || tv->count > 1)
--			    && fip->field_tag != TIFFTAG_PAGENUMBER
--			    && fip->field_tag != TIFFTAG_HALFTONEHINTS
--			    && fip->field_tag != TIFFTAG_YCBCRSUBSAMPLING
--			    && fip->field_tag != TIFFTAG_DOTRANGE) {
-+			    || tv->count > 1) {
- 				*va_arg(ap, void **) = tv->value;
- 				ret_val = 1;
- 			} else {
--			    int j;
- 			    char *val = (char *)tv->value;
- 
--			    for (j = 0; j < tv->count;
--				 j++, val += _TIFFDataSize(tv->info->field_type)) {
-+			    assert( tv->count == 1 );
- 				switch (fip->field_type) {
- 					case TIFF_BYTE:
- 					case TIFF_UNDEFINED:
-@@ -936,7 +934,6 @@
- 						ret_val = 0;
- 						break;
- 				}
--			    }
- 			}
-                 }
- 		break;
-diff -Naur tiff-3.9.7.orig/libtiff/tif_print.c tiff-3.9.7/libtiff/tif_print.c
---- tiff-3.9.7.orig/libtiff/tif_print.c	2010-07-08 12:17:59.000000000 -0400
-+++ tiff-3.9.7/libtiff/tif_print.c	2012-12-13 13:42:12.773478278 -0500
-@@ -112,16 +112,22 @@
- }
- 
- static int
--_TIFFPrettyPrintField(TIFF* tif, FILE* fd, ttag_t tag,
-+_TIFFPrettyPrintField(TIFF* tif, const TIFFFieldInfo *fip, FILE* fd, ttag_t tag,
- 		      uint32 value_count, void *raw_data)
- {
- 	TIFFDirectory *td = &tif->tif_dir;
- 
-+	/* do not try to pretty print auto-defined fields */
-+	if (strncmp(fip->field_name,"Tag ", 4) == 0) {
-+		return 0;
-+	}
-+
- 	switch (tag)
- 	{
- 		case TIFFTAG_INKSET:
--			fprintf(fd, "  Ink Set: ");
--			switch (*((uint16*)raw_data)) {
-+			if (value_count == 2 && fip->field_type == TIFF_SHORT) {
-+				fprintf(fd, "  Ink Set: ");
-+				switch (*((uint16*)raw_data)) {
- 				case INKSET_CMYK:
- 					fprintf(fd, "CMYK\n");
- 					break;
-@@ -130,11 +136,18 @@
- 						*((uint16*)raw_data),
- 						*((uint16*)raw_data));
- 					break;
-+				}
-+				return 1;
- 			}
--			return 1;
-+			return 0;
-+
- 		case TIFFTAG_WHITEPOINT:
--			fprintf(fd, "  White Point: %g-%g\n",
--				((float *)raw_data)[0], ((float *)raw_data)[1]);			return 1;
-+			if (value_count == 2 && fip->field_type == TIFF_RATIONAL) {
-+				fprintf(fd, "  White Point: %g-%g\n",
-+					((float *)raw_data)[0], ((float *)raw_data)[1]);			return 1;
-+			}
-+			return 0;
-+
- 		case TIFFTAG_REFERENCEBLACKWHITE:
- 		{
- 			uint16 i;
-@@ -174,10 +187,13 @@
- 				(unsigned long) value_count);
- 			return 1;
- 		case TIFFTAG_STONITS:
--			fprintf(fd,
--				"  Sample to Nits conversion factor: %.4e\n",
--				*((double*)raw_data));
--			return 1;
-+			if (value_count == 1 && fip->field_type == TIFF_DOUBLE) {
-+				fprintf(fd,
-+					"  Sample to Nits conversion factor: %.4e\n",
-+					*((double*)raw_data));
-+				return 1;
-+			}
-+			return 0;
-         }
- 
- 	return 0;
-@@ -524,44 +540,28 @@
- 				value_count = td->td_samplesperpixel;
- 			else
- 				value_count = fip->field_readcount;
--			if ((fip->field_type == TIFF_ASCII
-+			if (fip->field_tag == TIFFTAG_DOTRANGE
-+			    && strcmp(fip->field_name,"DotRange") == 0) {
-+				/* TODO: This is an evil exception and should not have been
-+				   handled this way ... likely best if we move it into
-+				   the directory structure with an explicit field in 
-+				   libtiff 4.1 and assign it a FIELD_ value */
-+				static uint16 dotrange[2];
-+				raw_data = dotrange;
-+				TIFFGetField(tif, tag, dotrange+0, dotrange+1);
-+			} else if (fip->field_type == TIFF_ASCII
- 			     || fip->field_readcount == TIFF_VARIABLE
- 			     || fip->field_readcount == TIFF_VARIABLE2
- 			     || fip->field_readcount == TIFF_SPP
--			     || value_count > 1)
--			    && fip->field_tag != TIFFTAG_PAGENUMBER
--			    && fip->field_tag != TIFFTAG_HALFTONEHINTS
--			    && fip->field_tag != TIFFTAG_YCBCRSUBSAMPLING
--			    && fip->field_tag != TIFFTAG_DOTRANGE) {
-+			     || value_count > 1) {
- 				if(TIFFGetField(tif, tag, &raw_data) != 1)
- 					continue;
--			} else if (fip->field_tag != TIFFTAG_PAGENUMBER
--				   && fip->field_tag != TIFFTAG_HALFTONEHINTS
--				   && fip->field_tag != TIFFTAG_YCBCRSUBSAMPLING
--				   && fip->field_tag != TIFFTAG_DOTRANGE) {
--				raw_data = _TIFFmalloc(
--					_TIFFDataSize(fip->field_type)
--					* value_count);
--				mem_alloc = 1;
--				if(TIFFGetField(tif, tag, raw_data) != 1) {
--					_TIFFfree(raw_data);
--					continue;
--				}
- 			} else {
--				/* 
--				 * XXX: Should be fixed and removed, see the
--				 * notes related to TIFFTAG_PAGENUMBER,
--				 * TIFFTAG_HALFTONEHINTS,
--				 * TIFFTAG_YCBCRSUBSAMPLING and
--				 * TIFFTAG_DOTRANGE tags in tif_dir.c. */
--				char *tmp;
- 				raw_data = _TIFFmalloc(
- 					_TIFFDataSize(fip->field_type)
- 					* value_count);
--				tmp = raw_data;
- 				mem_alloc = 1;
--				if(TIFFGetField(tif, tag, tmp,
--				tmp + _TIFFDataSize(fip->field_type)) != 1) {
-+				if(TIFFGetField(tif, tag, raw_data) != 1) {
- 					_TIFFfree(raw_data);
- 					continue;
- 				}
-@@ -574,7 +574,7 @@
- 		 * _TIFFPrettyPrintField() fall down and print it as any other
- 		 * tag.
- 		 */
--		if (_TIFFPrettyPrintField(tif, fd, tag, value_count, raw_data)) {
-+		if (_TIFFPrettyPrintField(tif, fip, fd, tag, value_count, raw_data)) {
- 			if(mem_alloc)
- 				_TIFFfree(raw_data);
- 			continue;
diff --git a/media-libs/tiff/files/tiff-3.9.7-printdir-width.patch b/media-libs/tiff/files/tiff-3.9.7-printdir-width.patch
deleted file mode 100644
index 6ad7534ac6fe..000000000000
--- a/media-libs/tiff/files/tiff-3.9.7-printdir-width.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Make TIFFPrintDirectory cope with both TIFF_VARIABLE and TIFF_VARIABLE2
-conventions for field_passcount fields, ie, either 16- or 32-bit counts.
-This patch is taken from upstream commits dated 2012-05-23 ("fix crash
-with odd 16bit count types for some custom fields") and 2012-12-12 ("Fix
-TIFF_VARIABLE/TIFF_VARIABLE2 confusion in TIFFPrintDirectory").
-
-This doesn't qualify as a security issue in itself, mainly because
-TIFFPrintDirectory is unlikely to be used in any security-exposed
-scenarios; but we need to fix it so that our test case for CVE-2012-5581
-works on all platforms.
-
-
-diff -Naur tiff-3.9.4.orig/libtiff/tif_print.c tiff-3.9.4/libtiff/tif_print.c
---- tiff-3.9.4.orig/libtiff/tif_print.c	2010-06-08 14:50:42.000000000 -0400
-+++ tiff-3.9.4/libtiff/tif_print.c	2012-12-13 12:17:33.726765771 -0500
-@@ -518,8 +518,19 @@
- 			continue;
- 
- 		if(fip->field_passcount) {
--			if(TIFFGetField(tif, tag, &value_count, &raw_data) != 1)
-+			if (fip->field_readcount == TIFF_VARIABLE2 ) {
-+				if(TIFFGetField(tif, tag, &value_count, &raw_data) != 1)
-+					continue;
-+			} else if (fip->field_readcount == TIFF_VARIABLE ) {
-+				uint16 small_value_count;
-+				if(TIFFGetField(tif, tag, &small_value_count, &raw_data) != 1)
-+					continue;
-+				value_count = small_value_count;
-+			} else {
-+				assert (fip->field_readcount == TIFF_VARIABLE
-+					|| fip->field_readcount == TIFF_VARIABLE2);
- 				continue;
-+			} 
- 		} else {
- 			if (fip->field_readcount == TIFF_VARIABLE
- 			    || fip->field_readcount == TIFF_VARIABLE2)
diff --git a/media-libs/tiff/files/tiff-3.9.7-tiffinfo-exif.patch b/media-libs/tiff/files/tiff-3.9.7-tiffinfo-exif.patch
deleted file mode 100644
index a326e21e298b..000000000000
--- a/media-libs/tiff/files/tiff-3.9.7-tiffinfo-exif.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Teach "tiffinfo -D" to not try to print image data inside an EXIF subdirectory,
-because there isn't any.  Back-patched from an upstream 4.0.2 fix.
-
-This is not a security issue in itself (it crashes, but with a simple NULL
-pointer dereference).  However, our test case for CVE-2012-5581 tickles this
-bug, so it seems easier to fix this than make a new test case.
-
-
-diff -Naur tiff-3.9.4.orig/tools/tiffinfo.c tiff-3.9.4/tools/tiffinfo.c
---- tiff-3.9.4.orig/tools/tiffinfo.c	2010-06-08 14:50:44.000000000 -0400
-+++ tiff-3.9.4/tools/tiffinfo.c	2012-12-11 16:33:17.062228558 -0500
-@@ -49,7 +49,7 @@
- int	stoponerr = 1;			/* stop on first read error */
- 
- static	void usage(void);
--static	void tiffinfo(TIFF*, uint16, long);
-+static	void tiffinfo(TIFF*, uint16, long, int);
- 
- int
- main(int argc, char* argv[])
-@@ -124,19 +124,20 @@
- 		if (tif != NULL) {
- 			if (dirnum != -1) {
- 				if (TIFFSetDirectory(tif, (tdir_t) dirnum))
--					tiffinfo(tif, order, flags);
-+					tiffinfo(tif, order, flags, 1);
- 			} else if (diroff != 0) {
- 				if (TIFFSetSubDirectory(tif, diroff))
--					tiffinfo(tif, order, flags);
-+					tiffinfo(tif, order, flags, 1);
- 			} else {
- 				do {
- 					uint32 offset;
- 
--					tiffinfo(tif, order, flags);
-+					tiffinfo(tif, order, flags, 1);
- 					if (TIFFGetField(tif, TIFFTAG_EXIFIFD,
- 							 &offset)) {
--						if (TIFFReadEXIFDirectory(tif, offset))
--							tiffinfo(tif, order, flags);
-+						if (TIFFReadEXIFDirectory(tif, offset)) {
-+							tiffinfo(tif, order, flags, 0);
-+						}
- 					}
- 				} while (TIFFReadDirectory(tif));
- 			}
-@@ -426,10 +427,10 @@
- }
- 
- static void
--tiffinfo(TIFF* tif, uint16 order, long flags)
-+tiffinfo(TIFF* tif, uint16 order, long flags, int is_image)
- {
- 	TIFFPrintDirectory(tif, stdout, flags);
--	if (!readdata)
-+	if (!readdata || !is_image)
- 		return;
- 	if (rawdata) {
- 		if (order) {
diff --git a/media-libs/tiff/tiff-3.9.7-r1.ebuild b/media-libs/tiff/tiff-3.9.7-r1.ebuild
deleted file mode 100644
index 467c3bb64906..000000000000
--- a/media-libs/tiff/tiff-3.9.7-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# this ebuild is only for the libtiff.so.3 (+ 4) and libtiffxx.so.3 (+ 4) SONAME for ABI compat
-
-inherit eutils libtool multilib multilib-minimal
-
-DESCRIPTION="Library for manipulation of TIFF (Tag Image File Format) images"
-HOMEPAGE="http://libtiff.maptools.org"
-SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz"
-
-LICENSE="libtiff"
-SLOT="3"
-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cxx jbig jpeg zlib"
-
-RDEPEND="jpeg? ( >=virtual/jpeg-0-r2[${MULTILIB_USEDEP}] )
-	jbig? ( >=media-libs/jbigkit-2.1[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	!media-libs/tiff-compat
-	!=media-libs/tiff-3*:0"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-CVE-2012-{4447,4564,5581}.patch \
-		"${FILESDIR}"/${P}-tiffinfo-exif.patch \
-		"${FILESDIR}"/${P}-printdir-width.patch
-
-	elibtoolize
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--libdir=/libdir \
-		--disable-static \
-		$(use_enable cxx) \
-		$(use_enable zlib) \
-		$(use_enable jpeg) \
-		$(use_enable jbig) \
-		--without-x
-}
-
-multilib_src_install() {
-	# Let `make install` and libtool handle insecure runpath(s)
-	dodir tmp
-	emake DESTDIR="${ED}/tmp" install
-
-	# .so.3 (upstream) is used by sci-chemistry/icm
-	# .so.4 (Debian) is used by net-im/skype
-	exeinto /usr/$(get_libdir)
-	doexe "${ED}"/tmp/libdir/libtiff$(get_libname 3)
-	dosym libtiff$(get_libname 3) /usr/$(get_libdir)/libtiff$(get_libname 4)
-	if use cxx; then
-		doexe "${ED}"/tmp/libdir/libtiffxx$(get_libname 3)
-		dosym libtiffxx$(get_libname 3) /usr/$(get_libdir)/libtiffxx$(get_libname 4)
-	fi
-
-	rm -rf "${ED}"/tmp
-}
-
-multilib_src_install_all() {
-	# (avoid installing docs)
-	:
-}
diff --git a/media-libs/tiff/tiff-4.0.10.ebuild b/media-libs/tiff/tiff-4.0.10.ebuild
index a41a3102657c..8373253c0284 100644
--- a/media-libs/tiff/tiff-4.0.10.ebuild
+++ b/media-libs/tiff/tiff-4.0.10.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
@@ -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 ~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="
author	V3n3RiX <venerix@redcorelinux.org>	2019-04-05 21:17:31 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-04-05 21:17:31 +0100
commit	dc7cbdfa65fd814b3b9aa3c56257da201109e807 (patch)
tree	c85d72f6f31f21f178069c9d41d41a7c1ff4b362 /media-libs
parent	0706fc6986773f4e4d391deff4ad5143c464ea4e (diff)