gentoo resync : 15.01.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
commit: 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree: e1810a4b135afce04b34862ef0fab2bfaeb8aeca /media-libs
parent: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
358 files changed, 3615 insertions, 4916 deletions
diff --git a/media-libs/Field3D/Field3D-1.7.2.ebuild b/media-libs/Field3D/Field3D-1.7.2.ebuild
index 4fe5e0457742..4cbf036f9660 100644
--- a/media-libs/Field3D/Field3D-1.7.2.ebuild
+++ b/media-libs/Field3D/Field3D-1.7.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="A library for storing voxel data"
 HOMEPAGE="http://opensource.imageworks.com/?p=field3d"
@@ -29,7 +29,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DINSTALL_DOCS=OFF # Docs are not finished yet.
 		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
-		$(cmake-utils_use_find_package mpi MPI)
+		$(cmake_use_find_package mpi MPI)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-libs/Field3D/Manifest b/media-libs/Field3D/Manifest
index 96c0b4b59e6c..8877a52cb65a 100644
--- a/media-libs/Field3D/Manifest
+++ b/media-libs/Field3D/Manifest
@@ -1,4 +1,4 @@
 AUX Field3D-1.7.2-Use-PkgConfig-for-IlmBase.patch 5371 BLAKE2B c8a1360db04de4cfa18b739af024934469b9cf2a2314d3fb248ad2df371be902369989f120dc7c1adb86ea77cf01a7a5e0944b9a4a57e9a9e329a06c5d24c97d SHA512 167da6b57983e317266ccbb9670cc5ec03f041343e44af3cbedc14366e349edd1d5f2a0ac163fa919827b2dfdd9811525b81c446a0e32016b3bd51f84f202bcb
 DIST Field3D-1.7.2.tar.gz 502481 BLAKE2B 8d5fbac915b52b36e66250f8fcd2beb5fff9d2446696ad1829e3edf05c9810b5d54928c6ab4f5aa99c1338da24cea446134434a59aa1d053f3da3500c2800f59 SHA512 e4ea51310105980f759dce48830db8ae3592ce32a02b246214d8aed9df7a7f5c500314f2daf92196b7a76d648f2909b18112df4c5c3c8949c0676d710dfbf1f2
-EBUILD Field3D-1.7.2.ebuild 802 BLAKE2B 27dc400e9da29bb4d37a74eaa9af197c23f7950619c6951fc684e0447b099faec54e2295e0ae05136e31936efe3c899432cfa7b837f6e58171c2cfb061824e0c SHA512 6be8c07b78d6c0fd350efedcf7a690cffbf49f6619838ac673f6823cadbc0d0db6412e4201ad650b45437dce8721beec4878691ad00c276524c5873cf07a0d2a
+EBUILD Field3D-1.7.2.ebuild 784 BLAKE2B aebb2cc4394c38a481546400063714a9ca8442fe20b08e7fc24360b468a3e6ff63b6f945cbbaf72d66099b7dc9054a1ad1b4786d99bdf8fdd862328929484e24 SHA512 24d49d5423c45b9438f743dd5f5770a2d5ed0ffddcb0765fbb5ae97dcb2c5a16f45e0d8ae9cfa7b62a97e395e9221d8fc8afc2343866448ea08e40de47500eee
 MISC metadata.xml 708 BLAKE2B b783e8e9cc226dbf51d9033659f49ad45587757791112f704a799a081b02d34f4ec772701f7b88c3bbe1c31a10a2b9bb80ddd51eb5d61376367bb99886c6dad8 SHA512 421af157753908d4743f552d65c649b8852ec4811a9b58eac99b63d377cf3bb289beccc5a6a8c6862884a48c8ebbc4aa9deb7f62fba4d329e17346712ab0f514
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 565adb1bd75e..01131f0909d1 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/aalib/Manifest b/media-libs/aalib/Manifest
index 1c71e962f282..58548008097c 100644
--- a/media-libs/aalib/Manifest
+++ b/media-libs/aalib/Manifest
@@ -7,5 +7,5 @@ AUX aalib-1.4_rc5-more-protos.patch 1499 BLAKE2B abf425195f87f83dc019ded382c365f
 AUX aalib-1.4_rc5-tinfo.patch 709 BLAKE2B fb7dd0eb1e39046c66de0466b0411f97fa948d9da03719fcd759a7331c7da0a6cfcba92353ef5363cf651501d73ce4fd29a5baf94897f10f0518284ebb4db10c SHA512 2abab613af549f4c24f7d617cf65de773e7850ec8485dfa23de2405ed59cf14f7cb70c2f1b701e27ae541e5f75302f4d28c3f866303bfc901a96074c9d9d534b
 DIST aalib-1.4rc5.tar.gz 391028 BLAKE2B fd527716c0484d45fa3b75712a24301bd485fab8191ac1d5c6d35f8af093a00e11f0f8d2797ddcc32f4d87a39649fd50145dcc557e5ba98e67336cff2bb79002 SHA512 3e4506eccce3b81ccbbb79a4a1b90abd39e2259e6043fde90f70b9ca279bd4c37758a047167267b97c4ec92f64fb17c7c8f548114f0d0c6e78ddb9463b5f1299
 EBUILD aalib-1.4_rc5-r8.ebuild 1952 BLAKE2B e63df56ae0ff3bd304763f5ed09af2ad6bd875f812c24eaddc4eb9eccdaefaef9a2291e0861de3f6024c4c2f1427f589fa19b9bb86c1633decb07397895baabe SHA512 7a34dcbd79a379078fe37a0cbdd75d166180ad6903e693e62b72e26a580ac1b582982ff956ab8fc8cfe16b43aea686e35d249d5512c81fdafa9f692c7e511061
-EBUILD aalib-1.4_rc5-r9.ebuild 1950 BLAKE2B da62e9aed3b9a3533ae4969395ee71a8f75cb2d518f80bc2770d357fd691345807e2962956828c2907bdc7e87413baa939afea4c0d917744e2405b33767b3342 SHA512 cfeedcdce3b0ade9d778d72887829f7ce5a661e75a33db7ae68ca618a4e64c4a9bc412931d3d1abaf4aa76e0fc04cd5db4534dfff9db88370f71e8aaad498bd6
+EBUILD aalib-1.4_rc5-r9.ebuild 1939 BLAKE2B 9b8558b34289b53ec5fcd2c8522d0c523b22202285880723cf574cac082cc126d91305060d6e9f279a681ffc09f9c81e37051409acb5f71602cbcc5e461dbc18 SHA512 beaef8f4bc421a1509d83588b3b2586ec0b20abce4f2da9231466a4c884d14f924d04359f50b67bcc5a7168c894f915be7068f0ff341213f853a348ce2b81ed4
 MISC metadata.xml 415 BLAKE2B 3f7c9a9f7118b0fc7e4134f829c28bc47e637256ad0408e7964cdf617df77e4f5c7742d05850444debc0f6ed7aeac0e756bba5d746092cd9bda69797d5540f66 SHA512 f49d1e3652e86e14a048ad6944c108bec49ba19b961ea89b171d55e789e9c42bd4f981086dc643daf1c805fec79de3831488bdc9c29c2c1a6d6e4b00bb786def
diff --git a/media-libs/aalib/aalib-1.4_rc5-r9.ebuild b/media-libs/aalib/aalib-1.4_rc5-r9.ebuild
index 750d19857c67..e748dea0212d 100644
--- a/media-libs/aalib/aalib-1.4_rc5-r9.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc5-r9.ebuild
@@ -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-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-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 046610e6a836..70ef5a115849 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -6,8 +6,8 @@ DIST alsa-lib-1.1.9.tar.bz2 1058187 BLAKE2B 60454be162a0f36334602586762f8ce657d2
 DIST alsa-lib-1.2.1.1.tar.bz2 1002960 BLAKE2B 6df2145e0fdd42b86759a6250f6fa3d18075d1bbff1c5ec0b4b6130f934ab369e5cc0edd9a53c3b6298dce0d374a9888c5fc63ae0d42b3fd0ef5ca97eff00369 SHA512 8a0b6f1ecc58d60991b4509e791b1581eebae57cd754b0b4829e66b1cfee81d588b04f42a17f598f06310b9658d9f46fd748cca516cc48b6f2989389c22c42e9
 DIST alsa-lib-1.2.1.2.tar.bz2 1004129 BLAKE2B e8bf117f3036a32b020897f16b9648ac105c499f547ae157508720502722d4e1a651719c86a4e2756ca7a3c573a1f17c02524125ccaad12bcb8c7c71675c898a SHA512 e8286fd55f63ee0d95513279d0885c287533de89b7af6c338413dec5d38ba4f5a15da1a4a4ce36e052614e4b730e3778782dab9979d82958283be17b48604913
 EBUILD alsa-lib-1.1.2.ebuild 2123 BLAKE2B 97a24d65932fdd5d1a08a94d77e1a456cdc20501c50bfbb5766df74a6246d4ba5f37578240543c9c2ede9544e0a50ea11e4f886e9c77e7ee872c7ccb30ab2aee SHA512 7368a2744004ceff3ea41b39f5417cc6f190bcf2823f1db76ecffcec753e855c3cc6d2668d02b95f4df4d507a0d087f0c7dd2fb5de7a94e95d4fba83e9757050
-EBUILD alsa-lib-1.1.8.ebuild 2070 BLAKE2B 4d82e902423c47404cddc5ae583a4119faebb7361e507c805f482704455d980756e66601062e3c88ac0366ad574154af9a4eea072b8fbcd17847ea68d19e8eb6 SHA512 468d0516920e27a5afe79d8b061922d0d584cfd9351c240503d87ab006f010ff88dd7dfd2efdc05bf3bb7e0cec67436d3e30c1fe21359e510228010e68d96755
-EBUILD alsa-lib-1.1.9.ebuild 2078 BLAKE2B e26d36574a8610f822ed53cdcca3a6199f4b6d23c544b39996684ca42dc51a13e5466499ecaabc9ad07bed13f1f44e97797eba99356559db63cc98e3a3c38018 SHA512 f37d9860383098876f1b8278cce9f7b9711f2a47f0d9b117927b8f5c3e41c9cfa7cc59a5d80bdc87f60ab406fbc36d95a63344338759501818f41815697a647c
-EBUILD alsa-lib-1.2.1.1-r1.ebuild 2149 BLAKE2B 030086ae17c1a8f0ea612671bdba894e9e47361738fc0452ded7cae80a74a7ce2899caca30cec8551cbe7c86281b6784a249a177d34682812df8cb5a55715c25 SHA512 1d84e2bd2b6d5b63fb924b7aa2547d02971fff0231149cdfac3792c7b64caa9c1d38d4e44a68d8231cdfe6bf0743311f8c3688117efbdb778e6b930eb91fa3ab
-EBUILD alsa-lib-1.2.1.2.ebuild 2095 BLAKE2B 13615b3dd4e6971800d51678e4cec2026261a25f92ebbf88d8f3e2bed76ccc3adf3c96a724c61b803ca698661676b53bce5a51f2b37a2a76d7d3f3393e25a055 SHA512 b1499113fdbb948563df08095a8b81a5e761b2a0663314fd4b4e475e08d6b140c9aaded17fc5bc4879c3db2079759b5d4408113e164d3314a509d9710239723c
+EBUILD alsa-lib-1.1.8.ebuild 2068 BLAKE2B a8953eb38342fae539132e3bf1f1024f39762c922a223895a8a11d6f741d414ff0bdaad84d54f4b9024ae2f70c33867f177c860e9d2d438236444b64c1510785 SHA512 aa228c80a34c2ff8fce3cc2bdfcf254761325c93b6beda262c90754759871eb0ff6a70ce98121e4505b3ec2941edc3615201e442f2c48103413da0c092af1f5a
+EBUILD alsa-lib-1.1.9.ebuild 2076 BLAKE2B a5b993db209ad0fc59d2846c083a0906622a86911fcaa023fdb90de823d95ec33f67b61d710ec5e164e78ad323c774bc524f844f7dbcd3b8e5f0b102b30192b0 SHA512 a13d43dc7efb41f4a47ce06a66e07b8f7846350988fbfd64c01ce9b6c14da35b24a8b02f59383ba339230bb8efaf938c09a8c225e923c00cd207cbc47b646aef
+EBUILD alsa-lib-1.2.1.1-r1.ebuild 2147 BLAKE2B d2bb59384252242313a6bc20197bad9dd8979bf0bec59ea8409793b4516b169caf3279ab88c941404580267dabf604071ac8893889097c63403be2d11c329b12 SHA512 abab7f9e9c1b896afb1f7236f349315acbe71ca32316488148c5ee47e35b0ed67007c2cc645adb89f0fa94f3c297f344ddf962744cdb4071a840b781fba1505f
+EBUILD alsa-lib-1.2.1.2.ebuild 2093 BLAKE2B 76989e25782a0133021d786e5c3e26280805d6af8a8a01146e062ce483d8937aec3486d98007f003314b84fe86d7bdb51be035458cfc3043c0335b546edb3957 SHA512 e4d43e6a21573cb052d94aa1960a44a3c45e128a7ec30c02a5919f8877d7b119c843029218bb3c6e0971edf62c3bccaea729a10a876c8659ec118622487da14a
 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 57d9380777de..15483ef2edc0 100644
--- a/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit autotools multilib multilib-minimal python-single-r1
 
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.9.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.9.ebuild
index caa67002ec6e..ba510e926095 100644
--- a/media-libs/alsa-lib/alsa-lib-1.1.9.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.1.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit autotools multilib multilib-minimal python-single-r1
 
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.1.1-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.1.1-r1.ebuild
index 704317dcf5a9..a9f1cec60974 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.1.1-r1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.1.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit autotools multilib multilib-minimal python-single-r1
 
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild
index ba7e99bdece2..c09b03a0ee34 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit autotools multilib multilib-minimal python-single-r1
 
diff --git a/media-libs/alure/Manifest b/media-libs/alure/Manifest
index 70e57d4052d0..3ce0893952df 100644
--- a/media-libs/alure/Manifest
+++ b/media-libs/alure/Manifest
@@ -1,4 +1,4 @@
 AUX alure-1.2-include-unistd.patch 192 BLAKE2B 61cfebb2c2f8d2ea0e228d81f37d25b6b59445711658a04e7e85c20624099aeb86c065e6d7ab4f3cdc65b5ba35248cde4c93104c971fd008c1aba19de259bd9f SHA512 ebb1f841ea28f7e7690f1cdf6991af6bd97486473b63ffd11d79b05d66faf44b8ee590e45b0b1ede69af99a3f817103e8e444885834defd4ccbc76e2104649e8
 DIST alure-1.2.tar.bz2 65210 BLAKE2B 6e99e5bb56c96db27b2ab5ff67c98406636e5b1fc9e446356234c332edf0a4c167707068edf380f99a3744cf0f26a76c1c0325401977d1b3fe8bc989c4a1129c SHA512 f1a2dbbe6870c9d34da724e49cad993cabdca393482bf6476adc925ba5da2a34dc26d86e612e6ed829183c6df595d46921766f46063d0d478ddb18deeb8878a6
-EBUILD alure-1.2-r1.ebuild 1251 BLAKE2B a1d6f681ddd0e4edda102ebfe432e4f1accf9bb412a3b1ccdc5eebf4f1ffb306181701c12d36c4564aa0862c627c21271ad4de135c86010e1f8fc4185f351309 SHA512 98deededfc7f498775cdac04d0aef32254a14431f1b0e1b6b58251d19826a922ade85cd502b8f119a71222721a45207076a618a03bf9a7bb9cceb6b4e1f32d9f
+EBUILD alure-1.2-r1.ebuild 1233 BLAKE2B 6c7febe0888310b765139da60ddc573af59a64f82c168ca47cdada18827abfc4f7105743edda7eee6ff9dac43b9b976e195013038a5d8e9494250dd63a2b33a2 SHA512 0baf16125f4753b41bd4e7c76260d9acfbc3b1f709ea6017c720313cd86c317596e4248763d57a886821c99f37ba2c9a05bc8ad088e961c629ff437c7b3338cb
 MISC metadata.xml 440 BLAKE2B dbe7f0e580e3b0c1b28237654dc06f8c3945ddc42ec690a254add4f5d2855fd1e60d0cfc91cf9ed62c6edd39bfdf9d2d75e3fc7fb6cbdfae3bac1e7e07026f3f SHA512 5b6106088e98c6676d01e02b99a93dc661eb24909ee8aa235e9506c18175fbac7d765c05ce95dbe085c8aa772d45a4f8f717657f281694f40ddc10dd83f1e58e
diff --git a/media-libs/alure/alure-1.2-r1.ebuild b/media-libs/alure/alure-1.2-r1.ebuild
index 24092bba44b6..69166861c89a 100644
--- a/media-libs/alure/alure-1.2-r1.ebuild
+++ b/media-libs/alure/alure-1.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="The OpenAL Utility Toolkit"
 HOMEPAGE="https://kcat.strangesoft.net/alure.html"
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}"
 PATCHES=( "${FILESDIR}/${P}-include-unistd.patch" )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -i -e "/DESTINATION/s:doc/alure:doc/${PF}:" CMakeLists.txt || die
 }
@@ -46,5 +46,5 @@ src_configure() {
 		-DVORBIS=$(usex vorbis)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index b8b9398af158..c1cdd002d152 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -14,4 +14,4 @@ EBUILD assimp-4.0.1-r1.ebuild 1412 BLAKE2B 6887461a143ac6864da211607bfb4ca8c98cb
 EBUILD assimp-4.0.1.ebuild 1361 BLAKE2B 3e443ab7c085b57d15f426b591d23975e18ad4c2951ce3a71d7210a4ad9851cc916425de6ed8aa0e434dd7f3c49488fa83a7f419f6d2f80aa6a76313719812b1 SHA512 627808af638bb489fcc341ea9ff502a7bda81137292fa48e707f9c1f83b381295485ecf22f212de45ca66a789f2641f30aa4ef0b54ed2f8b267a558c05085e95
 EBUILD assimp-4.1.0.ebuild 1362 BLAKE2B 672412dc4acc3c48f4d376d9a3787442050e32a639fa901ad2952b6d7442709d6d89856eae5f9a23ce67e8ff2a7823a2b242020f26eb081674d04719716c91df SHA512 a538b4e10a5406a01f1f0e60fbd50630679c44a56d1de474aa5d0b6ba3db55e3f22c4fb1bc26e23f4457114080fc08f23d10b45c0660df844466f83891a953d9
 EBUILD assimp-5.0.0.ebuild 1362 BLAKE2B 672412dc4acc3c48f4d376d9a3787442050e32a639fa901ad2952b6d7442709d6d89856eae5f9a23ce67e8ff2a7823a2b242020f26eb081674d04719716c91df SHA512 a538b4e10a5406a01f1f0e60fbd50630679c44a56d1de474aa5d0b6ba3db55e3f22c4fb1bc26e23f4457114080fc08f23d10b45c0660df844466f83891a953d9
-MISC metadata.xml 463 BLAKE2B e8815466468672f2ebf597e0155adf205234f603ae9287a5743005d26ec240429ea5b98d006554abc69e08251613257130a258fe6cd5e1a79865005d98475eb5 SHA512 8daf9f83564ce1357b6a99441fc733b9d7a00db2071cb2fc47f1a0c6a1842cea57a1ec4aa628b86271abbdaaf5c17c60092f1e2de42e9604a5165e81b2f4bf2a
+MISC metadata.xml 415 BLAKE2B 66f2082a72d1c299f8d93b13a2139538096f6fd609768f5600f523eaa3a031793cbb0d70817201cea85af8c3d082905fe8c5594817fab7190da387002feeab37 SHA512 5c1688db3bf253c842d996f17bf596260e618eb50aaea9f639eb92fb00c5391e1a5c9337d992e78952d074484d7de25c179fe3dbf47e4d9ac01daf69d94227ae
diff --git a/media-libs/assimp/metadata.xml b/media-libs/assimp/metadata.xml
index 1480b57c1253..a9d38618addb 100644
--- a/media-libs/assimp/metadata.xml
+++ b/media-libs/assimp/metadata.xml
@@ -1,9 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slis@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="samples">Build viewer library</flag>
 		<flag name="tools">Build assimp tool binary</flag>
diff --git a/media-libs/aubio/Manifest b/media-libs/aubio/Manifest
index b0f04a3d0fb2..e4a15969e419 100644
--- a/media-libs/aubio/Manifest
+++ b/media-libs/aubio/Manifest
@@ -4,6 +4,6 @@ DIST aubio-0.4.7.tar.bz2 372173 BLAKE2B 544239b215dd87d4cf4a6ed6b5dd856411d0a3f1
 DIST aubio-0.4.8.tar.bz2 387933 BLAKE2B e30d0ce97360376edf8eba895dc3040157a139c843ef9d6bf0483ffb750916eaccf9e28b8d80dcc0034572cca4f08479e4db44468c96206ce7b60a2fa9600634 SHA512 e58b32beda36865a5243ec7ed4647cf96e3652a25fd319fc697c08f93487f895070dc66b830700b40b879220c2e3a53b8cdc255ce2e34770ba5e34b36a4f51b4
 DIST aubio-0.4.9.tar.bz2 397604 BLAKE2B b849d92678ea8fb20e17921b1a61fdc85a84d4a528acfefa3278169ab5f7fe935217ec37dd9f931202f0f0a1fd3a9518372afbce34cc2dd3ca30c6b4e5d9a301 SHA512 0cb81bb4b15051db3f3f4d160d500af56fdfb237e0a74e3f366f53c2870030aa0a7cee8469a611a9694c36b8866d3d42ffb48241c999de08f3fee43e6d903130
 EBUILD aubio-0.4.7.ebuild 2477 BLAKE2B 0071c4fd437edf4d89c0dc3c5b85fc06f8dd58e58b70e070262d5a50a64dc3c32db637c3b245a4709b418e6f220c0697ab842a4e08f29051d73e0ddff326907e SHA512 600915d76b7a5cfb5a5e18ad54866f8e15b5e60b16289b28e7a5bee1799246ff385234ec1626ad354d2e955ec34e131bba951ff6761fbf688b54212f51366c23
-EBUILD aubio-0.4.8.ebuild 2546 BLAKE2B c0d9496929e6da054b4b0edbab08d0d3694fa8a788c41bb2755af09f7368702f9857e1fcceaf42ca5c4bbce45edbf027f58a51233936b84dd3bbd37b3aa46b07 SHA512 da8fa401e4a51b651229e6a19a5d61407ce5d3e41a4ea97172b0157c111040faab1e5a382296db0eb0259c7311dfaf155d336aa20a8579f7914d515719c06985
-EBUILD aubio-0.4.9.ebuild 2571 BLAKE2B 6dead70a0f87f0f6f9af689b8487e44a4d609475d224265dff1073652eb4cef25cb32daa95275fb6c08e2af8113cb9cfb86826a9d9d6daa07a9a8c909139cfe3 SHA512 0340ccc1788eb9c9d94e70fb81e24ed641097f3178a4c507e3130529ef744169174c5a2909f31d2b72e99b62eb6924f773acc00c00fcdcdca3dd041921c9b0cb
+EBUILD aubio-0.4.8.ebuild 2544 BLAKE2B 1c9a3a7723a78dc74e554d166701969ffaa9c01e6c8821b22e2ac8bb514a547f087fc545ebbf3676a56acb642065f63fa37ab861d3422d2855f7388b40c2cbbc SHA512 4224e5ed0e09abf4ce89649a2e5862d223b76a9808770663b7337f26c3a4d378f3575ead8c8cf649f9ea6c153069bdde02a1af431f1d938e923e57cd1e159516
+EBUILD aubio-0.4.9.ebuild 2569 BLAKE2B c01530e50482dec3c6e1a270ef1ab6f167741202e46025c43fdc22960aa16d54760dacefb4a65bfdf4a4539863b8cd741715d7405c1575233d6da03a11be122f SHA512 25226154d05bd84cfc746829e280fcb3a4a60bc0fdf1ec56fd66f25b14c96f5801b903134dc25f9a003af68f874b628ffd78edbf813c06ce1a1694ec0f52b631
 MISC metadata.xml 346 BLAKE2B 00429033f506bf3818f26f13062d21d0d04d8fc84185244615a09d008c5da6e350df5f32bdcba2c07103039ed64f802cc563a0ca8cd79e117741b947e421142d SHA512 ff3830c2d2322fabdb34458fd27c3e05ad825b1d707eee6150417e4c21480bdffbe4e639ff33a9914cc28189b91e970719326f065746f4241e186f7b27b168d1
diff --git a/media-libs/aubio/aubio-0.4.8.ebuild b/media-libs/aubio/aubio-0.4.8.ebuild
index e9f738ddd156..dbdea5d92c6d 100644
--- a/media-libs/aubio/aubio-0.4.8.ebuild
+++ b/media-libs/aubio/aubio-0.4.8.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 PYTHON_REQ_USE='threads(+)'
 inherit distutils-r1 waf-utils
 
diff --git a/media-libs/aubio/aubio-0.4.9.ebuild b/media-libs/aubio/aubio-0.4.9.ebuild
index 4ef488dd5591..4406674b7a91 100644
--- a/media-libs/aubio/aubio-0.4.9.ebuild
+++ b/media-libs/aubio/aubio-0.4.9.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 PYTHON_REQ_USE='threads(+)'
 inherit distutils-r1 waf-utils
 
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index c988bbf140ea..2d18f08ac2e8 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1,6 +1,6 @@
 AUX avidemux-core-2.7.3-permissions.patch 1079 BLAKE2B 64e4b1718ef91051253b0d09a69acbd11fb2467d48a62443b4ccd2ca89feee454d1ed35542c49fbf94c217397bd363e6aefc6a3bf13498af9a57eb6fdf32b5ba SHA512 d9c316b76cedd2119a3fdae1810846358f7addf21258021ba896f0e1dd7d68d27db5f7e97b53e284806482334ccd016833a2f8b24f50cddd28ac6cfdf28dfce3
 DIST avidemux-2.7.3.tar.gz 23772654 BLAKE2B f946c267140bc8aebda2ce027ed8cb7c84a98a401255d3e0cdaf7498680e8bd9c78a33c122cb177d397ed2dd6bc3c29d7508578028c2964c2897279bf860b62d SHA512 d7761de1c40de1b824efbcf24173ea738a2e0ba7fa41cefa09e7bac3ec97f3af4b04201e36f9de50ade2b09e394aa99ed1d4907f90bb132f9896e8f1b5e82d7a
 DIST avidemux-2.7.4.tar.gz 23815808 BLAKE2B 3a7206f04f568f28dd4d5116c580dd780b057a59e94dd61a2abe5dadfa557291a0c50f917ad1926f9f9a82d01af065c06138f954320e2d9c174fda7583a6b265 SHA512 36d857837cd6a74039a414df16367cd8cbf615173bcc531e57dc0dbfc2e002b1c0c4a80cef73a0d8f25d305deca809af0b5cbcdbad8c311324fa2e64381fd10b
-EBUILD avidemux-core-2.7.3.ebuild 2291 BLAKE2B 913b26cac99698593a555fe360896f0c158bc8e17e4658694525eea6f37570c4aa39e6465cf4a3a1394a42d4762eb570b7771cf926649ea1523648d36810a634 SHA512 432d8cf723d97a360b7a1a702e61bcb64760edd7391a23cea1e3784133514538b31283716049b1cc9de1addc187bddb4f0a7c07a48f84287467551db5d6b9d50
-EBUILD avidemux-core-2.7.4.ebuild 2228 BLAKE2B 7fb455e6abbc8d444be1b90d30ff40a245955d2f6e58210f3c6813f5ae6baf0e9c99929867c88330b905ed00d5073051511a085f8dbb4a21befa7d28ee79c538 SHA512 5182e13e491f401d9e53c9cbd898088d17459fac291fb6e08bb9e3303a585fb954ba283dc11813794c35a00e638a5d03fa322907335bbc1c7b3d755af2bd1c19
+EBUILD avidemux-core-2.7.3.ebuild 2261 BLAKE2B ffa56d146611986405399d2bdf63c08f8011e4b363466e11b32f6bb8196fa9d3cf424a431f23155a5b4e3aa28e4096d32c60301c415b4978e9e3a86bc3f3e6c8 SHA512 6f1550cc931ae91297a835a2be482bffeaea3dc4cf67c169cb1fcf946ed83ac277b220e1ea01cc9cfe9aba449974f6de3ec51472d039df3a46888efdd2fc2d6d
+EBUILD avidemux-core-2.7.4.ebuild 2198 BLAKE2B cac9d85f23bb7c187ee7719394e2afd9fbf8b1e3ff4612301ea3f40aeeecd327769cff30740f2dd18f700cdeb8c61a1eda55b5851918a49f750a13aa18205820 SHA512 117950d2d4aabfde83532c39c37350df73454be9a61f825056188daf92acbea0b117fbaf90bc05d5efe41463b86c7e78ab17f2ab02517ee27ef2ad157febc79d
 MISC metadata.xml 569 BLAKE2B 19e9f892bf6e5c63f2054dfd44beef6b394fcdeecbb2e91edf01e7e9370b7a32c21529ad566921d46992f14d00943ac69e5f0f55cff8406d48ee84dc6515619c SHA512 58e100ccdc3e1145703d4feef2776bdf4ccfcc44dc9e04f1e79f5ea1b89f6ae59c386794028328f27d8715cd00abb410cb6970f1b72c1646750babf742fe3270
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.3.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.3.ebuild
index 5f88c831da3c..1ed1591e1a59 100644
--- a/media-libs/avidemux-core/avidemux-core-2.7.3.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.7.3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks"
 HOMEPAGE="http://fixounet.free.fr/avidemux"
@@ -42,7 +42,7 @@ CMAKE_USE_DIR="${S}/${PN/-/_}"
 PATCHES=( "${FILESDIR}"/${P}-permissions.patch )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	if use system-ffmpeg ; then
 		# Preparations to support the system ffmpeg. Currently fails because
@@ -76,13 +76,13 @@ src_configure() {
 		mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 }
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.4.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.4.ebuild
index b47c3bc01646..1143e35d737b 100644
--- a/media-libs/avidemux-core/avidemux-core-2.7.4.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.7.4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks"
 HOMEPAGE="http://fixounet.free.fr/avidemux"
@@ -40,7 +40,7 @@ S="${WORKDIR}/avidemux2-${PV}"
 CMAKE_USE_DIR="${S}/${PN/-/_}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	if use system-ffmpeg ; then
 		# Preparations to support the system ffmpeg. Currently fails because
@@ -72,13 +72,13 @@ src_configure() {
 
 	use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 }
diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index fb487b504620..0cb97bb6e00a 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1,6 +1,6 @@
 AUX avidemux-plugins-2.6.20-optional-pulse.patch 743 BLAKE2B e60a7433e539d49d5bff7dea62bfda984866dd72b93158827ee5ed785d77174db3fbde9e67c9c3fdc8d652485d8e704c075811c65848ef48f78490c6a3061b7f SHA512 dcec29c63aa7eb828fc1aaf4b54edb76290e3c7655b00002efa8036f0572b1c0111c30e873b925bb606e8e672e177ba8d103100b1fb55dcc830b83e4a5556710
 DIST avidemux-2.7.3.tar.gz 23772654 BLAKE2B f946c267140bc8aebda2ce027ed8cb7c84a98a401255d3e0cdaf7498680e8bd9c78a33c122cb177d397ed2dd6bc3c29d7508578028c2964c2897279bf860b62d SHA512 d7761de1c40de1b824efbcf24173ea738a2e0ba7fa41cefa09e7bac3ec97f3af4b04201e36f9de50ade2b09e394aa99ed1d4907f90bb132f9896e8f1b5e82d7a
 DIST avidemux-2.7.4.tar.gz 23815808 BLAKE2B 3a7206f04f568f28dd4d5116c580dd780b057a59e94dd61a2abe5dadfa557291a0c50f917ad1926f9f9a82d01af065c06138f954320e2d9c174fda7583a6b265 SHA512 36d857837cd6a74039a414df16367cd8cbf615173bcc531e57dc0dbfc2e002b1c0c4a80cef73a0d8f25d305deca809af0b5cbcdbad8c311324fa2e64381fd10b
-EBUILD avidemux-plugins-2.7.3.ebuild 4351 BLAKE2B 04bdb03c46a5856ff9ba97d71f89c1d6c1caa7387696875169124420e69cb93538791e6249d8e9362f1f84a04d9600e947f430f736bac0bf6889357528d64cc4 SHA512 1b1e071e03002acf313dabfde1da4a367b78892a215ec98f7d8b27e1259870e3ca40748bd7b45c0b51333b3fbe8f1956f77158ca298b5e49542f0f65d11e6edd
-EBUILD avidemux-plugins-2.7.4.ebuild 4267 BLAKE2B 8575dac5383482f1560e627cdef936d1ce34411103adc74b45ae80826bcab3aab782f2540e6f7d1b0571207cbb9c9715f80561abba7a36148c02bf70218eb6f6 SHA512 04c83316ac5252303ff346c150eb3935c753b7827c3d084c0725f3710e1ad0dc22aa2f7a82f54cbf8d88f77083d296c2445bcfc2770729fa81cbeaef8614cfcb
+EBUILD avidemux-plugins-2.7.3.ebuild 4315 BLAKE2B f99b4475f1da295309a43fefb329d2905df5fd1fb77664f6222170eaa7031a2b94ee99df739f10ef6c4b82504614ad1299aee56b01bdbe9b22bd5101f18af08c SHA512 d5c5b70242f63b267c137573388ece2876bbc59dd8024083542b60684c16175feeac6aedb831f2d6abe2d763cd784f6225c75c3f4bc22f29617d5687ab926271
+EBUILD avidemux-plugins-2.7.4.ebuild 4231 BLAKE2B b320b836d0cd9ff80cb622e3f03363a92e8ece3b4cfbdb33fd164b2f04d4c9741729ce6e1d9a1865e84f0152aaed81d6e31e1a6d332f57c8795f5ac5c4faea6d SHA512 ac2b70f9970b557c7d155cb016dc32756d1112575fe6d4b8714e11c9ed38d82f5a1bb7a4fe4ad98f3b9ff3a567746a1895162e9ecb4425a6063d6a4180fcf465
 MISC metadata.xml 1313 BLAKE2B 931af633c34ab1bf1f45705ac5b6e2fd6ea3b3fa86dc870c404d29e7fbdb723f1f3d1bf60f051fd9ab30ac8ee83142c1082d0ca3994019d527c3b2f66884ed20 SHA512 26aa4c4bb69ea3d2b41c2f6b8147019b79d8b740690ac7381f28abbc51232e9340b007a53562e4b74ff8a46cbbdb6d9091b2d1981720f4bfe89656cbde28fb3d
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.3.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.3.ebuild
index 7345ea0cb705..0650e3a9f4d8 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.7.3.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.7.3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 CMAKE_MAKEFILE_GENERATOR="emake"
 PYTHON_COMPAT=( python{2_7,3_6} )
 
-inherit cmake-utils python-single-r1
+inherit cmake python-single-r1
 
 DESCRIPTION="Plugins for the video editor media-video/avidemux"
 HOMEPAGE="http://fixounet.free.fr/avidemux"
@@ -83,7 +83,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.6.20-optional-pulse.patch )
 src_prepare() {
 	default
 
-	# Don't reapply PATCHES during cmake-utils_src_prepare
+	# Don't reapply PATCHES during cmake_src_prepare
 	unset PATCHES
 
 	processes="buildPluginsCommon:avidemux_plugins
@@ -91,7 +91,7 @@ src_prepare() {
 	use qt5 && processes+=" buildPluginsQt4:avidemux_plugins"
 
 	for process in ${processes} ; do
-		CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
+		CMAKE_USE_DIR="${S}"/${process#*:} cmake_src_prepare
 	done
 }
 
@@ -146,20 +146,20 @@ src_configure() {
 			mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
 		fi
 
-		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake-utils_src_configure
+		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake_src_configure
 	done
 }
 
 src_compile() {
 	for process in ${processes} ; do
 		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake-utils_src_compile
+		BUILD_DIR="${build}" cmake_src_compile
 	done
 }
 
 src_install() {
 	for process in ${processes} ; do
 		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake-utils_src_install
+		BUILD_DIR="${build}" cmake_src_install
 	done
 }
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.4.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.4.ebuild
index 2a7b0e7ee510..cad08c9330b6 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.7.4.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.7.4.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 CMAKE_MAKEFILE_GENERATOR="emake"
 PYTHON_COMPAT=( python{2_7,3_6} )
 
-inherit cmake-utils python-single-r1
+inherit cmake python-single-r1
 
 DESCRIPTION="Plugins for the video editor media-video/avidemux"
 HOMEPAGE="http://fixounet.free.fr/avidemux"
@@ -83,7 +83,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.6.20-optional-pulse.patch )
 src_prepare() {
 	default
 
-	# Don't reapply PATCHES during cmake-utils_src_prepare
+	# Don't reapply PATCHES during cmake_src_prepare
 	unset PATCHES
 
 	processes="buildPluginsCommon:avidemux_plugins
@@ -91,7 +91,7 @@ src_prepare() {
 	use qt5 && processes+=" buildPluginsQt4:avidemux_plugins"
 
 	for process in ${processes} ; do
-		CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
+		CMAKE_USE_DIR="${S}"/${process#*:} cmake_src_prepare
 	done
 }
 
@@ -142,20 +142,20 @@ src_configure() {
 		use qt5 && mycmakeargs+=( -DENABLE_QT5=True )
 		use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
 
-		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake-utils_src_configure
+		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake_src_configure
 	done
 }
 
 src_compile() {
 	for process in ${processes} ; do
 		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake-utils_src_compile
+		BUILD_DIR="${build}" cmake_src_compile
 	done
 }
 
 src_install() {
 	for process in ${processes} ; do
 		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake-utils_src_install
+		BUILD_DIR="${build}" cmake_src_install
 	done
 }
diff --git a/media-libs/bcg729/Manifest b/media-libs/bcg729/Manifest
index d11b901985e6..25e6970c400f 100644
--- a/media-libs/bcg729/Manifest
+++ b/media-libs/bcg729/Manifest
@@ -1,7 +1,6 @@
 AUX bcg729-4.3.0_beta-cmake-build.patch 135 BLAKE2B c3379f4327ab4f1d2a12ec31f3f0c0a3a15b0c2945da0d707d2d1b308c1860d52914b875504c0967c4b75ae42a4f7766611563c150cd0afb0acfe1369cc72116 SHA512 97fa2a52456809b2c4bac66c4c309b0d95a7a12d43eb102857339e729ede84f9a2cef9050a7232090e7b4e2f3817890d94e565051553f4cec3b7e83e69b2481c
 DIST bcg729-1.0.4.tar.gz 115641 BLAKE2B 5240fc10f8c4c32d9c9a6fc527a198fc896a8ff5ea12aa8a692808877582ac25b3fee122799cb7f6cea58db2f07cc07348da36d9f526e62f0bf62d61ef33bcfa SHA512 fdbbd2c9a807ed832ac3976301843bae854368ab281d16f792550bbda921d226fc6003c0a499561529f22eae08bc0d78b8826c2d06c859ab706d999a96967ffb
-DIST bcg729-4.3.0_alpha.tar.gz 121783 BLAKE2B 10d34fcea3eae131cefc8133f092e4e74f5c8df244bc343fe5d73a49167c6d6ec506845d6cb29cac1fb111c1a68bcc1b60d011aa635923138fea6bec5d342594 SHA512 326a76ff32086c1cb70c0327153f04bfcb82f5fb6767668a713f2517cf4b130f23563db3c6c9b4cd33b1514ce829356120d2ebd9208291da277a9a09263764fe
+EBUILD bcg729-1.0.4-r1.ebuild 761 BLAKE2B 2d02aecbacfd9ffe8a6ab38de28a8677634c49327d52405c8e9be2b936486a0d1ac86fe8980cae550e765ce18a8ea857345fcaa87cb964f5a7e3adee598446cd SHA512 d625aed5ceacc2ced810b4561f851a54385680a7f51b90c36122f2a302d3b4fe511fb7938651656285b721daa4ee07ad5b8e030e8f7db8c26d2fbc2779816a03
 EBUILD bcg729-1.0.4.ebuild 666 BLAKE2B 0bbddcfe3e7f90118742640a61da666a75d50295fb487af348e3ec772bd310d9652d05d516dad59911c49bc039f88bc535bb21795019663881e5980d59ff47af SHA512 c94709c6b22b23a2421ec547ad8c447e12012558f89a7aca98a568b4fb0b47db7c1e460b9177ccedc24ea09d6518aaf768de9cbc35ebc1b51f3e0a96c87db4bb
-EBUILD bcg729-4.3.0_alpha.ebuild 791 BLAKE2B ea1912ae4149b29f8ebb5f472b42f7f6a347323c7a5f42b4eac412ec53935eb9ace388e22f53f0e59143ea1514821baf649b2dfd8b743eee4a575112d0c8859c SHA512 5cb2703428b853633f87762f22d63fbd0b1a51b338865e9565e6eea96ff80da36674315932fb402f95cbb68e02020ee4599127d71144475b897d8a077e73ec1a
 EBUILD bcg729-999999.ebuild 722 BLAKE2B b25c170cab5975861a9b8caae9922efda53869c39a74094a5092be074db3c5b4da37f0fcedeb776ed34a154c5e9dbf74cd796d1eb7fb83ca8eec358fc86d97a7 SHA512 9f3d10de5a4010848e067fc21fcabe64fa0de7797e61521be5c8779e55ae676f7d7fc7c72d54d3d134eb978adeb2fc23b95b7129324bbd77f0a8bc196eab84a9
 MISC metadata.xml 214 BLAKE2B 4446a18615c9ae6446000d6d87c369372cf676ce6d21f6ac5e11932fc97833478c6d42f7469ac5a0cccb3aecbda03850590c3fed13b1395c9272d366e13e08c1 SHA512 7a44c566c4d93dfca459487b5ccf51b49f02d11f56e766442953c12db49cf45fdf6aa12089e0a52b6942ea7adadcc90fc7814fc02f6ada5a0e91831e1a44149e
diff --git a/media-libs/bcg729/bcg729-4.3.0_alpha.ebuild b/media-libs/bcg729/bcg729-1.0.4-r1.ebuild
index 0af9054bbb8e..53c6d19ed726 100644
--- a/media-libs/bcg729/bcg729-4.3.0_alpha.ebuild
+++ b/media-libs/bcg729/bcg729-1.0.4-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-
 inherit cmake-utils
 
 DESCRIPTION="encoder and decoder of the ITU G729 Annex A/B speech codec"
@@ -14,13 +13,12 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc64 ~x86"
 IUSE="static-libs"
+
 RDEPEND="
 	!media-plugins/mediastreamer-bcg729
 "
 S=${WORKDIR}/${P/_/-}
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.0_beta-cmake-build.patch
-)
+DOCS=( AUTHORS NEWS README.md )
 
 src_configure() {
 	mycmakeargs=(
diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index f364f5f7a217..caf34f9a0b39 100644
--- a/media-libs/chromaprint/Manifest
+++ b/media-libs/chromaprint/Manifest
@@ -2,5 +2,5 @@ AUX chromaprint-1.4.3-cmake.patch 1787 BLAKE2B 596a2ec2e684c3f2a03180fd5420029cc
 AUX chromaprint-1.4.3-test-bigendian.patch 1944 BLAKE2B e8441359f3d830451398c492e0711e6eeb290be75e336099b307e61d327158fbc2e188ffa96201e16fa5d2c1588ab763b79d9881b6f3ba276c6dcdee7de5e4ea SHA512 a6df0cd861c3d9d2c5ae28f50459c6930ddac262e2126e2f3ca4ec05a5e4d790df8cb0d7fc90eb0f4269ea4289958e9777d7d39cf588fea99e4c1d1f9f63bb59
 DIST chromaprint-1.4.3.tar.gz 613741 BLAKE2B 728f08e14c46a36d98c3a32a7c7a221a48b51561b623a403d9bee6aeea5cb5254866da26d50db0dbc5b0b4ceddb8312d52a8aab4c2979709bd2c8221b9e84d0f SHA512 101360bd643d2410fafcdd4aef8fe4c716ec728f0e4b9b3a62ba125fe010b0315e55a1839a2ca8c29d9abfbf8171560b23d68b732e75632ce8f4a4698f77ea72
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
-EBUILD chromaprint-1.4.3.ebuild 1438 BLAKE2B 7b2b41732d8637bdef586a438371e7b8a8ee2e87562ad20462964e5ef72285bda89a5c9001b0adf4756ecbc57188004fcf48c5832e78d39c1cbc2d7e13f4c807 SHA512 71c13d57d5110f9a60c867d1736296e35a41a55520bbcf2e9eadf96c545546da6559f911b178b1493888ce4b65aad703840d819c25efb68a1c086023a3ffcccc
+EBUILD chromaprint-1.4.3.ebuild 1451 BLAKE2B 0b5195d9bb47c62072f1bf4223005403c6af1c980491a3f60ddcefa6a60b819eefad528966fd74bf329625a2f5abcd28f08aa67be13a6f6a869561ee93f2e484 SHA512 64b1df233e1f1eb142a6a24e04ddbb9fc8547b6dc7480b7405e65eca9195b0d4b3ac51ad711d0009617fd13e42ede5a5662616958e4eb5df703408e6bfa3569e
 MISC metadata.xml 502 BLAKE2B b4f7420ba8b5e4004b6f8fa9cc70c0eddea04a0e1759c9724b94198e3df99c2505893706cb5232c643a43208822d7ef5bb56660c76029cadb52b9a0562fd8021 SHA512 229e807429496e637ba289f269af83eca274c53eb2fc2d9dc5f304c39118eaf1d0ae9a5cca01ffa1958d110c55537f1792e26343bf3309ad72b1f0411af9dafe
diff --git a/media-libs/chromaprint/chromaprint-1.4.3.ebuild b/media-libs/chromaprint/chromaprint-1.4.3.ebuild
index 943c2de4042b..cd4a0daac612 100644
--- a/media-libs/chromaprint/chromaprint-1.4.3.ebuild
+++ b/media-libs/chromaprint/chromaprint-1.4.3.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 GTEST_VERSION="1.8.0"
 inherit cmake-multilib
 
@@ -43,7 +44,7 @@ multilib_src_configure() {
 		-DFFT_LIB=avfft
 		-DAUDIO_PROCESSOR_LIB=$(usex libav avresample swresample)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_test() {
diff --git a/media-libs/cimg/Manifest b/media-libs/cimg/Manifest
index 38bb340aafbe..ff9684147428 100644
--- a/media-libs/cimg/Manifest
+++ b/media-libs/cimg/Manifest
@@ -1,5 +1,5 @@
-DIST cimg-2.7.0.tar.gz 11076642 BLAKE2B db2c8715f25ec160cdf41ac2cc1bee366ef49dbd0b3e5bd5bf6b4b8a0ba4c880f6af4cbd78d843abf0edd99ca45337fd1bd5dc25779b94984a64f5217c3430a5 SHA512 b1b12f4b36d7d799da330bb2854732e6207aa73b4d28bf9a13408154664c2d518652065738d1964da00a022449a3b618b25b72ec17deec6df463ff6811c21b21
 DIST cimg-2.7.2.tar.gz 11204962 BLAKE2B dce4198e23d814fc4bd481388ca959cc831927329c5611b057aeb88cb5c3f80facc87433482ee6c1048b8478147db25ca592ecafe18528def156f30f626eef22 SHA512 ad251d2d433497be2fbf812dba7efecfdedc1b38770c34d600f5848fe91c130b8952c8d86fcd58894849175aa31358225e255b1558173ead79c47a985c7b11b2
-EBUILD cimg-2.7.0.ebuild 589 BLAKE2B ba27cc3c33dcecbd207d4a656893daa6cfafa4bf745da82a312075db4c23c7379348e1b37194afec9252c17c887cf342406c9fbc25dfd24119ca6f4b3085ba58 SHA512 1e6aba42be7cc3ce84384e49b2a2e59aafd0d0ffae2f07bed0fcdcc0dc9cd164c28b49f03af07ce15a0bbd25cdea4aee24fee4c4d425e58fac03ffa52b6d335e
+DIST cimg-2.8.1.tar.gz 11208148 BLAKE2B 1d53c11f76c63c453b9090d01c9b970a5d38f9accc13ed5f03d3107d218ff1b69a9e3d469cd9a5a51f90a0d0565efeb2523a2f0f7964752ca8ea8f2e2115f45e SHA512 df7bf86e5957c998180494eba70218a86f6e33c85d3f5d441a695a35725bb811956a945f40cc73573d6507dd4bcb25589ec05083ac99539365f73e6bd1247dd9
 EBUILD cimg-2.7.2.ebuild 589 BLAKE2B ba27cc3c33dcecbd207d4a656893daa6cfafa4bf745da82a312075db4c23c7379348e1b37194afec9252c17c887cf342406c9fbc25dfd24119ca6f4b3085ba58 SHA512 1e6aba42be7cc3ce84384e49b2a2e59aafd0d0ffae2f07bed0fcdcc0dc9cd164c28b49f03af07ce15a0bbd25cdea4aee24fee4c4d425e58fac03ffa52b6d335e
+EBUILD cimg-2.8.1.ebuild 589 BLAKE2B 4f29b517cf57fca50633c4abfa9f5c24c5aa9da7c45f9530b24912205ddcb6640b5837a7cbcbe96cd9690a242d3d85d6db84a00a5a07ba5a0a1ae93cd435dc2c SHA512 b783e57a641c122eee451bd7ae49a6dfdd63b0b6a813c56b4322cbb0bcf75f255e68edfb9d5562800c47b1473ef0b9e82ee079d5952ef0630125c12a2d3036d9
 MISC metadata.xml 386 BLAKE2B f7a15bc91bb1eb327b7a491dcf59b1ebadac6e36560bfbecaa07f7d3b189bfb86df12f1c2214b86cc83e70bce941f44a9424f13865c963ba38e9d992ca89075d SHA512 7273a9131bce0af6a2ae93e4893be6beadf25ed510dd3d32c267ea4400e0524929c49df92627fa3aa83ab539075d3404c7e5a2df77628261253aaced1216d59f
diff --git a/media-libs/cimg/cimg-2.7.0.ebuild b/media-libs/cimg/cimg-2.8.1.ebuild
index a3f01bc9ba22..3205e035da6e 100644
--- a/media-libs/cimg/cimg-2.7.0.ebuild
+++ b/media-libs/cimg/cimg-2.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/media-libs/clutter/Manifest b/media-libs/clutter/Manifest
index 41ae0c81fc4e..5e168e16b05a 100644
--- a/media-libs/clutter/Manifest
+++ b/media-libs/clutter/Manifest
@@ -1,3 +1,5 @@
+DIST clutter-1.26.2-patchset.tar.xz 10204 BLAKE2B d3515420600a7d7df7df608f5091ccd1df5e23a5e75cc1e3cc3856de94a935234280d3648eace3220a299214a4715860c74d24a994b7f6e36901d8c80e10a7dc SHA512 2659b9a4ec3db59bc5a35ce09f974271a7a3f5e7bfbc7f741b5a5e87b2a017f4a779aafd97386fe448b94a5285d9eecad661cc320620c7c56928e296939bb708
 DIST clutter-1.26.2.tar.xz 5353736 BLAKE2B ac30cee3c5a8ed786c38820b7afb86e80929c2a797b737b35650ae6dd856576d72cc7f5407a984f418e255d6ab43c8d3ca9d7efd6f50650b2e0c733ecca19114 SHA512 c8008a1a1f111313d9abaff8d4415f112ddc32a02e08845f3735d33bb25b72b082f133daba06749bb9595eaf1ba83b308d30a413fbbe8dcdc1afdd7077a30937
 EBUILD clutter-1.26.2-r1.ebuild 2918 BLAKE2B b70aedd42169b93ad7ca2bb32ff886c1018cde9c0677defe443d8a38014bac597a58bfbbacb8a4496473b0e919d506c338c9b3049c481700f219764fdd8aabc5 SHA512 557aa003b559eb8c99c529cd4c92b275d8e57932aa2ebda4ae040c78807eacb6064da5433799d12113cfc19398d0f75c831a01c19fc0170f0baf12cea764ad90
+EBUILD clutter-1.26.2-r2.ebuild 3239 BLAKE2B cc389c6d4951fd6f2459830b097a2ce672dcaa50a5f9b3337458f6b2c04498b45ccfb780673bce941273021c63a785c3fb3506b04be10bf1d053d2bdd475870a SHA512 97f3482d91f717868d16d84a9abb2912bdfd46807b3e592be09a2d4f66dadf247c5a7fdd3f65b780c360a3af752e1e534fec269bf9398a0ae986e8581f6fc9da
 MISC metadata.xml 404 BLAKE2B 45f5b28d9e612464ad5f56c016adae7466e549403a3939fddc433f9f428476db7b4e5a2436a436b0f9c46176bf849938c4c8895ae8f464115ea6ffeedac0f19d SHA512 c6e268f9e2fd4400fd0e7c265b6c64b738a22005ea9af7d792c45a8bd1de8fe81ac1d534cbfc2988cf55bd810aa84bdddf45d3ce33c3bf60e5030fc48d467db6
diff --git a/media-libs/clutter/clutter-1.26.2-r2.ebuild b/media-libs/clutter/clutter-1.26.2-r2.ebuild
new file mode 100644
index 000000000000..ed51ee09f533
--- /dev/null
+++ b/media-libs/clutter/clutter-1.26.2-r2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2 virtualx
+
+DESCRIPTION="Clutter is a library for creating graphical user interfaces"
+HOMEPAGE="https://wiki.gnome.org/Projects/Clutter"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="LGPL-2.1+ FDL-1.1+"
+SLOT="1.0"
+
+IUSE="aqua debug doc egl gtk +introspection test wayland X"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	|| ( aqua wayland X )
+	wayland? ( egl )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+# NOTE: glx flavour uses libdrm + >=mesa-7.3
+# >=libX11-1.3.1 needed for X Generic Event support
+# do not depend on tslib, it does not build and is disabled by default upstream
+RDEPEND="
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/atk-2.5.3[introspection?]
+	>=dev-libs/json-glib-0.12[introspection?]
+	>=media-libs/cogl-1.21.2:1.0=[introspection?,pango,wayland?]
+	>=x11-libs/cairo-1.14:=[aqua?,glib]
+	>=x11-libs/pango-1.30[introspection?]
+
+	virtual/opengl
+	x11-libs/libdrm:=
+
+	egl? (
+		>=dev-libs/libinput-0.19.0
+		media-libs/cogl[gles2,kms]
+		>=dev-libs/libgudev-136
+		x11-libs/libxkbcommon
+	)
+	gtk? ( >=x11-libs/gtk+-3.22.6:3[aqua?] )
+	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
+	X? (
+		media-libs/fontconfig
+		>=x11-libs/libX11-1.3.1
+		x11-libs/libXext
+		x11-libs/libXdamage
+		>=x11-libs/libXi-1.3
+		>=x11-libs/libXcomposite-0.4 )
+	wayland? (
+		dev-libs/wayland
+		x11-libs/gdk-pixbuf:2 )
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.20
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	doc? (
+		>=dev-util/gtk-doc-1.20
+		>=app-text/docbook-sgml-utils-0.6.14[jadetex]
+		dev-libs/libxslt )
+	X? ( x11-base/xorg-proto )
+	test? ( x11-libs/gdk-pixbuf )
+"
+
+PATCHES=(
+	# assorted patches from git at 2020-01-03; most importantly fixes wayland amdgpu picking (with working 10bit color) for various GNOME clutter games and gnome-maps
+	"${WORKDIR}/patches" # requires eautoreconf
+)
+
+src_prepare() {
+	# We only need conformance tests, the rest are useless for us
+	sed -e 's/^\(SUBDIRS =\).*/\1 accessibility conform/g' \
+		-i tests/Makefile.am || die "am tests sed failed"
+	sed -e 's/^\(SUBDIRS =\)[^\]*/\1  accessibility conform/g' \
+		-i tests/Makefile.in || die "in tests sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# XXX: Conformance test suite (and clutter itself) does not work under Xvfb
+	# (GLX error blabla)
+	# XXX: coverage disabled for now
+	# XXX: What about cex100/win32 backends?
+	gnome2_src_configure \
+		--disable-maintainer-flags \
+		--disable-mir-backend \
+		--disable-gcov \
+		--disable-cex100-backend \
+		--disable-win32-backend \
+		--disable-tslib-input \
+		$(use_enable aqua quartz-backend) \
+		$(usex debug --enable-debug=yes --enable-debug=minimum) \
+		$(use_enable doc docs) \
+		$(use_enable egl egl-backend) \
+		$(use_enable egl evdev-input) \
+		$(use_enable gtk gdk-backend) \
+		$(use_enable introspection) \
+		$(use_enable test gdk-pixbuf) \
+		$(use_enable wayland wayland-backend) \
+		$(use_enable wayland wayland-compositor) \
+		$(use_enable X xinput) \
+		$(use_enable X x11-backend)
+}
+
+src_test() {
+	virtx emake check -C tests/conform
+}
diff --git a/media-libs/codec2/Manifest b/media-libs/codec2/Manifest
index 81d8f74d3d9d..6d6df1ebe17b 100644
--- a/media-libs/codec2/Manifest
+++ b/media-libs/codec2/Manifest
@@ -1,4 +1,4 @@
 AUX codec2-0.8.1-unused-deps.patch 2966 BLAKE2B 886ea88d068b8c6058468c0dffa1071443ab993ff169a9b38b628767ebb866e0e05feba2fdb1a5f108dab15d2f4a06acc228d4fbee7b005ada1185e48ae26f94 SHA512 89c75477ce2ebed216c2239b237c5c9a502753ac55d73808702230b89f81e6a2ce176b0613f258655e6a83e85b5943ccbd7bccecf650117ff61e7d49e386be06
 DIST codec2-0.8.1.tar.xz 8868212 BLAKE2B 2c0ba40df02cc6791386243e75f97ce17026842b13384e4a330cf22ea4bef5db75ddbc764dd4045027a6e2bf2eeba9b509b372aeaef81bb235e3d6c2930b01fe SHA512 4f2633d510ab68102b77b15492d87d25fe5fa96d90dc1ca6b3bf7deea04a3765382bfbbde981c9cac70d3e9d091c56b2099544b09b36a84ed62cb9087c9bb819
-EBUILD codec2-0.8.1.ebuild 658 BLAKE2B 81815bec31e08f29946225924d675989dd41b970f5bf038fa9c8213137368e88cb47a06dc82e9146a36dcd6aecf96ebff434bce0624fc77d9d54efa7e1b69829 SHA512 5e605385cceec2b1c03fe1e9efa2b5b1df2037c5565268a35052e1ea0b063a2514f1926584c6fc058effe317cc6308d3a6538f305db26d788c2dd3f6e11fc76f
+EBUILD codec2-0.8.1.ebuild 671 BLAKE2B df9b8a34e0e0fea05d72fde9ae00bbfaf3e077b1edee8df5ca444d9f5dc2157c46ed42d612f2db83276781aff1bfa3f784d361a4aaef353872654671ba38f197 SHA512 ed494996b0f56e8f6d23cc566987d6384d5de1fafda1805ba8f929386b163aa95e9e9a6be425d4205d927e837fc624cd0221cc786ca9e438969c54fa82fcc44d
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/codec2/codec2-0.8.1.ebuild b/media-libs/codec2/codec2-0.8.1.ebuild
index 29f29b27f097..9660f28e09b5 100644
--- a/media-libs/codec2/codec2-0.8.1.ebuild
+++ b/media-libs/codec2/codec2-0.8.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="Low bit rate speech codec"
@@ -18,7 +19,7 @@ PATCHES=( "${FILESDIR}/${P}-unused-deps.patch" )
 
 multilib_src_configure() {
 	local mycmakeargs=( -DUNITTEST=OFF )
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest
index 1c48c5cd786a..4c1a3c1e2cf2 100644
--- a/media-libs/cogl/Manifest
+++ b/media-libs/cogl/Manifest
@@ -1,6 +1,4 @@
 AUX cogl-eglmesaext-include.patch 2204 BLAKE2B 307a473a606129fe7e08e65915dbe985d3765c2745ec444b41592f8c36ab5b6ad0d43bbc35a93f01666d8cff81111e0c211bddfbf5d89f48591c8bf5377cb471 SHA512 41e475d73e12e4ab517c49ae1a70d1dd71e9f8a618eb28cd7b81430bf3acec84bbdf8a31ec4e02fd87734fe402e523cda5c14c4a4c5d63928b9de930bcf23e10
-DIST cogl-1.22.2.tar.xz 1682360 BLAKE2B f5a1543266bd87c6835322d5dbf501ec4f9fec52cc18d73d140323fef2f1b6b2293b5998bc8914b0a8cb514e7fefe5a1500793e1c7d8b5e0a4365fe8ef13233f SHA512 2ec99f5ff22683d12925b9a1f748387b47c4506aaf3c5afec851b3b6fe6b7cdfd211fb7e4359bd7a1d1b7cb3cb7fbd257efbcb7d2941d0f133a60bad1c9645e3
 DIST cogl-1.22.4.tar.xz 1723856 BLAKE2B 9e8532e3a0d17662042e2e61e45a7ddab6d3a35c7fbb070426b574292d7d3ed81e42a05cde9ab9a58ecda4eb6d560d0dca6c44b7791bba195e2ab2a33e8c0dc1 SHA512 85f3af49c16dd2e545a3b91c076ac10107a4b9d0dc785cefe489e91eabdd82837f732685f1f0dca1695fc2f8095f42d5f30f145b659eb4295964787f06c1e37a
-EBUILD cogl-1.22.2.ebuild 3380 BLAKE2B 3f0edc07cb21afd76037f3d6450ab6076b304805c6e4bd7a33dd338860271eafe190ecf4f72e35993a2d5f059b5aeb8981dd3a14c1ebbe74b57dca63394aa4b5 SHA512 1cf4cf32c2f628ef48ded55dbf79e8137d83ccad6a60de82adb735980055d1533bd76c185a32904910b27a731d6f83391422847034b8b02b811c3713f2aa0282
 EBUILD cogl-1.22.4.ebuild 3384 BLAKE2B e7ec47ce429bb379fbd09bc914f1084e9005675c39d08266e4617704b56cc429c2feaa9fdaf174943dbbbe3961b738a10ec627c97879191d7c43dee8bb4d21ff SHA512 1ea40945fce8368d3f265b10c6dd57ebe29301948318eab0d9b283fdcbcf51df59f8d1dad4c198e6b7eb85a2087ade02817731aeb4bdf5fecdf5a85b1f021b24
 MISC metadata.xml 457 BLAKE2B 79c55fb3e5a1e5772c7b26cea5b54b15d683772204ec2ff2229481085130f4945b877a4608f01308a297571c01fa0da50220cd44b6a333eb34d2aae71c3a9157 SHA512 e0e4be51119ec98c906ca2f5df69c9024d77855fafa53ec00bc30b481f33dfd98708c2c9021737f84a46121788079fdc1d9ecffc2693a3257819f05879318a44
diff --git a/media-libs/cogl/cogl-1.22.2.ebuild b/media-libs/cogl/cogl-1.22.2.ebuild
deleted file mode 100644
index eae9521a25cd..000000000000
--- a/media-libs/cogl/cogl-1.22.2.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GNOME2_EAUTORECONF="yes"
-inherit gnome2 multilib
-
-DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
-HOMEPAGE="https://www.cogl3d.org/"
-
-LICENSE="MIT BSD"
-SLOT="1.0/20" # subslot = .so version
-
-# doc and profile disable for now due to bugs #484750 and #483332
-IUSE="debug examples gles2 gstreamer +introspection +kms +opengl +pango wayland" # doc profile
-REQUIRED_USE="
-	wayland? ( gles2 )
-	|| ( gles2 opengl )
-"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32:2
-	x11-libs/cairo:=
-	>=x11-libs/gdk-pixbuf-2:2
-	x11-libs/libX11
-	>=x11-libs/libXcomposite-0.4
-	x11-libs/libXdamage
-	x11-libs/libXext
-	>=x11-libs/libXfixes-3
-	>=x11-libs/libXrandr-1.2
-	virtual/opengl
-	gles2? ( media-libs/mesa[gles2] )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.34.2:= )
-	kms? (
-		media-libs/mesa[gbm]
-		x11-libs/libdrm:= )
-	pango? ( >=x11-libs/pango-1.20.0[introspection?] )
-	wayland? (
-		>=dev-libs/wayland-1.1.90
-		media-libs/mesa[egl,wayland] )
-"
-# before clutter-1.7, cogl was part of clutter
-RDEPEND="${COMMON_DEPEND}
-	!<media-libs/clutter-1.7
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.13
-	>=sys-devel/gettext-0.19
-	virtual/pkgconfig
-"
-
-# Need classic mesa swrast for tests, llvmpipe causes a test failure
-# For some reason GL3 conformance test all fails again...
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-eglmesaext-include.patch
-)
-
-src_prepare() {
-	# Do not build examples
-	sed -e "s/^\(SUBDIRS +=.*\)examples\(.*\)$/\1\2/" \
-		-i Makefile.am Makefile.in || die
-
-	#if ! use test ; then
-	# For some reason the configure switch will not completely disable
-	# tests being built
-	sed -e "s/^\(SUBDIRS =.*\)test-fixtures\(.*\)$/\1\2/" \
-		-e "s/^\(SUBDIRS +=.*\)tests\(.*\)$/\1\2/" \
-		-e "s/^\(.*am__append.* \)tests\(.*\)$/\1\2/" \
-		-i Makefile.am Makefile.in || die
-	#fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# TODO: think about quartz, sdl
-	# Prefer gl over gles2 if both are selected
-	# Profiling needs uprof, which is not available in portage yet, bug #484750
-	# FIXME: Doesn't provide prebuilt docs, but they can neither be rebuilt, bug #483332
-	gnome2_src_configure \
-		--disable-examples-install \
-		--disable-maintainer-flags \
-		--enable-cairo             \
-		--enable-deprecated        \
-		--enable-gdk-pixbuf        \
-		--enable-glib              \
-		$(use_enable debug)        \
-		$(use_enable opengl glx)   \
-		$(use_enable opengl gl)    \
-		$(use_enable gles2)        \
-		$(use_enable gles2 cogl-gles2) \
-		$(use_enable gles2 xlib-egl-platform) \
-		$(usex gles2 --with-default-driver=$(usex opengl gl gles2)) \
-		$(use_enable gstreamer cogl-gst)    \
-		$(use_enable introspection) \
-		$(use_enable kms kms-egl-platform) \
-		$(use_enable pango cogl-pango) \
-		--disable-unit-tests \
-		$(use_enable wayland wayland-egl-platform) \
-		$(use_enable wayland wayland-egl-server) \
-		--disable-profile
-#		$(use_enable profile)
-}
-
-src_install() {
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/{*.c,*.jpg}
-	fi
-
-	gnome2_src_install
-
-	# Remove silly examples-data directory
-	rm -rvf "${ED}/usr/share/cogl/examples-data/" || die
-}
diff --git a/media-libs/ctl/Manifest b/media-libs/ctl/Manifest
index 92811ab8e423..fee7d0ed9e2e 100644
--- a/media-libs/ctl/Manifest
+++ b/media-libs/ctl/Manifest
@@ -1,5 +1,5 @@
 AUX ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch 16825 BLAKE2B 4a732a2b461e81016d0d3e165d998b19904fbd9a77af4cc041b29a6c785beaedec109fe33ddcc6cb05c08f3001231b1e832a687dfccf96fbef70c4e517737fb0 SHA512 53df4449eb0acca2f20a42cf9945870e580de3be6be416c52428e300aca1833eda081d6fc17024aa61f1ecd0886098958d187249a9189fb6d1e62c82d0964afb
 AUX ctl-1.5.2-openexr-2.3.patch 455 BLAKE2B b42032d28612bef6f6a3beeda67c6b6a20fb4b99527003acd6a97eceec8286e073b3c6594c92ae99ad559c9d520b9d94fe93ea783e9d6021d81f66b258c3e2f1 SHA512 0e97065c78c6ef5c2a8f657c6c41031f66379483aaf2754f612d69261932a7f6ee1ccd01c5c0b1b450e511aa758a640cacf55629651d5974a92c519f4ff3a25a
 DIST ctl-1.5.2.tar.gz 1411871 BLAKE2B 223740aa8b68630f449b65e17470c76b2825a77eead040724b65e9e69752a696f642ae6755116046e188305a7d043c4def7cb8a773ad08d51fba35e9273b3a71 SHA512 c92af23e897f30f96ecb27b4b865e2fe1a1e33c8616797fc18f68e7fcc89210ce8ae70a003169b2f449bfd5f90d192734f1e8038b1d3e03c5f48c81587c871c6
-EBUILD ctl-1.5.2-r1.ebuild 707 BLAKE2B 670c6973856cf284f9e877c99d9ce815a45b63ba3da0fa799a465c2cc56fb6d0d9a36354f8c539f7b72455363670747df93a4da3ad9fabb41317ac3feb15b51e SHA512 22b547e3d444f5fe8ce63e2cb98a9070c4a90b7090920a114e5499b7cedd5f1e50a98d4aec8b9914578b9ed646331eab544680d341fbe0cd0c53403e2476dc95
+EBUILD ctl-1.5.2-r1.ebuild 704 BLAKE2B ef33b9ba580d49646dfe78303e97d2370e52244a08680f133590f9d8b96f6cef500be79c5252c5b38807ff03667ab7e268f958cb9fff4a5d7a19b40ef175f880 SHA512 4d21da20422cf60590a04211149c9f76a8df9ab2ee5c7703496a87b84509541c7a26060201be58d6acf3f39f0fe45319ea7b45b9538bc1ccf2cf387ebd793706
 MISC metadata.xml 297 BLAKE2B 773f2836e68b0405f210dc51fac01e9c40845d34e4d7ed036916af8f8d63bebcd91bbd672bf84e4dac6ab84135915db85914c07a8bdecdb1ce3c3ff1b5f6408b SHA512 e437384a215b9cd38ecc3e4721bb47c6acf9b8c17d6bc348ddb1272b899428cf7835371a3fca39e6b66f49f1760996fccc336bf15f6d4e36783bd12db84afe49
diff --git a/media-libs/ctl/ctl-1.5.2-r1.ebuild b/media-libs/ctl/ctl-1.5.2-r1.ebuild
index 67aca511194e..df157eb6112d 100644
--- a/media-libs/ctl/ctl-1.5.2-r1.ebuild
+++ b/media-libs/ctl/ctl-1.5.2-r1.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils
 
 DESCRIPTION="AMPAS' Color Transformation Language"
 HOMEPAGE="https://github.com/ampas/CTL"
-SRC_URI="${HOMEPAGE}/archive/ctl-${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/ampas/CTL/archive/${P}.tar.gz"
 
 LICENSE="AMPAS"
 SLOT="0"
diff --git a/media-libs/dav1d/Manifest b/media-libs/dav1d/Manifest
index 8c53cde6336f..9f4d86906c99 100644
--- a/media-libs/dav1d/Manifest
+++ b/media-libs/dav1d/Manifest
@@ -14,5 +14,5 @@ EBUILD dav1d-0.3.1.ebuild 1161 BLAKE2B 102cd9d3e438f66ad960b9542650acf2f1171d47c
 EBUILD dav1d-0.4.0.ebuild 1190 BLAKE2B 4fe099fcc58984942b8a82d7b63396a24e90848acabfcdc8765225afdf708345ddf56529daa4babfccf90b66b9c250b9190b083bc545ccd220b41048ced780c7 SHA512 01fa672b164a9a3ec00c9a591d1511ab182c2d21987af8317636c829890f0cce32633a12818bbd9be7940392ca23bb96fc9b00c3da3664bcb2dbf3a0b392fe87
 EBUILD dav1d-0.5.1.ebuild 1181 BLAKE2B 9ced3e650729cb29eba911bbbfb326170a227ce23a449dab56034d2c978808d591161fc016f298f4817c7d990f16670b84de47016286bfc5e7e7634978ac5897 SHA512 8667a407ba4b026c476933d144363d86862d8a764805b1715abf15e610ff7f62b3f5435629851a218fdf200a63efe91b8ca33284219da42897944dff127788cb
 EBUILD dav1d-0.5.2.ebuild 1181 BLAKE2B 9ced3e650729cb29eba911bbbfb326170a227ce23a449dab56034d2c978808d591161fc016f298f4817c7d990f16670b84de47016286bfc5e7e7634978ac5897 SHA512 8667a407ba4b026c476933d144363d86862d8a764805b1715abf15e610ff7f62b3f5435629851a218fdf200a63efe91b8ca33284219da42897944dff127788cb
-EBUILD dav1d-9999.ebuild 1181 BLAKE2B 9ced3e650729cb29eba911bbbfb326170a227ce23a449dab56034d2c978808d591161fc016f298f4817c7d990f16670b84de47016286bfc5e7e7634978ac5897 SHA512 8667a407ba4b026c476933d144363d86862d8a764805b1715abf15e610ff7f62b3f5435629851a218fdf200a63efe91b8ca33284219da42897944dff127788cb
+EBUILD dav1d-9999.ebuild 1181 BLAKE2B 0e249792fe05fd2d7c9734b25f88e9116eccd34cfe5c959822070f9f5a2653fed974be6c2ebf7e579ff6eabf0c013237b2076b9297a9acde53e203d90a5d2db4 SHA512 6ee1ec6338b474090ba936710359a7e1fc97d78b52f0e6f2dc76dc8e392cb3f9c0bc202098d702dfe636f776f36aa5cd6818a81403268bf49a7398fa95b95f65
 MISC metadata.xml 536 BLAKE2B 40ec2224aed078ad4748d3182defb6813cdd34a614d40db2fbbbeb8b63e24a59ba1cbe9d458fec17516c328a89f77927d9fbeb9a1e4a2b8c296b7de7235b1af4 SHA512 74e6595ce441bb313364f375a8afa9b2a0179f350e30d075ecf99e058874450e15f4005a0712e20a4feb047d57799dffacb3903af00a3c5a8d059f7025e49de6
diff --git a/media-libs/dav1d/dav1d-9999.ebuild b/media-libs/dav1d/dav1d-9999.ebuild
index 2d5b991ec5d9..df2296051be2 100644
--- a/media-libs/dav1d/dav1d-9999.ebuild
+++ b/media-libs/dav1d/dav1d-9999.ebuild
@@ -18,7 +18,7 @@ DESCRIPTION="dav1d is an AV1 Decoder :)"
 HOMEPAGE="https://code.videolan.org/videolan/dav1d"
 
 LICENSE="BSD-2"
-SLOT="0/3"
+SLOT="0/4"
 IUSE="+8bit +10bit +asm"
 
 ASM_DEPEND=">=dev-lang/nasm-2.13.02"
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 050e68b4be0b..dd744f4fa1bf 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,7 +1,9 @@
-DIST Image-ExifTool-11.69.tar.gz 4628872 BLAKE2B 3e7aac9e23ab38f721a6ff778423fd2591a70197e06e0da48aba7e30ec4cdf8bb38a4a139c23ee3e2e1921e96086e16b4ae694be25a02b845766062f7b08684b SHA512 70d15d8f60cdcc7aaeb96057e90b6c228fa21b87a90448fb9285bbfd58287ad49b8d084419acdca329ac7d354fa849a1c77fde71ad39a3925b057595335c809d
-DIST Image-ExifTool-11.75.tar.gz 4689565 BLAKE2B 1916aecf6b7ea1025c94f582cc87215bcff69947daad98be5f01706517d4babf24bd5f29b758a98de4f0b7e6d6bafef4bd2bf51ac8cf70d0810b56b8ad3e3e8d SHA512 7a98ab46df6f816754f8b3fb4ae071f9bdde4767da59555d6a981a6deec48b1534c25b36dc42f6e9f8751d5238ec04757bc423c81d94c561bf6876a820c2c878
 DIST Image-ExifTool-11.76.tar.gz 4691479 BLAKE2B a7c4ab28c281ce9a3d95934038d99a5ebaf4c262ae181f96b17fe2449187fa1f03fe54ad6bf2f0f9729cbc959bcba5eeb19c720e392871b6bffde1bce251ed04 SHA512 f99f5335fa84ba5038b608de8b817f09c6cd81c850e27cd4b4b7be37455318c96eaa1d1ab9fb42abd74ce4587a334f189d46fa63f3f207ab58dee39f8395c309
-EBUILD exiftool-11.69.ebuild 605 BLAKE2B 321361a04e5d97128b6d1bfcb845150b287b4a47e57b8a512d7fda58684b67393a1455f6a40eee426c5240dd1160bbd656783c1c4b02966a7808be9b73d40c78 SHA512 88d9ba9249f429d2d36c516298b9461f36bfea90f6025b770fc9012ee4d182f83ffcce76e0010f19eaa1b8bfe5b80de1c7c07d76ff127a044f78e42accc1768a
-EBUILD exiftool-11.75.ebuild 610 BLAKE2B e3d631967c3970948f44d2fb65d4bd49e5520cf2bad7e2113db9d9ee699d676eb4e7c7f26fce256169aac4be26eb4d4c7e1ef6d07ce9d7f500a7f1a4d8317e8b SHA512 2f03d0599dc67f567878cdec992a41fa27fb6e137b0ead6efe41b411338d9dd4b6aca397ccdf0a9553f7315f2fbe68e50ece85d0e705fef7c1857b56b3c9f026
-EBUILD exiftool-11.76.ebuild 598 BLAKE2B 31d4f0413e95f5ebb71d6a4346e634b2f7f20c60e70760e64435d294257a94aac8438ae60660755fac52602f33c84bc6838f1529e0190ec11c16849303cbb1dd SHA512 7feab148a92e00973525fbd338cc83d3aa617bf2149ac599c240f43bff90b5e28a4508dbef9b70464281a12b46f86988b9b073c8ea2c78dc28ec4609787b8257
+DIST Image-ExifTool-11.80.tar.gz 4697210 BLAKE2B 682ab224188f0094ca964d217bc2547aa928fdfffdc47423c9684626ac9211fe2518ea89d2162d33322718fd1abe062cbc8ff478cecb55ccdcf289894271058b SHA512 302c358f8d727ad37030bb0678ee1ad6f235f842037485e2cad52a53a3b9e7e091b30c69e1b3f1ab8f42a4d1d674a4207276abb896abf5370a3a237d50eeb228
+DIST Image-ExifTool-11.81.tar.gz 4698517 BLAKE2B 6289583559e40ec5aa92c3dc9eaf42d42b95a4065d04ee731827fa2d1ea4e80d2c54b6dfb916e1470f43d7657035bd5dcb64740adf82ec575d1e7dd2bf08f5f2 SHA512 11bfb4799676d2e28d33e9b36684f7c9fa76677539901031f7e0dddefda65fb6e21b68c1d794d1c369fe5dc34176822124f1795892659540f0892859989a7332
+DIST Image-ExifTool-11.84.tar.gz 4699618 BLAKE2B 3ecb800c39edf06c567fa65df0c5c09919fb97477d78208e21275ed200016c724aafe7ceda745183b069915060f11609cd7566eccd13bff8528159d044964886 SHA512 b0bc535da0081c21349f116de51b8dd113dc23bf78491cc48d08ab3c82f5da09687b6cc6d5f096f876b9042146e30fccdd17f6f9d9de0e608df9b73ead7807da
+EBUILD exiftool-11.76.ebuild 593 BLAKE2B 6b7dc3a386bdff58d1bf65fbd17f81ed50fe60ac59a5b44969ab5da5c784bd92dcd110c7c4762569e04a7d59f19135be0ddf0fddb73c85b939d220dde2832778 SHA512 5e11c79de05f482ca0bf9b85fb993423d595e372bb5aad05ff1c1bf53549c1ed9d6475ae5713b6dbd20995f4c5d63a14c9b886464296640eed5550c1a33e69f6
+EBUILD exiftool-11.80.ebuild 548 BLAKE2B 0bfcc4612b971d6b71e5eab26b04179f80e6f4ac72c10340498ee44526e3b3b74b8c06231b83c273b61a82cafd24a9cce279ce6891fef110824a70f0ec6595c8 SHA512 6da6b1e959542295fe729eabb584e41550fa2fb22d2fdcb83c0c4db4091c199bc5f28732db2f22d68eac12c68d847e019af508bd0aecfec76584eccc2c742fe2
+EBUILD exiftool-11.81.ebuild 548 BLAKE2B 9c445a8b1392e1479a5b207a2d5bf27dc49933ffef2ff6d1cd60d2d0db74ca7334dafbd378e4fa584cb76c38aba1499acc0bb6c89184b2509f609794ca53b619 SHA512 0e2d98eaabc1d5eeb821bb6d96abe38a14297140d01b8f07fcd8533b6b5a03eb0e25e86291452eec8f7763e6ed4fbb5d2d4d9bd44c4851de063f99c264c78d01
+EBUILD exiftool-11.84.ebuild 548 BLAKE2B 9c445a8b1392e1479a5b207a2d5bf27dc49933ffef2ff6d1cd60d2d0db74ca7334dafbd378e4fa584cb76c38aba1499acc0bb6c89184b2509f609794ca53b619 SHA512 0e2d98eaabc1d5eeb821bb6d96abe38a14297140d01b8f07fcd8533b6b5a03eb0e25e86291452eec8f7763e6ed4fbb5d2d4d9bd44c4851de063f99c264c78d01
 MISC metadata.xml 10159 BLAKE2B 3b879f3679b07864e8e32d0223d1512919d56ede4b51bc5a550a83694c8c956c6e6e60a92309ceafef61ed738ccd0b5a6817094b4132be013560d3d7830f6349 SHA512 88662e634877bf2b67144fd37a862626e247f7df5daa82ed8d7a91a00611290d3976687221b5f58b78111a8894d45d55c8999966436f621baebf1bc7b3561484
diff --git a/media-libs/exiftool/exiftool-11.76.ebuild b/media-libs/exiftool/exiftool-11.76.ebuild
index 5160df13e56c..01710a29b5df 100644
--- a/media-libs/exiftool/exiftool-11.76.ebuild
+++ b/media-libs/exiftool/exiftool-11.76.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/"
 SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 arm64 ppc ppc64 x86 ~x64-macos"
 IUSE="doc"
 
 SRC_TEST="do"
diff --git a/media-libs/exiftool/exiftool-11.75.ebuild b/media-libs/exiftool/exiftool-11.80.ebuild
index d65975820b77..014eec1ce9b4 100644
--- a/media-libs/exiftool/exiftool-11.75.ebuild
+++ b/media-libs/exiftool/exiftool-11.80.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 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"
+HOMEPAGE="https://exiftool.org/"
+SRC_URI="https://exiftool.org/${DIST_P}.tar.gz"
 
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
diff --git a/media-libs/exiftool/exiftool-11.69.ebuild b/media-libs/exiftool/exiftool-11.81.ebuild
index 3afc7ec316dc..58ee12770a1c 100644
--- a/media-libs/exiftool/exiftool-11.69.ebuild
+++ b/media-libs/exiftool/exiftool-11.81.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 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"
+HOMEPAGE="https://exiftool.org/"
+SRC_URI="https://exiftool.org/${DIST_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc ppc64 x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
 IUSE="doc"
 
 SRC_TEST="do"
diff --git a/media-libs/exiftool/exiftool-11.84.ebuild b/media-libs/exiftool/exiftool-11.84.ebuild
new file mode 100644
index 000000000000..58ee12770a1c
--- /dev/null
+++ b/media-libs/exiftool/exiftool-11.84.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_NAME=Image-ExifTool
+inherit perl-module
+
+DESCRIPTION="Read and write meta information in image, audio and video files"
+HOMEPAGE="https://exiftool.org/"
+SRC_URI="https://exiftool.org/${DIST_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+IUSE="doc"
+
+SRC_TEST="do"
+
+src_install() {
+	perl-module_src_install
+	use doc && dodoc -r html/
+
+	insinto /usr/share/${PN}
+	doins -r fmt_files config_files arg_files
+}
diff --git a/media-libs/faac/Manifest b/media-libs/faac/Manifest
index 979e4a439bb5..f7ebd8c13e01 100644
--- a/media-libs/faac/Manifest
+++ b/media-libs/faac/Manifest
@@ -1,3 +1,3 @@
 DIST faac-1.29.9.2.tar.gz 483826 BLAKE2B f845e75ec640f2a6ac41ad10dfdf1dbc6a6ddef3cb8cc3fe63450515f888343126cb2ec1df4c4eaaefed3d7d5d56249078f14363fcb9d9484228e9b1754a8b99 SHA512 71aaf060d087e866700a3a7c7d447e85709f65709e148610c4b34f5a3e095fa4a5c19f49450610949fd7db12345422b8a116a1d061899c127ad9a1bc30e79c7c
-EBUILD faac-1.29.9.2.ebuild 1083 BLAKE2B 4d8845676557c15602a3f75f99b7efe0234226baf6a1f13332c54da27a5a48de5056b946bcb1022d1cb5211d83bb157649269a546149903707adc6c2d4d844b3 SHA512 45fc486a8c3fe9e6700e9eeb8ee5f1b56e902f3b9ee85c4fb7c88bc5e543c1eee08500df7ff0247f346bd97b02626ec83d563caac202dade1aedde1e1ea51fe5
+EBUILD faac-1.29.9.2.ebuild 926 BLAKE2B 1590d0a13afb4d7708e7d4e696f0164ce86536129c0215669e059ce3706ea4d6537bef624b22b8a1a5b9e52e7b0fa5445cd3fc9e66bb689911710c6a1088d2f8 SHA512 e6662cb4d46acd8657d62a1f8ae3be48e277a61176ea248e3ce5a03a2b624669d89fe59f9de5a32b084603334a27d65b78ffb0f678957e4313cb0fea1c8d008a
 MISC metadata.xml 327 BLAKE2B 3c3eabbf763b0f521edb87c8d91f43a9e64c22c2ef6b86d4b95b997208a5d575f55575cc97d2c2caf3b759cbfbba7ce91377cba0121dca9f7b1a18cdab7e0162 SHA512 a323b91cffc6e960e52f3aac94763767ba428361b736e635ddc6eaee7dab9bacc36cee8bbd38c4887f3243f3f060707f3533b1c4e4be49d14ba1f602e7bf6f80
diff --git a/media-libs/faac/faac-1.29.9.2.ebuild b/media-libs/faac/faac-1.29.9.2.ebuild
index 58776bbdaad1..8b790a669fc9 100644
--- a/media-libs/faac/faac-1.29.9.2.ebuild
+++ b/media-libs/faac/faac-1.29.9.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools epunt-cxx multilib-minimal
+inherit autotools multilib-minimal
 
 DESCRIPTION="Free MPEG-4 audio codecs by AudioCoding.com"
 HOMEPAGE="https://www.audiocoding.com"
@@ -12,34 +12,25 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1 MPEG-4"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="static-libs"
-
-DEPEND="${RDEPEND}"
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
 
 src_prepare() {
 	default
-
 	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466984
-
 	eautoreconf
-	epunt_cxx
 }
 
 multilib_src_configure() {
-	local myconf=(
-		$(use_enable static-libs static)
-	)
+	ECONF_SOURCE="${S}" econf --disable-static
 
-	ECONF_SOURCE="${S}" econf ${myconf[@]}
-
-	# do not build the frontend for non default abis
-	if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
+	# do not build the frontend for non-native abis
+	if ! multilib_is_native_abi; then
 		sed -i -e 's/frontend//' Makefile || die
 	fi
 }
 
-multilib_src_install() {
-	emake DESTDIR="${D}" install
+multilib_src_install_all() {
+	einstalldocs
+
+	# no static archives
 	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/ganv/Manifest b/media-libs/ganv/Manifest
index e3920040b37f..a3023e9c1d37 100644
--- a/media-libs/ganv/Manifest
+++ b/media-libs/ganv/Manifest
@@ -1,4 +1,4 @@
-AUX ganv-1.4.2-no-fdgl.patch 775 BLAKE2B f89f72f91941325ce8912f8f107dd36c2519dda6837e1103a23a2c2cb085c55795cedc38a14667d2f59a1a326420215f1fe3e62a09cebb8ffcd54aa88177e6e2 SHA512 760d5332df51f91f4045d80a21f8d06e08578dda8ddf383d0ff2cbd150cb0553db253b6cb8b9d45cc6c8bbdccf97c11fd164babf42965809110c452e2e8243c5
+AUX ganv-1.4.2-no-fdgl.patch 843 BLAKE2B ae7007f466712536681a5736d73e585315a6129538642fb20676fb967aa978bb3f4acbd61be6652b2918bbff235faa4c2e6f38cd96158e3f04ee13a784c82f62 SHA512 94f0cf7536ae6ae844088cabce0a22caa61113145c51332fda0831878af23267d24780416e2157eb6b50e9690deb508b9474c9b50b08186fb367406a896de55c
 DIST ganv-1.4.2.tar.bz2 175510 BLAKE2B 4e6d7e411c78a516ea6603245ae13787607591b061d3856f305bcc4731f27ef46897d032a9b8a1f672776b41351823f89a2ddfeac40b47f584dbf638af79d466 SHA512 0609dea81cceb0c560286ad2f132f318c2d583af5163dcea4511155e78a022248dcb7ae535233493bdf906fb036422ebd4368d688123f3e1676c4e0398cbc6c2
-EBUILD ganv-1.4.2.ebuild 1025 BLAKE2B b95c91f7e4849cfb0978d2303ab5144930dfa5855252bb95bf15e28c64b04b3493c02712380fb34b60ea0f7c9ca1ec79c02a99f5d8615d133e2aa9363d79a0d5 SHA512 e0a423a6d9347f4232f6ee326c6dbc34e4994e27046a4cefba841b5079050caaba991e8eedec94b32a6c0bee9db43288cf38763e5a420c064a6ec0d4378494ee
+EBUILD ganv-1.4.2-r1.ebuild 1058 BLAKE2B de1464cd90a78ae10ce2ad2ab11ab501a37c7328f7b60520e753cf3c3d9148a76b65d8da86be0cd4c4aee9ed85bb4c2cc22f23f5e3f0f0f0205704055c914c0f SHA512 a8b3f3c1351dba62c362f82fb5f8f5d037994ca8df0d57d53a027865c8d93f915aaf4e6770b1dbb0902c898b72eb1159540b595ab864d5f609449e20cf835a99
 MISC metadata.xml 356 BLAKE2B 0ca0ad63495c9f314c3fe7bfc48a7538d07ad65f9b772996b86ffc268420bf9548002a920a9a7f53f25984c309fc50d9a1735281dd18421a82cef913e10d49da SHA512 f2b5f01deb2f8d879b4a4107571ac469caf163bd2c44a066b8758a9596445f0baaa125b5e3ea883008221aee90d98982222b40b43c10f694d2672842bc1103ef
diff --git a/media-libs/ganv/files/ganv-1.4.2-no-fdgl.patch b/media-libs/ganv/files/ganv-1.4.2-no-fdgl.patch
index 17cc2432d0ec..3fb29a7f0b54 100644
--- a/media-libs/ganv/files/ganv-1.4.2-no-fdgl.patch
+++ b/media-libs/ganv/files/ganv-1.4.2-no-fdgl.patch
@@ -1,8 +1,8 @@
-Index: src/Canvas.cpp
-===================================================================
---- src/Canvas.cpp	(revision 5479)
-+++ src/Canvas.cpp	(revision 5480)
-@@ -760,6 +760,18 @@
+diff --git a/src/Canvas.cpp b/src/Canvas.cpp
+index c01021c..1c66a6c 100644
+--- a/src/Canvas.cpp
++++ b/src/Canvas.cpp
+@@ -760,6 +760,18 @@ GanvCanvasImpl::layout_dot(const std::string& filename)
  }
  #endif
  
@@ -21,7 +21,7 @@ Index: src/Canvas.cpp
  #ifdef GANV_FDGL
  
  inline Region
-@@ -788,18 +800,6 @@
+@@ -788,18 +800,6 @@ apply_force(GanvNode* a, GanvNode* b, const Vector& f)
  	b->impl->force = vec_sub(b->impl->force, f);
  }
  
diff --git a/media-libs/ganv/ganv-1.4.2.ebuild b/media-libs/ganv/ganv-1.4.2-r1.ebuild
index dafedc72ffda..3d19184be690 100644
--- a/media-libs/ganv/ganv-1.4.2.ebuild
+++ b/media-libs/ganv/ganv-1.4.2-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+# oes not work with python3
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE='threads(+)'
 inherit eutils flag-o-matic waf-utils python-any-r1
@@ -26,12 +27,13 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
+	dev-util/glib-utils
 	nls? ( virtual/libintl )
 "
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-fdgl.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-no-fdgl.patch
+)
 
 src_configure() {
 	append-cxxflags -std=c++11
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 7cd7e7881384..f773a3ee51e3 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -7,7 +7,7 @@ AUX gegl-0.2.0-fix-without-exiv2.patch 823 BLAKE2B f2f0f8ff2d12ae0586518d4bfdbee
 AUX gegl-0.2.0-g_log_domain.patch 1079 BLAKE2B 7d0ba02291aa33b4a8077d56de01c5b0e10b46740c64565bf8b6a9867a6d76fe6fa07a752d0698f0674236e0be06c41135af114847096cfec642572fba315c06 SHA512 a538d42164dbefbd5044461fe8fdac5d3b2de2d7df5013a5206b0230fe48ea7cf537972b8aab2a40081a15ece1dd818bef70cef95cd0a04bc7179764070a1e45
 AUX gegl-0.2.0-introspection-version.patch 1233 BLAKE2B 1565b0600b5d5c55e0e3909670c59fb6b73d91222911cc4caac07025cfadba39af39d60d42d133ed209f1464bf97aa5a5bd7da233e673a4557ef4451999ab7f3 SHA512 539508215c769a5571ba0b798ab001d37756a0f264817394282ee3aa9d46ca83fe10a3d37ee8915afe79453d1e72e7adcb928fbb54a22229a06cf0a308095d23
 AUX gegl-0.2.0-libopenraw-0.1.patch 1733 BLAKE2B 16aacee7c0a702b0965c0f342822710b8b791fc950e10040de92a4eef06b4d5010b1f8fb8c0d1b23d5bc43e92487e37d278dd750baf06a641d91bbd5205b676f SHA512 8eaa767c7d30e77ebffacb9ebb01789f05c82385ed7671767f0e04dba98a95ee22a4a8f0ca8f19365e0b26e74641dbe00939ff8baa40e84a8a26770c325ad980
-AUX gegl-0.2.0-underlinking.patch 1638 BLAKE2B c8118a47b9d83d9737a2ec1deb25d23b99219a8ca018f74a330050e15f6a62f73fd534327bdbd75831121931c54f69c067dfba125ce18b84fc6a7355d27abb22 SHA512 cec86ffddbe6ce1fd4b6bcf5b7550b538b4967ce409034153ea8712ae59f52471c653ed9b28b4821cc8ddc8b6bfd54775ca17db8c65718712ee6205803050bfd
+AUX gegl-0.2.0-underlinking.patch 2038 BLAKE2B 80dc1aeeb73d08ae7184f5eb57f97a16ec4d5b237bf7fb4232fef16c443f913d16b179a297e0bea8b8b459cd740720843d06d537e9cc703c66ae3b54b6c70255 SHA512 c952d015ac74eefea96c6b6c4190fc5c230654cb6efee20ea06f9b43e4f3dac8953ce94f604602489556e4ab59b44f85daff95e3e7c98c640b2b532d1de3dfc5
 AUX gegl-0.3.12-failing-tests.patch 888 BLAKE2B 548933991347ac397b98ac044d5524d0ae8e5307d52e8b48eb0168d30eda8b73350cec57bc5233abde708184c152ee94ec5c2b3213161ffff93b2a6494a2d36f SHA512 a7b8f58ff9057e086412ec5b12694ffc4e30e2a7b3a8bfa72ef34bc230d0d91c80aa45de94f8e48496844c96e257cee6d3791db0e520abc7cbcc2691d1a5ce84
 AUX gegl-0.4.0-ffmpeg-4-0-compat-1.patch 2181 BLAKE2B 8bf1c46395ee4981fad7c5518c9091043374b54c9c4a684e6decc376e8b57e2a60b7ff5c5b21e07f24d7835f92f62a7aebf976122391d206450cc1d5a52bcb30 SHA512 1edf86549a0a91b7e66ad1b59373b141c20e7f63fff981aaa5a0ba535b38e89b593c60a4a4573cf6fa723181cb38a10c6ac4a0838fc947bb54713a3bde299e4f
 AUX gegl-0.4.0-ffmpeg-4-0-compat-2.patch 786 BLAKE2B c2ee0da954aa16c755f76058c54ca9d19ceb70667aff40e126d52bb10b7ecaa6e346667fa9cf7f96605b87a1d41e511d4787a33b004409708d8e3496de391745 SHA512 1084d1cd802eebdeacc536115d4808ce310a85063110bfc06627c8836b86e65396d175a4c3bc6b2083a9a486b7fb21d0210e42fcc8ef3c404b6b930797ecc83a
@@ -26,6 +26,6 @@ EBUILD gegl-0.3.0.ebuild 5255 BLAKE2B ba5de53a099d96b637bcbcfee75b7b387cb391101c
 EBUILD gegl-0.3.34.ebuild 5322 BLAKE2B f9446f59e9a0d1b5a796d74ab1629bbce550b8303aa9dcbe346f0b982f42acc672a166be05bce83f4732ae93380bd11ad5c99b3c51b32d57310cd02f7ba148d7 SHA512 f228fda2bb264a091afa38e490fe4865ab3d5cac57e0cd10577e10db1c8a25ac32082f8ec69625dc65b848ef511c348d39291864303249a9d0b20c7a3ff23c96
 EBUILD gegl-0.4.14.ebuild 4990 BLAKE2B 402cee7dc2c3c3537faa945bd2633df1e40925764bf5b350068ed3db413ab573b8b6a9c80320690e51f4b6cba42ace54aeffe47a8122518f940db1fe46f9ca15 SHA512 c56a418e491a617b1d058f99fcf6f447b89be5f1fb222a4d7c52043a29614eee9d81509300272afe570eff06ce83bf44d5e07e6fd57da8d985183da510e8cb21
 EBUILD gegl-0.4.16.ebuild 4872 BLAKE2B 5126609563c9d39b6d4d6c691e9c1418859461a936805238f493b53d2766a5240a5cd9252e4659bdb99f9a72df068c601170885243fabb000210223c6dd651bc SHA512 c86beb3fe1024a23ad1ce8307e05c985124b2c74d03d0d2a0abebfbe6749ea76437107a15eefb7e4e5da00cd45d1d485f38c5ce5d34052f9f811839f2837740f
-EBUILD gegl-0.4.18.ebuild 4856 BLAKE2B f44c0be360f580fa8a87023e1cafb6c65c6eb56a0cbd34947075f3db6ae4f1f1d0e15dd09fde11c0be1b9dfd0a8153c7c5048ce2124c0067b551f91ee740037d SHA512 ac98299d44101a4278b70fb987dc5033ebfd588843d2085d924ea3c24c4675d8058b94520eb466b16674422b5b2111f9dedc2bc387d1a66776887d4a1e45d2cc
-EBUILD gegl-9999.ebuild 4468 BLAKE2B b1bbefe3a68f767853f2be612e5158c0cd9d54765945815410ff333ac208cffb7260e1988d6e9b88be1830654600d43e16dcd29d4b14c9c2067fb8b499121807 SHA512 564f1845c8b29ba6223191ffaeeae26495548aefed1f6bfed1f5f3e27b0195b0a531d6df874a989c3505fc03b5bcd7c389b59d82d76e4b04bdf1e6e809789b7f
+EBUILD gegl-0.4.18.ebuild 4854 BLAKE2B cde5a6dd8f2689763a091ab4ec84fdfa6a795826bd8d2db0604e09edd9c4d23c2eb6395eed3a822925494856b83f4f15a351782245c6018e8d8b39179f0985b6 SHA512 8367124789367070775d734a2cf12da3b844ca107564205cc164d6d49ce58c0232e289eaabddb7bcc557dc051fe7704d1054d2d2d1916228788b5aeab48ec033
+EBUILD gegl-9999.ebuild 4466 BLAKE2B d8ce86a2625434508d004bd54139d9a5baeb53c860ca13e9244c9b9da31958c0870cfcd6a451336047a15170bfcf9a169040618a6184162fee517bc9dfed0360 SHA512 2ac085cfc1232a9d68aada6227487ec5f11112ccd9a48ab519c5d8b602aa6ca7e743cbcc29201c8ef5db9055750ffa98bd9b4cb25de114819789ce9f4aa5f88c
 MISC metadata.xml 550 BLAKE2B 8afb3a5aa69ba6b3139f3183ed013cd0797edad0865b0aebcd2824a31549f4968e938017adb85506fea2e60c18ea1278fd3bce0ce1cf9be0efb74b1f0b020470 SHA512 8c5637454afcab249f671518153067a99cac9d60d8e9108688b4328a19ea653de21948a63c7e680585d208c0b3230fd2fb87c2d8a0a7266d31bc328342a47016
diff --git a/media-libs/gegl/files/gegl-0.2.0-underlinking.patch b/media-libs/gegl/files/gegl-0.2.0-underlinking.patch
index 53f29c49da7d..00e936ce68ea 100644
--- a/media-libs/gegl/files/gegl-0.2.0-underlinking.patch
+++ b/media-libs/gegl/files/gegl-0.2.0-underlinking.patch
@@ -47,6 +47,19 @@ index 8f1077d..4dd3845 100644
  
  noinst_PROGRAMS = introspect operation_reference img_cmp
  
+diff --git a/tests/buffer/Makefile.am b/tests/buffer/Makefile.am
+index d62ce71..0a4df53 100644
+--- a/tests/buffer/Makefile.am
++++ b/tests/buffer/Makefile.am
+@@ -30,7 +30,7 @@ AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
+ 
+ buffer_test_LDADD = 						\
+ 	$(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la	\
+-	$(DEP_LIBS) $(BABL_LIBS)
++	$(DEP_LIBS) $(BABL_LIBS) $(MATH_LIB)
+ 
+ 
+ # Our custom target rules
 -- 
 2.12.2
 
diff --git a/media-libs/gegl/gegl-0.4.18.ebuild b/media-libs/gegl/gegl-0.4.18.ebuild
index 0faafc6c7f59..f2c662e0cbae 100644
--- a/media-libs/gegl/gegl-0.4.18.ebuild
+++ b/media-libs/gegl/gegl-0.4.18.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 # vala and introspection support is broken, bug #468208
 VALA_USE_DEPEND=vapigen
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index 3651bef83e5b..98a250798f67 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 # vala and introspection support is broken, bug #468208
 VALA_USE_DEPEND=vapigen
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index 4425eb175ba8..bbcea9152026 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -2,7 +2,7 @@ AUX gexiv2-0.10.10-meson-fixup.patch 1718 BLAKE2B 0460652424a8314eeba8f0d677b5df
 AUX gexiv2-0.10.10-vala-fixup.patch 1785 BLAKE2B d82ec357f2ee7d50b79fa1c82bd9c4b6d0a528561fcacc08e966c73f9d89daf3c2ce2e2712f69e246507e14e0f10a0a5470c830e43aeeb06fdceffc3484cbc0e SHA512 e9708245ddee0fb88939ae26987e4e5859fd5e13efb03f01d276eeb77d4361832eac11b2873e73984ef25dbdcf502f2f3a82a78330f3c7b57b2e186cfb49395f
 DIST gexiv2-0.10.10.tar.xz 638168 BLAKE2B ae75a06007dcaca4c22e463661073d796b77921a313a5bb450c488ee963f72c6095d7abc12dedc0d089a28905cf386062221073100ba3513d9fb13eb524365ee SHA512 41e5b4a9d81882ea4b1bc6f3b9ced95ca4d03f836de30ff90b7a43311e5319f7c0f46cbad767bf2b00926c8e5fd2c1e8ca2a2113c308e23b7a4c21205399abf7
 DIST gexiv2-0.12.0.tar.xz 370816 BLAKE2B 7768cffafedf41948ca6ddd22614f0eb3b44a317a23ade3c8d39d5ec5ff77c0d8c61dd8dcca5108b3403e0e3ec8be6659c16445de27163e8689c6c40f5313566 SHA512 c89e7d307359c718dff1f3991acb4ece66bce985a3d8bee1c8fccf4ce39187af62684c87eaae9b0425a6fdbf147b7330902041d9588e52a4bad1da4255d245e9
-EBUILD gexiv2-0.10.10-r1.ebuild 1859 BLAKE2B 571cd27d784156fd7ad20f5abf31a49ca9f24bc2abe09fd4471e35c4c225d919453a890c86eda6e0a4beb0979228f3df2bf01be1abc0e1ab71796a86b7b11309 SHA512 b1af7fef73c5582137c3f28ed3c6eeb18b7eab5bc460aa26ef63a85abad92daeabd4b15d9253df1e9feafeff28760e85ca724eebcd1c3d1b398dd3def7aa839b
-EBUILD gexiv2-0.12.0.ebuild 1642 BLAKE2B f487bcc583c48a99a816b689ffabf1cc17ab58d848581e00149d3f8e852b7df96833e0cf9780d609cd39f4720132538e4994ab6f70848b0342c4007b9cd85ce0 SHA512 fc63ee66b2a63127a54a503ac9e0007c20df1f924b6aa1eaca46f0327348e91e62d70da13e0186e5268cb65033a53f1b64e1f0dd7396d5f4ecd8d5a95fa0f48f
-EBUILD gexiv2-9999.ebuild 1642 BLAKE2B f487bcc583c48a99a816b689ffabf1cc17ab58d848581e00149d3f8e852b7df96833e0cf9780d609cd39f4720132538e4994ab6f70848b0342c4007b9cd85ce0 SHA512 fc63ee66b2a63127a54a503ac9e0007c20df1f924b6aa1eaca46f0327348e91e62d70da13e0186e5268cb65033a53f1b64e1f0dd7396d5f4ecd8d5a95fa0f48f
+EBUILD gexiv2-0.10.10-r1.ebuild 1855 BLAKE2B e13120c7e659e6cc350c2596056bdec673d66c6058d22ddc3d0b1f6e292480269adad96d58eeabd50fbdbf36bf3d40af1a8f50978b8e5104acb3fb35349cb531 SHA512 20b00946713a427ed5c765a1417a1f8698258831b1c8f81acd3b4735054a05f90eb0cc7d8a0cf2cc5e1143efd2c3662c82c22e4197f2ab707180e6cbf8827fb4
+EBUILD gexiv2-0.12.0.ebuild 1640 BLAKE2B 22fc7fcd5b25b21b539548dcfb6753386a31609714505e77a210f77614e01f7d3ff3747ce93bd7b1be8d65cc5dd5087d504c455c0163b990832f200c9a9a7126 SHA512 0af92a5afa270474b67b8132f3e76d33e6c3224df8d4dbe7922a5e3d07fb094b6dc9af6f1f323937d5edd6305ac89ece39060bb9fe01c66cb00ca4ca72041d71
+EBUILD gexiv2-9999.ebuild 1640 BLAKE2B 22fc7fcd5b25b21b539548dcfb6753386a31609714505e77a210f77614e01f7d3ff3747ce93bd7b1be8d65cc5dd5087d504c455c0163b990832f200c9a9a7126 SHA512 0af92a5afa270474b67b8132f3e76d33e6c3224df8d4dbe7922a5e3d07fb094b6dc9af6f1f323937d5edd6305ac89ece39060bb9fe01c66cb00ca4ca72041d71
 MISC metadata.xml 643 BLAKE2B 449e133d5846d7390b649aa2f101438c2305fec51f048ad5b29a5ff46f42f51ed47d27fef583e78a34b66cfc9dfa1e3e1e08e5a998a9127b5cbcd70f72420993 SHA512 9972f031fd8ea9451f59a4aa69fd45acbe8a119c32a2e81edafb7ef14b5be3475b3660eb141d1281c9483821cdadd29249c27a9f3ac0e9187037ae53f6f683f6
diff --git a/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild b/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
index ed3b99e6bbd7..4d58e765c48c 100644
--- a/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit meson python-r1 vala xdg-utils
 
diff --git a/media-libs/gexiv2/gexiv2-0.12.0.ebuild b/media-libs/gexiv2/gexiv2-0.12.0.ebuild
index c83cec2f56ad..10707cbef096 100644
--- a/media-libs/gexiv2/gexiv2-0.12.0.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.12.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit meson python-r1 vala
 
diff --git a/media-libs/gexiv2/gexiv2-9999.ebuild b/media-libs/gexiv2/gexiv2-9999.ebuild
index c83cec2f56ad..10707cbef096 100644
--- a/media-libs/gexiv2/gexiv2-9999.ebuild
+++ b/media-libs/gexiv2/gexiv2-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit meson python-r1 vala
 
diff --git a/media-libs/giflib/Manifest b/media-libs/giflib/Manifest
index 27ccd0d3a1aa..35955e19e753 100644
--- a/media-libs/giflib/Manifest
+++ b/media-libs/giflib/Manifest
@@ -1,17 +1,7 @@
-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.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
+AUX giflib-5.2.1-fix-missing-quantize-API-symbols.patch 920 BLAKE2B a559e326851cc937977f7b91295b218b444deddb8d03350406be706722139005a01160be6f558064239ef6f245b6dbfbb9836899dc72cc1c3106d7900234cabc SHA512 5de1e8724f5221fa3637b4e6a482f650f7608673e2c9200233290018ec8a0bf1beea049b3979b5f57dbf2b2a5fda409324e636e9af10582fd01c71d92d4de3b3
 DIST giflib-5.1.4.tar.bz2 639703 BLAKE2B 5176fbd94c37a86a7f7a3964b6b5f2637d76ba5d40e594a0db52a3a09e22b915a0388fc9bd2f1446dcf66b3b9c0d76741583e4d5d3f7362fa3997e8b26503fc4 SHA512 32b5e342056c210e6478e9cb3b6ceec9594dcfaf34feea1eb4dad633a081ed4465bceee578c19165907cb47cb83912ac359ceea666a8e07dbbb5420f9928f96d
-DIST giflib-5.1.8.tar.gz 419065 BLAKE2B 4a42120758be15e765dae249d98d25164b40e64f933415412420163c0ed7fd6967d3958fff70478d5635a5bb9a6ed397f06ad6de510f2e97de5574b7c68d84d2 SHA512 d390917837a64de1912720ab8968e6b077c6be9f9a2f835faced44420f54d6d55d4e3543b9779ec65d399858856188fea93c170b253d0b83928f15548a14aba3
-DIST giflib-5.1.9.tar.gz 385068 BLAKE2B 0c6765eb9a017fee8de28c9440434f3054f87ae65139a3f9f4a41145d4d86dfbd88ece54ea6f40c58054e0ab728a1d346c2f725843bcc34bfd75825e58b8f650 SHA512 b6350b39755e3eeba58b5fccf319bbaeee2db6564e13c8ce44d3652cc32d243c391def74b6b1529bc5e0d4573eff94b2ffa5faa90fc564a049122d3e23f1d184
 DIST giflib-5.2.1.tar.gz 444187 BLAKE2B 8c1e105bbb65dc7ab103976caed70834356440f381ec5118311882fb1c558bb65f6c1081e5767f9835087860de44df5dfcd2826f89744dded548d535736f27f0 SHA512 4550e53c21cb1191a4581e363fc9d0610da53f7898ca8320f0d3ef6711e76bdda2609c2df15dc94c45e28bff8de441f1227ec2da7ea827cb3c0405af4faa4736
-EBUILD giflib-4.1.6-r3.ebuild 1457 BLAKE2B e61692e026885c84372598dac86642176d1e2d361ee41954c122b0ed33ad563e734a280b5cd5bf4702f05ef538969ee13d24b93dd8ef46a6a9f506d1e1e781aa SHA512 992b4a14584aac4cf154921fc36f6493a96d061e6e290f82d37b911f88f0178f89eb04cd974629825c702a09d286c7d97555748c49260036c987ad7842a857b9
-EBUILD giflib-5.0.6.ebuild 1038 BLAKE2B 5a6c7ae4f88624995c3fd518eac4ea512ef0646c1b9e345ba44a0e6b3f9f3ee9bcf826c49f615eac1e507c4f4b9ecfb80e307dc5dad7d3b30f50c07b792b83e8 SHA512 99d325391763ba015c2b27173cff64c91cd8fc401c6e5d977bc966ab8d60d303eb2ba9dfdf13354822df3b56bacc7b52299052dc8aa99f734bdf3c033d022a17
 EBUILD giflib-5.1.4.ebuild 1368 BLAKE2B 485f64770f0e384adb3750a6c0272f475f37a8c16487ecb6d593e267aa5a462e79e6457cd0f39cb131a7eb9430d595b2064fcdebaded78484bd25c65bcab9334 SHA512 023b996bcf47bbe3350de231fe2aedf36a2c68655d44ad5afbd155b3e8b672d64bb83d3cb2623a5f37f58d45c691c89bbf9a3831c7677d1318d1740383ceb5fa
-EBUILD giflib-5.1.8-r1.ebuild 1853 BLAKE2B 677f21d9ef26c558242aa93ef640a96f5d4123e787b9f03d7a2e8080853e10649d84cd51896a8f1a95f3445dcc61dcc39b58b486552954e09c3f7c54f3e43b99 SHA512 7bfd62190a45aa343b8ec80f3d5a36cdebd270de1d8b9a89d98b7e4eff9e9f1a26b66f7a8fa46b5976f80db4f97af91a20588c9668dd2eeac2042805bd4bfaa1
-EBUILD giflib-5.1.9.ebuild 1853 BLAKE2B 547761c4aa17b33c224dcd4e17e58f0e8a2c629d7daf3cc3a559c7ad1a7c3c2596d15a3e24d901909ff51284fe30c9f4352982cf621f29598ac6550dba5bd4cd SHA512 b99e38eb5b4b5084bcc4a771451737ecfae9b45076ac40133a6397fff6bcfc386e2d86807422b80c0321af23e3d2af4fe60b5e32b2a16e83805d89496eb352c5
-EBUILD giflib-5.2.1.ebuild 1853 BLAKE2B 547761c4aa17b33c224dcd4e17e58f0e8a2c629d7daf3cc3a559c7ad1a7c3c2596d15a3e24d901909ff51284fe30c9f4352982cf621f29598ac6550dba5bd4cd SHA512 b99e38eb5b4b5084bcc4a771451737ecfae9b45076ac40133a6397fff6bcfc386e2d86807422b80c0321af23e3d2af4fe60b5e32b2a16e83805d89496eb352c5
-MISC metadata.xml 444 BLAKE2B 50913e89623c9855de9b3344c4f7a9f6266b42d99ab88cd4c6be63b8fb00a984dc05b89efbac92ed2b5980e9bed163473925a88384a61b3887ef86473f89b216 SHA512 10f7b2069a73ae9d488fba9febb6b8edcab5f278e1d68ef5b998037f02de5de81d07983b66f3c4ac8a59fa9a4836b92a909c66a4c1188a97aa03174cf4f546cf
+EBUILD giflib-5.2.1-r1.ebuild 1919 BLAKE2B 89c8c1dfe291cc0ae3fd44160ef0b92b38b77a274afe497336a0d3cc8df78bce00a82279784fc90d1f066d3773efaf132e8585665d1001d512d84c141f4eedf6 SHA512 d977ddc14269d5dcc2e46cff86f7878e497e3fe9a9df4ba5fb7aa8ef83d95fa3f62f7ffa330730e236bb0328741f6fc7dc020fff83dcefeafeae89fe56d49f3b
+MISC metadata.xml 345 BLAKE2B 86b96e35605026c5c83878ee105a1f90aa5f8fb32c11af81a8a8ec42b89e0a82d321898ca714087d4c1c8c123718f97b2a8c0ac77edaff0f2bd9f52427032cf2 SHA512 0a21a308b86cd075e436bb61f42a7bbc40eb069f2704cfe44b4c13f1e5dc124294d614be0130af66d60214b75989acb17510bfc44943a585277bffb5feda767d
diff --git a/media-libs/giflib/files/giflib-4.1.6-gif2rle.patch b/media-libs/giflib/files/giflib-4.1.6-gif2rle.patch
deleted file mode 100644
index 95334016648e..000000000000
--- a/media-libs/giflib/files/giflib-4.1.6-gif2rle.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://sourceforge.net/tracker/index.php?func=detail&aid=1829712&group_id=102202&atid=631304
-
---- giflib/util/gif2rle.c
-+++ giflib/util/gif2rle.c
-@@ -222,11 +222,8 @@
-     ColorMap = (GifFile->Image.ColorMap ?
-                     GifFile->Image.ColorMap->Colors :
-                     GifFile->SColorMap->Colors);
--    if (ColorMap == NULL) {
--        fprintf(stderr, "Gif Image does not have a colormap\n");
--        exit(EXIT_FAILURE);
--    }
--    ColorMapSize = 1 << ColorMap->BitsPerPixel;
-+    ColorMapSize = 1 << (GifFile->Image.ColorMap ? GifFile->Image.ColorMap->BitsPerPixel :
-+				                GifFile->SColorMap->BitsPerPixel);
-     DumpScreen2Rle(ScreenBuffer, GifFile->SWidth, GifFile->SHeight);
- 
-     if (DGifCloseFile(GifFile) == GIF_ERROR) {
diff --git a/media-libs/giflib/files/giflib-4.1.6-giffix-null-Extension-fix.patch b/media-libs/giflib/files/giflib-4.1.6-giffix-null-Extension-fix.patch
deleted file mode 100644
index 3e99e66c0d15..000000000000
--- a/media-libs/giflib/files/giflib-4.1.6-giffix-null-Extension-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ru giflib-4.1.6/util/giffix.c giflib-4.1.6.new/util/giffix.c
---- giflib-4.1.6/util/giffix.c	2005-10-09 23:22:23.000000000 -0700
-+++ giflib-4.1.6.new/util/giffix.c	2008-09-04 14:00:41.000000000 -0700
-@@ -181,8 +181,8 @@
- 		/* Skip any extension blocks in file: */
- 		if (DGifGetExtension(GifFileIn, &ExtCode, &Extension) == GIF_ERROR)
- 		    QuitGifError(GifFileIn, GifFileOut);
--		if (EGifPutExtension(GifFileOut, ExtCode, Extension[0],
--							Extension) == GIF_ERROR)
-+		if (Extension && EGifPutExtension(GifFileOut, ExtCode,
-+					Extension[0], Extension) == GIF_ERROR)
- 		    QuitGifError(GifFileIn, GifFileOut);
- 
- 		/* No support to more than one extension blocks, so discard: */
-
diff --git a/media-libs/giflib/files/giflib-5.1.8-gentoo.patch b/media-libs/giflib/files/giflib-5.1.8-gentoo.patch
deleted file mode 100644
index 90a72685d343..000000000000
--- a/media-libs/giflib/files/giflib-5.1.8-gentoo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- giflib-5.1.8/Makefile
-+++ giflib-5.1.8/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) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS)
-+	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,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.2.1-fix-missing-quantize-API-symbols.patch b/media-libs/giflib/files/giflib-5.2.1-fix-missing-quantize-API-symbols.patch
new file mode 100644
index 000000000000..5948f4546858
--- /dev/null
+++ b/media-libs/giflib/files/giflib-5.2.1-fix-missing-quantize-API-symbols.patch
@@ -0,0 +1,32 @@
+From ff8d9a59e79b79657e64430730c35835a84db619 Mon Sep 17 00:00:00 2001
+From: anthraxx <levente@leventepolyak.net>
+Date: Tue, 2 Apr 2019 11:46:18 +0200
+Subject: [PATCH] fix missing quantize API symbols
+
+GifQuantizeBuffer is required by many libs and applications
+like mplayer, libgdiplus (mono) and others.
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index e4ded69..17d0a5c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -29,11 +29,11 @@ LIBPOINT=0
+ LIBVER=$(LIBMAJOR).$(LIBMINOR).$(LIBPOINT)
+ 
+ SOURCES = dgif_lib.c egif_lib.c gifalloc.c gif_err.c gif_font.c \
+-	gif_hash.c openbsd-reallocarray.c
++	gif_hash.c openbsd-reallocarray.c quantize.c
+ HEADERS = gif_hash.h  gif_lib.h  gif_lib_private.h
+ OBJECTS = $(SOURCES:.c=.o)
+ 
+-USOURCES = qprintf.c quantize.c getarg.c 
++USOURCES = qprintf.c getarg.c
+ UHEADERS = getarg.h
+ UOBJECTS = $(USOURCES:.c=.o)
+ 
+-- 
+2.21.0
+
diff --git a/media-libs/giflib/giflib-4.1.6-r3.ebuild b/media-libs/giflib/giflib-4.1.6-r3.ebuild
deleted file mode 100644
index 4fc4d01d0925..000000000000
--- a/media-libs/giflib/giflib-4.1.6-r3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch epunt-cxx libtool ltprune multilib-minimal
-
-DESCRIPTION="Library to handle, display and manipulate GIF images"
-HOMEPAGE="https://sourceforge.net/projects/giflib/"
-SRC_URI="mirror://sourceforge/giflib/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="rle static-libs X"
-
-RDEPEND="
-	rle? ( media-libs/urt )
-	X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gif2rle.patch
-	epatch "${FILESDIR}"/${P}-giffix-null-Extension-fix.patch
-	sed -i '/X_PRE_LIBS/s:-lSM -lICE::' configure || die #483258
-	elibtoolize
-	epunt_cxx
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	# prevent circular depend #111455
-	if multilib_is_native_abi && has_version media-libs/urt ; then
-		myconf+=( $(use_enable rle) )
-	else
-		myconf+=( --disable-rle )
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-gl \
-		$(use_enable static-libs static) \
-		$(use_enable X x11) \
-		"${myconf[@]}"
-}
-
-multilib_src_install_all() {
-	# for static libs the .la file is required if build with +rle or +X
-	use static-libs || prune_libtool_files --all
-
-	dodoc AUTHORS BUGS ChangeLog NEWS ONEWS README TODO doc/*.txt
-	dohtml -r doc
-}
diff --git a/media-libs/giflib/giflib-5.0.6.ebuild b/media-libs/giflib/giflib-5.0.6.ebuild
deleted file mode 100644
index f80e51e8c669..000000000000
--- a/media-libs/giflib/giflib-5.0.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils libtool autotools-multilib
-
-DESCRIPTION="Library to handle, display and manipulate GIF images"
-HOMEPAGE="https://sourceforge.net/projects/giflib/"
-SRC_URI="mirror://sourceforge/giflib/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0/6"
-# Needs testing first.
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-src_prepare() {
-	elibtoolize
-}
-
-src_configure() {
-	local myeconfargs=(
-		# No need for xmlto as they ship generated files.
-		ac_cv_prog_have_xmlto=no
-
-		$(use_enable static-libs static)
-	)
-
-	autotools-multilib_src_configure
-}
-
-src_install() {
-	autotools-multilib_src_install
-
-	# for static libs the .la file is required if built with +X
-	use static-libs || prune_libtool_files --all
-
-	doman doc/*.1
-	dodoc doc/*.txt
-	dohtml -r doc
-}
diff --git a/media-libs/giflib/giflib-5.1.8-r1.ebuild b/media-libs/giflib/giflib-5.1.8-r1.ebuild
deleted file mode 100644
index fcf9ffd016aa..000000000000
--- a/media-libs/giflib/giflib-5.1.8-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-DESCRIPTION="Library to handle, display and manipulate GIF images"
-HOMEPAGE="https://sourceforge.net/projects/giflib/"
-SRC_URI="mirror://sourceforge/giflib/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs"
-
-DEPEND="doc? ( app-text/xmlto )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.1.8-gentoo.patch
-)
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	# Use reallocarray() from libc if available.
-	if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -D_GNU_SOURCE -o "${T}/reallocarray_test" -x c - <<< $'#include <stdlib.h>\nint main() {void *p = reallocarray(NULL, 0, 0);}' 2> /dev/null; then
-		local -x CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE -DHAVE_REALLOCARRAY"
-		sed -e "s/ openbsd-reallocarray\.c//" -i Makefile || die
-		rm openbsd-reallocarray.c || die
-	fi
-
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} -std=gnu99 -fPIC -Wno-format-truncation" \
-		LDFLAGS="${LDFLAGS}" \
-		OFLAGS="" \
-		all
-
-	if use doc && multilib_is_native_abi; then
-		emake -C doc
-	fi
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		install
-
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-
-	if use doc && multilib_is_native_abi; then
-		docinto html
-		dodoc doc/*.html
-	fi
-}
-
-multilib_src_install_all() {
-	docinto
-	dodoc ChangeLog NEWS README TODO
-	if use doc ; then
-		dodoc doc/*.txt
-		docinto html
-		dodoc -r doc/whatsinagif
-	fi
-}
-
-multilib_src_test() {
-	emake -j1 check
-}
diff --git a/media-libs/giflib/giflib-5.1.9.ebuild b/media-libs/giflib/giflib-5.2.1-r1.ebuild
index 55389387daec..00d52ae80e36 100644
--- a/media-libs/giflib/giflib-5.1.9.ebuild
+++ b/media-libs/giflib/giflib-5.2.1-r1.ebuild
@@ -18,6 +18,7 @@ DEPEND="doc? ( app-text/xmlto )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.1.9-gentoo.patch
+	"${FILESDIR}"/${PN}-5.2.1-fix-missing-quantize-API-symbols.patch
 )
 
 src_prepare() {
diff --git a/media-libs/giflib/giflib-5.2.1.ebuild b/media-libs/giflib/giflib-5.2.1.ebuild
deleted file mode 100644
index 55389387daec..000000000000
--- a/media-libs/giflib/giflib-5.2.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-DESCRIPTION="Library to handle, display and manipulate GIF images"
-HOMEPAGE="https://sourceforge.net/projects/giflib/"
-SRC_URI="mirror://sourceforge/giflib/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs"
-
-DEPEND="doc? ( app-text/xmlto )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.1.9-gentoo.patch
-)
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	# Use reallocarray() from libc if available.
-	if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -D_GNU_SOURCE -o "${T}/reallocarray_test" -x c - <<< $'#include <stdlib.h>\nint main() {void *p = reallocarray(NULL, 0, 0);}' 2> /dev/null; then
-		local -x CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE -DHAVE_REALLOCARRAY"
-		sed -e "s/ openbsd-reallocarray\.c//" -i Makefile || die
-		rm openbsd-reallocarray.c || die
-	fi
-
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} -std=gnu99 -fPIC -Wno-format-truncation" \
-		LDFLAGS="${LDFLAGS}" \
-		OFLAGS="" \
-		all
-
-	if use doc && multilib_is_native_abi; then
-		emake -C doc
-	fi
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		install
-
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-
-	if use doc && multilib_is_native_abi; then
-		docinto html
-		dodoc doc/*.html
-	fi
-}
-
-multilib_src_install_all() {
-	docinto
-	dodoc ChangeLog NEWS README TODO
-	if use doc ; then
-		dodoc doc/*.txt
-		docinto html
-		dodoc -r doc/whatsinagif
-	fi
-}
-
-multilib_src_test() {
-	emake -j1 check
-}
diff --git a/media-libs/giflib/metadata.xml b/media-libs/giflib/metadata.xml
index e88f57a6700b..8aeeef3de709 100644
--- a/media-libs/giflib/metadata.xml
+++ b/media-libs/giflib/metadata.xml
@@ -5,9 +5,6 @@
     <email>graphics@gentoo.org</email>
     <name>Gentoo Graphics Project</name>
   </maintainer>
-  <use>
-    <flag name="rle">Build converters for RLE format (utah raster toolkit)</flag>
-  </use>
   <upstream>
     <remote-id type="sourceforge">giflib</remote-id>
   </upstream>
diff --git a/media-libs/glfw/Manifest b/media-libs/glfw/Manifest
index b2e86083d5c2..892ee8752cb7 100644
--- a/media-libs/glfw/Manifest
+++ b/media-libs/glfw/Manifest
@@ -1,3 +1,5 @@
-DIST glfw-3.2.1.tar.bz2 654840 BLAKE2B 3140aea8fbbf5b9cb5106229408bb013cd613da506e1e06be32f68a2b1042e091eddd464417ac1f171f88e978715c14355ceac94df1c39dc3e358d38e1992a14 SHA512 4371285ae72a428c77440baaf5e92fd83e51eafc2c7f024e8ae9f5a4068623c86d73ae70799b3c7775d1f5984de8be408386f3960303522aa9144dd6b2c21bef
-EBUILD glfw-3.2.1.ebuild 864 BLAKE2B 24bbdaff6f2e161a63e13e8deae01f94d839bf02a6e129dcd7acf283469aa8418c8664a84f1a3519c489e74f7bd73ca3c55b6de4c5952cea75fd2f040584365d SHA512 6a521705c5c054c10e3d049626a992fd7896d818f34f04e3bbd2466e515a165651d5a8a8033e3bed68a957cfc2103f6d0c5e4bff8bb634efd0c75ff91e91b056
-MISC metadata.xml 327 BLAKE2B 3eecec443c03734781e343cb9400b1397f72d43d218b368c53925b8e472277828fea273cc66236849f05a37584a9c49c4ec241dd020adf50dbc61898ba8b9be0 SHA512 b05bb424ec0a41530424dd7c4af5d1894d7389994f2415a0a71ccb394cbcecb34d3d07a6af8b10d4d2f7cb8cc5016a58b256d032ecec1a968b1783a9fd316479
+DIST glfw-3.2.1.tar.gz 472450 BLAKE2B abffe6580dee968baa23f8f4f38af164f7479fe0bf3c4d64cc6386b1450aee4a8e8de5f963faecd536e2bbbc925da7ac1dcc16f219984758950263e6b6d022e1 SHA512 c7921f993b9a99b3b9421fefadb039cd475c42d85f5b5a35d7c5401c70491349bb885a02fd31e527de06a8b40d9d49a1fdb92c964e13c04ae092c6b98eb491dc
+DIST glfw-3.3.1.tar.gz 760014 BLAKE2B 72d23a612157b2083dc6950ff7a2531490d1440f24008fca39646860ea7f9e61eedc5d3c96edb024a125f2e9a1ef65780b4a672aa001bcbc6f41d908e904f966 SHA512 f9376002314eae5518ca63738cf1558433007dbf628fb6093a6f54c330f72d85e0ac30049877c50bc99f029e3eb6f69e69508f412d1ec9bdde0ac721dbbeba1e
+EBUILD glfw-3.2.1.ebuild 890 BLAKE2B 1547fc4dbaba7dcc405c6768cbce0fc351e1d1b089136e0ddda290ce80667c4293d9cf2b9f3c7039f5b11e83ab3886354038eaf5e96f8f2bcbeba7751227ecc6 SHA512 9f3b7e2b0c15b3883a88244b8c7e89e1dec2513a968f44839ae83471e060b29663ea343e80693bf818267ab0505e237fa03e5f081a508caa048758bd3059ce44
+EBUILD glfw-3.3.1.ebuild 877 BLAKE2B 456e0c472dd7cbb5e3415e79cb5f799029e802469a58a26e500ef8a64e55c5b1b33635c75329921b1903e2e57f7f8fa491b2a4a26389239cde5aa0ccc9ddad4d SHA512 6a6cb51a6166e2767b1693837db1b80e217dbd58b9480d79cb0753e713ea85749403e0cac916064fed3c5608ce63d44193452c56162cf7c1d328b3764587c216
+MISC metadata.xml 327 BLAKE2B fd8eb3b2c083a3f02e52ae8290f0e1105847ff17cd052eb0211bd007cddf452f34009ad2eaee0809f90a633e60baf4cd2a47e2184d21f691a16219c409ebc907 SHA512 d9d3fe05c0a07b0e0ea3f49589117dc9e3d7859bb0207dcea3d95451858b040c27bba2eaf422b2dcdc6aa8e08b0147ff32d12fea93b648fd861df0e70960a650
diff --git a/media-libs/glfw/glfw-3.2.1.ebuild b/media-libs/glfw/glfw-3.2.1.ebuild
index 9042d28f2df1..3f8a54aea0a2 100644
--- a/media-libs/glfw/glfw-3.2.1.ebuild
+++ b/media-libs/glfw/glfw-3.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ inherit cmake-utils
 
 DESCRIPTION="The Portable OpenGL FrameWork"
 HOMEPAGE="https://www.glfw.org/"
-SRC_URI="mirror://sourceforge/glfw/${P}.tar.bz2"
+SRC_URI="https://github.com/glfw/glfw/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
diff --git a/media-libs/glfw/glfw-3.3.1.ebuild b/media-libs/glfw/glfw-3.3.1.ebuild
new file mode 100644
index 000000000000..762e43166413
--- /dev/null
+++ b/media-libs/glfw/glfw-3.3.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="The Portable OpenGL FrameWork"
+HOMEPAGE="https://www.glfw.org/"
+SRC_URI="https://github.com/glfw/glfw/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
+IUSE="wayland"
+
+RDEPEND="
+	x11-libs/libxkbcommon
+	!wayland? (
+		virtual/opengl
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXxf86vm
+	)
+	wayland? (
+		dev-libs/wayland
+		media-libs/mesa[egl,wayland]
+	)
+"
+DEPEND="
+	${RDEPEND}
+	wayland? ( dev-libs/wayland-protocols )
+"
+BDEPEND="
+	wayland? ( kde-frameworks/extra-cmake-modules )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DGLFW_BUILD_EXAMPLES=no
+		-DGLFW_USE_WAYLAND="$(usex wayland)"
+		-DBUILD_SHARED_LIBS=1
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/glfw/metadata.xml b/media-libs/glfw/metadata.xml
index 1236bfe275a1..19c47b0974ba 100644
--- a/media-libs/glfw/metadata.xml
+++ b/media-libs/glfw/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">glfw</remote-id>
+		<remote-id type="github">glfw/glfw</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest
index 157c162ea371..254367e44d51 100644
--- a/media-libs/glm/Manifest
+++ b/media-libs/glm/Manifest
@@ -1,12 +1,15 @@
 AUX glm-0.9.9.2-avx.patch 1124 BLAKE2B d7cf404b222d98ea4771c354ad3afa712e217be0a4e917c026f79cfb7262e1be9faa2efe85c5bf2cae8df446b421b5f3c1c5545fcc8f6cf3181f6b50425dd680 SHA512 a6a67dccfd9eeecf3ddf083de89da2fd48498a1d815e58d82a9f53feab164d46450c8a41978fcb131b9517e468bdc0949ce4c15b1b24ffe9c0dd6e94516c7874
 AUX glm-0.9.9.6-simd.patch 427 BLAKE2B 9f6e4637ff526497ba9a77247125d1fe5f06eda9bb689b5c42661deb72703b004e2c18f7236503f0673b354ba0e6fa7b13361606ea64fc0e7b9e55eccead91a2 SHA512 72f46827cd6651dd6fddc7ba548f8d9132fd74b9799a8eca6e94435141e96f752917b4343d4c3f37536bbc7713e978e4d85842da6d262c086019eb85f351a431
+AUX glm.pc.in 149 BLAKE2B 9a34ca2590ef006315e004fa6ba0b08469c9da348d8354d0ab6a7e602da1d49126cffbd28c2aab2e2dbe711d047d482b4aead45d1e8770ab571e23e895201b4d SHA512 c875971c208bac82c1a326ebcd327ec9dd92a5b86981d26bf759516107204876a401ac9c57ca6c9965021364678ebbffcaaca6a3b4ee0e532d468d7b03b3ab9b
 DIST glm-0.9.9.2.tar.gz 4572279 BLAKE2B 8b9ade542989b3f73f1a80403b73b5c04c5d64ae259891a6b41564eb7b4417876d527ea8440352f2feec6480ec926ca877a4849c4e75c6ece3692d24d87c942a SHA512 80a5fbeaaea5f1034cd6f8ad3f4daf8b5fa8d9410ccce15ced20f37e24c0f6083332fde82b1fa7357399b3e37c1a31dd3a14f257b7847a5f1ddefa627b50351a
 DIST glm-0.9.9.4.tar.gz 4578404 BLAKE2B 4c0bb64bb477ca46d45b4d25d7d992a39a82a7d745d4564dfac04c7f6e31ea0741b33d2d6c7832580e6f51f62a2efe269a9601c10d87f1e68b333e71e20c3d02 SHA512 50e4784fcd5f1da4ae27830948ffe4b412ec53447b89d30c6dcc2b4e0f9ec05cca4b07461d3d8a339eb103fae8dac325fabc87607b5397122ce2021d6e15a1a1
 DIST glm-0.9.9.5.tar.gz 4578601 BLAKE2B 9ce4dc7e638a651f958e2e0e1bfa0da121aefc382579838bfd810952bb8f4253e17caa6d743de713c86a4e8bd5f1afa38f8162e5f2d98ab141d94574d1103d40 SHA512 3b329acf5144aab1c0f47f8045d34e097699bd6685118ad8322c5ce23afdcb44ba2bb07e49301db06355b8eef7d4340b72251d55e113b533740d1e6ef6609911
 DIST glm-0.9.9.6-install.patch.gz 7594 BLAKE2B a273e1e2adc6bdcaab2a3b66457b59e42384215c19b12ce6d27706d74c4d0ec5f010912c295dff4300a44ebc16cabc09c381df5dede01daf7ebe60cf8b95d060 SHA512 bf489673077dcfc821264cbda55d63cf7a01f4e27cdcadf3f6e0d73f016a24fe590142144e2fa5d074cbc518acf34164653c31a346ab6909cfbd7af6c294e79f
 DIST glm-0.9.9.6.tar.gz 4354114 BLAKE2B e62af8d4fe22eced565a2703f5d02ad935a18a4c9352302fdb203c85149b9374066684246f940e417882d2700d13b93fc0232921151680ec58c9df80ee0be1fd SHA512 1bc8fc1da21e19f95d4a24259993c7932db328fdd2d0db68dbf60c07f372e19003a8df094fb4e153bb7f50df584c17cf0a540d3d3c38b7a287f3b55314ec2d70
+DIST glm-0.9.9.7.tar.gz 4357077 BLAKE2B 59746a8775e0fc20fe8a8c3ae01c48841066d6092ce3cd7fa93bbf29f5247c42645bc920a3dbf3f0b4b61eb1e47f46514d9cd98c4e6df133ced0072ba6a570ee SHA512 9c557788d6382777317c94f8b30bc3df7e533877705514fa5d384f97b076d6bc750e841acbecdec8113e21af07bd8850159f5f1e079aaa2cde25540b480f983b
 EBUILD glm-0.9.9.2.ebuild 928 BLAKE2B 249029f2fc8e9ca124346e5b5ac3a216c069d61abd1910b36c34f49601d367216fdb426c5df78dcf3d2952cb3fe64e2e5bc807d8de0793d0576ae0993d07cfa0 SHA512 fb5eebd6f6bd8e026828708749ac8659dea4af0eff083372a7aa458f157d03adc10ffe72445fec85b35ec06b607895fef5addc9356d880c37a7f569f276add7f
 EBUILD glm-0.9.9.4.ebuild 889 BLAKE2B bd801b50840bd50869202ca22adf6e877aa48d3817b2d09c5800c6e4708ff03578cdcad3fbd9d87144c28b488b2bcdbecad44e6bba3f819330aa5b28700f22ac SHA512 954dd2e6d9263793b8924fe9a6db7f9036af0f439dac005f9df5ac40a8ebcf5eed55f9a8dbcc75ee0e9384731eb56999e927289361c5175c46be22db35e7a7bc
 EBUILD glm-0.9.9.5.ebuild 888 BLAKE2B 8b24c2462309c9ee9447cb55e443f6b02971e62b038ba3147b33a66a3324c94f056acfd690c412cacaf009c21296ffe002ce1c84879dab029d3f48c3d6bfce65 SHA512 79bbe88e3487f1ea637272e74c4e81f0037c5249aead813e4ce3060adcfa3040efa2340a3fb3fa7a31fa6f8a0ae129e0b64bf8d1e5ef394d91b8fca614d830df
 EBUILD glm-0.9.9.6-r1.ebuild 1030 BLAKE2B 0f06f3cc185b1a888deb28bc96387432a03e7c770e928a1436012c63aa2642d7d5019eb57071411fbc0b624ec59a8a4a8140425a9fbae9ea3b91b8f01db869da SHA512 77cf7c42c718aa860241acf83b0db18199c07c6da79e51ae8563c3314e17e2fcc0da6b765270ca9feac19fa24233adf204b59444e64b1c0221038ae0aae35190
+EBUILD glm-0.9.9.7.ebuild 1229 BLAKE2B 829c68198f35298f4bb7c469eff56846b5b23d46b6e72ab8c91b4ce401fd93c3ca09550beee7d370a7bff6424fdd00249fa79de9b6ff86ed27d5af7585182229 SHA512 294d7faa1bb212b57c0ef5919e195fdc753a448481cc48ccf5481cfae3033e18a402f8bfdbee1824b439baa3cc1156bd1ada573f9e746975310d6866a022cb7a
 MISC metadata.xml 545 BLAKE2B 842701f1a6d1483b75f14aa99f546975b4c7de1a84d36b1e15a882d17662d98d37b491e236da73d9457706b667f0499405b5717af3ccfed73ad0518f34167c72 SHA512 637114ed9721e6d1c8f1d1ce56e9b9c208ca4dfe5f3a0c2b844d90bcdbab8344c00682c9647f7323eec7c485abcd841ef37300a8fe0bc8a5f5c12cfbb1da4971
diff --git a/media-libs/glm/files/glm.pc.in b/media-libs/glm/files/glm.pc.in
new file mode 100644
index 000000000000..fc5c7bb7f90c
--- /dev/null
+++ b/media-libs/glm/files/glm.pc.in
@@ -0,0 +1,7 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+includedir=${prefix}/include
+
+Name: GLM
+Description: OpenGL Mathematics
+Version: @GLM_VERSION@
+Cflags: -I${includedir}
diff --git a/media-libs/glm/glm-0.9.9.7.ebuild b/media-libs/glm/glm-0.9.9.7.ebuild
new file mode 100644
index 000000000000..d806cb6f3757
--- /dev/null
+++ b/media-libs/glm/glm-0.9.9.7.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="OpenGL Mathematics"
+HOMEPAGE="http://glm.g-truc.net/"
+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"
+IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2"
+RESTRICT="!test? ( test )"
+
+RDEPEND="virtual/opengl"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.9.6-simd.patch
+)
+
+src_prepare() {
+	sed \
+		-e "s:@CMAKE_INSTALL_PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@GLM_VERSION@:0.9.9:" \
+		"${FILESDIR}"/glm.pc.in \
+		> glm.pc
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	if use test; then
+		local mycmakeargs=(
+			-DGLM_TEST_ENABLE=ON
+			-DGLM_TEST_ENABLE_SIMD_SSE2="$(usex cpu_flags_x86_sse2 ON OFF)"
+			-DGLM_TEST_ENABLE_SIMD_SSE3="$(usex cpu_flags_x86_sse3 ON OFF)"
+			-DGLM_TEST_ENABLE_SIMD_AVX="$(usex cpu_flags_x86_avx ON OFF)"
+			-DGLM_TEST_ENABLE_SIMD_AVX2="$(usex cpu_flags_x86_avx2 ON OFF)"
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	doheader -r glm
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins glm.pc
+	dodoc readme.md manual.md
+}
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 77d4844ba35d..e78544b1034e 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -2,9 +2,9 @@ DIST intel-gmmlib-19.2.1.tar.gz 633194 BLAKE2B fe6105bd76d18f3c4e0d42550fa91a1cf
 DIST intel-gmmlib-19.2.3.tar.gz 633252 BLAKE2B 81fcb541cc1a5fe3bd8ebbb2d98b5d4d7d6af409f1b837327c4cc322da7cc77c80992cc22ef6920cfe3704d6cd030bbf5e36936cb7f205e38f65807297a58dcb SHA512 d82973a18804474708e252cd1f0d5205e72dea0b7b14401ff7bad351f94ad7a53ada7def16f62da0810bfa6a747135fb2c7649e4a1fa6fbc4e8f5a38cf948d6b
 DIST intel-gmmlib-19.2.4.tar.gz 633227 BLAKE2B e7ce9143ced27c8be87b807eeb6fa66dec7f0931dda83d7f1ee597682e593798fda6edf665471723df23bb0ca8b730ff88070211728b83478340d80ad982b089 SHA512 7921b11abc2c0658b614decf5bad92a63155aadd35439eb1885e0314ece1b9a983d44ed28b48ae2259f949cb913272583a0c4f064cfacd698dd5c7013d6bff52
 DIST intel-gmmlib-19.3.4.tar.gz 706943 BLAKE2B 12eef2d0bed76e94770295461935b4056f40dab97bb24acf8e700d2b83198bb8a2800ab9155aebba5138a3269d4aefe645390524d34e57706de750f8e967d106 SHA512 77c7cf1cd3e7f0c2476badca6ae7a36504afb4af5f2c2282e790744a9b8ef668f24c4db8be171eef02394966021b5647921c0faf710e26689cebbd879b786a9d
-EBUILD gmmlib-19.2.1.ebuild 819 BLAKE2B b73f418ae95b025e76499a26e5b7bc04923bd1c6115fb1d7d3788ac24bb07c763fcd0fd2e953084f2cb5a476cee303b233afb2860911b7568f0208518e3a61c0 SHA512 43dfe602d4588bd394f0c4218cdf6b40a8094527393cddc5af7d5180b1bdead3f93e312f1a5f8fd7e780f624a765987ef833195b8e3ea727a2805ca8ae5a059c
-EBUILD gmmlib-19.2.3.ebuild 819 BLAKE2B b73f418ae95b025e76499a26e5b7bc04923bd1c6115fb1d7d3788ac24bb07c763fcd0fd2e953084f2cb5a476cee303b233afb2860911b7568f0208518e3a61c0 SHA512 43dfe602d4588bd394f0c4218cdf6b40a8094527393cddc5af7d5180b1bdead3f93e312f1a5f8fd7e780f624a765987ef833195b8e3ea727a2805ca8ae5a059c
-EBUILD gmmlib-19.2.4.ebuild 819 BLAKE2B b73f418ae95b025e76499a26e5b7bc04923bd1c6115fb1d7d3788ac24bb07c763fcd0fd2e953084f2cb5a476cee303b233afb2860911b7568f0208518e3a61c0 SHA512 43dfe602d4588bd394f0c4218cdf6b40a8094527393cddc5af7d5180b1bdead3f93e312f1a5f8fd7e780f624a765987ef833195b8e3ea727a2805ca8ae5a059c
-EBUILD gmmlib-19.3.4.ebuild 819 BLAKE2B b73f418ae95b025e76499a26e5b7bc04923bd1c6115fb1d7d3788ac24bb07c763fcd0fd2e953084f2cb5a476cee303b233afb2860911b7568f0208518e3a61c0 SHA512 43dfe602d4588bd394f0c4218cdf6b40a8094527393cddc5af7d5180b1bdead3f93e312f1a5f8fd7e780f624a765987ef833195b8e3ea727a2805ca8ae5a059c
-EBUILD gmmlib-9999.ebuild 819 BLAKE2B b73f418ae95b025e76499a26e5b7bc04923bd1c6115fb1d7d3788ac24bb07c763fcd0fd2e953084f2cb5a476cee303b233afb2860911b7568f0208518e3a61c0 SHA512 43dfe602d4588bd394f0c4218cdf6b40a8094527393cddc5af7d5180b1bdead3f93e312f1a5f8fd7e780f624a765987ef833195b8e3ea727a2805ca8ae5a059c
+EBUILD gmmlib-19.2.1.ebuild 832 BLAKE2B c679b2b098ab9b69bca49506c3579417f0bba14abc968eb64f58d7d47dceec272288f7bea7ac076f92fd6416c12adf476db57b4f08e58a63094bc6f7e40bf787 SHA512 3a4bcd7e49d73af846df1abd753e5d8d07920b5c589196217854a0968825763f8c89e16b5b2e4e1432c83af6123f3259f97589a3a45012de3332c8c8c42b2e28
+EBUILD gmmlib-19.2.3.ebuild 832 BLAKE2B c679b2b098ab9b69bca49506c3579417f0bba14abc968eb64f58d7d47dceec272288f7bea7ac076f92fd6416c12adf476db57b4f08e58a63094bc6f7e40bf787 SHA512 3a4bcd7e49d73af846df1abd753e5d8d07920b5c589196217854a0968825763f8c89e16b5b2e4e1432c83af6123f3259f97589a3a45012de3332c8c8c42b2e28
+EBUILD gmmlib-19.2.4.ebuild 832 BLAKE2B c679b2b098ab9b69bca49506c3579417f0bba14abc968eb64f58d7d47dceec272288f7bea7ac076f92fd6416c12adf476db57b4f08e58a63094bc6f7e40bf787 SHA512 3a4bcd7e49d73af846df1abd753e5d8d07920b5c589196217854a0968825763f8c89e16b5b2e4e1432c83af6123f3259f97589a3a45012de3332c8c8c42b2e28
+EBUILD gmmlib-19.3.4.ebuild 832 BLAKE2B c679b2b098ab9b69bca49506c3579417f0bba14abc968eb64f58d7d47dceec272288f7bea7ac076f92fd6416c12adf476db57b4f08e58a63094bc6f7e40bf787 SHA512 3a4bcd7e49d73af846df1abd753e5d8d07920b5c589196217854a0968825763f8c89e16b5b2e4e1432c83af6123f3259f97589a3a45012de3332c8c8c42b2e28
+EBUILD gmmlib-9999.ebuild 832 BLAKE2B c679b2b098ab9b69bca49506c3579417f0bba14abc968eb64f58d7d47dceec272288f7bea7ac076f92fd6416c12adf476db57b4f08e58a63094bc6f7e40bf787 SHA512 3a4bcd7e49d73af846df1abd753e5d8d07920b5c589196217854a0968825763f8c89e16b5b2e4e1432c83af6123f3259f97589a3a45012de3332c8c8c42b2e28
 MISC metadata.xml 322 BLAKE2B 802cb8da9b68866ac616c175586bc3651330ecbfb1b08fe3fad52ec8817e1994f347ae49815869d50296504d9607fcf6c41d40543d8896fafd8d36c4421604f6 SHA512 52324c98984d04659d8ee327850152e41b6146f45a35b147a1fba2043be7ca91e220dd57fc3712e5154b416d04f8a1b0f614259cd9fde8c66ad7734853bb50ec
diff --git a/media-libs/gmmlib/gmmlib-19.2.1.ebuild b/media-libs/gmmlib/gmmlib-19.2.1.ebuild
index aee2550263c0..814f7e0d4a70 100644
--- a/media-libs/gmmlib/gmmlib-19.2.1.ebuild
+++ b/media-libs/gmmlib/gmmlib-19.2.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 if [[ ${PV} == *9999 ]] ; then
@@ -37,5 +38,5 @@ multilib_src_configure() {
 #		-DMEDIA_RUN_TEST_SUITE=OFF
 #	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-libs/gmmlib/gmmlib-19.2.3.ebuild b/media-libs/gmmlib/gmmlib-19.2.3.ebuild
index aee2550263c0..814f7e0d4a70 100644
--- a/media-libs/gmmlib/gmmlib-19.2.3.ebuild
+++ b/media-libs/gmmlib/gmmlib-19.2.3.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 if [[ ${PV} == *9999 ]] ; then
@@ -37,5 +38,5 @@ multilib_src_configure() {
 #		-DMEDIA_RUN_TEST_SUITE=OFF
 #	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-libs/gmmlib/gmmlib-19.2.4.ebuild b/media-libs/gmmlib/gmmlib-19.2.4.ebuild
index aee2550263c0..814f7e0d4a70 100644
--- a/media-libs/gmmlib/gmmlib-19.2.4.ebuild
+++ b/media-libs/gmmlib/gmmlib-19.2.4.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 if [[ ${PV} == *9999 ]] ; then
@@ -37,5 +38,5 @@ multilib_src_configure() {
 #		-DMEDIA_RUN_TEST_SUITE=OFF
 #	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-libs/gmmlib/gmmlib-19.3.4.ebuild b/media-libs/gmmlib/gmmlib-19.3.4.ebuild
index aee2550263c0..814f7e0d4a70 100644
--- a/media-libs/gmmlib/gmmlib-19.3.4.ebuild
+++ b/media-libs/gmmlib/gmmlib-19.3.4.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 if [[ ${PV} == *9999 ]] ; then
@@ -37,5 +38,5 @@ multilib_src_configure() {
 #		-DMEDIA_RUN_TEST_SUITE=OFF
 #	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-libs/gmmlib/gmmlib-9999.ebuild b/media-libs/gmmlib/gmmlib-9999.ebuild
index aee2550263c0..814f7e0d4a70 100644
--- a/media-libs/gmmlib/gmmlib-9999.ebuild
+++ b/media-libs/gmmlib/gmmlib-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 if [[ ${PV} == *9999 ]] ; then
@@ -37,5 +38,5 @@ multilib_src_configure() {
 #		-DMEDIA_RUN_TEST_SUITE=OFF
 #	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-libs/graphene/Manifest b/media-libs/graphene/Manifest
index a53606e56100..363bd3a98a31 100644
--- a/media-libs/graphene/Manifest
+++ b/media-libs/graphene/Manifest
@@ -1,3 +1,3 @@
 DIST graphene-1.8.6.tar.xz 127984 BLAKE2B 7f67b99796cca1a47324674b1871ddfbcce1193ded5f0a37c8c2894d52b6b5823b0fb1909018ea6adb90f7ed53ad6b09eeda9b1606a22a8b85cd0d661d500195 SHA512 ef6e9b5587bd540099216a7e3f7c86eb62368d49876dcd380c9767c6740c8267c9d510c5025dbe56402f3cd15084ef8fc634d3abe486b516f4f5328b87df277c
-EBUILD graphene-1.8.6.ebuild 1840 BLAKE2B 365d94651dfd3fcada9752eaea005b608e5b2c4396904baf055882bc2ce2580d9d0b88c1117c5d16d85bbca50d30916d5fdcad81b85a09919f63fbab96c4b4ae SHA512 638b87762911c7390731806116aa3b027c766368a06e964810a3d94fc45ffa6c987e443e62268d41092c26f78022399e7128256aa737308f87872b9ef38e4aec
+EBUILD graphene-1.8.6.ebuild 1838 BLAKE2B 4b22e5dc8b839f4bbd426a6c7c5bcb2efe98ae50ef0fa3e31feda9c0cd6611680d60723bbc9c75e5d0b0c377efdff145a8af57ca82d7ea816a9308e55c03770c SHA512 694d09cabfd35c19a5fdfc1da5efefe44fc78e429ba8da53c4a0610f6338b5f51c483a761e61319ac8dd00559a4a757b1ad30aef576a59ba67b39a1c659d8a55
 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
index 4e09ce2ddb97..397385431e0f 100644
--- a/media-libs/graphene/graphene-1.8.6.ebuild
+++ b/media-libs/graphene/graphene-1.8.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit xdg-utils meson multilib-minimal python-any-r1
 
 DESCRIPTION="A thin layer of types for graphic libraries"
diff --git a/media-libs/grilo/Manifest b/media-libs/grilo/Manifest
index d45a2e99c8d2..a279b4317599 100644
--- a/media-libs/grilo/Manifest
+++ b/media-libs/grilo/Manifest
@@ -1,5 +1,6 @@
-DIST grilo-0.3.7.tar.xz 232544 BLAKE2B 2d1f7942b09808bb5e09040b4a633a6bd354220ba1369d31ff6160c12ab15c1e2642617ae7f35c8320d7a5842736d8714c6e7dc7f3cb0651d841b6513633f5c9 SHA512 82c41d63edc23c056e189a73b0de87db342bba575d42efeda78ed4bf78fb8994111a2e9457e6f2453045b9b7b2d171b9e89d71c3a107cfa06af24644d9cb71df
+AUX grilo-0.3.9-totem-pl-parser.patch 1140 BLAKE2B 4b6b176e4fb072074299ca2bce71b663d981c382445c8e07ee31d763456f859846ae8ee9c4b04218766b1727235903e925b2e24414c91d0709cd977a855e855b SHA512 bd0af0e0c390bb610556cd165b1e7317f1cf683f1f2649e4d56f8359803aff7474749e19c8812feefb5c192d9554f4cb5de2857861c3df69d21903c565eab2df
+DIST grilo-0.3.11.tar.xz 233516 BLAKE2B 4f239ae99bbd0fefe501e60bbb1249641a2996a26cc8342d5b8daf0665baaad268de9e295bf52b0b504da5c9a0a1f9174664c1afe1303e5dc8a5b547b2e1d160 SHA512 fd46d035982b14ed19681acce3f4878cc678919babc031ce5eb577a21d14f97b905eb5094b344b7fc732bf317fb504dae940cffb7875de2d577bae431b7f9c36
 DIST grilo-0.3.9.tar.xz 233616 BLAKE2B c22b868d5bcb6731024b212d6bc1502b493950e363127202ded0ed80f3e937bf78062ba6f2803e29f686ff8cfc521147e69b8f4a7b33060d81e30f34a231e37b SHA512 250596f277ea76d8f6a071fb0e48dd7ea735a534f48a4f2e3f69f7c62a2b5b4c995714a8435ffa9107345e86bba5b21fc136cc47b956f461723a00d0e6ede9bf
-EBUILD grilo-0.3.7.ebuild 2053 BLAKE2B 13132593347bd779208414302a0268478867e98ac583673bcb71608f9c72c420e9dae73025bbb5e33994e6ef6c0c3d27c53bd2ed46802df80a10661c6255f23e SHA512 3ec448ba94ee9206379ca5f7676e14471a472ae761edd077ec306fb9aa48841ca4e342fb8c141b1056a6d964f5b3c9dcd5bd0ba0c1bdb968b634472ec2cf130f
-EBUILD grilo-0.3.9.ebuild 2191 BLAKE2B c332c97093dee6ddf9d3ffebc846293526101df4e53e6708a26b6c5c90066920bf1203c86b3d4410ae8a6e5f568f9f49f96f4faa66ae7e150814af28125ba34d SHA512 27c98791d18cad64deaa447a0cb75e73b97b4bdefb8d7c2e35b67305b8aa85786c05c2371d4e3f8009b16fdbc151ffcd111917c924b5da9ca34c2338e413dc20
+EBUILD grilo-0.3.11.ebuild 2186 BLAKE2B 5be765152b052397e7570d424bc0fd410404d068f66b8b641e3091b53c64fb6e269c08df4bc771c6a7b7248f51fdab8d87f22522fa4615ca9f453d3ea8592046 SHA512 d3ca3961ef602fa856060006ca206bd09df32e72330061979ad6e6f0ccea4d439b437103869781b27c57e20280c27d600a40689a86a82aa3f658150dd51434f2
+EBUILD grilo-0.3.9.ebuild 2364 BLAKE2B 5f77e800677fad0893565973173e6c7215b22f4b272f55f75414cb0e1d420718f698499655b5032c88856ba9309ad00da91a1cd0aa085cc0ce540c57e53c4621 SHA512 dd90a99e0e5e356edbc7c9b558fcd16e604bb67734e53caf90bbb370cff66aa3b418a53e55d4e560c8aa10f370b4bb64689bafde50935c5b0360bdb4d4797d5e
 MISC metadata.xml 728 BLAKE2B f552b3317894c70912c17e3e46367198f4451940b5029508f83ba3ce904faea24ed3876195f1b062145582dd268064e0c63636ddd5d6033b7032b392e10abba0 SHA512 bbd75a063a5697c257dd9084961d6519fb71409dcd1375d66ff25218deee87841c822edfa66d440cd5c6bfbad70942f01b30f2b7e1a3cc9727beac23ca717b5f
diff --git a/media-libs/grilo/files/grilo-0.3.9-totem-pl-parser.patch b/media-libs/grilo/files/grilo-0.3.9-totem-pl-parser.patch
new file mode 100644
index 000000000000..66d844f79124
--- /dev/null
+++ b/media-libs/grilo/files/grilo-0.3.9-totem-pl-parser.patch
@@ -0,0 +1,36 @@
+From 60d135ef64f16671bb0ab4079ecbc59bdc32cbc7 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Tue, 12 Nov 2019 19:44:04 +0100
+Subject: [PATCH] pls: Support totem-pl-parser 3.26.4
+
+---
+ libs/pls/grl-pls.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/libs/pls/grl-pls.c b/libs/pls/grl-pls.c
+index 62c578b..f6121cc 100644
+--- a/libs/pls/grl-pls.c
++++ b/libs/pls/grl-pls.c
+@@ -47,6 +47,10 @@
+ #include <totem-pl-parser.h>
+ #include <totem-pl-parser-mini.h>
+ 
++#ifndef TOTEM_PL_IS_PARSER(x)
++#define TOTEM_PL_IS_PARSER(x) TOTEM_IS_PL_PARSER(x)
++#endif /* TOTEM_PL_IS_PARSER */
++
+ /* --------- Constants -------- */
+ 
+ #define GRL_DATA_PRIV_PLS_IS_PLAYLIST   "priv:pls:is_playlist"
+@@ -465,7 +469,7 @@ grl_pls_playlist_entry_parsed_cb (TotemPlParser *parser,
+   GRL_DEBUG ("%s (parser=%p, uri=\"%s\", metadata=%p, user_data=%p)",
+       __FUNCTION__, parser, uri, metadata, user_data);
+ 
+-  g_return_if_fail (TOTEM_IS_PL_PARSER (parser));
++  g_return_if_fail (TOTEM_PL_IS_PARSER (parser));
+   g_return_if_fail (uri);
+   g_return_if_fail (metadata);
+   g_return_if_fail (user_data);
+-- 
+2.22.2
+
diff --git a/media-libs/grilo/grilo-0.3.7.ebuild b/media-libs/grilo/grilo-0.3.11.ebuild
index 9dd70438b908..1c79be334ffd 100644
--- a/media-libs/grilo/grilo-0.3.7.ebuild
+++ b/media-libs/grilo/grilo-0.3.11.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 VALA_USE_DEPEND="vapigen"
 
 inherit gnome.org meson python-any-r1 vala xdg
@@ -12,10 +12,11 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.3/0" # subslot is libgrilo-0.3 soname suffix
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="gtk gtk-doc +introspection +network +playlist vala"
+IUSE="gtk gtk-doc +introspection +network +playlist test vala"
 REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!test? ( test )"
 
 # oauth could be optional if meson is patched - used for flickr oauth in grilo-test-ui tool
 RDEPEND="
@@ -29,7 +30,8 @@ RDEPEND="
 		net-libs/liboauth
 		>=x11-libs/gtk+-3.14:3 )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/glib-utils
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
@@ -37,6 +39,7 @@ DEPEND="${RDEPEND}
 		>=dev-util/gtk-doc-1.10
 		app-text/docbook-xml-dtd:4.3 )
 	${PYTHON_DEPS}
+	test? ( sys-apps/dbus )
 	vala? ( $(vala_depend) )
 "
 
@@ -46,7 +49,7 @@ src_prepare() {
 	sed -i -e "s:'grilo':'grilo-${SLOT%/*}':" doc/grilo/meson.build || die
 
 	# Drop explicit unversioned vapigen check
-	sed -i -e "/vapigen.*=.*find_program/d" meson.build || die
+	sed -i -e "/find_program.*vapigen/d" meson.build || die
 
 	# Don't build examples; they get embedded in gtk-doc, thus we don't install the sources with USE=examples either
 	sed -i -e "/subdir('examples')/d" meson.build || die
@@ -66,3 +69,7 @@ src_configure() {
 	)
 	meson_src_configure
 }
+
+src_test() {
+	dbus-run-session meson test -C "${BUILD_DIR}" || die
+}
diff --git a/media-libs/grilo/grilo-0.3.9.ebuild b/media-libs/grilo/grilo-0.3.9.ebuild
index 8cdfd059b112..c7a226b799b8 100644
--- a/media-libs/grilo/grilo-0.3.9.ebuild
+++ b/media-libs/grilo/grilo-0.3.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 VALA_USE_DEPEND="vapigen"
 
 inherit gnome.org meson python-any-r1 vala xdg
@@ -43,6 +43,12 @@ BDEPEND="
 	vala? ( $(vala_depend) )
 "
 
+PATCHES=(
+	# Will be fixed in 0.3.11
+	# https://gitlab.gnome.org/GNOME/grilo/commit/60d135ef64f16671bb0ab4079ecbc59bdc32cbc7
+	"${FILESDIR}"/${PN}-0.3.9-totem-pl-parser.patch
+)
+
 src_prepare() {
 	sed -i -e "s:'GETTEXT_PACKAGE', meson.project_name():'GETTEXT_PACKAGE', 'grilo-${SLOT%/*}':" meson.build || die
 	sed -i -e "s:meson.project_name():'grilo-${SLOT%/*}':" po/meson.build || die
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index 2dbdf6be1568..9e943be6cc92 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-bad-1.14.3.ebuild 2604 BLAKE2B 1fa6fcd55addb2bc7ae21d6634700ac8a06e49b219702a0ee2569f067359fcc2e983740db79b27fee33f3fb273c68644cf9e3102cb72b70b1643622068778f08 SHA512 9187d53c7d79eefe88048e45e8df34f7133fd53f547f997534b6408f32ab49b545159f18d34495615e71c1840a4ed92f616f3e2aa1aeeb27412f48062bffcd74
-EBUILD gst-plugins-bad-1.14.5.ebuild 2606 BLAKE2B d93093a22b47fc6ff44c53de76951c7e2a54862965b73739171811c8d6373f77441ce0a766bc144479151e007b0f9e0c088082820c6a941137b11444ea5b4bdf SHA512 f18632ab69e0bb837c812fc3b4a239f4e0b991ac78a8bd3c0079ca17538fa6e103fc4b47a0613837b60b5bd812d885cb7384cee2eba8e5c7169436f6f43e4d0f
+EBUILD gst-plugins-bad-1.14.5.ebuild 2604 BLAKE2B d50c1ebd919fb6ffe0447c658d7584f77fceb392bda61764eb26ae8429da3cbab5d6e0337a90ba77c8ace28ac8a8ca7d8942cd39d40f844dbae41913552e58f5 SHA512 a54da2dcb623eedab6a0a99657a19c5be30ed2807c58359a76ea50df5d58f8ebce7fc16c13d9dcad342c06c39f7f74d2c547c23ec2be391e21c779531c40980e
 MISC metadata.xml 439 BLAKE2B 5a4a36ccf4bd485eaf1fa66650eec8fa592d4c5bbf9fa478f1645e1b39649b7115694bf55dee7aeb4a5c53b2ba3c4614591cdf4e7d745938397c304108e0aa7c SHA512 9bd27a1a513fc2d697f7d0f2ceb7fa0701c446fe21b597256afd4c2c1f44145e875323ed1ef6202bf7b85472ab4aab43a4b6db5795bb1d28ff53a2a7e484055e
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.3.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.3.ebuild
deleted file mode 100644
index 746a8fad7596..000000000000
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE="gst-plugins-bad"
-
-inherit flag-o-matic gstreamer virtualx
-
-DESCRIPTION="Less plugins for GStreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-
-LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-# TODO: egl and gtk IUSE only for transition
-IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vcd vnc wayland" # Keep default IUSE mirrored with gst-plugins-base where relevant
-
-# X11 is automagic for now, upstream #709530 - only used by librfb USE=vnc plugin
-# We mirror opengl/gles2 from -base to ensure no automagic openglmixers plugin (with "opengl?" it'd still get built with USE=-opengl here)
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},egl?,introspection?,gles2=,opengl=]
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
-
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	vnc? ( X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) )
-	wayland? (
-		>=dev-libs/wayland-1.4.0[${MULTILIB_USEDEP}]
-		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.4
-	)
-
-	gtk? ( >=media-plugins/gst-plugins-gtk-${PV}:${SLOT}[${MULTILIB_USEDEP}] )
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.12
-"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	addpredict /dev # Prevent sandbox violations bug #570624
-}
-
-multilib_src_configure() {
-	local myconf=()
-	if use opengl || use gles2; then
-		myconf+=( --enable-gl )
-	else
-		myconf+=( --disable-gl )
-	fi
-
-	# Always enable shm (shm_open) and ipcpipeline (sys/socket.h); no extra deps
-	gstreamer_multilib_src_configure \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable bzip2 bz2) \
-		$(use_enable orc) \
-		$(use_enable vcd) \
-		$(use_enable vnc librfb) \
-		$(use_enable wayland) \
-		--disable-examples \
-		--disable-debug \
-		--without-player-tests \
-		--enable-shm \
-		--enable-ipcpipeline \
-		"${myconf[@]}"
-
-	if multilib_is_native_abi; then
-		local x
-		for x in libs plugins; do
-			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	unset DISPLAY
-	# Tests are slower than upstream expects
-	virtx emake check CK_DEFAULT_TIMEOUT=300
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild
index 2cbcd04b92da..59842cb29ad8 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ DESCRIPTION="Less plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 # TODO: egl and gtk IUSE only for transition
 IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vcd vnc wayland" # Keep default IUSE mirrored with gst-plugins-base where relevant
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index b4d4c6d4d7cf..3075e0e6f1aa 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -1,7 +1,4 @@
-DIST gst-plugins-base-1.14.4.tar.xz 3703232 BLAKE2B b22c44b857bc4f1972f03752cc1afb35c8d76e2d0c4a06c574af0ac4f3a91080c584ae4e4fc2a263ee879a53d58505c24a756ebc051d81ec62661c4f9e532f0e SHA512 42c59df9f2d848108f12afa0466acbcfa5ccda64e4d0d44608d4268abed20f2e036713de04e7d71feaed1868ad742c5bcb55ae0eef5dec8e19e053dc8541b8af
 DIST gst-plugins-base-1.14.5.tar.xz 3717076 BLAKE2B 461e90df614c60d7efce6fabcf8ad7a5cb68b5fc01b05761fa441d838d3155b5a2e7f9b9420b7e48b2eec49e4bcfbd39009a662db03a923f42c6f45c782795cd SHA512 4e81c44a5ea3b910f96d3e9251ba38a79feacead4f96adb92eab5a650695ca8d5313e3ec1df78fec04376cf3152d2eefd4d39f6c11dadc98a11e55bbf8c8ccdc
-EBUILD gst-plugins-base-1.14.4-r1.ebuild 5919 BLAKE2B eb497ebed24ba4775e90d05236714a5c65c9576d6c61a7df3ca25b9677a614db7fcdcaf3f6afb61751fee435e0df296b878dd383c142d7d5d3c39e8a6cab7623 SHA512 298e7adb9daa3447aed8d67c9d3d3672c356d20b11b82fbe51bfb970833baa27c8f9be63ebab3913f34c98c2c50872369831177e307750a181b3962190f210f2
-EBUILD gst-plugins-base-1.14.4.ebuild 6039 BLAKE2B 8fd57fa801b5d500e70d895cc6036daf12ecabadacb0983c060f7154e739e643d9f60e158f786f7468f3f1dc9a0ca58d19c6be3466c18af04487ed1e7f017ec1 SHA512 9397f00f9f6a7c2944ba04da79e3b672d333b9104c6488d4ebd8d7edda130a64ea7e67c51b7742e83b3188abf8eeeb432ab3269c26dd34de8c0d7096ddc8269c
-EBUILD gst-plugins-base-1.14.5-r1.ebuild 5919 BLAKE2B 7c30cc10928b91a20a582eb66b07848de822ed47ca536a8003ab5be4bf69d236dfe86ee7952075e3065f6036869dcc3f531a07e9d637194d4abdb1e8c6f02656 SHA512 d02b70f7e3bed53e14216460cacbd7dab84653f8f07916dd741f15c28209fed0e6ed673ece6bebccab76453fbab2fc2258965ac0f9ff3207eb0919e3a43101a2
-EBUILD gst-plugins-base-1.14.5.ebuild 6041 BLAKE2B f51eac6a9fdb00a02bfc29cf831c1ce37a57777ac0c2249bfdaf9dfe81968eb794db731ae6ecaa614fabb067bbadc70a36a342ce2158eb8847cb1dbdf367cf40 SHA512 958157b77bff773354a4284354ecbb8cbbe839a0bebe7bf23b0ac5b6c8a11d5205c3b06ac2522e1333c85dbb6863225e6133ab341ce6dd44e3b82275ff5407df
+EBUILD gst-plugins-base-1.14.5-r1.ebuild 5918 BLAKE2B 4f766d8db1e9c8219c4600edb9e5b97f375edc12a9125ea7ab591893c8dd7d28dc398ee49f57e783aaf2be6638e5183bf90a5f3ff01608bd35181ed8e6cb243f SHA512 771e9273197aa32db0cc2ce140cf5dc1ca1c25ebb90a651de08270e3e5dc7eb25fbf70e6afd971efaee02ce9c3b1449d46ae5994e9c3724fed06021d3db01cb5
+EBUILD gst-plugins-base-1.14.5.ebuild 6040 BLAKE2B 7fc2a8aee2fb2554ec86d1ddbf36f6757e355eb2eceffba0cdb9298d773d04ed995ec4520e7bc0060fc7587df573980b7d528c750ed3e30b6e62f084103db8d2 SHA512 bafe790cf5acb48150d84b752efcabe0ee0b2b326622ffb4248b41018e81cc86f4c905436f656911d752e02f5d22c35a219514e4ac0dae47476e28768084cc86
 MISC metadata.xml 1065 BLAKE2B 9736df3218c6157e5cc0f14e96a15ec6ab6140e8774c7361dd4fe9378efd37d1a3da593527313a81591818ad48a5585bd4395fbeb85d357449b00bf7e51bbb5c SHA512 520802b59fc6575e16edd765dacab4ff0ff6e51dd162f03fe7e4e07eb472aeb78f3974a32ba613939932e123179106a450c503234ed806a08416dc6b8dd534c2
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.4-r1.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.4-r1.ebuild
deleted file mode 100644
index b0f0de699336..000000000000
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.14.4-r1.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE="gst-plugins-base"
-
-inherit flag-o-matic gstreamer
-
-DESCRIPTION="Basepack of plugins for gstreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-
-LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-
-# For OpenGL we have three separate concepts, with a list of possibilities in each:
-#  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
-#  * opengl platforms - glx and/or egl; also cgl, wgl, eagl for non-linux; USE="X opengl" enables glx platform; USE="egl" enables egl platform. Rest is up for relevant prefix teams.
-#  * opengl windowing system - x11, wayland, win32, cocoa, android, viv_fb, gbm and/or dispmanx; USE=X enables x11 (but for WSI it's automagic - FIXME), USE=wayland enables wayland, USE=gbm enables gbm (automagic upstream - FIXME); rest is up for relevant prefix/arch teams/contributors to test and provide patches
-# With the following limitations:
-#  * If opengl and/or gles2 is enabled, a platform has to be enabled - x11 or egl in our case, but x11 (glx) is acceptable only with opengl
-#  * If opengl and/or gles2 is enabled, a windowing system has to be enabled - x11, wayland or gbm in our case
-#  * glx platform requires opengl API
-#  * wayland, gbm and most other non-glx WSIs require egl platform
-# Additionally there is optional dmabuf support with egl for additional dmabuf based upload/download/eglimage options;
-#  and optional graphene usage for gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader;
-#  and libpng/jpeg are required for gloverlay element;
-
-# Keep default IUSE options for relevant ones mirrored with gst-plugins-gtk and gst-plugins-bad
-IUSE="alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X"
-GL_REQUIRED_USE="
-	|| ( gbm wayland X )
-	wayland? ( egl )
-	gbm? ( egl )
-"
-REQUIRED_USE="
-	ivorbis? ( ogg )
-	theora? ( ogg )
-	vorbis? ( ogg )
-	opengl? ( || ( egl X ) ${GL_REQUIRED_USE} )
-	gles2? ( egl ${GL_REQUIRED_USE} )
-"
-
-# Dependencies needed by opengl library and plugin (enabled via USE gles2 and/or opengl)
-# dmabuf automagic from libdrm headers (drm_fourcc.h) and EGL, so ensure it with USE=egl (platform independent header used only, thus no MULTILIB_USEDEP); provides dmabuf based upload/download/eglimage options
-GL_DEPS="
-	>=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,${MULTILIB_USEDEP}]
-	egl? (
-		x11-libs/libdrm
-	)
-	gbm? (
-		>=dev-libs/libgudev-147[${MULTILIB_USEDEP}]
-		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
-	)
-	wayland? (
-		dev-libs/wayland[${MULTILIB_USEDEP}]
-	)
-
-	>=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}]
-	media-libs/libpng:0[${MULTILIB_USEDEP}]
-	virtual/jpeg:0[${MULTILIB_USEDEP}]
-" # graphene for optional gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader; libpng/jpeg for gloverlay element
-
-RDEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-${PV}:1.0[introspection?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
-	ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
-	ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
-	orc? ( >=dev-lang/orc-0.4.24[${MULTILIB_USEDEP}] )
-	pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] )
-	theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] )
-	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-	)
-
-	gles2? ( ${GL_DEPS} )
-	opengl? ( ${GL_DEPS} )
-
-	!<media-libs/gst-plugins-bad-1.13.1:1.0
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.12
-	X? ( x11-base/xorg-proto )
-"
-
-src_prepare() {
-	# Disable GL tests for now; prone to fail with EGL_NOT_INITIALIZED, etc
-	sed -i -e '/^@USE_GL_TRUE@/d' tests/check/Makefile.in
-	default
-}
-
-multilib_src_configure() {
-	filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340
-
-	local myconf=()
-	# FIXME: Automagic gbm and x11 wsi
-	if use opengl || use gles2; then
-		myconf+=(
-			--enable-gl
-			$(use_enable egl)
-			$(use_enable gles2)
-			$(use_enable opengl)
-			$(use_enable wayland)
-			$(use_enable X x11)
-		)
-	else
-		myconf+=(
-			--disable-gl
-			--disable-egl
-			--disable-gles2
-			--disable-opengl
-			--disable-wayland
-			--disable-x11
-		)
-	fi
-
-	if use opengl && use X; then
-		# GLX requires desktop OpenGL and X
-		myconf+=( --enable-glx )
-	else
-		myconf+=( --disable-glx )
-	fi
-
-	myconf+=(
-		--disable-cocoa
-		--disable-dispmanx
-		--disable-wgl
-	)
-
-	gstreamer_multilib_src_configure \
-		$(use_enable alsa) \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable ivorbis) \
-		$(use_enable ogg) \
-		$(use_enable orc) \
-		$(use_enable pango) \
-		$(use_enable theora) \
-		$(use_enable vorbis) \
-		$(use_enable X x) \
-		$(use_enable X xshm) \
-		$(use_enable X xvideo) \
-		--enable-iso-codes \
-		--enable-zlib \
-		--disable-debug \
-		--disable-examples \
-		--disable-static \
-		"${myconf[@]}"
-
-	# bug #366931, flag-o-matic for the whole thing is overkill
-	if [[ ${CHOST} == *86-*-darwin* ]] ; then
-		sed -i \
-			-e '/FLAGS = /s|-O[23]|-O1|g' \
-			gst/audioconvert/Makefile \
-			gst/volume/Makefile || die
-	fi
-
-	if multilib_is_native_abi; then
-		local x
-		for x in libs plugins; do
-			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS NEWS README RELEASE"
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
-
-multilib_src_test() {
-	unset GSETTINGS_BACKEND
-	emake check
-}
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.4.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.4.ebuild
deleted file mode 100644
index 8799cf46d1ed..000000000000
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.14.4.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE="gst-plugins-base"
-
-inherit flag-o-matic gstreamer
-
-DESCRIPTION="Basepack of plugins for gstreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-
-LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-# For OpenGL we have three separate concepts, with a list of possibilities in each:
-#  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
-#  * opengl platforms - glx and/or egl; also cgl, wgl, eagl for non-linux; USE="X opengl" enables glx platform; USE="egl" enables egl platform. Rest is up for relevant prefix teams.
-#  * opengl windowing system - x11, wayland, win32, cocoa, android, viv_fb, gbm and/or dispmanx; USE=X enables x11 (but for WSI it's automagic - FIXME), USE=wayland enables wayland, USE=gbm enables gbm (automagic upstream - FIXME); rest is up for relevant prefix/arch teams/contributors to test and provide patches
-# With the following limitations:
-#  * If opengl and/or gles2 is enabled, a platform has to be enabled - x11 or egl in our case, but x11 (glx) is acceptable only with opengl
-#  * If opengl and/or gles2 is enabled, a windowing system has to be enabled - x11, wayland or gbm in our case
-#  * glx platform requires opengl API
-#  * wayland, gbm and most other non-glx WSIs require egl platform
-# Additionally there is optional dmabuf support with egl for additional dmabuf based upload/download/eglimage options;
-#  and optional graphene usage for gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader;
-#  and libpng/jpeg are required for gloverlay element;
-
-# Keep default IUSE options for relevant ones mirrored with gst-plugins-gtk and gst-plugins-bad
-IUSE="alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X"
-GL_REQUIRED_USE="
-	|| ( gbm wayland X )
-	wayland? ( egl )
-	gbm? ( egl )
-"
-REQUIRED_USE="
-	ivorbis? ( ogg )
-	theora? ( ogg )
-	vorbis? ( ogg )
-	opengl? ( || ( egl X ) ${GL_REQUIRED_USE} )
-	gles2? ( egl ${GL_REQUIRED_USE} )
-"
-
-# Dependencies needed by opengl library and plugin (enabled via USE gles2 and/or opengl)
-# dmabuf automagic from libdrm headers (drm_fourcc.h) and EGL, so ensure it with USE=egl (platform independent header used only, thus no MULTILIB_USEDEP); provides dmabuf based upload/download/eglimage options
-GL_DEPS="
-	>=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,${MULTILIB_USEDEP}]
-	egl? (
-		x11-libs/libdrm
-	)
-	gbm? (
-		>=dev-libs/libgudev-147[${MULTILIB_USEDEP}]
-		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
-	)
-	wayland? (
-		dev-libs/wayland[${MULTILIB_USEDEP}]
-	)
-
-	media-libs/libpng:0[${MULTILIB_USEDEP}]
-	virtual/jpeg:0[${MULTILIB_USEDEP}]
-" # graphene for optional gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader; libpng/jpeg for gloverlay element
-# >=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}]
-
-RDEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-${PV}:1.0[introspection?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
-	ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
-	ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
-	orc? ( >=dev-lang/orc-0.4.24[${MULTILIB_USEDEP}] )
-	pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] )
-	theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] )
-	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-	)
-
-	gles2? ( ${GL_DEPS} )
-	opengl? ( ${GL_DEPS} )
-
-	!<media-libs/gst-plugins-bad-1.13.1:1.0
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.12
-	X? ( x11-base/xorg-proto )
-"
-
-src_prepare() {
-	# Disable GL tests for now; prone to fail with EGL_NOT_INITIALIZED, etc
-	sed -i -e '/^@USE_GL_TRUE@/d' tests/check/Makefile.in
-	default
-}
-
-multilib_src_configure() {
-	filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340
-
-	local myconf=()
-	# FIXME: Automagic gbm and x11 wsi
-	if use opengl || use gles2; then
-		myconf+=(
-			--enable-gl
-			$(use_enable egl)
-			$(use_enable gles2)
-			$(use_enable opengl)
-			$(use_enable wayland)
-			$(use_enable X x11)
-		)
-	else
-		myconf+=(
-			--disable-gl
-			--disable-egl
-			--disable-gles2
-			--disable-opengl
-			--disable-wayland
-			--disable-x11
-		)
-	fi
-
-	if use opengl && use X; then
-		# GLX requires desktop OpenGL and X
-		myconf+=( --enable-glx )
-	else
-		myconf+=( --disable-glx )
-	fi
-
-	myconf+=(
-		--disable-cocoa
-		--disable-dispmanx
-		--disable-wgl
-	)
-
-	gstreamer_multilib_src_configure \
-		$(use_enable alsa) \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable ivorbis) \
-		$(use_enable ogg) \
-		$(use_enable orc) \
-		$(use_enable pango) \
-		$(use_enable theora) \
-		$(use_enable vorbis) \
-		$(use_enable X x) \
-		$(use_enable X xshm) \
-		$(use_enable X xvideo) \
-		--enable-iso-codes \
-		--enable-zlib \
-		--disable-debug \
-		--disable-examples \
-		--disable-static \
-		"${myconf[@]}"
-
-	# bug #366931, flag-o-matic for the whole thing is overkill
-	if [[ ${CHOST} == *86-*-darwin* ]] ; then
-		sed -i \
-			-e '/FLAGS = /s|-O[23]|-O1|g' \
-			gst/audioconvert/Makefile \
-			gst/volume/Makefile || die
-	fi
-
-	if multilib_is_native_abi; then
-		local x
-		for x in libs plugins; do
-			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS NEWS README RELEASE"
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
-
-multilib_src_test() {
-	unset GSETTINGS_BACKEND
-	emake check
-}
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.5-r1.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.5-r1.ebuild
index 2959bc0dbc7b..83bcb9e58c17 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.14.5-r1.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.14.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
 
 # For OpenGL we have three separate concepts, with a list of possibilities in each:
 #  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild
index 60f43b861174..06fa58012ab5 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 # For OpenGL we have three separate concepts, with a list of possibilities in each:
 #  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index 355563335c81..255dee0446ee 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
-EBUILD gst-plugins-good-1.14.4.ebuild 1409 BLAKE2B 7298669dbfa2c45587a11e9709ab8339ba280bd23b62f02a8ecc6565ffbee30a45740ee70b22535b571f7e9e96d8e6da9cccbde19de0fb0efe7018c96d8f4377 SHA512 f959728ae42ad0c0c75dd49e84ec05e2d3ca291810c379012bac1692311fbec86db3fd1b55a7da5a53438f32901e0c73b49c81532e8a39b1f0ac8413fec1e486
-EBUILD gst-plugins-good-1.14.5.ebuild 1411 BLAKE2B bc5feab0c910d35717ab032561180fd884a94c0fa906e1167baf6b613eebfa30646515b54ab36e9436772073fff00e896651d46a819194dd1008b17ad1c79122 SHA512 620bf87a5b67ef03a78efcd5fa3732a603decf0657fe9f723e498cacc0190f5de41265ae20857389f81bbf76b6e21b9dce2e5e4ffa6ece9b2880c427bdbb9aee
+EBUILD gst-plugins-good-1.14.5.ebuild 1409 BLAKE2B 25085b0bb67474077441fea22be7b1eb5c3d73c9bd071427e516ebd12bf7b28486bec24060e8df8015f270fb83b4a411666631d668d8d7fe33c0d0f1a9f08af7 SHA512 5520567a675bfbad26dfa6aca7c61622a720641ccb87b4eb10f367a1959b0b2663545874155d098cec7f48651c0d6486e78500355b023e628e576f92249a6e0c
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.14.4.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.14.4.ebuild
deleted file mode 100644
index 8926eb711350..000000000000
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.14.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE="gst-plugins-good"
-
-inherit flag-o-matic gstreamer
-
-DESCRIPTION="Basepack of plugins for GStreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-
-LICENSE="LGPL-2.1+"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
-IUSE="+orc"
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	>=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-"
-
-multilib_src_configure() {
-	# Always enable optional bz2 support for matroska
-	# Always enable optional zlib support for qtdemux and matroska
-	# Many media files require these to work, as some container headers are often
-	# compressed, bug #291154
-	gstreamer_multilib_src_configure \
-		--enable-bz2 \
-		--enable-zlib \
-		--disable-examples \
-		--with-default-audiosink=autoaudiosink \
-		--with-default-visualizer=goom
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/plugins/html docs/plugins/html || die
-	fi
-
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild
index 5d13e774f3b5..e4368ccdcaeb 100644
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-libs/gst-rtsp-server/Manifest b/media-libs/gst-rtsp-server/Manifest
index f41ab4efd89e..e06cec7767d6 100644
--- a/media-libs/gst-rtsp-server/Manifest
+++ b/media-libs/gst-rtsp-server/Manifest
@@ -1,5 +1,3 @@
-DIST gst-rtsp-server-1.14.2.tar.xz 665904 BLAKE2B 3f9ab3c1579d34ec8877bcc6da2802cc69aa444ef1fabfe548e2acf3b1c58eb0e29ffb09c250fb6d2ae61e4847bf2098c22874ec43266d46d5b402cbbbcda892 SHA512 81c64c31cef45479ec23d57b11d09950ca8c04820b6cf422af6caabccd71ad648e210a114f9f020136ddfdfc9e942c3eb15f055778d493d54c8770ed4f93634c
 DIST gst-rtsp-server-1.14.5.tar.xz 672180 BLAKE2B 3e67f703c190e46580cf7c08a9437d51e9c1e009dd27cf359ecd5aa301ddda6cd70c0d5567e72c6e5f9443318e899a9b55e6883c71c9fc021f77286afd89bbc9 SHA512 dbfb63fb219808d2a32d710bef33d2b3b9906300d4c527c72534a4cb6db0f5ce4f4fadcedf7f6a3a5f46005f4408717d9aafa1a510c4aed18f5d07d6b3646492
-EBUILD gst-rtsp-server-1.14.2.ebuild 2010 BLAKE2B 833ecbd6e036b942a323e8955a6173a6f204318e01ab6b106a6ec6939ad119d46754661bed2a7a1ffd1d0e23df9a95e1ada7a616b51b728e607f5809ccc04bad SHA512 a56c10fb64ec714daeb7d788041fc9442711c95ef0ea10099beadaa9978a06925f2e7a285d545b5fadec259a37998ef77147d5a2b9f4651a1e3ef33a33b84cdc
 EBUILD gst-rtsp-server-1.14.5.ebuild 2010 BLAKE2B 833ecbd6e036b942a323e8955a6173a6f204318e01ab6b106a6ec6939ad119d46754661bed2a7a1ffd1d0e23df9a95e1ada7a616b51b728e607f5809ccc04bad SHA512 a56c10fb64ec714daeb7d788041fc9442711c95ef0ea10099beadaa9978a06925f2e7a285d545b5fadec259a37998ef77147d5a2b9f4651a1e3ef33a33b84cdc
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-libs/gst-rtsp-server/gst-rtsp-server-1.14.2.ebuild b/media-libs/gst-rtsp-server/gst-rtsp-server-1.14.2.ebuild
deleted file mode 100644
index 00ad98309663..000000000000
--- a/media-libs/gst-rtsp-server/gst-rtsp-server-1.14.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gstreamer
-
-DESCRIPTION="A GStreamer based RTSP server"
-HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-rtsp-server.html"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 x86"
-IUSE="examples +introspection static-libs test"
-RESTRICT="!test? ( test )"
-
-# gst-plugins-base for many used elements and API
-# gst-plugins-good for rtprtxsend and rtpbin elements, maybe more
-# gst-plugins-srtp for srtpenc and srtpdec elements
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-good-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	>=media-plugins/gst-plugins-srtp-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-"
-
-# Due to gstreamer src_configure
-QA_CONFIGURE_OPTIONS="--enable-nls"
-
-multilib_src_configure() {
-	# debug: only adds -g to CFLAGS
-	# docbook: nothing behind that switch
-	# libcgroup is automagic and only used in examples
-	gstreamer_multilib_src_configure \
-		--disable-debug \
-		--disable-valgrind \
-		--disable-examples \
-		--disable-docbook \
-		--disable-gtk-doc \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable static-libs static) \
-		$(use_enable test tests) \
-		LIBCGROUP_LIBS= \
-		LIBCGROUP_FLAGS=
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi ; then
-		ln -s "${S}"/docs/libs/${d}/html docs/libs/${d}/html || die
-	fi
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-	# Handle broken upstream modifications to defaults of gtk-doc
-	emake install -C docs/libs DESTDIR="${D}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins "${S}"/examples/*.c
-	fi
-}
diff --git a/media-libs/gstreamer-editing-services/Manifest b/media-libs/gstreamer-editing-services/Manifest
index 280d2986fec5..d8566db7bf2b 100644
--- a/media-libs/gstreamer-editing-services/Manifest
+++ b/media-libs/gstreamer-editing-services/Manifest
@@ -1,5 +1,3 @@
-DIST gstreamer-editing-services-1.14.3.tar.xz 1066740 BLAKE2B c5511ca12eccb08d49733540e2d264290a6ca53ec0d5e9007d354e10808568727ed10bfb205c425fd56d334ef12e30324d67b0dcff8115b3c13d1123fe6026b9 SHA512 5dc4fc65c7ce9604b75516774c4481f3214ed703c0d3bb2a6fa348e5a8a09c963ac711e81e5c91f12f57ab3df63a94d7d178fcd4aab4d4d429f32e055c14a205
 DIST gstreamer-editing-services-1.14.5.tar.xz 1069356 BLAKE2B 95ddff56b56b3ae59872a340258af0277d9b5c3619fe25861ce3f65238d3802bdda3c51cf84f0a206f7ccf095ab81ff3f178b7c0322dc7687741626c3b8da947 SHA512 9b3d0336e596004a51069900c61f293eaf213a83655799139373c77cf5637a3511ba4ec6a1c75f53d81643539e32f7d130fd0cd58090b948f81e8e081226b5c3
-EBUILD gstreamer-editing-services-1.14.3.ebuild 1539 BLAKE2B 6f6a6a961099c57bea9c0a0c4c9b3b91c88ffdc51ae078657edbb2ff956a7faa2eb392db1e9a71758d2229ae3bc54959f6ca9a90291bbf647ad7660f9630bb57 SHA512 6a06f9007b0383ce3fa5fbd04fc78be2e0bb2389e43817855864688a3d807f8e02818859b6c0948a96e9228e5eeb3656adabf7cea76099bc33bddbc4dd37a45f
-EBUILD gstreamer-editing-services-1.14.5.ebuild 1539 BLAKE2B 6f6a6a961099c57bea9c0a0c4c9b3b91c88ffdc51ae078657edbb2ff956a7faa2eb392db1e9a71758d2229ae3bc54959f6ca9a90291bbf647ad7660f9630bb57 SHA512 6a06f9007b0383ce3fa5fbd04fc78be2e0bb2389e43817855864688a3d807f8e02818859b6c0948a96e9228e5eeb3656adabf7cea76099bc33bddbc4dd37a45f
+EBUILD gstreamer-editing-services-1.14.5.ebuild 1537 BLAKE2B c20e1cfb4ac480eebdcc18251d277725e9b13921b24c27bf767782432ff2942e00d2650e2f181d23df820d36bc118913152827e2e029165752fa42763f07d8b1 SHA512 d9eeb38d370560e9fc068b44f924d0b6ded1f47ee0027b64c0f54dcadaa311518be08c74eda785b855c83f0d0bb538cdf5f3c76c87d2c5be34ff26166f48ec5e
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.3.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.3.ebuild
deleted file mode 100644
index da0e7bcc5a20..000000000000
--- a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-GNOME2_LA_PUNT="yes"
-
-inherit bash-completion-r1 gnome2 python-r1
-
-DESCRIPTION="SDK for making video editors and more"
-HOMEPAGE="http://wiki.pitivi.org/wiki/GES"
-SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="1.0"
-KEYWORDS="amd64 x86"
-
-IUSE="+introspection"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/glib-2.40.0:2
-	dev-libs/libxml2:2
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=media-libs/gstreamer-${PV}:1.0[introspection?]
-	>=media-libs/gst-plugins-base-${PV}:1.0[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.3
-	virtual/pkgconfig
-"
-# XXX: tests do pass but need g-e-s to be installed due to missing
-# AM_TEST_ENVIRONMENT setup.
-RESTRICT="test"
-
-src_configure() {
-	# gtk is only used for examples
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		--disable-examples \
-		--without-gtk \
-		--with-bash-completion-dir="$(get_bashcompdir)" \
-		--with-package-name="GStreamer editing services ebuild for Gentoo" \
-		--with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer-editing-services"
-}
-
-src_compile() {
-	# Prevent sandbox violations, bug #538888
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
-	addpredict /dev
-	gnome2_src_compile
-}
diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.5.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.5.ebuild
index da0e7bcc5a20..117138d33c8e 100644
--- a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.5.ebuild
+++ b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 GNOME2_LA_PUNT="yes"
 
 inherit bash-completion-r1 gnome2 python-r1
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 5f0f41bf806a..b5d5a736a293 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -1,6 +1,4 @@
 AUX 1.14-glib-2.60-tests-compat.patch 2173 BLAKE2B 1e7e3320d2eb52f968280e8204e5cbdb2d4fe085fcf77bd798cb474216b758bff3a70f6b0e3f93d656a6e41b44be6c3f931ed5543e4ca10b51d19b4f4f153bc9 SHA512 f559150ac5e40a2fe259a8346ed085a20df86d93e5292c9dcc024274f12e0beb90266395538943946ca01a2a5f56be3ab32f1f850e1c8c047848aebc13ab2350
-DIST gstreamer-1.14.4.tar.xz 3264324 BLAKE2B d51febcd7c317964a09dadb4d3bd3ee7a60ac38bef28cdd7d42f49a7b710d6f6180ca7edee1765c8d146f7e3e852e93d0d5f69962089a653cfc3e6bd4ab42f89 SHA512 7ece9f01d40df7c8358482eac94536c5e15261e9568962008e2029e1ee1b3ebb220d2e4802ed1c81c40d897576fafe52234065e273724bfb4df3a3ddf2711abe
 DIST gstreamer-1.14.5.tar.xz 3268756 BLAKE2B 6ef5bdcb103b4d8fd581ae7342d6d467f4c6919610bdd620e4a531755347d8e3276a50f2e637045b9b97cbf7726495608437c180d37a1019ec8a79ab1bc4e4d6 SHA512 1a97ae17f8fff041db5e24d712d33c7116e408be1fabc2abd7b652b067b6ebe6c0943845a33a21335a5b4fa0a1ba178873158659f761f1e3aab04a969029c5d8
-EBUILD gstreamer-1.14.4.ebuild 3462 BLAKE2B db6faeb54f1590f2cc96f7217317542d56809382680c7bfa1613aa16b552cdfe55f3ac0a04c8017c571e9f7a6b5a24d611d3ce8b09f17fc9a54e55abf3668a27 SHA512 6a826229d49896d55a0f3cb959a6bb4cd345011b4dd71f92b666e6dee33ab4f75cb96cf3a6f4fc763f1b5b8648a8f1ed992243ccfff533271370229b74d8ceaa
-EBUILD gstreamer-1.14.5.ebuild 3464 BLAKE2B b8b54e6e2800d22f59526f8a1392ba69627a57eff89874aa3bb7de9d088620933ff2065cae4c8b4e9f7e53f8b56c57be5a589228932a1b59d8b1ed23a427f395 SHA512 7cf7970a7ccffad74c959caca256b2584804bb77d6054ca7c68343177a40dcde31430cf5875bc2f7f0e9cd44cef6e469a8a6794a69d4649455b9d8ceae166c87
+EBUILD gstreamer-1.14.5.ebuild 3462 BLAKE2B d864f12fc55624a8c9cb37ee156cafda2769adddf841ad371e159b65092091de68012df7b962338bb1a40ab8e08ae926a7784628fcc724ede3008f99be5c119b SHA512 b6073eb99b9ae9ecb6702c520728343773d4edd85869c0f98016ecce66880db7c4a0e8ea4eca5976c4049736286abf09bd08ce9cfc36d473b454599721f15d3c
 MISC metadata.xml 586 BLAKE2B 319df0c2c013f3018bdb31afddcd80b298f9b74d0a581981f30d483b0773339befe4dc62eb78a267b3a0f5a63a7e6462bd0ece4d4285c0ca91a1329c12ba1b93 SHA512 f7de0325f671119a5b787dcba9572d06d58375ba9d815854beffd668da55e4d4695f586365b3455e63cd56f4469fb8e1a92ab6de4e05847668f56c076dfdaf57
diff --git a/media-libs/gstreamer/gstreamer-1.14.4.ebuild b/media-libs/gstreamer/gstreamer-1.14.4.ebuild
deleted file mode 100644
index 4bcd587409bc..000000000000
--- a/media-libs/gstreamer/gstreamer-1.14.4.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 multilib-minimal pax-utils
-
-DESCRIPTION="Open source multimedia framework"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="1.0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+caps +introspection nls +orc test unwind"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	caps? ( sys-libs/libcap[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
-	unwind? (
-		>=sys-libs/libunwind-1.2_rc1[${MULTILIB_USEDEP}]
-		dev-libs/elfutils[${MULTILIB_USEDEP}]
-	)
-	!<media-libs/gst-plugins-bad-1.13.1:1.0
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.12
-	sys-devel/bison
-	sys-devel/flex
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	nls? ( sys-devel/gettext )
-"
-# gtk-doc-am to install API docs
-
-PATCHES=(
-	"${FILESDIR}"/1.14-glib-2.60-tests-compat.patch
-)
-
-src_configure() {
-	if [[ ${CHOST} == *-interix* ]] ; then
-		export ac_cv_lib_dl_dladdr=no
-		export ac_cv_func_poll=no
-	fi
-	if [[ ${CHOST} == powerpc-apple-darwin* ]] ; then
-		# GCC groks this, but then refers to an implementation (___multi3,
-		# ___udivti3) that don't exist (at least I can't find it), so force
-		# this one to be off, such that we use 2x64bit emulation code.
-		export gst_cv_uint128_t=no
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local completiondir=$(get_bashcompdir)
-	# Set 'libexecdir' to ABI-specific location for the library spawns
-	# helpers from there.
-	# Disable static archives and examples to speed up build time
-	# Disable debug, as it only affects -g passing (debugging symbols), this must done through make.conf in gentoo
-	local myconf=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		--disable-benchmarks
-		--disable-debug
-		--disable-examples
-		--disable-static
-		--disable-valgrind
-		--enable-check
-		$(use_with unwind)
-		$(use_with unwind dw)
-		$(multilib_native_use_enable introspection)
-		$(use_enable nls)
-		$(use_enable test tests)
-		--with-bash-completion-dir="${completiondir%/*}"
-		--with-package-name="GStreamer ebuild for Gentoo"
-		--with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer"
-	)
-
-	if use caps ; then
-		myconf+=( --with-ptp-helper-permissions=capabilities )
-	else
-		myconf+=(
-			--with-ptp-helper-permissions=setuid-root
-			--with-ptp-helper-setuid-user=nobody
-			--with-ptp-helper-setuid-group=nobody
-		)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	if multilib_is_native_abi; then
-		local x
-		for x in gst libs plugins; do
-			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
-		done
-	fi
-}
-
-multilib_src_install() {
-	# can't do "default", we want to install docs in multilib_src_install_all
-	emake DESTDIR="${D}" install
-
-	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
-	use orc && pax-mark -m "${ED}usr/$(get_libdir)/gstreamer-${SLOT}/gst-plugin-scanner"
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README RELEASE"
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-
-	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
-	use orc && pax-mark -m "${ED}usr/bin/gst-launch-${SLOT}"
-}
diff --git a/media-libs/gstreamer/gstreamer-1.14.5.ebuild b/media-libs/gstreamer/gstreamer-1.14.5.ebuild
index 7f59947075bc..03f5af5d40a3 100644
--- a/media-libs/gstreamer/gstreamer-1.14.5.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.14.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~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 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+caps +introspection nls +orc test unwind"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index cd57d3b59829..5675e2ecdf1c 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -2,6 +2,6 @@ DIST hamlib-3.1.tar.gz 2130615 BLAKE2B dbc348d5df04015e1706b6f165496f0b0d9a4f7ce
 DIST hamlib-3.2.tar.gz 2223125 BLAKE2B c9bffa2b4d2aa4b3f9c590276058c159aa1236f22d3f37a063124af09002dc3034a88fd6f1273b5f4562ae22618222ea50c254fb59384bfae778448fe029ef49 SHA512 9aec2d361980abafdedf7b80f5b8bcf5b71f4f0c32bbfecebc0a50e6f74eb263ddc5188cf77283ed7361baabedb8364a2ce94a12fdda1bbdfaa0a030f510f224
 DIST hamlib-3.3.tar.gz 2192119 BLAKE2B edefd8b8c75876c07fa498c98f7d6760985fdecc477bf6711e948071e45964bf7fdf6705b3172e56951366a7dfb0288e025eab66d3b6436d158649ae53ac39bd SHA512 4cf6c94d0238c8a13aed09413b3f4a027c8ded07f8840cdb2b9d38b39b6395a4a88a8105257015345f6de0658ab8c60292d11a9de3e16a493e153637af630a80
 EBUILD hamlib-3.1.ebuild 2146 BLAKE2B 6df82502b57856e0f1e4328c1a13a825cfb329f7da72842e5a5191893ab53a89ccc570d12c8a988cdee84a4eb6a0f0bf4eae2ad37bcce52304c548ca23211aaf SHA512 49897ae1082a8c7442a99c388d7be1691f70fa8085d0a65cb225f77cb651bf43c0ca6253838676d6cf6d6b3ea6d836701676b806b70217eee77df0d60665ecfe
-EBUILD hamlib-3.2.ebuild 2167 BLAKE2B 99a20f9109451c6d787d3f228b3b9baa34215a5cdc2d3477e0daf78664d9b65a3380baa352e8d7c1b4a140352d6af8ee731a8895c9bfa86494c449dec5e4e4c7 SHA512 8eecf32b3de9f06b998d8ce99eae2eae27ce84057a839aecb0b19b89c4e3d0e416640c324d1888f53c78a1c48b11fc35aadd431db734818262792b5a8872346d
-EBUILD hamlib-3.3.ebuild 2022 BLAKE2B 58e3711c9eec9ba8aefc4971e738d40cd0237b8427bb3f25d1299666f72dbbd0a83d20d5adb4de2fb492bc9e6894a96cb4804f215446b64ea783692f4cae5428 SHA512 2d98892404e650b7786f4d6b8f4737bb40d740981e61924481d45e53c77dd6d3cd2e6b64d890190ac5ab00ced910e884fc7733bf5b089b6c0244c694a0b649e6
+EBUILD hamlib-3.2.ebuild 2163 BLAKE2B 0c576caf1e1d6457d9e5d8aa5f68ed2bd9aa1814ee41cc84ee3823e5061cd79fc44727314eeb78572bdd0473aba923f69353a2e65a0b74bf72cb4aa6f0326337 SHA512 e7a5ea8a5506fb5db5c2217ad50bbf56e7e0bd1542c6fa4e2810d5b8a0125430952f96aa13e4e678aac79af87e922916e598ad8878f946bda52b218a68a91f31
+EBUILD hamlib-3.3.ebuild 2018 BLAKE2B cb9d883705cb8aca8b94a43da7ba097977ffc0aa28e9629da4c9585f9c70a6273f09fb02c5897feb1b66f5ad922853ef0a9ef8034b8127830fc73b66500538d9 SHA512 3553647a517a792ea5f58ffd719fe03f124dbbdd925b913e6368b9f02bfaf1436f9458daacf825afa64f899f73890f144d6d4deeb552e418e3a339f650a59155
 MISC metadata.xml 325 BLAKE2B c1966def562280393eeb5b575d4e136525dc3cf36ef4e6c00dbeff7e0069a4d10eb16706f4b4e929eda1f046d18a8e25fd0025c74695eba1f9c10d19a9f55598 SHA512 fb6d5d77da29969e9b61921ae59e5d5c71b74cebd331867a546a6b2c568650f89191a39a3a1a73c58e1244fa5d13a090b45b866c21b3a3dd71cff0a812c149e5
diff --git a/media-libs/hamlib/hamlib-3.2.ebuild b/media-libs/hamlib/hamlib-3.2.ebuild
index 16773a38a259..351a58259c60 100644
--- a/media-libs/hamlib/hamlib-3.2.ebuild
+++ b/media-libs/hamlib/hamlib-3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit autotools-utils eutils multilib python-single-r1
 
diff --git a/media-libs/hamlib/hamlib-3.3.ebuild b/media-libs/hamlib/hamlib-3.3.ebuild
index e263b96f43f7..f4a753957eb1 100644
--- a/media-libs/hamlib/hamlib-3.3.ebuild
+++ b/media-libs/hamlib/hamlib-3.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit autotools python-single-r1
 
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 8b620b913fa1..c9ebe5c5a717 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -2,6 +2,6 @@ AUX harfbuzz-2.6.1-gcc-9.patch 468 BLAKE2B 5f0b42d7a834f5b59c79adcbc2fb67e9aa1fa
 DIST harfbuzz-2.6.1.tar.xz 5741372 BLAKE2B bb763eba23a37bd20d0ddb39824d5a0c655d6e098aea2e44b6943e7bd5cb1f9a5cd94e3de5520d962e3c476defac43af58f98d0a5b80e5c1506d00bc716ec876 SHA512 cea531ab9db0ae1b188ac56c3ea6e0344192c4321b97d4425f4a53e6bb34c88463a7453fd69fcadccb8574506c1fb5505422019e41a7938a04e7823e3f484c06
 DIST harfbuzz-2.6.4.tar.xz 5967468 BLAKE2B 24d215324a408a724f47a901c4a56605144d15373518bd52643ece83705d0c63582a80635ecef6a6d8d2f5f39c750076d553fb39aaa8c0dd41702ee910c32f24 SHA512 d8664bb64fda11ff7646693070637e3827f8b3d1de50e11ecf108ce4d19c878b26b2ba4cff278da6e6cc0cb431e1630d9eaa7c32a9bebb9655a7aa8dabf7114f
 EBUILD harfbuzz-2.6.1.ebuild 3072 BLAKE2B 353742e2283755c2893492058004d5bc95a4cc8b2ce7355ca1f8e2357b742cdfecca6980ad70ed995070140afa40a022fd6ba57175fa3412297ae0f7fff0e6ed SHA512 1c32a1c1cc910288cd0e278bc3b18ce4e8c81f70bc5add24bab14c3569b4ef9f67a0ded4e88ab031760a561bd8c7b6d2741828abf48ae50474227235a56ed2a4
-EBUILD harfbuzz-2.6.4.ebuild 3028 BLAKE2B a3f81261fa2337c5af45e7dac00fb70e5e451c817e24f3610fdc1e2077b90e34e47c591e650f73d9b1154fa14acabcc556b2a8e0f06d852111610491a2f96322 SHA512 a4266444d71ae5e2e06d35e21bc726ac4a409c3f1eef41371ed71d9522fee356627fee5174a687684852c9c59b82dfa277d824eeb603fab7e35d09e782495d01
-EBUILD harfbuzz-9999.ebuild 3038 BLAKE2B 5cc29a5485ec75496e810e11c03f1a5c8361af2774e005afff21572303269a18bc9d00fd09d1e9c033b32c24e9ac723cc19ae29cc8634bd6c0a207a0ff5db372 SHA512 2f1bea1aa99f554c96bb203a8d25cf7441e605099822b63eccc26f3ac48af941afd9c0f3bd79d624cceef5f90e7656accc937ce04ef66e37666bf0851ee5752e
+EBUILD harfbuzz-2.6.4.ebuild 3040 BLAKE2B 0438cd7c1f236fbbcb580d90f7f15f2601974e0ba33fbd2818f21b84824b9318fdd61da97a137263284757dd5e415bf4440c8fc375a13dc2349ef04c14f2bbfd SHA512 fb5174fb5327819cc93c089f39234483ea9073b5f457e2a23fd6509a08b2210c45e4f15d31c0957cad5651cf97a6f8dcadd3df6e6ba99c9124b58df793121dcf
+EBUILD harfbuzz-9999.ebuild 3058 BLAKE2B d2336819bc96892978b4243bb6771b4a788f85e04f369f12c05f41ab05e6d0bbf1b3fa575016264451171a5bfdd093aa364d405db843c55021e735197dbcc9de SHA512 69baa034155020602c120fc70617fd1f0f086faf40d64dee494bf56ea4313236aaae43f8941fe5af1da0eba15a1bce5bb769479ef2696e31c9ad6cbb23b7a7a4
 MISC metadata.xml 739 BLAKE2B df7724d5cef26b569f76d41c808f99a1ecf44631f0bae96fbc2a9b4f5981061b55c60d69b1b64d966897f223a3d3b5cc4325a3ac780599ed76591fc2044b4988 SHA512 192f7abc191044f267bddb4db7d91f9b78926f4a361802f607bfe4635d7cf63398c289bc52009ad4d3bc6f92684cafd8b40e48f1e0f8cdaef9a4e27f538e7dbd
diff --git a/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild
index 37dcf3fee8ac..ba83033526e9 100644
--- a/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
 
 inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
 
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 6a4bfdfcd95a..356659abc38a 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
 
 inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
 
@@ -107,5 +107,5 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	einstalldocs
-	find "${ED}" -name "*.la" -delete || die
+	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 68770383b3f3..6ac997c4fb0e 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,5 +1,5 @@
 DIST imlib2-1.5.1.tar.gz 1020701 BLAKE2B 33213a49293fba9e86cfec312d3cd8018c2284d60040b63899778d2fa65bffe173926eb14bc893c1a80e1472084a711423f77f6288779486512074e75d92acfd SHA512 9872aa3c4d45b1e9cbb0b1d0a7d5b47256e35f01a4fe19d84d276096c2da053c55bd28554441f92464d19edf1222b427571ba7b06d716031021ff1f9b4bc9656
 DIST imlib2-1.6.1.tar.gz 1038614 BLAKE2B 89751ea5548e86b810d621cbcd5b3d37c7ddbedc9e634095f61d91779c1e96d50f87842136687e2b9cefa249b17fc98df61d07b368c7c4f466687ed38f2ed70f SHA512 0c6d874973c46c7e96e49fc391d463ec8c7c5ce9de682600cb4e28ca81ff0366a02055cbec2a2b743204051243d20b2316ab602b98df9d03dcf319297f7e6a13
 EBUILD imlib2-1.5.1-r1.ebuild 2148 BLAKE2B a3ab5d15b8a28cec83cfa0a465519a4708504372edbbc1ed95f15ad14f57e23223e06224bf71d09d594f4d69b3ab19ecc2c891f1c279147f63648e7798a14f02 SHA512 b27de2fbc1670425e36ce6ce858d9fcdf3b2e431201a9b295bc6a2f55d845bee99766bb7e5a4f91d063e676966a641b678471d89fc73261c415d3890adca769a
-EBUILD imlib2-1.6.1.ebuild 2288 BLAKE2B fccd874d9c0173df5ae448439cffe6f564a21e8b9a0c6bf368a85e45afb62b042048eac5db3177577e625611608ec1ffb3c4eaa7ab027d4c2544811d939e9370 SHA512 bd9dbfc1cce343fe57d26449f3b94f0f453114ee317cfe12d6ce97bbb4460e2d31216a7caba6b063010d9544ae3f730212c1b3dc57de9be13393cabde87db01e
+EBUILD imlib2-1.6.1.ebuild 2286 BLAKE2B 24d32915e167f9ff30ea326e0bb901609cdcbb6cb962bde7e26913460f02d8848a1ec8d45aded74510029ccc885d3bae9b737210629af51b5040d766ae77ce11 SHA512 67cc877b4e4d2ea009fca218f189e8f8022f7ce77e7ac07bff6f0731c9f38770b04533ebb957601ec23315f06b4f8af230f50aa1720804185a277a80f29a1135
 MISC metadata.xml 3005 BLAKE2B 1b67eed4da7c73ed10d37bc2d5706c09e6457d1c8be4420758afe8906771f0cbba1f8ccb21a2bb5988d5271e794c0460019cba7c1241572443c8f6219db4f003 SHA512 dee85662dd1ef54784c0af882ff76581e3ce6f7d67ae6015801fcaa57e6e05b6ce2e67b408e1f66177a19e0519efc9ddc84b01c208e6f397129768d470a0c424
diff --git a/media-libs/imlib2/imlib2-1.6.1.ebuild b/media-libs/imlib2/imlib2-1.6.1.ebuild
index bb6d29fdb685..2bec8deb9070 100644
--- a/media-libs/imlib2/imlib2-1.6.1.ebuild
+++ b/media-libs/imlib2/imlib2-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+X bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 doc +gif +jpeg mp3 +png +shm
 	static-libs +tiff +webp zlib"
 
diff --git a/media-libs/jbig2dec/Manifest b/media-libs/jbig2dec/Manifest
index a5c153e1720d..0e5ce32c23a2 100644
--- a/media-libs/jbig2dec/Manifest
+++ b/media-libs/jbig2dec/Manifest
@@ -3,5 +3,5 @@ DIST jb2streams.zip 1285838 BLAKE2B 9a2b6047a7b970439693d6f5fdefb9488019a562e7f8
 DIST jbig2dec-0.14.tar.gz 463572 BLAKE2B 91351a3879bd1906fabe2620cf5379fbbc32eaae808a8c2754c661d6dc592d3c9da13c558c8f7ced30c48b73fbd9ed4631f2817298f959b59ad4dff5fce9ac1a SHA512 066bd880ac0665fc1e42b0ae0e481008b125aab6e173b7f82d61a2a30e72c90085cbded9b2a68c6836f92dea3d8d8d5c2228dba76e0d99c79c922197d215705b
 DIST jbig2dec-0.17.tar.gz 141195 BLAKE2B 858befb59c0b943cddbc4ae2e9ffc6cdb7e1dd2185cedbffb577f0152f27a548f565548b4b0a4867e3973692b8b019a565eabe2cf672334a6b2994fd7988dcaf SHA512 79b3957186a30fc304ecd571d31c5cc421364921eb4eba242c3ea941ea111f461773f86c975657fa2ce91f2f79ff9abf760ef9bed404c7a4f35c036e5642ba0f
 EBUILD jbig2dec-0.14.ebuild 1143 BLAKE2B ff3484d4768f8b7e0f2e744732e8a82a9bd6c4630b55469b9a8da428603cfcf68e6d7cb5a1d5257936aed687fa1db52b10741783dca78ff55ae9bf6e8434d5cb SHA512 719e7b390c4f9572d2d08192468bfd3a868a2bdcaa7ce30b2aaeb169c1c012cc041990148b33d92d1128bc394788c7aee01d5bcfe717bf5054c9d2397ea876ef
-EBUILD jbig2dec-0.17-r1.ebuild 1629 BLAKE2B db5efe7f4fb51c215ade1ad52e0f90c090327d932a8ee87bc0203d1d8a3649fda7e74a4e885ce2b0921a88b2cb11358990c06c73887a45afda76c8f4faed596c SHA512 b91126c9ecc40323d0eb5c9b607a02d72de726c29d75434af4d787619c3e666bcec9c0df9afcfe8a4fb6cd2807f2cc2b941454f671a9d3c46aeeecc8a303b06c
+EBUILD jbig2dec-0.17-r1.ebuild 1627 BLAKE2B ed178ddd2629516410d23668646d2acf29721fb758878a87eb92438cecd18b432e7d96f5174b3f058a514e9eec7088115966f54bb755a8dbf4b424209fb96b9a SHA512 d32ffc409ad412e967d0b312662ebd0867acf3c3d5d25e310adf7b59fe4bce9cfb169892cbb9a740a36d6ecd10173a2193d516a6055bd3431d3a4c5e59a9d9c4
 MISC metadata.xml 473 BLAKE2B 6d374023a106375c7f5500968ed4ea2f4dd5584fb0db8f85b042844d08afb6196b7d7c019ae69b35917f43e496c9a25212aec328f0c3cf78aaa94b963de65c15 SHA512 501077ac27f5c6f8a616fa32cec23d28cb16dc0e0c19ce933cbc067494117c9c55fc3e00dfc21270892d57478a9e268f99215c8d074d6cc4114916f55a571a6f
diff --git a/media-libs/jbig2dec/jbig2dec-0.17-r1.ebuild b/media-libs/jbig2dec/jbig2dec-0.17-r1.ebuild
index 29f5067a4060..c456f456e924 100644
--- a/media-libs/jbig2dec/jbig2dec-0.17-r1.ebuild
+++ b/media-libs/jbig2dec/jbig2dec-0.17-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit autotools python-any-r1
 
diff --git a/media-libs/kodi-platform/Manifest b/media-libs/kodi-platform/Manifest
index e7ae3e171ee0..cc1020e3d77a 100644
--- a/media-libs/kodi-platform/Manifest
+++ b/media-libs/kodi-platform/Manifest
@@ -1,6 +1,6 @@
 DIST kodi-platform-18.0_pre20180301.tar.gz 8605 BLAKE2B 8486c0777373de75c0120b3e62ef1ff43107b36471696a7329f15fc62670f230737ee382695dbcb61ca5215fa2898cf3c6ecdfc0b48043b57f48cf15adc9fbf5 SHA512 35bb8d27db3b1e9debef647e02c2cf4ba7f2b2bdde07cb57eedd5859800d0614426d82f4be9cdeb11dba6576cad93e43095a05047411dcbcb749609d51f53ec7
 DIST kodi-platform-18.0_pre20190429.tar.gz 8616 BLAKE2B 424fa1da5f2dda5343ebe8414555382be6391d9467e73a07088a9e46674508bd83aeec59277f5d0b6e4bf0e1a6c56910a338f1774b17ef4ad21ca7b1e4198fef SHA512 acbe478c2167cbd90ef8cd0ba6ea9ac657a4140f5337e840e960358b26cb3d7880e52527c0d7f6d0ae8068b92b3a3cc5719110163ecfa4520469fc64b8e1b9b7
 EBUILD kodi-platform-18.0_pre20180301.ebuild 628 BLAKE2B 03929d9e7863fc872d5cda7d580a6d91539846f213ef5bbb1e0bd572c9fa9211ec249d8e6fadc3b8b3bd26c7bd206268ebac6c995073d9063c0edca9fcb5e0f2 SHA512 466496d3c19431d76f9760460b36d69219627c9a4af7c3ec79aa53f62ced3c884770f0ce1e82c02b24cf5e72ee073b4421f0f1648ecee9b113c7cda8601d57f2
-EBUILD kodi-platform-18.0_pre20190429.ebuild 628 BLAKE2B df78d9e7544b8322f55637615ddc0c7be309616d9f8b39fc03b125b547c9759520c099c8ca8816cd4148f4eca73e3a1f94905f6f6efd95dd4afa38ef9b249996 SHA512 6bece6573b6d767e53ca96f91fb3f0456117321e8660c9521ac25df6a7550f06c65f03670a1031e76de4c76e564c2302da5b2aadc613bff13ebe864b51620c33
-EBUILD kodi-platform-9999.ebuild 629 BLAKE2B 3d38ae45b6948b1dc6e8cfbdc408542b48fa34af8e46417aca223042ffcba9ff4cf229044fc030bd50822227611b851d1edc671d771f5cba9feaac0ec5bf52bc SHA512 b0571f8ad5b50694fb1daae48ce34cc58f2e4f1a4884786a53b80625aa2f221cb3a5568c4f6f609ed19baaab80fa877bc4c8fc080fb61ba829293da0265c3c8d
+EBUILD kodi-platform-18.0_pre20190429.ebuild 622 BLAKE2B 2425853da7c96d80f03f9f59a083c912aae69dca9c82d6a094d38df721cf7d7d17a8dbd71a73a1732b866d5bce66398c66e657360b4d93b1db4fd05fde67001b SHA512 3465b38aad0306ca15ce569e626d5e53a5fe3e49028ed9ca044529fad1e30a5cb34ac809fd09f68e59768ed5cfcfcb358a086a61c156a4f1ff5089d70f720fdd
+EBUILD kodi-platform-9999.ebuild 623 BLAKE2B ffe2166f2786248c2f770cdd1a8a6aaf290e339b53f0d5ab6786ab85bc1098133527f6c3de9baf708062d4469ab0c87daee2a6fef07c11f50c97836214b307e1 SHA512 125c6e6afa14751a3cb2df691c73c7b7697345bcc5d3f430555985919142ad55f5291e7049f44d235dc19edec88c174b339f645621581645f030f379b0bbea13
 MISC metadata.xml 507 BLAKE2B d2f9a4bf2b904a20c489879e019d4280fa5fa9b94d1887ce64b96da46c64543865d46d823eb32b262121d1cbb936fe15a4df0d8042aef23a3927a0bb81ba2a89 SHA512 cb4626340b4a2aa62e652aec196440c5b0f66e560e1a92fc0bcbba17e67374d46ed74c6e8cc53e0c17db961247ae3aece65c2afd904ae3d1685cde8cedfd5a3a
diff --git a/media-libs/kodi-platform/kodi-platform-18.0_pre20190429.ebuild b/media-libs/kodi-platform/kodi-platform-18.0_pre20190429.ebuild
index 88901d491fec..25b8068f12cb 100644
--- a/media-libs/kodi-platform/kodi-platform-18.0_pre20190429.ebuild
+++ b/media-libs/kodi-platform/kodi-platform-18.0_pre20190429.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]]; then
 	SRC_URI=""
diff --git a/media-libs/kodi-platform/kodi-platform-9999.ebuild b/media-libs/kodi-platform/kodi-platform-9999.ebuild
index df88789daf7f..b8ac6aa32eba 100644
--- a/media-libs/kodi-platform/kodi-platform-9999.ebuild
+++ b/media-libs/kodi-platform/kodi-platform-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]]; then
 	SRC_URI=""
diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest
index 58ce96936356..5263b9248150 100644
--- a/media-libs/lensfun/Manifest
+++ b/media-libs/lensfun/Manifest
@@ -1,3 +1,3 @@
 DIST lensfun-0.3.2.tar.gz 784825 BLAKE2B c77cd6b2f1bda0313a980fbd3bbc7ca9ad5ed0b9777cce924f66da5de3974ccfc8939d054c7a7532508b6b0913e2d436a825a83916800b625ff2c552c96a0ae3 SHA512 9c6f546fa70e6dc692e66ef378447345be6d3383812934780d326d772d775c1918cbf3447cd91c067655044cf659025763bf47ba2d938a82a3c2de4d60127446
-EBUILD lensfun-0.3.2-r1.ebuild 1436 BLAKE2B 25613e83cbbfa2a348f7bb35aa62402b42547987784a7f05fe88111761c1fc5b0400456f3d5aed6afd80a81d468902ebb2596282f3937fbfe49bbec174500423 SHA512 83c360c014974ded32f24346e40eaea5258179e1ee9014e4a14645f91b99f651db812d5a255f7f2f38679b4f35a47655cf7e59e1653f8e6891ea264a1fd77598
+EBUILD lensfun-0.3.2-r1.ebuild 1434 BLAKE2B 1dc31062cdeda14ffa589279e13a61fed1d7de16c5fdae37d2a47f4e62a1e85bdcf5eafb9eaffa38480515fe539ac001da54b440ef6a182df969121ccb8ce787 SHA512 efea27a6f69dd70ba2f2217ac52d8ea54c9cba7160c355ede7c69334b5bb659476c64f4863aeb12af6f04dee17a243103ae4a441f9603103aaab61c2be3a7049
 MISC metadata.xml 612 BLAKE2B e0e745eb0d418ebbd7461736d92c432b48d88823142bc2bebf9765c3b9270124fd4a9718e384fd46acd8667bbb602d10c74435acaedfa0449e3890a186671ea0 SHA512 f61a2e3333e7f8fa5f3a64f93eabccac5bfd6587a195c019a3f2ed786f2d996412921a8308fc48e70b4347f230704b8fc18f0f7274a5e00ab68e0e5667640faa
diff --git a/media-libs/lensfun/lensfun-0.3.2-r1.ebuild b/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
index cc1d5dc2542c..a1b5bbee0e9d 100644
--- a/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
+++ b/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit python-single-r1 cmake-utils
 
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 15f6ab862ee1..b44bf97e8908 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -5,5 +5,5 @@ AUX libdirpc2.patch 2481 BLAKE2B 6236c31784ebd76884e716857e665824f9b325a97c2cb8e
 AUX pthread_lib2.patch 535 BLAKE2B 17eabab9e5d7b9d22b4f25ec8006e7e48bc3683b88f560bcb092234a1448ff47ae20d6ba04efb1af5742d7fc253acf9c944322acc8e8ed1acfad0b08df358eda SHA512 be19983342bae014409dd22c2e94ce11a5003a8ded3547a287ff71f53ef63ce1a1cfd6cdfbbfbf36deece2d3c1d9fb3e8e679598698a045229f79ba704976001
 DIST libaom-1.0.0.tar.gz 2775454 BLAKE2B 09b891d365804f0c086785a00760af3191b40fc66fc752294e915b54454171fb47d3d1b037fb6d276727772ceec3177d78c14f90a2b01e28250d2de735bf02ec SHA512 131512ef286cb138047bb56dea54196f9a8d2b0d9f3d7689299f185338e5c03ee658b0cfe017a099f1a6be351a3a7157204dea70d2645a1d0a9249fd582c3fa4
 EBUILD libaom-1.0.0-r2.ebuild 2603 BLAKE2B 40d47ed48e2185694ab98325e61d17c0e99d717616e5695dcbc8151bb5fe00b7afbf2974023f0ea56488421b515025e87ef497f28a620ab14d2b8480e0d2ca54 SHA512 8abb5a13424d02f7671eb5aaf5b16c4bdc892b886c484a463936bcf05e97b05a046c551191be0a7c6e3c8a97a6dd426eb9c79ec0392d0f129024e7450501f638
-EBUILD libaom-9999.ebuild 2117 BLAKE2B 72780d6b75fd008e7b0693962e811a8dd14afcbfa23d2a25b8e5b63af5c9cffee49e5511645929a80f795d15ddeb015f5e513117034d0a09e39e5500df8209f5 SHA512 6dffb6b857531c56302d91953e09c84414bd8cf07ba0b0631e990c7edc1cdc8765f85f95f86a9bda9fbd4c851bce0f686638b2fb4b4dfddea3eb96ce6bc9ead2
+EBUILD libaom-9999.ebuild 2124 BLAKE2B c3b3d2ffed644cbfd40c692d13b3a52cf8f51454283846aa56d81e95507d04517f0aed83763c1d1b326923847452096fac2cbe1d94bdb9f1bf885f2dec636b5a SHA512 cc64a48074bf750d8fdd3d9c035e80c0a776bf21173b8a20a9d0f025cd638149d139a7ff3a3a6c73f92bc59ee53e99de483722627da83130ed0ebcb55342ad37
 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-libs/libaom/libaom-9999.ebuild b/media-libs/libaom/libaom-9999.ebuild
index d22f4369dcb5..53bc9ffd6e14 100644
--- a/media-libs/libaom/libaom-9999.ebuild
+++ b/media-libs/libaom/libaom-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 if [[ ${PV} == *9999* ]]; then
@@ -63,12 +64,12 @@ multilib_src_configure() {
 		-DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF)
 		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_install() {
 	if multilib_is_native_abi && use doc ; then
 		local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
 	fi
-	cmake-utils_src_install
+	cmake_src_install
 }
diff --git a/media-libs/libchamplain/Manifest b/media-libs/libchamplain/Manifest
index 7674ee745153..93698d89a0a8 100644
--- a/media-libs/libchamplain/Manifest
+++ b/media-libs/libchamplain/Manifest
@@ -1,6 +1,3 @@
-AUX 0.12.19-gdk-meson-fixes.patch 4022 BLAKE2B 55d1c2710ae8fca1e0befeedc87fc49c5776cfd2eaf34f6a544ac668ead2475eae4761b2c28caa513f26e92401c89f0c9464d928710b5612516d935b847eb8f9 SHA512 e67cdfef9025d00e5be8786cce71f4fd4caac06c48cc117a40827d70e759c5150ff8965dc395f7165f3ae705c36e8075f714fb571d4d9fc2dd54aaaa0982e358
-DIST libchamplain-0.12.19.tar.xz 233084 BLAKE2B b46ef4b1ceaef3d3b7d52652e825de30a11d7b8f5a68b5a08abcec7111c58443ba76b9aea6b350007ccd91bfc86a4062079c51416fc4e63795318269045ce509 SHA512 3fc03c123859b078f1c4f5062706c95446146a7ed2352306cea3f72f3fbf95099afd2a99f61182e3cb7c47e546de6501ff3ed6ff17614f23dc2e4139ba5e4902
 DIST libchamplain-0.12.20.tar.xz 222168 BLAKE2B 72093eecffca24a5f255269472216f24d0804b7c8daf7cf9dc1273df9afc3fe5664dd2ca7d351bf94065f61bf4a419b3babcf3e9b2ed9a0f67c9947190aaa476 SHA512 514e4bd2803ace0d87a95a318a03bc2f2ccc454129146d76590d1b1f5666c95a4fb7013e2ad0cfafc5844d7d8b732c81a44cd0e7d51c505adcfe55c55abb4f6f
-EBUILD libchamplain-0.12.19-r1.ebuild 1821 BLAKE2B f7345e702f341b09e9b82ac44e5e425a8a74bc8528909877b3468a460db0954d481c92b356ea587d23e839c84b5e6e02c3ccb5c23ec8e7902d1599ac7818765f SHA512 8481da660a53cfcbddd047cbe6b9497da2694e16234375a1f8a045d4afd9efab1923085beca6fd8b86e09d9d93196bb8c78089760d10d912645a8fe020927ca6
 EBUILD libchamplain-0.12.20.ebuild 1434 BLAKE2B 61c3b610f095e62706ac8543a62e97def387c4d78ed0151507d08686bc0cd526ac09f80ef0d5d4c47ef6df3cfa7db73cd0082e25e15bc55dd72b3ec3da028fbc SHA512 acb7611dc58af60da9a59069f8c278ef9ef3f136725648a17c1020cc2e80d40495d7278611b468e30ec83424368fe15df85f48a546a0249a9cfefd72d197c9eb
 MISC metadata.xml 621 BLAKE2B ff31085e2b6cee6e64d64161505ae026d3d6896964a0e5aa055b6052b6bc242396db2bc1bb603cfdd3b66300d65e39fa57a8556ac3cea2454ac52048eedea61e SHA512 6d2214f5f62f6deace80db56fee500efed4713be2087b6a9159594a36c503b534b8f50e728ceccfe13f17ce79614ec97baf5b56342680b9283e03096df644a64
diff --git a/media-libs/libchamplain/files/0.12.19-gdk-meson-fixes.patch b/media-libs/libchamplain/files/0.12.19-gdk-meson-fixes.patch
deleted file mode 100644
index 41c7484e2a43..000000000000
--- a/media-libs/libchamplain/files/0.12.19-gdk-meson-fixes.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From 17348668f16857296ac2caf32c4a503f1946e1a5 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Mon, 22 Apr 2019 15:03:06 +0300
-Subject: [PATCH 1/2] meson: Add missing gdk required dependency for champlain
-
-gdk/gdk.h header is included and gdk_cairo_set_source_pixbuf symbol
-is used from gdk, thus we need its header include path and link to it.
-If clutter is built with gtk support, this is implicitly included via
-clutter-1.0 dep, but it can also be built without gtk support, in
-which case the build of libchamplain fails due to no gdk/gdk.h header
-found.
----
- champlain/meson.build | 1 +
- meson.build           | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/champlain/meson.build b/champlain/meson.build
-index 3285c65..0bf8ba5 100644
---- a/champlain/meson.build
-+++ b/champlain/meson.build
-@@ -95,6 +95,7 @@ libchamplain_requires = [
- libchamplain_deps = libchamplain_requires + [
-   libm_dep,
-   gio_dep,
-+  gdk_dep,
-   sqlite_dep,
-   libsoup_dep,
- ]
-diff --git a/meson.build b/meson.build
-index 43e72e5..1e571c5 100644
---- a/meson.build
-+++ b/meson.build
-@@ -66,6 +66,7 @@ gtk_doc_req = '>= 1.15'
- glib_dep = dependency('glib-2.0', version: glib_req)
- gobject_dep = dependency('gobject-2.0', version: glib_req)
- gio_dep = dependency('gio-2.0', version: glib_req)
-+gdk_dep = dependency('gdk-3.0', version: gtk_req)
- clutter_dep = dependency('clutter-1.0', version: clutter_req)
- cairo_dep = dependency('cairo', version: cairo_req)
- sqlite_dep = dependency('sqlite3', version: sqlite_req)
--- 
-2.17.0
-
-
-From d938cb13fb13f28d18856e343ad3ee269e3cc0d9 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Mon, 22 Apr 2019 15:09:24 +0300
-Subject: [PATCH 2/2] Clean up gdk.h vs gdk-pixbuf.h includes
-
-Some source files included gdk.h without any use; others included it
-instead of gdk-pixbuf/gdk-pixbuf.h
----
- champlain/champlain-error-tile-renderer.c | 1 -
- champlain/champlain-image-renderer.c      | 1 +
- champlain/champlain-memphis-renderer.c    | 2 +-
- champlain/champlain-network-tile-source.c | 1 -
- champlain/champlain-tile.c                | 1 -
- 5 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/champlain/champlain-error-tile-renderer.c b/champlain/champlain-error-tile-renderer.c
-index 2b74730..f2dc67f 100644
---- a/champlain/champlain-error-tile-renderer.c
-+++ b/champlain/champlain-error-tile-renderer.c
-@@ -25,7 +25,6 @@
-  */
- 
- #include "champlain-error-tile-renderer.h"
--#include <gdk/gdk.h>
- 
- struct _ChamplainErrorTileRendererPrivate
- {
-diff --git a/champlain/champlain-image-renderer.c b/champlain/champlain-image-renderer.c
-index e0d9f65..ad21971 100644
---- a/champlain/champlain-image-renderer.c
-+++ b/champlain/champlain-image-renderer.c
-@@ -26,6 +26,7 @@
-  */
- 
- #include "champlain-image-renderer.h"
-+#include <gdk-pixbuf/gdk-pixbuf.h>
- #include <gdk/gdk.h>
- 
- struct _ChamplainImageRendererPrivate
-diff --git a/champlain/champlain-memphis-renderer.c b/champlain/champlain-memphis-renderer.c
-index e62d82d..5244889 100644
---- a/champlain/champlain-memphis-renderer.c
-+++ b/champlain/champlain-memphis-renderer.c
-@@ -44,7 +44,7 @@
- #include "champlain-memphis-renderer.h"
- #include "champlain-bounding-box.h"
- 
--#include <gdk/gdk.h>
-+#include <gdk-pixbuf/gdk-pixbuf.h>
- 
- #include <memphis/memphis.h>
- #include <errno.h>
-diff --git a/champlain/champlain-network-tile-source.c b/champlain/champlain-network-tile-source.c
-index 873a39d..281f000 100644
---- a/champlain/champlain-network-tile-source.c
-+++ b/champlain/champlain-network-tile-source.c
-@@ -45,7 +45,6 @@
- #include "champlain-private.h"
- 
- #include <errno.h>
--#include <gdk/gdk.h>
- #include <gio/gio.h>
- #include <glib.h>
- #include <glib/gstdio.h>
-diff --git a/champlain/champlain-tile.c b/champlain/champlain-tile.c
-index a218857..ea70c3f 100644
---- a/champlain/champlain-tile.c
-+++ b/champlain/champlain-tile.c
-@@ -30,7 +30,6 @@
- 
- #include <math.h>
- #include <errno.h>
--#include <gdk/gdk.h>
- #include <libsoup/soup.h>
- #include <gio/gio.h>
- #include <clutter/clutter.h>
--- 
-2.17.0
-
diff --git a/media-libs/libchamplain/libchamplain-0.12.19-r1.ebuild b/media-libs/libchamplain/libchamplain-0.12.19-r1.ebuild
deleted file mode 100644
index 2b8d17c1846d..000000000000
--- a/media-libs/libchamplain/libchamplain-0.12.19-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org meson vala xdg
-
-DESCRIPTION="Clutter based world map renderer"
-HOMEPAGE="https://wiki.gnome.org/Projects/libchamplain"
-
-SLOT="0.12"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="+gtk gtk-doc +introspection vala"
-REQUIRED_USE="
-	vala? ( introspection )
-	gtk-doc? ( gtk )
-" # gtk-doc build gets disabled in meson if gtk widgetry is disabled (no separate libchamplain-gtk gtk-docs anymore)
-
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=x11-libs/gtk+-3.0:3
-	>=media-libs/clutter-1.24:1.0[introspection?]
-	gtk? (
-		x11-libs/gtk+:3[introspection?]
-		media-libs/clutter-gtk:1.0 )
-	>=x11-libs/cairo-1.4
-	dev-db/sqlite:3
-	>=net-libs/libsoup-2.42:2.4
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	media-libs/cogl:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	>=dev-util/meson-0.49.0
-	virtual/pkgconfig
-	gtk-doc? ( >=dev-util/gtk-doc-1.15 )
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=(
-	# Fix compilation against clutter[-gtk]
-	"${FILESDIR}"/${PV}-gdk-meson-fixes.patch # https://gitlab.gnome.org/GNOME/libchamplain/merge_requests/8
-)
-
-src_prepare() {
-	xdg_src_prepare
-	use vala && vala_src_prepare
-	# Fix showing inside devhelp (gtkdocdir subdir and name of the module need to match)
-	sed -i -e 's:package_name:package_string:' docs/reference/meson.build || die # https://gitlab.gnome.org/GNOME/libchamplain/merge_requests/7
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dmemphis=false # TODO: What's the state of this vector renderer?
-		$(meson_use introspection)
-		$(meson_use vala vapi)
-		$(meson_use gtk widgetry)
-		$(meson_use gtk-doc gtk_doc)
-		-Ddemos=false # only built, not installed
-	)
-	meson_src_configure
-}
diff --git a/media-libs/libclthreads/Manifest b/media-libs/libclthreads/Manifest
deleted file mode 100644
index cad0f92556be..000000000000
--- a/media-libs/libclthreads/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX libclthreads-2.4.0-Makefile.patch 1589 BLAKE2B 13640b1e9a449e87277c5a89fd1df71b8cda59976b0db0d8102593c84880131ff82002f64f1157838d7297b01cd4ffd66665712d503706131c91f330bd945d86 SHA512 3b58b701d46027d5c1fe7c540b100e1a62059db3d1c3b4c2201ab2e02557de5393a3b1eace0656fab4ea14089a35752e5676f1a52a2a3ed7c60f5fea89abae75
-AUX libclthreads-2.4.2-Makefile.patch 1130 BLAKE2B 485f02a464a367fb32ff6b888beaa7cf293d295ca8ae4b7f8f36b540c1dafba6f2ba09dcead778bac4a69931c63eb4191341399e5042b00518c7422009786444 SHA512 a8a72ee6cb0eea6c37ecd517ad1398255e2c4c107f2d5f22e08cc9fb8b7de01198f8dfe0938024ed6053244bc1968ff369a970d908ac00ba57c10751b3b2e968
-DIST clthreads-2.4.0.tar.bz2 14796 BLAKE2B 7c79608b8ebe29a8170a355069aa39496f785146a272edfe048e7dc61100302b56789ab5faa0aaad227cbe8b44eb660132f1ba22d34d304e417301d8582d5431 SHA512 c307d9611e0530469b36367f05721e6676d7bb186be97d38b851e66d9f670663ceceedf065823b27ac5864725d52cc2f462fd8d96f1398a202e30d82910ec58b
-DIST clthreads-2.4.2.tar.bz2 14357 BLAKE2B c73696e816431d70737d0481237efbb7a05d274f9fb0728b2bf2ba748a4a0540672af92ab8d35b6ab331c91841185aeb3705f5a75e3446a0c2c3631a8b331421 SHA512 a91de7a287c2cb9b2ce17e4c158db79bbaeccb278510d11e6c05fcbe9295c26b4d0231fa97800b265decd1d0886b7425f7b5d4cbcb18758be540356408e72131
-EBUILD libclthreads-2.4.0-r1.ebuild 710 BLAKE2B 23cd10cabde9a4be221f11aa66d6ea52242ecb8f9647a4e402b1b56c0e64cb7c3d55e5aa773868b7b679bae207462180b532600e25590b8eb61bbc7bd00de102 SHA512 7aaeb9038d4038ff6a23155bda8025fcd4e156452f22099f92122c84c7d795ba123154162013ad75e100e15965a1d8d81803c31bb3696b6440534ec509a73f0c
-EBUILD libclthreads-2.4.2.ebuild 818 BLAKE2B a566b4192c5fe71b3c2a507e41e52863a0f5b4639dc1423bb682017378155489e9619786f35dd58de10b5143c5887d94cbacf931a1ca3ffb36064d41a900d347 SHA512 6ccad618c15579524e6bea4944734b4c1d305a3523b08c729aa46835941f29cdbf4ffe6a37ada228bfd9fca391e064ef4407406e378b8a10e6f416802e5a1bfa
-MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libclthreads/files/libclthreads-2.4.0-Makefile.patch b/media-libs/libclthreads/files/libclthreads-2.4.0-Makefile.patch
deleted file mode 100644
index c20ba176d765..000000000000
--- a/media-libs/libclthreads/files/libclthreads-2.4.0-Makefile.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: Makefile
-===================================================================
---- Makefile.orig
-+++ Makefile
-@@ -28,7 +28,7 @@ VERSION = $(MAJVERS).$(MINVERS)
- DISTDIR = clthreads-$(VERSION)
- 
- 
--CPPFLAGS += -Wall -I. -fpic -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O2 
-+CPPFLAGS += -Wall -I. -fpic -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
- LDLFAGS += 
- LDLIBS +=
- 
-@@ -36,22 +36,20 @@ LDLIBS +=
- CLTHREADS_SO = libclthreads.so
- CLTHREADS_MAJ = $(CLTHREADS_SO).$(MAJVERS)
- CLTHREADS_MIN = $(CLTHREADS_MAJ).$(MINVERS)
--CLTHREADS_DEP = -lpthread
-+CLTHREADS_DEP = -lpthread -lrt
- CLTHREADS_O = p_thread.o a_thread.o itc_mesg.o itc_ip1q.o itc_ctrl.o textmsg.o
- CLTHREADS_H = clthreads.h
- 
- 
- $(CLTHREADS_MIN): $(CLTHREADS_O)
--	g++ -shared $(LDFLAGS) -Wl,-soname,$(CLTHREADS_MAJ) -o $(CLTHREADS_MIN) $(CLTHREADS_O) $(CLTHREADS_DEP)
-+	$(CXX) -shared $(LDFLAGS) -Wl,-soname,$(CLTHREADS_MAJ) -o $(CLTHREADS_MIN) $(CLTHREADS_O) $(CLTHREADS_DEP)
- 
- 
- install:	$(CLTHREADS_MIN)
--	/usr/bin/install -d $(PREFIX)/$(LIBDIR)
--	/usr/bin/install -m 644 $(CLTHREADS_H) $(PREFIX)/include
--	/usr/bin/install -m 755 $(CLTHREADS_MIN) $(PREFIX)/$(LIBDIR)
--	/sbin/ldconfig -n $(PREFIX)/$(LIBDIR)
--	ln -sf $(CLTHREADS_MIN) $(PREFIX)/$(LIBDIR)/$(CLTHREADS_SO)
--
-+	/usr/bin/install -D $(CLTHREADS_H) $(DESTDIR)usr/include/$(CLTHREADS_H)
-+	/usr/bin/install -D $(CLTHREADS_MIN) $(DESTDIR)$(CLTHREADS_LIBDIR)/$(CLTHREADS_MIN)
-+	ln -sf $(CLTHREADS_MIN) $(DESTDIR)$(CLTHREADS_LIBDIR)/$(CLTHREADS_MAJ)
-+	ln -sf $(CLTHREADS_MAJ) $(DESTDIR)$(CLTHREADS_LIBDIR)/$(CLTHREADS_SO)
- 
- clean:
- 	/bin/rm -f *~ *.o *.a *.d *.so.*
diff --git a/media-libs/libclthreads/files/libclthreads-2.4.2-Makefile.patch b/media-libs/libclthreads/files/libclthreads-2.4.2-Makefile.patch
deleted file mode 100644
index fa386fff7914..000000000000
--- a/media-libs/libclthreads/files/libclthreads-2.4.2-Makefile.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/source/Makefile b/source/Makefile
-index f841f3f..206e607 100644
---- a/source/Makefile
-+++ b/source/Makefile
-@@ -32,8 +32,7 @@ VERSION = $(MAJVERS).$(MINVERS)
- 
- 
- CPPFLAGS += -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -I.  
--CXXFLAGS += -Wall -O2 -fPIC
--CXXFLAGS += -march=native
-+CXXFLAGS += -Wall -fPIC
- LDLFAGS += 
- LDLIBS +=
- 
-@@ -51,12 +50,12 @@ $(CLTHREADS_MIN): $(CLTHREADS_O)
- 
- 
- install:	$(CLTHREADS_MIN)
--	install -d $(DESTDIR)$(PREFIX)/$(INCDIR)
--	install -d $(DESTDIR)$(PREFIX)/$(LIBDIR)
--	install -m 644 $(CLTHREADS_H) $(DESTDIR)$(INCDIR)
--	install -m 755 $(CLTHREADS_MIN) $(DESTDIR)$(LIBDIR)
--	ldconfig
--	ln -sf $(CLTHREADS_MIN) $(DESTDIR)$(LIBDIR)/$(CLTHREADS_SO)
-+	install -d $(DESTDIR)${PREFIX}/$(INCDIR)
-+	install -d $(DESTDIR)${PREFIX}/$(LIBDIR)
-+	install -m 644 $(CLTHREADS_H) $(DESTDIR)${PREFIX}/$(INCDIR)
-+	install -m 755 $(CLTHREADS_MIN) $(DESTDIR)${PREFIX}/$(LIBDIR)
-+	ln -sf $(CLTHREADS_MIN) $(DESTDIR)${PREFIX}/$(LIBDIR)/$(CLTHREADS_SO)
-+	ln -sf $(CLTHREADS_MIN) $(DESTDIR)${PREFIX}/$(LIBDIR)/$(CLTHREADS_MAJ)
- 
- uninstall:
- 	rm -rf $(DESTDIR)$(INCDIR)/$(CLTHREADS_H)
diff --git a/media-libs/libclthreads/libclthreads-2.4.0-r1.ebuild b/media-libs/libclthreads/libclthreads-2.4.0-r1.ebuild
deleted file mode 100644
index 22339f553e9c..000000000000
--- a/media-libs/libclthreads/libclthreads-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-MY_P="${P/lib/}"
-
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="An audio library by Fons Adriaensen <fons.adriaensen@skynet.be>"
-HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/index.html"
-SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.4.0-Makefile.patch"
-}
-
-src_compile() {
-	tc-export CC CXX
-	emake
-}
-
-src_install() {
-	emake CLTHREADS_LIBDIR="/usr/$(get_libdir)" DESTDIR="${ED}" install
-	dodoc AUTHORS
-}
diff --git a/media-libs/libclthreads/libclthreads-2.4.2.ebuild b/media-libs/libclthreads/libclthreads-2.4.2.ebuild
deleted file mode 100644
index 6efe7ccf191e..000000000000
--- a/media-libs/libclthreads/libclthreads-2.4.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="An audio library by Fons Adriaensen <fons.adriaensen@skynet.be>"
-HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/index.html"
-SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clthreads-${PV}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-S="${WORKDIR}/clthreads-${PV}"
-
-DOCS=( AUTHORS )
-
-PATCHES=(
-	"${FILESDIR}/${P}-Makefile.patch"
-)
-
-src_compile() {
-	cd "${S}"/source || die "Failed to cd to sources"
-	tc-export CXX
-	emake
-}
-
-src_install() {
-	default
-
-	cd "${S}"/source || die "Failed to cd to sources"
-	emake PREFIX="${EPREFIX}/usr" INCDIR="include" LIBDIR="$(get_libdir)" DESTDIR="${ED}" install
-}
diff --git a/media-libs/libclthreads/metadata.xml b/media-libs/libclthreads/metadata.xml
deleted file mode 100644
index c870d0eef0ab..000000000000
--- a/media-libs/libclthreads/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-libs/libclxclient/Manifest b/media-libs/libclxclient/Manifest
deleted file mode 100644
index 52dec804d931..000000000000
--- a/media-libs/libclxclient/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX libclxclient-3.9.0-Makefile.patch 1738 BLAKE2B f80642596892693bb4c46a404173aff3c1663ef227f06ace9247d44a9e5c1dde60afcda8c97073fd1106b3d929b5a1a61832cbb101a7d64a3518d3cadc0efc66 SHA512 51f938f60ce442a92c47509e8c2f0fca6614863f2482afe7f7dd558d27dfb9162cb86f4b151dd0c03f25eac65353bf796aac93374b030c70c5ac8957a456f7a2
-AUX libclxclient-3.9.2-Makefile.patch 1130 BLAKE2B a4d811b7bb964f2339d99838f3caa9088e4469bc8cd0ec18de1a4d0d87e53b1c62c797b239a3b1172a673c7d2f87c05f829fc72e4cb32c7d69a02bf31ddb64e6 SHA512 fe2d6bc14d5746786314792ddaaadac5f4d6e977cdf4e34ec58288e867c854082c93120e06002da17daf0c9709eb2074aa53603b2c99b8ad8bd9a1e9efe1eefd
-AUX libclxclient-3.9.2-enumip-include-fix.patch 310 BLAKE2B e0218f39b551978be1cf9318f21e53146c8e75826afd7e5f0cefcf43c434e3b64f3fb373386efd13b085b9b02bb631b5826b7441f9b73256097147dbb23c7b63 SHA512 3ff284c85635ea04b45f4640ab5a89a4d13b7933dc66bdb0310d5a4e1283b32d2d9078a9bf74f70f31636fb085d6ff8123d743d1750012cdf7549d8b1ad065e0
-DIST clxclient-3.9.0.tar.bz2 30272 BLAKE2B 51d7dbbf6e474b849461aaedb859bc92da0cb56f368e631016cfcb7dae1e5b3dca7630f35bc2d608fe8851cb5e60be599933834bbe358e092f2b08ad97cdc659 SHA512 4bbd621ceeebf3dfc36f0a3d02c63ba1c0e818e691e5c9681e737710824f53a58c682fb2475a7a2bba4f2dfd520166b782977320ceb73de39448cf512e26c842
-DIST clxclient-3.9.2.tar.bz2 29991 BLAKE2B ffd56894e0bcf09e2b6e4c882830e3c3a3a88f3778fe6a2c8b2ceb9336f8ce9cf28193da8e8c86987475e95e3ea2c07319bd82e88ad820b39167cfba9eefd7c3 SHA512 38c2782e58df24c2dfcb936fc9cfe4d44016055fb1aa52ef8e789bf8ec327f45f2f7a91f18012e4b0c6f253f6f10329d6d1e9fc341017ace3f2b6fa050592049
-EBUILD libclxclient-3.9.0.ebuild 920 BLAKE2B d102a195e6d77d427f9f3a7234c7bc5e71c3134f4c3d65f583dca65ab51410494f049635c40c82cff63b69ab3a2d8b7baf9367d2c88d0ea0491b1ec0394c4e38 SHA512 2a74cc4ad9d10d61b0b7ce90f372ae7d0eb72f2c45b34279654e0a77406bde530cab66917127578d5c0e7deca9a1151733c0ece650656b0fb7b4cc6f29375ee5
-EBUILD libclxclient-3.9.2.ebuild 1094 BLAKE2B 17df92a2b211a4aeaecf1606e882ce1e7e589bad823e44cee021ac3dafa003005035866eb029eeaed7946d04e5ff0ff4a64eba1223bc9d87b6e27b73103f6488 SHA512 6332a2a7fe66d7daa5cefe9b7d0cd24db499dbf8697398577ef8de0cd34b9654536bc2baa607d459b2682d30a787f139f0fd1950bbaaab281be91abdeacc598d
-MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libclxclient/files/libclxclient-3.9.0-Makefile.patch b/media-libs/libclxclient/files/libclxclient-3.9.0-Makefile.patch
deleted file mode 100644
index 7714ec5e9111..000000000000
--- a/media-libs/libclxclient/files/libclxclient-3.9.0-Makefile.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Index: clxclient-3.9.0/Makefile
-===================================================================
---- clxclient-3.9.0.orig/Makefile
-+++ clxclient-3.9.0/Makefile
-@@ -24,6 +24,7 @@
- PREFIX = /usr/local
- SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
- LIBDIR = lib$(SUFFIX)
-+PKGCONFIG = pkg-config
- 
- 
- MAJVERS = 3
-@@ -31,9 +32,9 @@ MINVERS = 9.0
- VERSION = $(MAJVERS).$(MINVERS)
- 
- 
--CPPFLAGS += -Wall -I. -I/usr/X11R6/include `freetype-config --cflags` -fpic -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O2 
--LDFLAGS += -L/usr/X11R6/$(LIBDIR) `freetype-config --libs`
--LDLIBS +=
-+CPPFLAGS += -Wall -I. -I/usr/X11R6/include `$(PKGCONFIG) --cflags freetype2` -fpic -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
-+LDFLAGS += -L/usr/X11R6/$(LIBDIR)
-+LDLIBS += `$(PKGCONFIG) --libs freetype2`
- 
- 
- CLXCLIENT_SO = libclxclient.so
-@@ -46,15 +47,14 @@ CLXCLIENT_H = clxclient.h
- 
- 
- $(CLXCLIENT_MIN): $(CLXCLIENT_O)
--	g++ -shared $(LDFLAGS) -Wl,-soname,$(CLXCLIENT_MAJ) -o $(CLXCLIENT_MIN) $(CLXCLIENT_O) $(CLXCLIENT_DEP)
-+	$(CXX) -shared $(LDFLAGS) -Wl,-soname,$(CLXCLIENT_MAJ) -o $(CLXCLIENT_MIN) $(CLXCLIENT_O) $(CLXCLIENT_DEP) $(LDLIBS)
- 
- 
- install:	$(CLXCLIENT_MIN)
--	install -d $(PREFIX)/$(LIBDIR)
--	install -m 644 $(CLXCLIENT_H) $(PREFIX)/include
--	install -m 755 $(CLXCLIENT_MIN) $(PREFIX)/$(LIBDIR)
--	ldconfig
--	ln -sf $(CLXCLIENT_MIN) $(PREFIX)/$(LIBDIR)/$(CLXCLIENT_SO)
-+	install -m 644 -D $(CLXCLIENT_H) $(PREFIX)/include/$(CLXCLIENT_H)
-+	install -m 755 -D $(CLXCLIENT_MIN) $(PREFIX)/$(LIBDIR)/$(CLXCLIENT_MIN)
-+	ln -sf $(CLXCLIENT_MIN) $(PREFIX)/$(LIBDIR)/$(CLXCLIENT_MAJ)
-+	ln -sf $(CLXCLIENT_MAJ) $(PREFIX)/$(LIBDIR)/$(CLXCLIENT_SO)
- 
- 
- clean:
diff --git a/media-libs/libclxclient/files/libclxclient-3.9.2-Makefile.patch b/media-libs/libclxclient/files/libclxclient-3.9.2-Makefile.patch
deleted file mode 100644
index e79dce5764e8..000000000000
--- a/media-libs/libclxclient/files/libclxclient-3.9.2-Makefile.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/source/Makefile b/source/Makefile
-index 177115f..c8fa0f5 100644
---- a/source/Makefile
-+++ b/source/Makefile
-@@ -24,16 +24,16 @@ SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86
- PREFIX ?= /usr/local
- INCDIR ?= $(PREFIX)/include
- LIBDIR ?= $(PREFIX)/lib$(SUFFIX)
-+PKGCONFIG = pkg-config
- 
- MAJVERS = 3
- MINVERS = 9.2
- VERSION = $(MAJVERS).$(MINVERS)
- 
- 
--CPPFLAGS += $(shell pkgconf --cflags freetype2) 
-+CPPFLAGS += $(shell ${PKGCONFIG} --cflags freetype2) 
- CPPFLAGS += -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS $(PCONFCFL)
--CXXFLAGS += -Wall -O2 -fPIC 
--CXXFLAGS += -march=native
-+CXXFLAGS += -Wall -fPIC 
- LDLIBS +=
- 
- 
-@@ -55,8 +55,8 @@ install:	$(CLXCLIENT_MIN)
- 	install -d $(DESTDIR)$(LIBDIR)
- 	install -m 644 $(CLXCLIENT_H) $(DESTDIR)$(INCDIR)
- 	install -m 755 $(CLXCLIENT_MIN) $(DESTDIR)$(LIBDIR)
--	ldconfig
--	ln -sf $(CLXCLIENT_MIN) $(DESTDIR)$(LIBDIR)/$(CLXCLIENT_SO)
-+	ln -sf $(CLXCLIENT_MIN) $(DESTDIR)$(LIBDIR)/$(CLXCLIENT_MAJ)
-+	ln -sf $(CLXCLIENT_MAJ) $(DESTDIR)$(LIBDIR)/$(CLXCLIENT_SO)
- 
- uninstall:
- 	rm -rf $(DESTDIR)$(INCDIR)/$(CLXCLIENT_H)
diff --git a/media-libs/libclxclient/files/libclxclient-3.9.2-enumip-include-fix.patch b/media-libs/libclxclient/files/libclxclient-3.9.2-enumip-include-fix.patch
deleted file mode 100644
index 710baac0db53..000000000000
--- a/media-libs/libclxclient/files/libclxclient-3.9.2-enumip-include-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/source/enumip.cc b/source/enumip.cc
-index 0873da8..1cdac0d 100644
---- a/source/enumip.cc
-+++ b/source/enumip.cc
-@@ -19,7 +19,7 @@
- // ---------------------------------------------------------------------------------
- 
- 
--#include <clxclient.h>
-+#include "clxclient.h"
- #include <X11/keysym.h>
- 
- 
diff --git a/media-libs/libclxclient/libclxclient-3.9.0.ebuild b/media-libs/libclxclient/libclxclient-3.9.0.ebuild
deleted file mode 100644
index c3e30e23f4c8..000000000000
--- a/media-libs/libclxclient/libclxclient-3.9.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-MY_P=${P/lib/}
-
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="An audio library by Fons Adriaensen <fons.adriaensen@skynet.be>"
-HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/index.html"
-SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXft
-	media-libs/freetype:2
-	>=media-libs/libclthreads-2.4.0"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-Makefile.patch"
-}
-
-src_compile() {
-	tc-export CC CXX
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)" PKGCONFIG="$(tc-getPKG_CONFIG)"
-}
-
-src_install() {
-	emake PREFIX="${ED}/usr" LIBDIR="$(get_libdir)" PKGCONFIG="$(tc-getPKG_CONFIG)" install
-	dodoc AUTHORS
-}
diff --git a/media-libs/libclxclient/libclxclient-3.9.2.ebuild b/media-libs/libclxclient/libclxclient-3.9.2.ebuild
deleted file mode 100644
index 718a4139a14e..000000000000
--- a/media-libs/libclxclient/libclxclient-3.9.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="An audio library by Fons Adriaensen <fons.adriaensen@skynet.be>"
-HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/index.html"
-SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clxclient-${PV}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-CDEPEND="
-	media-libs/freetype:2
-	media-libs/libclthreads
-	x11-libs/libX11
-	x11-libs/libXft
-"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}"
-
-S="${WORKDIR}/clxclient-${PV}"
-
-DOCS=( AUTHORS )
-
-PATCHES=(
-	"${FILESDIR}/${P}-Makefile.patch"
-	"${FILESDIR}/${P}-enumip-include-fix.patch"
-)
-
-src_compile() {
-	tc-export CXX
-	local prefix="${EPREFIX}/usr"
-	cd "${S}/source"
-	emake INCDIR="${prefix}/include" LIBDIR="${prefix}/$(get_libdir)" PKGCONFIG="$(tc-getPKG_CONFIG)"
-}
-
-src_install() {
-	default
-
-	local prefix="${ED}/usr"
-	cd "${S}/source"
-	emake INCDIR="${prefix}/include" LIBDIR="${prefix}/$(get_libdir)" PKGCONFIG="$(tc-getPKG_CONFIG)" install
-}
diff --git a/media-libs/libclxclient/metadata.xml b/media-libs/libclxclient/metadata.xml
deleted file mode 100644
index c870d0eef0ab..000000000000
--- a/media-libs/libclxclient/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-libs/libcue/Manifest b/media-libs/libcue/Manifest
index a0bfc7c8ac61..fd6c58b7c51c 100644
--- a/media-libs/libcue/Manifest
+++ b/media-libs/libcue/Manifest
@@ -1,5 +1,3 @@
-DIST libcue-1.4.0.tar.bz2 249426 BLAKE2B 5f26182abade1861fd2c8d9d05a9a9a4a97fc3d408a17b7b0ae6f2bf1828a1223cec7cfabd25778fad58c849481aee979c11d70925978ebf796e0b3598fffeeb SHA512 1efbe4ff2d7bf1716547c9377a8eefefd5392ce9fa62ee07bc948fc5b8832cefeecebf655a40e49eefe4ec857978dfee5a66a0439e36e4440e0ec472e2226ddb
 DIST libcue-2.2.1.tar.gz 24177 BLAKE2B 478f897567aee006c9e835bbf6e54373351b6b4e4bb68154c94f13107b38bdb670fa032d69744e7dbc51132d86dbf276cbf9701c9d7da0882820b71adae53362 SHA512 32e476cb09ed2cb2d64aaba1342fb91e77e448391b493a3a794a8d2a6723a0e6097a90b11c6ad82998cb7f270f4f18c2578d7b8575f6929c2a35502e09ebc964
-EBUILD libcue-1.4.0.ebuild 595 BLAKE2B 6c6939506c31fd64d83624592ab61d9ec64b2d1a58c57cb6850d2f7565efc28748df9f6e1f55e2831a4792aafa0602dbe7f81bfa879fbe52ef6fd172dad3121f SHA512 316e77edcaae1ba67167f71ab3a6fdbf3a748509c1cbf3b7a4fbbed28c79860b0eb0df71ebc1eae6ff3e993127c686b1134e96dc52afc6d769af5c9ed7e5eca3
-EBUILD libcue-2.2.1.ebuild 451 BLAKE2B b3b3692c4cc3032650d54386d450b1c02ac6c2592118cd294ddd70ccab97d1bd5bb073263584a76625665c15c6aa3cdb98fad52861b4d46a7cc13d27271055ce SHA512 e3100f11c3a9a510539e83472cdc0ed03d2c3964c26081681cc149f78ef51eecd3a360e03ebac8a8319ec0f4563d3be9b28d446b18bebd532ba112515382be4f
+EBUILD libcue-2.2.1.ebuild 444 BLAKE2B 97d0b092b1424a46c9e9d9e5efe6dbcbb1dc3d84398657607afb2e8b38986b26336a1a2bb5cd09df0d6eecc503a4b702a501a0e9377dff4a359b2cf1165b95f6 SHA512 f47d98953e8a3e2fa13a9958da6b941afc599926ac2596a296a1975d4fd3834d54e0a741f0adf8889d540ce2f07726170dc7504522ce77915b348e9ae3179d30
 MISC metadata.xml 333 BLAKE2B b53c2f4525fc5364906575900f0792aab5c4a6d21bf2559b9e830f9881815ee49bdaa70cd3a751edfe1dbaf9c7f5d14489d02752d5d19046cb5c7c4f071838c4 SHA512 80d51540185719f20f9a9fc16180ae49806ef5db4a5bec9e39d54785c98773e3ed2301aa9dcf2c646d028fa814d62e98daabddd2293c471eab8a4d93d301a3cd
diff --git a/media-libs/libcue/libcue-1.4.0.ebuild b/media-libs/libcue/libcue-1.4.0.ebuild
deleted file mode 100644
index 45e7b06937de..000000000000
--- a/media-libs/libcue/libcue-1.4.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="CUE Sheet Parser Library"
-HOMEPAGE="http://libcue.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sh sparc x86"
-IUSE="static-libs"
-
-RDEPEND=""
-DEPEND="sys-devel/flex
-	|| ( dev-util/yacc sys-devel/bison )"
-
-DOCS=( AUTHORS ChangeLog NEWS  )
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/media-libs/libcue/libcue-2.2.1.ebuild b/media-libs/libcue/libcue-2.2.1.ebuild
index 0e6a6eef721e..9d485704f6c7 100644
--- a/media-libs/libcue/libcue-2.2.1.ebuild
+++ b/media-libs/libcue/libcue-2.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="CUE Sheet Parser Library"
 HOMEPAGE="https://github.com/lipnitsk/libcue"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lipnitsk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
 IUSE=""
 
 BDEPEND="
diff --git a/media-libs/libde265/Manifest b/media-libs/libde265/Manifest
index f39c6cc68394..b7de3b3589e1 100644
--- a/media-libs/libde265/Manifest
+++ b/media-libs/libde265/Manifest
@@ -1,6 +1,6 @@
 AUX libde265-1.0.2-qtbindir.patch 1798 BLAKE2B 22e15a1d4dfe7f602c9b13611c17d4d6be396b1cb9d4d4690c43cb85cf6c21f64cde98e01b52551216612cf349f2fe74d59252b99a202cce7041d3c2b6a33dde SHA512 34b6efa56943e50d76c21e6911afff9c45e97d5608cfa5d3a53432bf2bf40f4fc6873d8c426b1a714542a6468670be2a710190191e5e1fe01c5e7dedf75f567c
 AUX libde265-1.0.3-use-new-FFMPEG-enum-names.patch 933 BLAKE2B 50f4f65a7c73365bd6f803c4fe85e029188a184dfe8dce5768e47af15cb489705129a5054aaf6bb12d8822de588c6ed10cf8384db7baeb2b4a6fee1a8a96494d SHA512 cf88bd2d40d9726dbe8bd8c3cddacccfef065635cf20751efd30dd30ac706d640be3b06a284a5bc11b457de63206d699405a6da8fb39cd0d5425371f5d538549
 DIST libde265-1.0.3.tar.gz 399996 BLAKE2B 988b21085f82d3b33b0480542677be96db5219c1b767aae3674f89862fdaf3355dcfea3fa99699798a4fcc6b72a63a3a6f61a3fd8d2ea8483231205cd6d87175 SHA512 0153632afcc9733950e8354997ccd93eddad90e8e0f7362bfe49b93b11cb1756cf803d0ba5c07042aee80e18227613af768ca82baf7891c687edf5e253a129c4
-EBUILD libde265-1.0.3.ebuild 1653 BLAKE2B db45b73a01efdd3b7c8b31949048519b7a575a69012358dd0b90dbede784f60c595442603d079f968e0f48779e1aa4b8f41b48c51f9155cd363c619f4f8777cc SHA512 c54ded9bbc7ae235632ab2c5ab60666ed98ce8f3949b1c650db6e5fb5dee6a3e2bd335a9bf3db0e06ea705f117a483d2e33ce680fe3ecde5e975e049db805eab
-EBUILD libde265-9999.ebuild 1587 BLAKE2B bf6bdc557cdbf839934ab3424012b5cae2637d26992d2f87492fb5877dd8ae3884cf5d57d053d67e81d5cada2dc21d41df8c5541086298b36b51f711aca8e369 SHA512 d147237b24d3fabf9c172c5b2b4d2f29e9ae96244dcd0bb91d00074b1d20e0a87a3d4f1fff982170ae4015538f29af5e7cdc95d33a55cd654567982266189e75
+EBUILD libde265-1.0.3.ebuild 1660 BLAKE2B 9856962bc2a8234d71e022e4c122b82de6d8b9775e717c0228105bf5c15de6fe538153568e987763913c273c24fcf5275f9109235f73e3ac72f1a527234d3a16 SHA512 2e20a286d98008780a4e5c0c8ebba21c32c41098cf2115dd38cfb4f43bdc3002ea63a24335c16fac8bde7aab7d8002fefe850a4cf2c4ced09b947665ddf94c76
+EBUILD libde265-9999.ebuild 1591 BLAKE2B ed15d6f1b6c081db4f8d88aba07be21a3a167ffb9f0dc3486d3e1eda737104bb2e613fdf5d7bc822952eb722e85be6232089d8bbd6f0834c1750358edc629b49 SHA512 3e617c6721f1ae5b768ba2bb8cfb74081aaee28566dfdaceecb5ab42de66ffd74239121469b3a6c99d8ae3dcc8bda885f2eeeaf57fc1126969fa2515cc6c73b6
 MISC metadata.xml 307 BLAKE2B 785344dd93b51d9103d01c68ba80c44821c36a1f61eeefb0dff56d708da5f6f1991ba142f44b6b652366e320410967deadcf537beaf256995a3a768fce7bee05 SHA512 27b883ff65471f49c87c1b21911172f82058a0492bec54290534fc5229f193a94675223a6b3064c84115eda4035fea6e6f5b5477f924adede2c2a72e55ece273
diff --git a/media-libs/libde265/libde265-1.0.3.ebuild b/media-libs/libde265/libde265-1.0.3.ebuild
index 777432a1f9e9..4e6baba9ecc4 100644
--- a/media-libs/libde265/libde265-1.0.3.ebuild
+++ b/media-libs/libde265/libde265-1.0.3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 x86"
+	KEYWORDS="amd64 arm64 ~ppc64 x86"
 fi
 
 DESCRIPTION="Open h.265 video codec implementation"
diff --git a/media-libs/libde265/libde265-9999.ebuild b/media-libs/libde265/libde265-9999.ebuild
index 8b1ede09936e..516a30d1f3d9 100644
--- a/media-libs/libde265/libde265-9999.ebuild
+++ b/media-libs/libde265/libde265-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Open h.265 video codec implementation"
diff --git a/media-libs/libdv/Manifest b/media-libs/libdv/Manifest
index dcbf096694fa..63f8405106fe 100644
--- a/media-libs/libdv/Manifest
+++ b/media-libs/libdv/Manifest
@@ -3,6 +3,5 @@ AUX libdv-1.0.0-darwin.patch 1387 BLAKE2B 176cf7d2b8d8b6407615782f74a169c7d32d4b
 AUX libdv-1.0.0-solaris.patch 4334 BLAKE2B 0b1ccd282e6d5b7fbe0a9c8b08e7b256af74559c12e06f35481db64e28d44febc7ac01d0bf70de79359fb11bda31f526072fb686715dcb3f33a552ba6d58f9e8 SHA512 e9a54eb2cbd74ec22d912e868566283365e15b831596b36ed06e20abdc0c87803e5b42d0dee810c2a19f663abf6e7358fdb8335e189b75adeeac8bde7b3e8e98
 DIST libdv-1.0.0-pic.patch.bz2 9771 BLAKE2B b8a597b5fb5facab05845dae1d08a84a17067804ef873b97b7f975a96c622a5cf3b2bbb17d3f5a364dd1aba1afbf3dbf2b18695f9ae8ccf3fcc478b3d7a17a4f SHA512 18fbc341f9a9349f2325c4cbdf2fcf60bf0b35e2efeaacb9a3e541ace4ab2ffcf64d18409b2d76fd40c6096a69ffd151c2bdc8c33411d1640f150202eef12021
 DIST libdv-1.0.0.tar.gz 574565 BLAKE2B 42d17b07501fa508630afd1cdbaee9378f657a4ee4b77666f1a147ddfcf5a9d67d90e0a6da53bfe4f2b5418984579322565c9e8c76516e8193e75bd4751a731c SHA512 19887a6f452fa7da8924901ad841f5c4a434a3bde56c932ddb43717592aa744281e3a8ad220231e11d7e6bc3b0e704952a8324e5f85d4e088675edceeeca7dc8
-EBUILD libdv-1.0.0-r3.ebuild 1096 BLAKE2B a2858bf8bc1d4ddd37865f0ac19482ae5d2274454063cf1d163f926c81fbf4e17b87d483d9c8a3b0a23b7387929fea62c817539825ab05d8b265f117ede66045 SHA512 fb9420f7ef0c7717e6fb3e4d2abc684f0e19cb3c8a9235f19dabfb654b7909ecfd39daea6e845086ff6bf013c3a11843e06ecc82ca7df2e750a79d6b5bff938e
-EBUILD libdv-1.0.0-r4.ebuild 1261 BLAKE2B 4acc813c74d46af4fe0926a5d4d7de71bfb74a17a9ab8934efbfec11bc311d104ebf2a552d6829bbb633c1e20986eec4448d28fa9226ed8a69f2f2cf32fc9643 SHA512 6a2860320d5f2163e5feeb7e05d96f231c2c1f31e71cd41914ad32afcc3763161410f53f94e79186d0a89c05085f2a471f6444b8849c7cffb195d817cac30118
+EBUILD libdv-1.0.0-r4.ebuild 1257 BLAKE2B c204f1db8743fb09cf2d91d9af60f930c723946a6004143a094574ebeb7c54620a0d3cdbbd4e4a87ff95bd85b65744ca27d53e478bb443f6f7dadfc0dfc176a1 SHA512 420ffbb5da8a6324ab0f93a88f76a71b775091411e19aa7671a8c6e138e6f70d55279bd8b790010db707464114efa3b8ac04ff0a808b8c0a12bdf49e3552037b
 MISC metadata.xml 298 BLAKE2B 673bcb158cdfda64a33e7d107dfbe978badcbbd44312638f845fe3c1fe481d3060820f587d87277366955e47d65334e1365d87ae3b733ff22e1442bf399336be SHA512 7a9face79c85c9ddf6e562db5fe3c1702c20147adec5564dfb67695e5be198732c57d5592985466432ebf9201704dc848b9e8b73f9483096c942f0c5ecf87cb7
diff --git a/media-libs/libdv/libdv-1.0.0-r3.ebuild b/media-libs/libdv/libdv-1.0.0-r3.ebuild
deleted file mode 100644
index e73f715b82ff..000000000000
--- a/media-libs/libdv/libdv-1.0.0-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit epatch epunt-cxx libtool ltprune flag-o-matic multilib-minimal
-
-DESCRIPTION="Software codec for dv-format video (camcorders etc)"
-HOMEPAGE="http://libdv.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://gentoo/${PN}-1.0.0-pic.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="static-libs"
-
-RDEPEND="dev-libs/popt"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog INSTALL NEWS TODO )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.99-2.6.patch
-	epatch "${WORKDIR}"/${PN}-1.0.0-pic.patch
-	elibtoolize
-	epunt_cxx #74497
-
-	append-cppflags "-I${S}"
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}"	econf \
-		$(use_enable static-libs static) \
-		--without-debug \
-		--disable-gtk \
-		--disable-gtktest
-	if ! multilib_is_native_abi ; then
-		sed -i \
-			-e 's/ encodedv//' \
-			Makefile || die
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	einstalldocs
-}
diff --git a/media-libs/libdv/libdv-1.0.0-r4.ebuild b/media-libs/libdv/libdv-1.0.0-r4.ebuild
index e519ffd56a41..e109633339a2 100644
--- a/media-libs/libdv/libdv-1.0.0-r4.ebuild
+++ b/media-libs/libdv/libdv-1.0.0-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="dev-libs/popt:="
 DEPEND="
diff --git a/media-libs/libebur128/Manifest b/media-libs/libebur128/Manifest
index 5d419d3ca8f1..74c612a4560f 100644
--- a/media-libs/libebur128/Manifest
+++ b/media-libs/libebur128/Manifest
@@ -2,5 +2,5 @@ DIST ebu-loudness-test-setv05.zip 91631421 BLAKE2B 95a345b0700893ab96854c7563ecc
 DIST libebur128-1.2.3.tar.gz 22150 BLAKE2B dee5857aa6d7a2523a4635d9d69964f22c7bda32b4329822650ad738d88a789f13d9ab5b66058f75093cbecac6db31742f4d041a511605be1357b5c2b6988c00 SHA512 d3e335a547e7e2b276be4f28ab93b87f6af91e818ea1e6513bcabe1ea74c99a04af0b03b6a36a27a83fec065ac609db0c6f70b67275134d39151114d54a50e29
 DIST libebur128-1.2.4.tar.gz 23140 BLAKE2B 4095a11b976109c82ffbd133d5e509b60a2fa27871982d4a81c1927cb23783e89f907bcce52e78d3c743d1e41d1bd823b9b7b510792137649e4b3b680c93eca7 SHA512 d9aec133aca9240f7e859aae30cfcab07ba7aa20378187d53dfeec4cd3840d49bb117fa0698591bac04d95f9d8b5cd0b1fbe41c364694f2fa8267dd690b2dc02
 EBUILD libebur128-1.2.3.ebuild 997 BLAKE2B 9c95e87e2eac5bf7128c442a3a4bc019c84c56cf82ba69e7ccf3d404690e8e903be514db85064a07c9da8d3debb18f62c6be7fe039f287f9add81dfdcae909db SHA512 dd326a7d274268382ff68a42db07546b5608bb181a5907d0aa130e33f086dd16fce447e691416f7fe0eaba81b1419a6cb31f95410067e883f98444a5c2486fe5
-EBUILD libebur128-1.2.4.ebuild 998 BLAKE2B f60bf628e84e9fc2141a24b2158778b5bc9e1ddaa3e52396a18fa782ac730cb2c72f67458c41ea9b903edd96bbaae13707d0520a27517832d7cd881ec0125f9c SHA512 d9de04e72d21415a612828f91fc12ac863f496954d3a060d1f76b6bec84bdb4ede62093048c1aaeac0a6903a2f057f156ad83bd4054dfbc878abc52fae05a989
+EBUILD libebur128-1.2.4.ebuild 997 BLAKE2B 79580d9b152c24b33252b5ccb55d3215aebb94bc19c2a97dd0a4a47f6d3e138c2fd53c77a93ce9ce23a07ab5a94fc8b215067c1c22d91551bc6a51564e28e413 SHA512 b821c03f8c2aa3afbb6acec1a2e6aa1ad464390255b0cb093bf296bb00ffd3e5fa6a0e43abd4035c076870791c730b0d6ebe676dc0b939bcd5d7bec7c9f1504a
 MISC metadata.xml 751 BLAKE2B dc363e6e8a40a11e18c8204cf4ce6b3054bb8edf61b872c836af6404230e6e9a1fe758bcc49bafc83dbb0fd36c9cb37a65d3b889cf2c323b441f7e763312dd8d SHA512 2fe85871c10acb1d2aed6ada85d2522e6bfdd4bc51f06c560e262438840e499bbec842e451074275431c94892d887eeeab715f3e8ad2a0b85fbb5a5fce200617
diff --git a/media-libs/libebur128/libebur128-1.2.4.ebuild b/media-libs/libebur128/libebur128-1.2.4.ebuild
index c4b92f343ee3..fe978ca5ac6a 100644
--- a/media-libs/libebur128/libebur128-1.2.4.ebuild
+++ b/media-libs/libebur128/libebur128-1.2.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jiixyj/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index 1c0f0a583504..fb4aa28bda05 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -1,6 +1,6 @@
 DIST libepoxy-1.5.3.tar.gz 326768 BLAKE2B 053665429a249adca4c9b3d57797949e3a0ffd0ed3f1c66cb8becfb884431e44a4cccb6b2fd3788a86ee01268ebad3cc36e67e391d2aa5cdea28837a162be9ad SHA512 e831f4f918f08fd5f799501efc0e23b8d404478651634f5e7b35f8ebcc29d91abc447ab20da062dde5be75e18cb39ffea708688e6534f7ab257b949f9c53ddc8
 DIST libepoxy-1.5.4.tar.gz 337615 BLAKE2B 2793fde6da59079dfadc653c9f0712b0bd2ca1455a8cda7982bce61c35a3629641a30a76db059af635c1fa0076b4e6c56874b199b41d548afbbad8f6e43384e3 SHA512 c8b03f0a39df320fdd163a34c35f9ffbed51bc0174fd89a7dc4b3ab2439413087e1e1a2fe57418520074abd435051cbf03eb2a7bf8897da1712bbbc69cf27cc5
-EBUILD libepoxy-1.5.3-r1.ebuild 1316 BLAKE2B 166f9905aa1e35e8568679c1a6e8dd74341d26257a31035bb429e4075a654e05eb3bfecaeddda7e14edc978677b123af373fb29904f9d8fed5cc5c271495c5a2 SHA512 aa6a8cecec9fd18c5bed126105eb2c9bafa49ad2c3d750e42f81997de82f5d6ef3f528924a0fc4bf05b3fc09fedc4f90bca5ce6399f6e663411bff3f660d8431
-EBUILD libepoxy-1.5.4.ebuild 1295 BLAKE2B 471776c6d120620538d3c4f32b87893ca8c624f3c7bfd46e1dd5cec062dcf34f8cab9ad8282544c11968704037ab43ca7a5ecd055d5cfc5b236602e8eb734079 SHA512 b286117484a4d075b7b2c0ec2945ebb6fafb82933685f0757ef8f3e4ac89761ec1541bb9b270b22aec73fd792be90baa3560a3dbcc5f8d6a466334969b20966f
-EBUILD libepoxy-9999.ebuild 1295 BLAKE2B 471776c6d120620538d3c4f32b87893ca8c624f3c7bfd46e1dd5cec062dcf34f8cab9ad8282544c11968704037ab43ca7a5ecd055d5cfc5b236602e8eb734079 SHA512 b286117484a4d075b7b2c0ec2945ebb6fafb82933685f0757ef8f3e4ac89761ec1541bb9b270b22aec73fd792be90baa3560a3dbcc5f8d6a466334969b20966f
+EBUILD libepoxy-1.5.3-r1.ebuild 1312 BLAKE2B 707db9238bc208a20c8c5dd530bcbe0d2bed24a7dd602058432d7f9678de9aca834f89bec9472d4ae2b593fdec123b1bcbd1f0f6d32ad933e7b63262cf96d7ff SHA512 38444001e31fa69e5847852284970eab4885b58e2995e3ca26578166f857865417f302b58e94b3f9f3b795ca280161bee4140b3e6a8494826d0076043bfe3add
+EBUILD libepoxy-1.5.4.ebuild 1282 BLAKE2B 7fbd18b374d253dc0576d283c9414a5f2379c3bc29b7b4649e59cb2ecc8f745fa25a20e8c64157c2724eafad1e86b353b6f67cdd3e6d4a93344b95f32cc1f3ad SHA512 8c8602880ff0c5538e5db77e68e09a400f25f54d7353e117b395ff1a44e118be40fd82658f170a5901be7bf40879eff78e780f7d1a8d371ff3e2d6bddf45b2ec
+EBUILD libepoxy-9999.ebuild 1291 BLAKE2B bf973caab3794cbb049bced0b544f84a2a34615c216a9ccb4aeac89e6e5d025bba05547164fa8e38053632df467b047c65b634872a4dd04f8902044e124c7a99 SHA512 9d5865264292a985cda4f83e6e6d22c64cbb36a5462ac3b4c5233300940f09f0c24956d17fbd94b6e544c2527529c2a8c6566f756b82f8c32b0a97a0cd6089ee
 MISC metadata.xml 375 BLAKE2B 09993b726e54558d32b0dfb2a221bdd8928b85f55bdaaeb2faf30a0711ed58b05022a9fb669ec43806aff223860e47db53226a0f8f34d7b35edf0a842ab45923 SHA512 fec0ce8c99534083afc197c156a7fbaf2e83b2e22887ef134984ea7a4e6226f2714db399a118cd96f22b20012e7b7572156fc13aa72516e2557880c716140ad6
diff --git a/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild b/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild
index 708bfd86c630..ac2e65cbab89 100644
--- a/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 PYTHON_REQ_USE='xml(+)'
 inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1
 
diff --git a/media-libs/libepoxy/libepoxy-1.5.4.ebuild b/media-libs/libepoxy/libepoxy-1.5.4.ebuild
index 667228151062..d3f97708c15c 100644
--- a/media-libs/libepoxy/libepoxy-1.5.4.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 PYTHON_REQ_USE='xml(+)'
 inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1
 
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/anholt/libepoxy"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
 	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/media-libs/libepoxy/libepoxy-9999.ebuild b/media-libs/libepoxy/libepoxy-9999.ebuild
index 667228151062..247ffa088bf2 100644
--- a/media-libs/libepoxy/libepoxy-9999.ebuild
+++ b/media-libs/libepoxy/libepoxy-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 PYTHON_REQ_USE='xml(+)'
 inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1
 
diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest
index c1228672aeb1..ce9c5e6eea61 100644
--- a/media-libs/libffado/Manifest
+++ b/media-libs/libffado/Manifest
@@ -1,4 +1,4 @@
 AUX libffado-2.4.1-python3-scons-fix.patch 982 BLAKE2B e9e6e5c8e9582db5e936d355abf8b7292c5a03d799dd3c36d567604a1f959b1b509856ee9ac1e7693a1147907ce7105841010c317d8d2981f35c1c125f4cb5a6 SHA512 5e3de46d1e9ff5d0ee0b555218d1d59deb81e87ccf3f4179c6c25fac0888abf27b96e6cd82a8815b58040b3ab949a5cf2128c709c91ea125c3194e19956817e1
 DIST libffado-2.4.1.tgz 1229295 BLAKE2B 3b42493b68fc8648e116784e04baee2278c21e01fa92b22d990340ef329f67c898e247891e76d494410a758009fcf186ba556e900598eaca539a9879664cc704 SHA512 0859f17b87c68108bbde726d1cf8ab0b99f6f7f02cbe36acd8b451e112688a4d1edc21134eb4a2edc8c92dcf5f5da52efeabb2ad0dc07804ed1aa664a3b38d74
-EBUILD libffado-2.4.1.ebuild 2803 BLAKE2B 4b586f0498fccee8a340fbf2f9260119c9d0fba88627eed9077a0ca092f0fc51d88f055942e9eb40176e8e77c94a607d4745ac94359777b825ca82c373ac5ebc SHA512 c9255ad333bf63f5e0a8ed0e74e1ea6b288381e6ece7845841624c0883d147ac4aece3ee7020b24c74fb4b60833f951c5a0e472e24999460dbb640369bf01d3a
+EBUILD libffado-2.4.1.ebuild 2799 BLAKE2B b88e34d36d8c708f568103cc1ba3995cf90919d5e459329fdb6fa3ffe39eb3ad344156f049e8a4836d3c408f321ec46583ff1ba63c7fbb5b3a8ab6a6cca2e7a3 SHA512 eba45eda82247f03f8b2033ee1eb2f63ab15f09566adbf65ecfe534d2f798ac53b0d2ae3bec1900825f4560d24d6a17a402153023556b9733c4babd590f4a049
 MISC metadata.xml 566 BLAKE2B 66bf590980ba18079dfc4127aad3de692e4544f93518fec98e8c337c129df35fac11ff1c8b2c5c3b606855da6020f7abf311b14a4b8b607b08ed1662ae5adc3a SHA512 f1d19db6ac852100cae4d73b8608a892bae5d4907b35601c4c751a35555111de450edf1f0373c2f81cd68e947c76e9c36c7e2b76a8c9d3aa64345fa9b9227b34
diff --git a/media-libs/libffado/libffado-2.4.1.ebuild b/media-libs/libffado/libffado-2.4.1.ebuild
index 04743360d811..571be2962fef 100644
--- a/media-libs/libffado/libffado-2.4.1.ebuild
+++ b/media-libs/libffado/libffado-2.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit desktop python-single-r1 scons-utils toolchain-funcs udev multilib-minimal
 
diff --git a/media-libs/libgig/Manifest b/media-libs/libgig/Manifest
index 87ea8d8654ea..f90cf135e44f 100644
--- a/media-libs/libgig/Manifest
+++ b/media-libs/libgig/Manifest
@@ -1,4 +1,4 @@
 DIST libgig-4.2.0.tar.bz2 746637 BLAKE2B a1ee9a0e77a662395c21995c465b8c4e57331de1ba0ae6636015eefc846698341980e908d7aa30cb607bfe6fb48f84999ea88995b0a254fea2465d21b2b9919b SHA512 52c8c749c7852e229c76c17211398dbf5dd5891a1ee9d8e8bc61d55b825c5676595b20b26014e739b9bfd387db36895152b380519609a928a8fa68f4a20279f6
-EBUILD libgig-4.2.0.ebuild 776 BLAKE2B c561ebc9dd6e5a0e19583ee3e6f8a0f69f38237b08d780eb8ff2f826377db778f8a3f839e8b4834c317d58c2fc559b086a81e815fed26bdbf425aabbe961eb6c SHA512 a07459e1f685007fe39b5ae136c81735e3a693ad7a3029706c7489f9b208b7b3c2c3d5ad5c10efa0446895eaa46357ec77bf1baf353410dd1663111a404b9897
+EBUILD libgig-4.2.0.ebuild 775 BLAKE2B 8669918a950e033082bf740228348fcce8e9a6af1884d68f6041984f851e81ce3182d11e43959cd7366041b98a81c8d76869c957eaa69b3ced9cb5caf1fde74a SHA512 765b17dee47b07b2e1776d1bb6c77bd5e672cecd662f7373713410ffcb00b1faa6bcc6bc9a3966836a1b1000844ecc2bba5edb04319bc77c3ae9f33b3bcf53be
 EBUILD libgig-9999.ebuild 851 BLAKE2B ee61ed3123e3e45d21dd4653231e0163ab2459b412524c1f09a486e789b72abc569913777251ab27aa75801dd003d0d9df3fc7a5230c73387c3d6585ef8f1a64 SHA512 9f839169b0ab8e055519c0089b5414357347039ba29a6ee4acb058c2c49921f660bde6839489956095f170d52f7268afb8a57631bb2ee5f7265837aa03d7484e
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libgig/libgig-4.2.0.ebuild b/media-libs/libgig/libgig-4.2.0.ebuild
index ee4a39704c59..2ccb3fcaa142 100644
--- a/media-libs/libgig/libgig-4.2.0.ebuild
+++ b/media-libs/libgig/libgig-4.2.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://download.linuxsampler.org/packages/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index a2b928ab177c..faf0188eb766 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,6 +1,6 @@
 AUX libglvnd-1.3.0-meson-Fix-the-PPC64-build.patch 2300 BLAKE2B d4e39da8f901d08e1c5162df928fcb000266e408ad7e7f2a5db711c2afc4802868263b0c82f941ce91f39f5a7ad6c3175013396a0c9fac0c68f6a79f462c8b5a SHA512 d1a0ab923011b93379bff803989f824d91efab378b785862916f12c2fde63c0ff80c4c4bad8d9c6b6a371098fc70d4d08d7d9c5b7fc3069a05c7f91c1b57b428
 AUX libglvnd-1.3.0-meson-Fix-the-armv7-build.patch 1279 BLAKE2B b21502bb309d3d45f51421b9474cb6d4a56a4c0fda637a093d8445de69f79bd36e8f2392d7389c152bf77c7a288ecd37b4c2457e0b86eaefc570a4c63eebffa1 SHA512 6b77410c4370ec7016e43c9be315478f83b8ddc254a3161d3f0e109f640bd1821438539de30ba64e2f599e0869a9cb9a5e01d35f00e0321d49f66733f7a9b3d6
 DIST libglvnd-1.3.0.tar.bz2 713781 BLAKE2B 15014038e8a0f14fc29892354b282535735af0f29e244e4826b945071deec151783fc042f3588add24c31f35a5c72c53bfb1090c109117466f8b8c805cc67356 SHA512 d573fc4a1114be9468afd6e035b3815111f9a7e7453bc2b127c93a1b8a01c7f20440ff8872fbae8fc93aab98862dac3224ceca7f28d02e93f3b9a641d1a248e3
-EBUILD libglvnd-1.3.0.ebuild 1483 BLAKE2B 9a696e1aaa6d2df2354c812bb8913a0138e689946cf76b01bc8ca9c410da14c764c22341f892e679f17e2b9e81996f6811e22b066cf5a0d226b1808b738802ef SHA512 aaa24c1c3b953c18769432b6c588a4019eb39bf6c398e1c2b462e288cb6b85ecc0613fd5377a8bc825f82ef0c042d538692e1271183ced75961988e5788190d1
-EBUILD libglvnd-9999.ebuild 1359 BLAKE2B 45b8f383971986cf55e605a13ce87665b3707c33a00dd7d3d9939b55c7c2b004b3b98bfb85479acde991e0c80a763df6dd4f755926ff4b3d2181f0a609d9d795 SHA512 54368367597cd940948d3c1b966d63bf2107b5bc3cf5328e9c7705d0dfa840793d421003b3551915cb687fefce705f142085cdbea716d6ea19cd3d80fd49bedd
+EBUILD libglvnd-1.3.0.ebuild 1495 BLAKE2B e9a6d8caac3810ebbe727d0b359fe6130d70f1b216f57823ed81b056d3fde71c96357d3acd04605e87d45aab2bbe5be059f3a63bd160f0986b20621283a7be54 SHA512 2758d8774e172c3310b0148ec10d0ac1f367851b3ca04c8c111685bdc91ecc5256acca840461f87ebe18aefd5b72c7e31ccb47486a3b6a2d30271f0d8d81f7ad
+EBUILD libglvnd-9999.ebuild 1378 BLAKE2B b7768837f805d81b881b756cb7a955296e63b9d6a2fa79b7df8360920d56b949e6e5a8e8ec9b02d4c18f26cda2a87df2d90f8610b1f1ee790f940dfba5210ce2 SHA512 1476d7e60692f2d5feab1ae648977e1e58f25069023e803539a8f3d0951bebb0d7e09e0e4488ffe91ec7d3635258223b32ed51455a839fa0ec1e033761a11924
 MISC metadata.xml 314 BLAKE2B 34c95a3e321c3059bca39c7beb5b7b15e8085b54affb267947fb3676018fa183040a157716e979c5e0381acdea6e738294b37841e75da308c3632fb3587dec33 SHA512 fa12f7fa880b0721baf2eb40b9fd8a68e51c143dd8ede7a199c5afcd5a208f84c51a80fc1f4bc68b266338bac8bf4137b2443d88567150f2c54b2f11913df89c
diff --git a/media-libs/libglvnd/libglvnd-1.3.0.ebuild b/media-libs/libglvnd/libglvnd-1.3.0.ebuild
index 948292fe2583..cb18f71aa5c2 100644
--- a/media-libs/libglvnd/libglvnd-1.3.0.ebuild
+++ b/media-libs/libglvnd/libglvnd-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2019 Gentoo Authors
+# Copyright 2018-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 VIRTUALX_REQUIRED=manual
 
 inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1 virtualx
@@ -19,7 +19,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 	SRC_URI="https://gitlab.freedesktop.org/glvnd/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
 	S=${WORKDIR}/${PN}-v${PV}
 fi
diff --git a/media-libs/libglvnd/libglvnd-9999.ebuild b/media-libs/libglvnd/libglvnd-9999.ebuild
index b98a84b1e5a6..444880b86a29 100644
--- a/media-libs/libglvnd/libglvnd-9999.ebuild
+++ b/media-libs/libglvnd/libglvnd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2019 Gentoo Authors
+# Copyright 2018-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 VIRTUALX_REQUIRED=manual
 
 inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1 virtualx
@@ -19,7 +19,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 	SRC_URI="https://gitlab.freedesktop.org/glvnd/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
 	S=${WORKDIR}/${PN}-v${PV}
 fi
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 030fb5b57f0a..26ee6bdd0321 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,5 +1,3 @@
-DIST libgphoto2-2.5.20.tar.bz2 7290524 BLAKE2B 0b616863fa74430f16d96a37955f655620a88fb2df2220fbe9337eb0f61b7babd9d36e1f1d58f45ca617c57feab93e9714228eae54c742385c3e4b0fc3667ff5 SHA512 13364a8fdfe137a21ebf04dfd2b30b20c7fb652e11e1b98cd06176e9a1576ef8f67121523111395100ed39d1d3e6e5d6d458b86d58502f7056a1c06a5623640a
 DIST libgphoto2-2.5.22.tar.bz2 7169810 BLAKE2B d4947a4b5cf4a6f48ec619e0531ab29a035143031529436f566ade26d11b354328dc70e5d20533a3c023fd8b87afd0db9d85617fea9d06ee433137da6a1d9413 SHA512 8f02c460324c115810f56a9408ecba7aabb801947249c1ee79f0f0a1db1d785d34992508232bad7af112aed2dfc6b213365cee694dd0e7d5edf4072c63fa01cb
-EBUILD libgphoto2-2.5.20.ebuild 6189 BLAKE2B 9596e72e751fa4dd92e6b9d76710d2f43adc3fab5eec4235d643addb36c5d1632990b59705a7677bca0f14f8c6df5a043aed8819a9cde1becf4c4a0c245fbd33 SHA512 4cf5cd7a96e3c751168e3ad16b556193ddacd9bb09114c97b3dcd18c7c17cf32103d04b00a1c0c61a8dcf333f4efe1d188cc913a4b5ca6207030adbb54c098b6
-EBUILD libgphoto2-2.5.22.ebuild 6188 BLAKE2B 60a0385303ef3475bb8e96bd61bea7fdeaeae71055303c6fb05bf450651866f2f9f78eb1b929c4fb86d25b4715e2e2e75f84f0ec8fcf0fd8ff11ed0e406ad607 SHA512 f4f613fc9111ec60c3c0152e46bc1ce61fde1649a1748aa604699ab12b9a26caddd6cca366f19c0d83a5a07f2753ad95ffa2b4ccb9be18420a690518a65eaecd
+EBUILD libgphoto2-2.5.22.ebuild 6187 BLAKE2B 116cbcf17ea8876b548a1ad32e4d2f6c5c0890fc5f1c30f75eab422bb1468d136f4b84deed0c9de3ddad13e1253adcb4e6bdd861f39680fb7980a149f695ce6f SHA512 4d67de568d345a22d7e0c0ebb6e8d658a005f852ca3b3caa51b6042c9621389a5ac777395c8ff176e83f00aebe0540f9909c44d8c5bd05e24998a6a086b6eca9
 MISC metadata.xml 520 BLAKE2B 113ca8821b8ba1d594d64f86facadebf238372742380ce99c6f3172712873d1ebb3d0bf32eb072d7af1771f6099f5bde84114d6e45468a0d33503fbbe393a19b SHA512 905b25e683f85a23323e1205c0492e3b955e11f9d93a9c9c360108ecdd3608fa2f9f4c2572444c0a4be0df3f5e350dd13ca4ebb5ca523c0fd70fed3f40e39ed0
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.20.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.20.ebuild
deleted file mode 100644
index 45a8bc7ef47f..000000000000
--- a/media-libs/libgphoto2/libgphoto2-2.5.20.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO
-# 1. Track upstream bug --disable-docs does not work.
-#    https://sourceforge.net/p/gphoto/bugs/643/
-
-EAPI=6
-inherit eutils multilib multilib-minimal udev
-
-DESCRIPTION="Library that implements support for numerous digital cameras"
-HOMEPAGE="http://www.gphoto.org/"
-SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-
-# FIXME: should we also bump for libgphoto2_port.so soname version?
-SLOT="0/6" # libgphoto2.so soname version
-
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples exif gd jpeg nls serial"
-
-# By default, drivers for all supported cameras will be compiled.
-# If you want to only compile for specific camera(s), set CAMERAS
-# environment to a space-separated list (no commas) of drivers that
-# you want to build.
-IUSE_CAMERAS="
-	adc65 agfa_cl20 aox ax203
-	barbie
-	canon casio_qv clicksmart310
-	digigr8 digita dimagev dimera3500 directory
-	enigma13
-	fuji
-	gsmart300
-	hp215
-	iclick
-	jamcam jd11 jl2005a jl2005c
-	kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica konica_qm150
-	largan lg_gsm
-	mars mustek
-	panasonic_coolshot panasonic_l859 panasonic_dc1000 panasonic_dc1580 pccam300 pccam600 pentax polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2
-	ricoh ricoh_g3
-	samsung sierra sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z
-	toshiba_pdrm11 topfield tp6801
-"
-
-for camera in ${IUSE_CAMERAS}; do
-	IUSE="${IUSE} +cameras_${camera}"
-done
-
-# libgphoto2 actually links to libltdl
-RDEPEND="
-	acct-group/plugdev
-	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
-	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-	>=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
-	cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] )
-	cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] )
-	exif? ( >=media-libs/libexif-0.6.21-r1:=[${MULTILIB_USEDEP}] )
-	gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,${MULTILIB_USEDEP}] )
-	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	serial? ( >=dev-libs/lockdev-1.0.3.1.2-r2[${MULTILIB_USEDEP}] )
-	!<sys-fs/udev-201
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	sys-devel/flex
-	>=sys-devel/gettext-0.14.1
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	doc? ( app-doc/doxygen )
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gphoto2-port-config
-	/usr/bin/gphoto2-config
-)
-
-pkg_pretend() {
-	if ! echo "${USE}" | grep "cameras_" > /dev/null 2>&1; then
-		einfo "No camera drivers will be built since you did not specify any."
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Handle examples ourselves
-	sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-		|| die "examples sed failed"
-
-	sed -e 's/sleep 2//' -i configure || die
-}
-
-multilib_src_configure() {
-	local myconf
-	use doc || myconf=( ac_cv_path_DOXYGEN=false )
-
-	# Upstream doesn't default to --enable-option-checking due having another
-	# configure in libgphoto2_port/ that also needs to be checked on every bump
-	#
-	# Serial port uses either lockdev or ttylock, but we don't have ttylock
-	# --with-doc-dir needed to prevent duplicate docs installation, bug #586842
-	ECONF_SOURCE=${S} \
-	econf \
-		--with-doc-dir="${EPREFIX}"/usr/share/doc/${PF} \
-		--disable-docs \
-		--disable-gp2ddb \
-		$(use_enable nls) \
-		$(use_with exif libexif auto) \
-		$(use_with gd) \
-		$(use_with jpeg) \
-		$(use_enable serial) \
-		$(use_enable serial lockdev) \
-		--with-libusb=no \
-		--with-libusb-1.0=auto \
-		--disable-ttylock \
-		--with-camlibs=${cameras} \
-		--with-hotplug-doc-dir="${EPREFIX}"/usr/share/doc/${PF}/hotplug \
-		--with-rpmbuild=$(type -P true) \
-		udevscriptdir="$(get_udevdir)" \
-		"${myconf[@]}"
-}
-
-src_configure() {
-	local cameras
-	local cam
-	local cam_warn=no
-	for cam in ${IUSE_CAMERAS} ; do
-		if use "cameras_${cam}"; then
-			cameras="${cameras},${cam}"
-		else
-			cam_warn=yes
-		fi
-	done
-
-	if [ "${cam_warn}" = "yes" ]; then
-		[ -z "${cameras}" ] || cameras="${cameras:1}"
-		einfo "Enabled camera drivers: ${cameras:-none}"
-		einfo "Upstream will not support you if you do not compile all camera drivers first"
-	else
-		cameras="all"
-		einfo "Enabled camera drivers: all"
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		doxygen doc/Doxyfile || die "Documentation generation failed"
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --modules
-
-	einstalldocs
-	dodoc TESTERS MAINTAINERS HACKING
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/README examples/*.c examples/*.h
-	fi
-
-	# FIXME: fixup autoconf bug #????
-	if ! use doc && [ -d "${ED}/usr/share/doc/${PF}/apidocs.html" ]; then
-		rm -fr "${ED}/usr/share/doc/${PF}/apidocs.html"
-	fi
-	# end fixup
-
-	local udev_rules cam_list
-	udev_rules="$(get_udevdir)/rules.d/70-libgphoto2.rules"
-	cam_list="/usr/$(get_libdir)/libgphoto2/print-camera-list"
-
-	if [ -x "${ED}"${cam_list} ]; then
-		# Let print-camera-list find libgphoto2.so
-		export LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)"
-		# Let libgphoto2 find its camera-modules
-		export CAMLIBS="${ED}/usr/$(get_libdir)/libgphoto2/${PV}"
-
-		einfo "Generating UDEV-rules ..."
-		mkdir -p "${ED}"/${udev_rules%/*}
-		echo -e "# do not edit this file, it will be overwritten on update\n#" \
-			> "${ED}"/${udev_rules}
-		"${ED}"${cam_list} udev-rules version 201 group plugdev >> "${ED}"/${udev_rules} \
-			|| die "failed to create udev-rules"
-	else
-		eerror "Unable to find print-camera-list"
-		eerror "and therefore unable to generate hotplug usermap."
-		eerror "You will have to manually generate it by running:"
-		eerror " ${cam_list} udev-rules version 201 group plugdev > ${udev_rules}"
-	fi
-
-}
-
-pkg_postinst() {
-	if ! has_version "sys-auth/consolekit[acl]" && ! has_version "sys-apps/systemd[acl]" && ! has_version "sys-auth/elogind[acl]" ; then
-		elog "Don't forget to add yourself to the plugdev group "
-		elog "if you want to be able to access your camera."
-	fi
-
-	local old_udev_rules="${EROOT}"etc/udev/rules.d/99-libgphoto2.rules
-	if [[ -f ${old_udev_rules} ]]; then
-		rm -f "${old_udev_rules}"
-	fi
-}
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild
index 6d4fc0766e01..b383e9214e7a 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # FIXME: should we also bump for libgphoto2_port.so soname version?
 SLOT="0/6" # libgphoto2.so soname version
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples exif gd jpeg nls serial"
 
 # By default, drivers for all supported cameras will be compiled.
diff --git a/media-libs/libharu/Manifest b/media-libs/libharu/Manifest
index 259d22d6e43a..1b4db76804ac 100644
--- a/media-libs/libharu/Manifest
+++ b/media-libs/libharu/Manifest
@@ -3,5 +3,5 @@ AUX libharu-2.3.0-2-Avoid-issue-with-libtiff-duplicate-symbols.patch 2867 BLAKE2
 AUX libharu-2.3.0-3-cmake-fixes.patch 6376 BLAKE2B ec14be6aeda6e0e43a40bc2f1d41fcec4b601161cdcf1bdeff3e585bd78d6924aae322ffa5fe48f4fe221b1750b672ec7a80ba0a985368da4e5b00122b7d6617 SHA512 186d36b0b943c811e9fc34d448f58177914d2146a3df5cf8b12fe8c9fe7525046a7e53361052d308164cb99d4ec9a28341e4fe3b6cc69d6cb2c0ea03a49b0355
 AUX libharu-2.3.0-4-Add-support-for-free-form-triangle-Shading-objects.patch 15988 BLAKE2B 6cbd9826317e6d1de126dfdcdd3508bfb6351c34cd58fda8f09fe44efead890d78c67f33750223cb2291312b2299ecf16f7b91e4e20a3024bb6007da96753f86 SHA512 94d1377e529d1d96941a90ac82276748f5bf7f0e248a6770d938394151e453aaa082c0d256c0de28f737e7e995bc0ee60a4eb5562aa450af1dfcc1733b403466
 DIST libharu-2.3.0.tar.gz 1396413 BLAKE2B 7f0c819f17740f12f9bf6c7a7c749eb8c6ada326d98985daeac4d3250733cfc8e085b540e0969cb1b4c3b1055f4d1e148a2ed010d9371685fd265b62a879be9c SHA512 ebcabf1e8488e21185a231e97b4c16f9de742ae0ac2ebc7535b72b6b8e2045c2619bc6a94a820f7f923b0dfeceb217408f4e4c613ef3602104373cdf000d3f41
-EBUILD libharu-2.3.0-r2.ebuild 977 BLAKE2B 11dfa82cc601b6ac1182c014e01d7b1de2d36c6ecff690f38d46a6f6ffbedc906f00a4acd57315e9e6bfd60392a45b49f0de0667505602215e4e678410d007ac SHA512 b84636e61c1a01c2c02b6c44c3b7c87f01dcebc05a7f7b936a8ace8784bacfa8f26c715f76b089692c29ae91b2aa4e5b187afe882fe05cb3e0d9e21995dc81b9
+EBUILD libharu-2.3.0-r2.ebuild 989 BLAKE2B a43ec8fff874db7c3293a89460f98eee691327489165850660778004a703b69ee2801f662027d869188b5bbe66bc4463c7eca5e9a1838d7f87bf16264dcf365c SHA512 8fd2da54d0e3e2e742771cf6fa9b4fda6526f574ee95ed456aa1ead9a48d97e2e2b61a59350bbcf431c9e1c25716dc55823927344f99aa1875a1f6e72a9550ad
 MISC metadata.xml 1001 BLAKE2B 885dfdacbde50227739f7f1e4a0b23febf988628cecc2bf67995408e978673022633d14407bdf95c29c7a1c8cce11f3c0133dba529e25a1a6df2e5cdacbd27b0 SHA512 baab0fbcff40fe0cf1ac6df68416335bf01f08a0b26d8441d76cfb0e1a6b3227aa8ed54d3f080c0ba5cbcf372f7a99c0c45c9ea215e7210c5e77805a30140d4f
diff --git a/media-libs/libharu/libharu-2.3.0-r2.ebuild b/media-libs/libharu/libharu-2.3.0-r2.ebuild
index 0d2427edfda0..0a5c2ae4ad1a 100644
--- a/media-libs/libharu/libharu-2.3.0-r2.ebuild
+++ b/media-libs/libharu/libharu-2.3.0-r2.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-inherit cmake-multilib
-
+CMAKE_ECLASS=cmake
 MYP=RELEASE_${PV//./_}
+inherit cmake-multilib
 
 DESCRIPTION="C/C++ library for PDF generation"
 HOMEPAGE="http://www.libharu.org/"
@@ -36,5 +36,5 @@ multilib_src_configure() {
 		-DLIBHPDF_EXAMPLES=NO # Doesn't work
 		-DLIBHPDF_STATIC=NO
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index 842346ad6fb8..7bf9a4def832 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,6 +1,6 @@
 DIST libheif-1.5.1.tar.gz 1510087 BLAKE2B 1dd5e913c8913c6b62b770653585f8ccf7cda14c4dd79ff2073bf085da4d730accaef8d0f8008ac941238a7e3e131add1a218e0c78a886847b3bcf253d66c9b6 SHA512 05e32ebff08d5f0e82e9b1107253c27882ae1694150033fe7b3ca07db8c64567f09002081276e92a3b490a63022a1522d577b094a7f489742139758d17f484b8
 DIST libheif-1.6.0.tar.gz 1512262 BLAKE2B db27c65130250d018d8bce9b793d281b9bc3928ef378f8d3180bd0236e7f92810b08da9aaea227733d533cd871712319da1263a9020c5e2dbcfda20ab13f6978 SHA512 25e3f08663224321a5d7646543787f026c0fc344e1b26c90b7b48247a7c036836112d104f3559b1c3c96c0252b2ce5efaaed456ccd0ae648f70e4055d81f2f00
 EBUILD libheif-1.5.1.ebuild 1457 BLAKE2B 083d8e9034d5c4fd5816047ab2e577978b395a13546e3a2d3a747f09c087feb99df885cddf20a0129c3e574bbe981a59c60bfece141505412358214463a4df92 SHA512 79599b18a58d121ffef9b15842c0faa90792d3821fdd9d54a0b2ed2ab81e6c90880230f96137cd21e406d6b254ce1f0b205401d49d0c3a774b6fc923e4b8ce93
-EBUILD libheif-1.6.0.ebuild 1457 BLAKE2B ffe1ba7266fdcad37f89f49dd1948db5ff432e070e15e13e346e48d965ab889ef6251c121262647e7bd0efbb4f9e5434bf5325f69ef9de528b7f107ea8abd66d SHA512 0910ab4d7fb442cc1502c5cae91bd2b19b09870ac4e4785fbf6ad56d6cb3b02f0c425b61e330bfa7e3dbd5d717ca0f78a6770263c8d530e137f2527898989d42
-EBUILD libheif-9999.ebuild 1457 BLAKE2B ffe1ba7266fdcad37f89f49dd1948db5ff432e070e15e13e346e48d965ab889ef6251c121262647e7bd0efbb4f9e5434bf5325f69ef9de528b7f107ea8abd66d SHA512 0910ab4d7fb442cc1502c5cae91bd2b19b09870ac4e4785fbf6ad56d6cb3b02f0c425b61e330bfa7e3dbd5d717ca0f78a6770263c8d530e137f2527898989d42
+EBUILD libheif-1.6.0.ebuild 1464 BLAKE2B 70597a66418d649017792b147e47dee7f69064326b40ca72e37756fd7e778621178dfab5213bbf5f1587b7735235d75d49a3732beb492342692ee57ad0924f6a SHA512 431ba0826e3087c0a95cf3898130ab31bc57ac975a561c0220400e832afa8a93ff0f214223245689488d01e0f681d461b4bbb60f31ce7c5f632f2ecaa8999b5f
+EBUILD libheif-9999.ebuild 1464 BLAKE2B 70597a66418d649017792b147e47dee7f69064326b40ca72e37756fd7e778621178dfab5213bbf5f1587b7735235d75d49a3732beb492342692ee57ad0924f6a SHA512 431ba0826e3087c0a95cf3898130ab31bc57ac975a561c0220400e832afa8a93ff0f214223245689488d01e0f681d461b4bbb60f31ce7c5f632f2ecaa8999b5f
 MISC metadata.xml 369 BLAKE2B e85296d149b4ebfe852a79ed951dff87e3586617cac09f2e81bc501f2739599e7fda1835f1d677cd923a1324e4f6d85e4f1552eb0589511372dd603d239880c5 SHA512 70bbaa03beb93f3649271be35d4c90e7d79395efefd0cfb9915525a5c736629bcf56bd66e2d1bbf2a746c62a5f21ddb8874cdf28f61180fe9abc3ad22ab51fc8
diff --git a/media-libs/libheif/libheif-1.6.0.ebuild b/media-libs/libheif/libheif-1.6.0.ebuild
index cbf2d5eaaaad..6cc971a64be1 100644
--- a/media-libs/libheif/libheif-1.6.0.ebuild
+++ b/media-libs/libheif/libheif-1.6.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strukturag/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
diff --git a/media-libs/libheif/libheif-9999.ebuild b/media-libs/libheif/libheif-9999.ebuild
index cbf2d5eaaaad..6cc971a64be1 100644
--- a/media-libs/libheif/libheif-9999.ebuild
+++ b/media-libs/libheif/libheif-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strukturag/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
diff --git a/media-libs/libid3tag/Manifest b/media-libs/libid3tag/Manifest
index 122f99560ba0..324e8f5f51ee 100644
--- a/media-libs/libid3tag/Manifest
+++ b/media-libs/libid3tag/Manifest
@@ -1,13 +1,13 @@
-AUX 0.15.1b/libid3tag-0.15.1b-64bit-long.patch 567 BLAKE2B 1f1797d093abb56e87be3151f958d9bb06a9320cac1a441c0ebad6114d8e632e0da7ceede7ef6c218c95f4f3be8c7542e71a541f8fbaeaf358860b9fa01f17ab SHA512 f2c19dd5138d1cf58764dfb2acb58b4f36ad18749b0a29de9110f3bf81ae1c56c24701b4a906692863501c175fab81c44d486a94a7ee63ea67f552a68f14dcaa
-AUX 0.15.1b/libid3tag-0.15.1b-a_capella.patch 1303 BLAKE2B 14ab259f31d2389735d35ecd138dac696368b35496c7de94513268fdbbaf3d9d56af74cd7dfcf2592bd14f5d1401c7a52e213851d24eb745d3e1904661b363e7 SHA512 a14fe71d32d620033afc73da9e4be3ecb1b88b750b96b5da960e3d323f0a45030e221d5a001ed9fbdb45d9072fa2f82946bae6a73a1e116355a88deada99435e
+AUX 0.15.1b/libid3tag-0.15.1b-64bit-long.patch 494 BLAKE2B 6d3f37e0b3cb642012cdf6f31a11a6852c524a4ca10c0ec2d7adb925704ce46378261e28c62464e7c5189479d15c8c5fe120fdf968629272879b299345079aa9 SHA512 4641e4fb2a954270af7669b4119bffc5bc1f15f039e11a3c07811a6f148aa2f82c7b56f64f09f724440630b99920651651761c05a77c15b54268907b599e9ff0
+AUX 0.15.1b/libid3tag-0.15.1b-a_capella.patch 875 BLAKE2B 7bc827cfe5c9991726655d444c6860fff3264a5e125dd1574e870796ff52affa10e0c034b4acd9bda3858be2f815cd934daf5755caff93361e2a51ce2234332a SHA512 c7e77bd81f620165d2e5b71c39b62d7633b579c67de30ffb12d51ee52987e072d8a0ff1384232d3c29d60f348d10c33fc47dbba7969e2c874a05009f12f607d0
 AUX 0.15.1b/libid3tag-0.15.1b-compat.patch 452 BLAKE2B c43437ca0319e383e375cb7826f1afa61774f2fb3cb52136ad3a267ea17a4f6bb7532d82e0b354168464f16e69bb3e8a1ea8dd313f5895d9c2e5c8d6b928985f SHA512 91364db67a02106ebd0f8930f16adb25f078f707f95c695b0da6b42f1519e6aadd7cf181d19f2fea6454b3ed64d0388222f279bb1e5c802365b5d3faeb9f30c3
 AUX 0.15.1b/libid3tag-0.15.1b-file-write.patch 1344 BLAKE2B ba1e43314a4e286db21a6236929ef125294a1826724cf13a33c30a906a03dc2e6ec26acc66419c4007208ca8c99324178c3c932569e70c1cf699d7595c3b75ff SHA512 a24cd37eefd6dc282c71f59ea1f612c2347deb87a15bd6aa5c163a61cabe77a0cc882adabae35d5090c711f7f796fb6e3787968e506627336f0f0d4ad7957414
-AUX 0.15.1b/libid3tag-0.15.1b-fix_overflow.patch 324 BLAKE2B 229a97eb0c9d136a36a629185fde8541727d5fe5f4ecfb93c34fc8e0e70cd1024e0988d3f66f069e952d13040dfa13d1aa8b894b31b2b9dc92384a92d328548a SHA512 895d6a71540c8a60258e8900479bbce8f3eef67c9b0ff631130862778b3688568c5e363e0ba2a7b55a2e4a9109e22673eda69903e7bcaa77776de876cb09295b
-AUX 0.15.1b/libid3tag-0.15.1b-tag.patch 527 BLAKE2B 045268d964d4dddad836a1a8e2a75db9762d6fc442f95cc1155639979c120941876c35d31587378be69f0610449babb583ff41fd8d4f5c7e261a3b2ccee6590b SHA512 d610b108b896126ff721d1910e882ba06089aef1d3d8db60b6b76548b777f03962200fc5f046d96f1b655de4dff0a3031231f78094037c9506f7ad7798e01c8f
-AUX 0.15.1b/libid3tag-0.15.1b-unknown-encoding.patch 879 BLAKE2B 77541d2bc967a46a4557e614309f403ac8320fe1380117da21f99a9b80fb31b49fd06e6ba0234589102b26a733447ff17fe3a448e9400c7a904822354f7b5b97 SHA512 b5fab5bec89ac1d1180edae3871718170b442ec79ebde0536b50a70d6aba98761fd93fe79ebb81ee21a12643d5fb84085b7c7fd62c321284da1d61c48bd34809
+AUX 0.15.1b/libid3tag-0.15.1b-fix_overflow.patch 251 BLAKE2B 5b61c73ed52d6e2f7b45bee2200e314c51338b1b93414a3e567e301c6aa133db96f22f95a94b5969195123949eb277c329573bf631d1fcf416d202bf122fbf88 SHA512 183c721a1524ee507572e300b875b0640b9f50d6257e16e818861cc0f8aadc193dc25c832c8f748a5722e4ed7e1f7f942e6f66ca674baf623410beafda973f39
+AUX 0.15.1b/libid3tag-0.15.1b-tag.patch 476 BLAKE2B 9437c589417dc4825a43718b79638ea0fa1aa5b2c027e3a9101afd02a5bd4053e7cf04bb69dfb9eeda2558132a4a7d63b1485515171397d9c355249ff29721ea SHA512 7e1cab9e05bf12bbcb20bcf82ee6e54dab049fc1234f65814de269e27f779e76c1e7732d9a725f811350d633b303ce9419a8bcb186f19f0685e1f6e938055084
+AUX 0.15.1b/libid3tag-0.15.1b-unknown-encoding.patch 507 BLAKE2B 5554786abfe2d909d4a1cdcab8fb076010519f6e0dfdfc137b8e533f56c7563a62204bec1845284e22b45d201e7ccfd65303255515a1e71dfa0f84eb47f65cf3 SHA512 c7c67cd1c6d54d03e964d02f7993222e3b995d67f4ba54372cc0b91978447920d54d655d5db99985f41448096131beb46b418a43e5bdb1dec0edeaf19937a61f
 AUX 0.15.1b/libid3tag-0.15.1b-utf16.patchlibid3tag-0.15.1b-utf16.patch 583 BLAKE2B 1ce651271b297fb1aadf952549b44946ca15643b733abfe6573e898345748086b5db4641c52dea76b0d19b17ad86ddf67930ef265c1d43d93d641212c578356d SHA512 973d037f116dc9ac5d11895eb6043cbdb18c9d87165a20c4a1989fbcebdff067739d754b6233f41b8b6a88d9cf90848ef3ee22f1439e3ebdff0be6d6fc348a53
 AUX id3tag.pc 222 BLAKE2B 3ad47be06f4752c8398f12a598e2955e8164bd633681995aa1aee925a335a0f8472a91288a13374ce8db6b1c554b6c1077c3ee1b6c713e455136f9ed0dc91142 SHA512 591fdff509376a3afeb43d6dc7f9063f2388d024494952d366dae2ba8ffc3d2d5e430e0ad7470951d6c740f794529994b882d12840ff06d2fffffe70c2feae84
 AUX libid3tag-0.15.1b-fix-signature.patch 424 BLAKE2B f3dce1cb1372f175758b7c48b3ee3a6f1c95c840f7103116f9ea3ef805c5aa186c2c87747f02cb67fda1e4c13c806c5a0b32b304c2f66941fddac0942761b62e SHA512 3f320d1d8719afd84aa0cf2a9e5615f3f535f84d1987f12df0a9d3f2b7c02e2c87fbc3aa41d538cdc4f8a30e629de6f3fc3a4e79f23448fd39d4c0c438c803fb
 DIST libid3tag-0.15.1b.tar.gz 338143 BLAKE2B a4e4e66177eae9aaa251c71d605034488fdd9a0a207a41a41f85793ecbb763dd4a4c8f01183eb45a5c8563c4ad120e73b29578fd4c3bb8e467e39c5427b530b5 SHA512 ade7ce2a43c3646b4c9fdc642095174b9d4938b078b205cd40906d525acd17e87ad76064054a961f391edcba6495441450af2f68be69f116549ca666b069e6d3
-EBUILD libid3tag-0.15.1b-r4.ebuild 1618 BLAKE2B 9ab8e36538eafb82efdaa914eafb02dab1ca9450b8385a851ce53073c73fd4b76a495984e981a045dfd805f55f3adb24dc2762ccac0c15efa4b97a9b6378504b SHA512 ee91f687bb0353bd017763c0ffc79477a5dbdfa9c21b4a662216042734452255c5924f861b823901d2c46b1ef52d9bd40a803af51f7bdc91bd750d6bae228a51
+EBUILD libid3tag-0.15.1b-r4.ebuild 1653 BLAKE2B b0837aa395bc4e6f3f9dec2c3185610c76fdb5811323a5a0011b521b8c4de828514187fa422cb1266e645c2f6f41886d23088e99f07a03fb072070cb6d81e3a0 SHA512 8848dcaba72ee077644590e8c67fec87d12d37edf83f97de53ce8e41d217ff74d793dc5db3178f6eea351ddd57783c8d96cc8a7788d3d9eb26ea0fafb6028d13
 MISC metadata.xml 326 BLAKE2B a9064ce28313804fb873d3e0b4fcb96681a2fcdcf60011d629268f73ab47f6c00ff6e0d95d2d075ec6af89bbe7aea4b6346ef2500815f08a69318a8736e7201d SHA512 b6c3a0765c5d00fd44caf7266edb75a373d8d4e813ac7f68507067f57713090fdc84f95886e73401d9c912f7f64453c975117030692526a49aebd6f5276751c9
diff --git a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-64bit-long.patch b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-64bit-long.patch
index 852d9efd69b2..bb320c7aa70b 100644
--- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-64bit-long.patch
+++ b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-64bit-long.patch
@@ -1,5 +1,5 @@
---- id3tag.h.orig	2004-01-23 18:22:46.000000000 -0500
-+++ id3tag.h	2008-05-04 19:46:33.000000000 -0400
+--- a/id3tag.h
++++ b/id3tag.h
 @@ -25,6 +25,8 @@
  # ifndef LIBID3TAG_ID3TAG_H
  # define LIBID3TAG_ID3TAG_H
diff --git a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-a_capella.patch b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-a_capella.patch
index 2adc2e6ced28..e196cb4df269 100644
--- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-a_capella.patch
+++ b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-a_capella.patch
@@ -1,6 +1,5 @@
-diff -urNad /home/debian/mad/libid3tag-0.15.1b/libid3tag-0.15.1b/genre.dat libid3tag-0.15.1b/genre.dat
---- a/libid3tag-0.15.1b/genre.dat	2004-02-16 21:34:39.000000000 -0500
-+++ b/libid3tag-0.15.1b/genre.dat	2004-09-06 09:50:33.000000000 -0400
+--- a/genre.dat
++++ b/genre.dat
 @@ -277,8 +277,8 @@
    { 'P', 'u', 'n', 'k', ' ', 'R', 'o', 'c', 'k', 0 };
  static id3_ucs4_t const genre_DRUM_SOLO[] =
@@ -21,9 +20,8 @@ diff -urNad /home/debian/mad/libid3tag-0.15.1b/libid3tag-0.15.1b/genre.dat libid
    genre_EURO_HOUSE,
    genre_DANCE_HALL,
    genre_GOA,
-diff -urNad /home/debian/mad/libid3tag-0.15.1b/libid3tag-0.15.1b/genre.dat.in libid3tag-0.15.1b/genre.dat.in
---- a/libid3tag-0.15.1b/genre.dat.in	2004-01-23 04:41:32.000000000 -0500
-+++ b/libid3tag-0.15.1b/genre.dat.in	2004-09-06 09:50:33.000000000 -0400
+--- a/genre.dat.in
++++ b/genre.dat.in
 @@ -153,7 +153,7 @@
  Duet
  Punk Rock
diff --git a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-fix_overflow.patch b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-fix_overflow.patch
index 26c54c5d2cfe..5e0a1f60e7aa 100644
--- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-fix_overflow.patch
+++ b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-fix_overflow.patch
@@ -1,5 +1,5 @@
---- field.c.orig	2008-05-05 09:49:15.000000000 -0400
-+++ field.c	2008-05-05 09:49:25.000000000 -0400
+--- a/field.c
++++ b/field.c
 @@ -291,7 +291,7 @@
  
        end = *ptr + length;
diff --git a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-tag.patch b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-tag.patch
index 2badfb35cffa..4d13e47018c7 100644
--- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-tag.patch
+++ b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-tag.patch
@@ -1,5 +1,5 @@
---- tag.c.orig	Fri Apr 18 18:14:33 2003
-+++ tag.c	Mon Sep 26 22:29:24 2005
+--- a/tag.c
++++ b/tag.c
 @@ -714,9 +714,12 @@
  
    frame = id3_tag_findframe(tag, ID3_FRAME_TRACK, 0);
diff --git a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-unknown-encoding.patch b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-unknown-encoding.patch
index 7c70d0020384..91b3d2a5eb06 100644
--- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-unknown-encoding.patch
+++ b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-unknown-encoding.patch
@@ -1,6 +1,5 @@
-diff -urNad libid3tag-0.15.1b~/compat.gperf libid3tag-0.15.1b/compat.gperf
---- libid3tag-0.15.1b~/compat.gperf	2004-01-23 09:41:32.000000000 +0000
-+++ libid3tag-0.15.1b/compat.gperf	2007-01-14 14:36:53.000000000 +0000
+--- a/compat.gperf
++++ b/compat.gperf
 @@ -236,6 +236,10 @@
  
      encoding = id3_parse_uint(&data, 1);
@@ -10,11 +9,10 @@ diff -urNad libid3tag-0.15.1b~/compat.gperf libid3tag-0.15.1b/compat.gperf
 +	continue;
 +    }
  
-     if (id3_ucs4_length(string) < 4) {
-       free(string);
-diff -urNad libid3tag-0.15.1b~/parse.c libid3tag-0.15.1b/parse.c
---- libid3tag-0.15.1b~/parse.c	2004-01-23 09:41:32.000000000 +0000
-+++ libid3tag-0.15.1b/parse.c	2007-01-14 14:37:34.000000000 +0000
+     if (string == 0)
+       continue;
+--- a/parse.c
++++ b/parse.c
 @@ -165,6 +165,9 @@
    case ID3_FIELD_TEXTENCODING_UTF_8:
      ucs4 = id3_utf8_deserialize(ptr, length);
diff --git a/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild b/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
index 0a3a7443ad69..bb711194b438 100644
--- a/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
+++ b/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-# eutils for einstalldocs
-inherit epatch epunt-cxx eutils libtool ltprune multilib multilib-minimal
+EAPI=7
+
+inherit autotools multilib-minimal
 
 DESCRIPTION="The MAD id3tag library"
 HOMEPAGE="http://www.underbit.com/products/mad/"
@@ -12,25 +12,32 @@ SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug static-libs"
+IUSE="debug"
 
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
+RDEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-util/gperf"
+	>=dev-util/gperf-3.1"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}/${P}-64bit-long.patch
+	"${FILESDIR}"/${PV}/${P}-a_capella.patch
+	"${FILESDIR}"/${PV}/${P}-compat.patch
+	"${FILESDIR}"/${PV}/${P}-file-write.patch
+	"${FILESDIR}"/${PV}/${P}-fix_overflow.patch
+	"${FILESDIR}"/${PV}/${P}-tag.patch
+	"${FILESDIR}"/${PV}/${P}-unknown-encoding.patch
+	"${FILESDIR}"/${PV}/${P}-utf16.patchlibid3tag-0.15.1b-utf16.patch
+	"${FILESDIR}"/${P}-fix-signature.patch
+)
 
 src_prepare() {
-	epunt_cxx #74489
-	epatch "${FILESDIR}/${PV}"/*.patch
-	# gperf 3.1 and newer generate code with a size_t length parameter,
-	# older versions are incompatible and take an unsigned int.
-	has_version '>=dev-util/gperf-3.1' && epatch "${FILESDIR}/${P}-fix-signature.patch"
-
-	elibtoolize #sane .so versionning on fbsd and .so -> .so.version symlink
+	default
+	eautoreconf
 }
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
+		--disable-static \
 		$(use_enable debug debugging)
 }
 
@@ -48,6 +55,8 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files --all
 	einstalldocs
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libinsane/Manifest b/media-libs/libinsane/Manifest
index b0ef144a6697..d5a8d5e2d354 100644
--- a/media-libs/libinsane/Manifest
+++ b/media-libs/libinsane/Manifest
@@ -1,6 +1,8 @@
 AUX libinsane-1.0.1-meson_options.patch 2038 BLAKE2B b14ba254604f214c2cd1a15e705ea361b635bac7faae4995811477456ea8a8d8bf969fefb4330b3b6f05cd498cd2f01b8b065c2f8f3c88e21e62ea6ef204de15 SHA512 c0d5d3ce5d763d04327ea500229c9f26d989aa8072dec569adb3766c70e0cab9e00629e3099c5ab8bd4e3c84b86925ad108fe78eeae9066164de1302e2226572
 DIST libinsane-1.0.1.tar.gz 706575 BLAKE2B 32ae63c275e6e9c709aefd0c6ed2237df70ad027626cf6ded2009071c74ce925d50ab730bd36b677915d2bd6e606d6337e890cfcc3e8bf4a1f281e026140537a SHA512 1b7091b207b8ea559f21084aa8231c62f34dfa6043e9f358d55708006989c50ee131011dbe5bd03bcd1212cd0219ae9d65a544e57cf3a71c4c2f65e5d89257bc
 DIST libinsane-1.0.2.tar.gz 712366 BLAKE2B 5be68792b3a89718308a180b1ca9383e7aebbd2f4e3420376ffecbc7d9b32d16b2fdcf060760708f8ef8f125c4d4caf2f41c6c15da53506e46302dc4155038be SHA512 d65c3fdcc8f64be473a7ff8078b5c9cbfa65ebbf44184fb76c12b40eedc87742167c8fa720683d83d5d29292664c6e311a2c12f45dff35306f60ac7612e63d97
+DIST libinsane-1.0.3.tar.gz 715603 BLAKE2B f6e97fc62c38a3481675671c5bed90d2c9c9db0ce9bf36e66f49f94726ce708300157484107e16b8e5f5a2c86fdd456418998a4b5566391246eeb213bf95f79f SHA512 2508347554cbcfc122dd8be16e60d7357a2fb7876ee044ba6024a4e564378d3748d1b267bd3b63cb0a2f6f9bb8daf748be72d3901d8f6e36961cf0849ff4ceb4
 EBUILD libinsane-1.0.1.ebuild 901 BLAKE2B a2f67af896828a3526f5494b508148d16ebef09c42afe67253fa40533bdba236ed0e34d069977994cef1953ff99ce2148ef85accf3498b86fc62481c877a76b9 SHA512 8c10f60d79fa4852442545c5b16ac7c240875dddd7e7ac0b0dda162cf8194976f7c7b2581d817324a32525e0327509b7f0cc0e096104fa786611693f27e0ab9e
 EBUILD libinsane-1.0.2.ebuild 907 BLAKE2B c7aaead31e64e3c4803c3984668ee8ebd35623092bb232b55cf3304a001231cc8eb9912b35c23b4b31b507eb0dd186754825f7e989b6610e0ec14772f0a3aa8f SHA512 4bbb9a14eefbbffec2e9a759919cc7c72f65785690b5d7c0ab22a03cff71266ffd4c9434473bd4e9acb7917aeff8cbae9cb8cc331c636eac73d4ca316fca39f0
+EBUILD libinsane-1.0.3.ebuild 928 BLAKE2B dd9554523c3bffa9ca5ea7a8ddbfac667deafe06c1a3a77f466190a27db22338e46f02edc53835eac24d8e8c1448aa6ec4fe7ebbe0cd8e4327d5348e2552a113 SHA512 51ffff6e9c1a33d548842084289ee31a4f8a59f0913e989e7850e50512fefa82b0199c47c18101eddf75545a7635f7a8a9b9297b68f0dc77e2ac507ef4e45391
 MISC metadata.xml 1015 BLAKE2B 2e8221fd55bcf22db23935d2150a4832c32c8e7b7703b7305797da9f63eda012261a8dbd25a00a92964a2b4e3fc22b9e2252133431582ae27964f091161d1176 SHA512 2de5a23ff82cc957941ac4e21d1261743a7f4f36a13ff6402224989eb613fa3a5138b3a464b79017e1c17cc4b7bd553e16e3cb5d9f575b57a362ab4c7d2d1fc9
diff --git a/media-libs/libinsane/libinsane-1.0.3.ebuild b/media-libs/libinsane/libinsane-1.0.3.ebuild
new file mode 100644
index 000000000000..ee4d9d71875b
--- /dev/null
+++ b/media-libs/libinsane/libinsane-1.0.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit meson vala
+
+DESCRIPTION="Crossplatform access to image scanners"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork/libinsane"
+SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/libinsane/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gtk-doc test"
+
+RDEPEND="media-gfx/sane-backends"
+DEPEND="${RDEPEND}
+	doc? (
+		app-doc/doxygen
+		dev-util/gtk-doc
+	)
+	test? (
+		dev-util/cunit
+		dev-util/valgrind
+	)"
+
+BDEPEND="dev-util/glib-utils
+	virtual/pkgconfig
+	$(vala_depend)"
+
+# Tests require an operational valgrind
+# https://wiki.gentoo.org/wiki/Debugging
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.1-meson_options.patch )
+
+src_prepare() {
+	vala_src_prepare
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use doc doc)
+	)
+	meson_src_configure
+}
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 43c25a8165b3..9bf11fd26437 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -5,5 +5,5 @@ DIST libjpeg-turbo-1.5.3.tar.gz 1658672 BLAKE2B 4d2182802aa9963fa57ec2c4fb5cf0a5
 DIST libjpeg-turbo-2.0.3.tar.gz 2161279 BLAKE2B c0def6d6d402eb2070f4861741f9579e5c360e8bc9a64924c7d53c3c65cc8d4577c01e2cf6acf8ddbe7bddc96540f605ddb47d1651a7400738638fb06928824b SHA512 ca7d4dcc5b34e23831ac450b65b8f92894d35e4afba0c52ac9e0c7dc6b41d4fa2bad66eb79198245032ec02b0b2e88cef39b8c696de17b6a869e3093a6b70e36
 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
 EBUILD libjpeg-turbo-1.5.3-r2.ebuild 2977 BLAKE2B 1cf872b7308510e14eb9c55cf60287cf297f71275d0d0aababbae34c260d903ec9d6337b9e6b63bf18ca25458a9f5ad46fd773d82a99b70d26552f6fbdf0296d SHA512 fe0954fb131f32a783501e58c094329429c34580a649a911f01030ef1d99af0fe1fbbd1d5f2fadc2db34be6e16097d3ffa9d66184f0dcbecb3a3bbe5e71eb00e
-EBUILD libjpeg-turbo-2.0.3.ebuild 2647 BLAKE2B 1d40be98a60d2414bce4610e0be9e99630e587c930efbe12ebece5fec768678486616d1166fefe2c1a9dbfe0236c515a5b3eec57be007d02efcab8a1d06a7851 SHA512 27f98fbc8ab30591a22240d3429ab7fa554ad4c2036238762a557defef285694fac48e9c983cc492f8685b5233f6e650c492094e82850be3656c5d071eeff1b0
+EBUILD libjpeg-turbo-2.0.3.ebuild 2642 BLAKE2B 75b6372e195cb6c5811b65e435a4abd7526006fe620fce09145d220bba14d16926b4f968d3591883f19d6995594a76dfde67eb37d10ad7bffec7cc056be71ec3 SHA512 4b363cdfb82f34db2d2c91612db559ce9c98163a9f8b634ce62395e6f31d9b33baf5245bf582aeae1810b86a89e438f4e138e229fae9949014ea8f246fbf1024
 MISC metadata.xml 425 BLAKE2B 675a25f38cc91c2d60d54acf1b07e58c682415b14f2a4fc61f363b743b8d00c8c7f0f8c763f8c6d3199afd2980a834b6a2acf587f6a6f94a6afeeae0d1d3ac25 SHA512 36f6245075da1d9925e7816a0014244e18c4cf5e2e634e7dedeb1aeba6f944449017a98bfa37f0724e1a04d30173533c81f770eca7a332191df7af8afab80959
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
index 2371b0b89b5d..57630393fa94 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib java-pkg-opt-2 libtool toolchain-funcs
 
 DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
@@ -37,7 +38,7 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
 src_prepare() {
 	default
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	java-pkg-opt-2_src_prepare
 }
 
@@ -54,11 +55,11 @@ multilib_src_configure() {
 		-DWITH_MEM_SRCDST=ON
 	)
 	[[ ${ABI} == "x32" ]] && mycmakeargs+=( -DREQUIRE_SIMD=OFF ) #420239
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	if multilib_is_native_abi ; then
 		pushd "${WORKDIR}/debian/extra" &>/dev/null || die
@@ -68,7 +69,7 @@ multilib_src_compile() {
 }
 
 multilib_src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if multilib_is_native_abi ; then
 		pushd "${WORKDIR}/debian/extra" &>/dev/null || die
diff --git a/media-libs/liblastfm/Manifest b/media-libs/liblastfm/Manifest
index 6a689652f932..5747836032a2 100644
--- a/media-libs/liblastfm/Manifest
+++ b/media-libs/liblastfm/Manifest
@@ -1,4 +1,4 @@
 AUX liblastfm-1.1.0_pre20150206-qt-5.11b3.patch 9192 BLAKE2B 0c4e96448692869202514ad54e0c1b371e839c9f9c4ea6ff9b085fc28f29d9f65912cd501d0c83b442242e292f868eb1d79eea6e36d20ef967cab9fb681b6b2b SHA512 f88acaed5b7a53e7e4ab47100a769a88c9579f373b7d6d305b8fd9ccd3cc749a5d5ec544e0d8f30734d940016bb8ce23e49ffc4347afd87601ad013a7111bacb
 DIST liblastfm-1.1.0_pre20150206.tar.gz 119380 BLAKE2B ec532b7577e60c02f9e8202b06e4e496b052801d60a27795d58204c6fbec62eea24512979ea9e42f643e7cfc01794982e07b808f6411b884893e13c29d9e17b0 SHA512 984d4b6b36a12e019e486425d243fc5be24fc3968b30f7ec746204c976b9c526477d56793205c9a6eed79bff1b33a2b1c7063d1d08fd376c4b89346337d8b166
-EBUILD liblastfm-1.1.0_pre20150206.ebuild 1092 BLAKE2B 57117f788bbd25b8216a900afc94454f713dfb214f7827fbf40271a4befc6db197256a270f87b2f241633c66222dc38f85c32468ea304f4c4dd739c8524b02c3 SHA512 cfcbf7257d864d812c5eebf5fe080753c978cc45eb1aa4e7b6e25dc7867885819af96ccd5a58d70d4af753b26cfcdea1ad57fe22581c6c6556abeb1fe1208be3
+EBUILD liblastfm-1.1.0_pre20150206.ebuild 1080 BLAKE2B 317ad17291bc477d59d761cd15fa3facd3389777d966b42b76b408726527094e0b65cb11c0d74194795f0fb92e78a320c2ad1904270f711f6800c9a40319dc5a SHA512 f7a09d4190eb8efa296b18f27a715bb64713de375ede6b1c70745df4bab90a77709c5a2dc34bb204bd46ad0dc17d3dbba39f6c4ad218fa10f7812729e8e14d41
 MISC metadata.xml 416 BLAKE2B 8f559223d9c09d5bcb551e582240252467d3846806e2d1ca1c2fe243286cd88b7f5760ec8313f15924b4041f55937c08795df1d4485e96c6523721c910b33efd SHA512 61b4387e1a4d837b28f13a7c705f1ab043fefb1ef80dda47399d52cb1a14ba79127f323967eb2e993fd6118375f134d9894fea9e132cc147c883758d1d5222a6
diff --git a/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild b/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild
index 33eb7fb67ef5..c539e6a7b1fa 100644
--- a/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild
+++ b/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 COMMIT=44331654256df83bc1d3cbb271a8ce3d4c464686
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Collection of libraries to integrate Last.fm services"
 HOMEPAGE="https://github.com/lastfm/liblastfm"
@@ -47,5 +47,5 @@ src_configure() {
 		-DBUILD_TESTS=$(usex test)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-libs/liblscp/Manifest b/media-libs/liblscp/Manifest
index 4df9975a7ef3..53074cafda0a 100644
--- a/media-libs/liblscp/Manifest
+++ b/media-libs/liblscp/Manifest
@@ -1,4 +1,4 @@
 DIST liblscp-0.6.0.tar.gz 670650 BLAKE2B 0cb825743fac7b328c32844f834d59e6622fcb9d860e9a13732d5548ce1f6bd0136928ea5be9b1de0a2811878c38b2e714823973c7a340d99de4735d6c46f637 SHA512 64c5cb51ac7821d65a8769415deb68cefa24684e1d4fa592a68c7e45cf2af02ffa41a2f2300ffc98a6d1d6d880279aa1b61499ac0fe59177c60fc0a2075ada15
 EBUILD liblscp-0.6.0.ebuild 586 BLAKE2B e3299ff0820b51bdfdef112702dbc72acba12370df85fa74f278dadaea50a75474980de4eb3d57759c47208a8ff1f6618d58eb77f940a5e4d70287f681b0642c SHA512 f4ade6a4ea2b72a6bc0c537088633ca8c188dcdc0e3f4a2c5892a39d82d9442b70f543d2bfb5e4a1c1e2edb14559073227e1214426bed87ff1f70bccb6a55705
-EBUILD liblscp-9999.ebuild 665 BLAKE2B 0cbf3d7b9d41d8e9e35ee1dd538a6b713f87f2d176fde1306e28cdcad237e446056d83ea29e060a2a85142d72840388379154c03d5d7217b05bb25b6b640c212 SHA512 907a7682554e7c2541cf23bbb56d9bafb78020f6b7978ea113fe21708915adcbf7fe6e6d2b32ee8bbac3484eb71896a9a77a13496c3b2740f23674b655a5d3d6
+EBUILD liblscp-9999.ebuild 665 BLAKE2B 467725b732d81f5f42cc3cf386f383336f2a9fd3cf63b348c1bfd60de45881bf67d50940ecf31e733783b05635670eafb3b071d55423ff5d0d406290c601d158 SHA512 6228569488fa50b3f30ca07e1d72edacabfb8db31142299b1b5cd1d1af2dc74665929889d46d1fb9245a9f0c681dbbfec98fb4c81730b1467448b719ca426109
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/liblscp/liblscp-9999.ebuild b/media-libs/liblscp/liblscp-9999.ebuild
index de7d7ff9c249..58bf2dff4bf3 100644
--- a/media-libs/liblscp/liblscp-9999.ebuild
+++ b/media-libs/liblscp/liblscp-9999.ebuild
@@ -21,7 +21,7 @@ DOCS=( AUTHORS ChangeLog TODO NEWS README )
 src_prepare() {
 	default
 
-	emake -f Makefile.svn
+	emake -f Makefile.git
 	eautoreconf
 }
 
diff --git a/media-libs/libmatroska/Manifest b/media-libs/libmatroska/Manifest
index a2cceefa8509..9aca8e443cd6 100644
--- a/media-libs/libmatroska/Manifest
+++ b/media-libs/libmatroska/Manifest
@@ -1,3 +1,3 @@
 DIST libmatroska-1.5.2.tar.xz 64996 BLAKE2B 6af202b9817ed54feca76c0a9ed60a0eca0431ffc4ebc9aeae2df191066501c16fb7bb8dc37cb6353eb22c87dfe9fa22420cbbf18d3a6a6edeec4900a59bc0cf SHA512 122b71b91ae89e2a7cc89db17655a006248d58f18d913b4f9ffc885aef7e39681a3a16eed43cd8ecd949c570a939007797c79829f5ee87d08562aee3f0224ba2
-EBUILD libmatroska-1.5.2.ebuild 639 BLAKE2B 269f32f45a309fa465b9a76881d31c719fe5f540235d0cc44b07566f905f65c580274198e3a88688c695f7720b0b821c04d4774fb8627bea6372a1f730ea57c0 SHA512 f65009cd6e87bf20a7ae3bec6062fd65f666edb849ec9c73b4c89fe68385b6ae6081bb055101dc9824b7d838a266ed6496fa4885e23897a19db675f5e80abacb
+EBUILD libmatroska-1.5.2.ebuild 627 BLAKE2B 53e93c618e049659fcd8b25c3f819bb1b1f13861258f62df11e61428c994cdd8b737e1c6b7fa2be68086fb1049410c03cf1d1b1d623b530ad4853de6e5dc2ee1 SHA512 10b0e49278778c179d39f399bfd794281bcaa468d5da6b31997466efd539bc903622082fe97e005f195a1350c2fcb9de3c88e9df42a9d0fd0bf6ea466c6686a7
 MISC metadata.xml 320 BLAKE2B edd6b2e35a7833d3510edec80f3771a319cbb257cbb203e0f71f33636431496c620cb3307b2bebb44360d6932a7e4376b0d134f3f42d26fc9271423c2eed11f6 SHA512 5c1dad06e1fef24b1ec68fb6b12d0d17b4bd05f22b1953f713c25a513340cb08540eebaec32fbe7c6607ba2142a057b8e6e5743a929b7368665d91bc014f35a9
diff --git a/media-libs/libmatroska/libmatroska-1.5.2.ebuild b/media-libs/libmatroska/libmatroska-1.5.2.ebuild
index 62097ee093e6..8ace52e9b280 100644
--- a/media-libs/libmatroska/libmatroska-1.5.2.ebuild
+++ b/media-libs/libmatroska/libmatroska-1.5.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Extensible multimedia container format based on EBML"
 HOMEPAGE="https://www.matroska.org/ https://github.com/Matroska-Org/libmatroska/"
@@ -19,5 +19,5 @@ DEPEND="${RDEPEND}"
 
 src_configure() {
 	local mycmakeargs=( -DBUILD_SHARED_LIBS=YES )
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-libs/libmygpo-qt/Manifest b/media-libs/libmygpo-qt/Manifest
index 12166214347a..ca61bb9a5a6c 100644
--- a/media-libs/libmygpo-qt/Manifest
+++ b/media-libs/libmygpo-qt/Manifest
@@ -1,5 +1,5 @@
 AUX libmygpo-qt-1.1.0-qt-5.11b3.patch 4991 BLAKE2B b79e01b8c72c9248ebcdda72f7051e799a399a8153785ec35cc223ff64e0707baa856846720e79acd5fc93bd73ea7e1ac8b48e8fc4a853970019b0eaac227a55 SHA512 91617ce03cfb94c9524f06dc5dd3af0c84b5b7af279cc8e13b8d4cc221b6d86c4f28347039a944f9002c57ba65bdf8c870e6076b7877ee1c88e1fefa31c1776c
 DIST libmygpo-qt-1.1.0.tar.gz 64959 BLAKE2B 85c8eebe036b5755ce6c765c2c19796532dcebbef1a7342a0f47b84ba7466de87334fd85f844c9f3f6ecf87352d8a5ba523480f1550b4928c67a3f0fe12ea902 SHA512 a24243a98b8e3544127b09e5c678d692e11ad0ad7ee8427e71b0d7cfd9455d068e4445bcd4d8d5ba94d8c0ef1b8f42390b544585ef258b5ec175546ee7bcd86a
 EBUILD libmygpo-qt-1.1.0.ebuild 941 BLAKE2B 514c644ff3dc0fd8b3bedbe3a6edd44dc202a313c324fa218289cc9eaf0a239e2164dd21fd6c9f23e784568b7c0c575a3e6d5672d94836220a82e6c8e48ffaff SHA512 6fe8106826d1b409b304e253d68b0efd576244238a22f5fd4609d8a6845723d499febac138da6338de77fc86c7ef4058ae017311b38c9955d53983aa77ca0e71
-EBUILD libmygpo-qt-9999.ebuild 799 BLAKE2B d6294cc4e1d0c2a19e32c21308e41e7048314271c1b4e022d0c911c9b357f14481107ec5a421a028ff7d5b05b69e4f1d3e947bd8185c2cf44bb6fbaaf8401f18 SHA512 75cf72284eb64da18efba16718624738ce654b013642c2799ff649e5d5ce9cc688d77ddd47f35344f2ffbf38e8ce1ee2c65ef46fac5fbecdff10ca9184bf9315
+EBUILD libmygpo-qt-9999.ebuild 787 BLAKE2B 47d3d8048f378ac0f07856e97896dece83d51aae984f6cacfddc35740b864f646710504c5834bf671fb67e0cd3ba75bd00ef055fa06998970f4403e251a80347 SHA512 ba87fcc11692dfff8978caeeeefd77060635f722a924800d77117502642aa04989dddbf8aacbbc49e6594a7d3a616f8b0f12df73ba29bb2e479f30a77e1ad377
 MISC metadata.xml 347 BLAKE2B 22a365b5f63dd847e2b9ed77d778fd645c8ebb5cbe30f933488739b5e039f879eecb5d07b176a29cd43defc9bb9a73d241c898623c11b60e753fd9a801b823ea SHA512 c9a3b16cdced1a5876ed473cce964ed24e72fac4ed6e78de8d74ac0bac4c3d1a9b6d372e4f2271e1aca75125f22c25c84a2acae448e514d623d524e844bb68db
diff --git a/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild
index 2e6fa31892f0..55b84538167e 100644
--- a/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild
+++ b/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Qt/C++ library wrapping the gpodder.net webservice"
 HOMEPAGE="http://wiki.gpodder.org/wiki/Libmygpo-qt"
@@ -38,5 +38,5 @@ src_configure() {
 		-DMYGPO_BUILD_TESTS=$(usex test)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-libs/libopenglrecorder/Manifest b/media-libs/libopenglrecorder/Manifest
index 94e223dc3b43..bbabf0d14f34 100644
--- a/media-libs/libopenglrecorder/Manifest
+++ b/media-libs/libopenglrecorder/Manifest
@@ -1,3 +1,3 @@
 DIST libopenglrecorder-0.1.0.tar.gz 101788 BLAKE2B 9fbd9e5acb51c033f533166cf4f55863d97331ca0d506ada7f0e2ffaf790a20b74521668d80dfe4ef230a6bf44466b5f5eda9ab6d4a248db730b0596ce441f6f SHA512 2264b5999870d89ab10366bbbbccfce8ef7c2674bb054005f4e182af2cb10c7553f97402feadc528da94608a47db030a07987b11470044965d70cd69fe47bacd
-EBUILD libopenglrecorder-0.1.0.ebuild 994 BLAKE2B 56b7f03d2d6394559dcd9e8e5f4326cc99852a9ee5c555901f3e846febbedfd3743fb709309816c54c629695f7f4bf1cdfa4fd0bec0c8029c8bc97ad5ba5e07e SHA512 4d5b88c42be3b0b7045010162da4e93eb1472dc035422a4c93897880fdec9f3cee2a5a654779bcaf5fb5b4de0bfce5ea7023303cde86d5a20d7ee5f1297db7ef
+EBUILD libopenglrecorder-0.1.0.ebuild 1038 BLAKE2B 5dd6e2ebd95d74d522c39114a385770808b4877e9c954571dc45e3cb3f24e6046329cc46052a00d915e2eb9c53fbe4249c3def5df3f8200b6c5005ec7ca99cff SHA512 180a92bd9c462ff83caf011d1fe6f788a70aac2d124cdd793bbee0dcecf713acbc6b517421488dc788e0f28d450cefe85cb734dee2297cba7e91ce6701b3e203
 MISC metadata.xml 533 BLAKE2B cd75ce8bc96e05b6c7284aa8d56f04b7decda54a9e14c18d553ec26ac4913319b0efe3756d6c8c23e8b3afb12081ba291db692e521d9ee7de52b1cdcbb165259 SHA512 d4067a58da4f73a5399a72713c2467f19936a1480b502798e6b02896f7930701d065f89de57b74e1fa6b92ef793db3aa1c7e059437fb1ff0167cefcdab744b1f
diff --git a/media-libs/libopenglrecorder/libopenglrecorder-0.1.0.ebuild b/media-libs/libopenglrecorder/libopenglrecorder-0.1.0.ebuild
index f948ce3df0ba..ed620f2ff98f 100644
--- a/media-libs/libopenglrecorder/libopenglrecorder-0.1.0.ebuild
+++ b/media-libs/libopenglrecorder/libopenglrecorder-0.1.0.ebuild
@@ -3,11 +3,12 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="Library for asynchronous OpenGL recording with audio"
 HOMEPAGE="https://github.com/Benau/libopenglrecorder"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/Benau/libopenglrecorder/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -38,5 +39,5 @@ multilib_src_configure() {
 		-DBUILD_RECORDER_WITH_SOUND=$(usex sound)
 		-DBUILD_WITH_VPX=$(usex vpx)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-libs/libopenmpt/Manifest b/media-libs/libopenmpt/Manifest
index 58dbe6eacae0..a82f3b147425 100644
--- a/media-libs/libopenmpt/Manifest
+++ b/media-libs/libopenmpt/Manifest
@@ -1,3 +1,3 @@
-DIST libopenmpt-0.4.10+release.autotools.tar.gz 1471662 BLAKE2B c20ef4d26b583f5cbbed5e6d108ce6f55fef74726997267a56d16b8508fb46f26f62f934a98bcc20749da2ed2aef0bdd22931cc785806ec0b6c5daef593d196d SHA512 d7c46016eea59c21e3f948d8538a747d5fa6b29f160841b688878d8ce48859d014c3a036738074b3d260af6e662c36b03391aef511c1817a5ace81f60bf27dfc
-EBUILD libopenmpt-0.4.10.ebuild 1554 BLAKE2B 9c094bebb82c016864cd62e5cdcc90fbc8dd661a9a81469b1d2a4b906dbc77b63906e80bee07c1a9d82262a9eed4e9f2af751a716607d3132de8f91aac564861 SHA512 d63c8bfe835a4d933d56d361488fd4e736b40a5b691f8e783dec263a472a5d5875ffded370b78d1de09ee69694326f27a98fbc588d7e10d0c821fbf65700ac42
+DIST libopenmpt-0.4.11+release.autotools.tar.gz 1471760 BLAKE2B fa6fd53974e235c9efb01dd7498067be9eb90a06906785d05257557c4c7faafbd0136f63e46f76638b46362cad02849fee45a21ed1c65603134c387d1c064d12 SHA512 d720a0c04984f624f7ecd1ee8648045cd09ced2cc8b1cf3546404b9e73b2781493076391c1881e0d0eee72cf829a38365313efb9852448cd1cfe5f7b7f535e99
+EBUILD libopenmpt-0.4.11.ebuild 1554 BLAKE2B 9c094bebb82c016864cd62e5cdcc90fbc8dd661a9a81469b1d2a4b906dbc77b63906e80bee07c1a9d82262a9eed4e9f2af751a716607d3132de8f91aac564861 SHA512 d63c8bfe835a4d933d56d361488fd4e736b40a5b691f8e783dec263a472a5d5875ffded370b78d1de09ee69694326f27a98fbc588d7e10d0c821fbf65700ac42
 MISC metadata.xml 327 BLAKE2B 586d07f006d87d8e0dc4c0be387cdbe4fadaabad3d9fb985f9d6c8afe77ca9686773c2eed48defbe85da365f0256efa3337f32a9e913d61fb8a48781236ce185 SHA512 52b1f22ca0b08f9d6201ec44718875f6c3b4de31703f55ebc22a516e574eeeba7ac8d0d06425e624b258b4658d0d164d1a1b7b44b2e049e151fcb390cfbeb297
diff --git a/media-libs/libopenmpt/libopenmpt-0.4.10.ebuild b/media-libs/libopenmpt/libopenmpt-0.4.11.ebuild
index 091bc25c2d2b..091bc25c2d2b 100644
--- a/media-libs/libopenmpt/libopenmpt-0.4.10.ebuild
+++ b/media-libs/libopenmpt/libopenmpt-0.4.11.ebuild
diff --git a/media-libs/libopenshot-audio/Manifest b/media-libs/libopenshot-audio/Manifest
index 9cb928292791..874c1aa40574 100644
--- a/media-libs/libopenshot-audio/Manifest
+++ b/media-libs/libopenshot-audio/Manifest
@@ -2,5 +2,5 @@ AUX libopenshot-audio-0.1.4-fix-under-linking.patch 642 BLAKE2B d4ff9256d49efb3b
 DIST libopenshot-audio-0.1.4.tar.gz 2959997 BLAKE2B 0736d9f4877f46ac90fd236cbdcfce8c1f66f5ac5d5e9762672a4eaeb668eb61a5f1e45996f0feea604d2c30891198fa58fc89f360815336ea18311d019fed2c SHA512 5605164a8c66c33ac893cc2b42cdacffff03eb156a61740c1b2c00dd7e7602a802fa1dc3795c620810e3ee29a290aa6bae8b62bc17eab3f4dd2d8052e0481824
 DIST libopenshot-audio-0.1.9_pre20190502.tar.gz 1696201 BLAKE2B 6bc0be3f8374f734cb6b7271c09dad8f7da794acb87236441f41999fab9baa3fee69d6a820db51a4c116b3a5113bb8f72da396babd13511d013b8ffafc2c1bf7 SHA512 73ba3e2054de1b74e6ae7c874a61388220efe12b640f741d5e18d9b242d427fd0fc82b03527af7de64ecd6dbe0a450b884c8557bb5a51493be21838e1f4dfd1a
 EBUILD libopenshot-audio-0.1.4.ebuild 665 BLAKE2B bde925e36f3875a26c4688d7bbb151ba499c4b28cc00053306e86c947e601475ae9fca2d3341275800aef5925a2d31ffb73abce975ad02b23499c88428d16f0e SHA512 38a7755b907648bf091c3808571efaaee5c6111042fd3da07b6c97bdb0f8573ccb1fbfb10478a50fb1fa9d0f1a4334141521f3ba8d384b9f06ba95c0d38c4d4c
-EBUILD libopenshot-audio-0.1.9_pre20190502.ebuild 631 BLAKE2B 331634541154349cf3c3d55b0ea207d99d4da28f32fac13e80248d5b69b44c0543ce3511d7082459b8c7559448dfdf228aa31c2d3e950cdc5739005f6db58d71 SHA512 b27144c088a7e653fbea29cdda0bc9cd557bb23efc11936d58828244a8a0279b902a66eefdb9a387f6edb4377fbcfbfce5b32815e74d42426aad035c97f24442
+EBUILD libopenshot-audio-0.1.9_pre20190502.ebuild 625 BLAKE2B 725a7962655c77f0a16b953135528cf13e46b8cbed0edbf3de1076c1a443bd64b98cfc9fba45a83db61ce9be351877ba885dbfa1387cd723b0860e7715887f98 SHA512 c938a556729e0a93af20f3a89264d975d15d1a3dd070474c8e2bf7f7b36560ee45e776091af53858639ac01a9c6ed3f8880223a1816c1b6acf5eb0256cf34987
 MISC metadata.xml 532 BLAKE2B 1c8bbee08ed6782cd3cbec2eb11fa4775966b7dae76444409d393d0e6adcc82cd45993d4598b375c3e4f91a38e02e6856e0c41e141c82c64e8ec4886e86071ec SHA512 edec80960aa8b55318dc2c4c1fcaa1751c69ab7897a9c965be732f5dcd1e195f26ca13f910124b0d57a7d11a78483bcba9268be79efd4a558fab568693450f96
diff --git a/media-libs/libopenshot-audio/libopenshot-audio-0.1.9_pre20190502.ebuild b/media-libs/libopenshot-audio/libopenshot-audio-0.1.9_pre20190502.ebuild
index 73f879a2280b..066adc17012f 100644
--- a/media-libs/libopenshot-audio/libopenshot-audio-0.1.9_pre20190502.ebuild
+++ b/media-libs/libopenshot-audio/libopenshot-audio-0.1.9_pre20190502.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 COMMIT="77edb1f14dde35e1facecc309dbc4fb7f07d7014"
 
diff --git a/media-libs/libopenshot/Manifest b/media-libs/libopenshot/Manifest
index b1a48ae79853..7af3df08b809 100644
--- a/media-libs/libopenshot/Manifest
+++ b/media-libs/libopenshot/Manifest
@@ -1,6 +1,6 @@
 AUX libopenshot-0.2.2-imagemagick7.patch 3545 BLAKE2B e2fe6ae205459c69ff288f14ba2d0a2b461b761e7ff6e9e66e11e4895b10661d5fc2ab9e2011899ca983399af685a0d411aa4820c02d02b4600617bd314d7670 SHA512 06622c81253fd15440e1cf0256a0beb21e2039a5a98a8c889828898b137a9a6efeb6fb295a0646dc5aa12da9805ff73b62c29272b0037cb1ea2454de7571f59b
 DIST libopenshot-0.2.2.tar.gz 11037768 BLAKE2B c307e41bf17d40ae421a541bbdf4cd53c6ef4d97041a476c6910bd156c10815aa5a5811813b24fdc472401516f29cf8cb68fbda17a0b434767c3f3aa63d6f222 SHA512 b89189e57e82da68a063417bba9c94704c04b0546c0aed227daa23a794eee56341a05988d8e28dbd339edfcdeeaed48103b347060eccf94f32fe1a4bf23d6553
 DIST libopenshot-0.2.4_pre20190609.tar.gz 10268173 BLAKE2B 01e07c0a7c051b5804f24fab1bfb920862a165ef14d3fdd020430b9e3a47858842c8cab3408ba0d161cb15cc6e90531a3b5df9ad327a01f414ff2e7e392fc243 SHA512 bf8c06aba6a899cb1ca6fbe9ac89fc859083b03175338c04af8dce68698f4ac78eac0b5b594e2b02390cd5e64576445b1c95324b254a267506353bed97ca16d1
-EBUILD libopenshot-0.2.2.ebuild 2207 BLAKE2B 31c03e9f5cb7e596930bf01efc6c1897b586a355dd1bd516e37872b0b2a37259ed83a4a1b1155e65b620554d1842ea7c71cc1ba223a542dc622c54d2c4ade00b SHA512 fa3c05436c0bbd2949ac11d8e35e763a96693dbb48d352264f5abd71d24ddaadf099b9035b2236471e07418b8533d3ff3bcbea7034660875e0f740b9bb141c69
-EBUILD libopenshot-0.2.4_pre20190609.ebuild 2555 BLAKE2B e2825eb7f984ec6bf15dd7d8b98958c4780593706fdbf911d5c8c74a845ee55531b34b6c13b96cbb0f02ae79113fd5252da15f40deb2fcf1fdd10c5506630e11 SHA512 d350d81af3d099e194c4a70d9e45c6709fc8368fecba0095fc17c035dc19512d0189cf80adb7585b07fbc2ff26e7c91e2cfc44cf6c0d4626f784714f1fa9e6ed
+EBUILD libopenshot-0.2.2.ebuild 2203 BLAKE2B 5df8e0074314e938d24c187b1caa311571e7941db450556363550a42f858eb994e2fcc259f98dbcda49360aa6a244b4e3963a5ae5fad1ee206efb6b727dac6bc SHA512 aa0645ebedd9d4d7e1b81300c9ad39cfcf39277cd7ff9a215204ab0c95e6acd6c9469a4531a3dbb461407e1579941a39248a32c47f3fca01c95ede448494c4ab
+EBUILD libopenshot-0.2.4_pre20190609.ebuild 2499 BLAKE2B 197e14dd027fe8b98ed18824e6fdc7b3684327c39a4e9275566e3c569e99415313bd87af1662653f6e7b3394f40846e1a6c04175c1121dec56cfeb4dfa370d19 SHA512 2edc3a1df921921f434aefb3edebc355eb1d54433acef15d8605a77cdd257a5c6977cc565b2137fe944947f5c4044f35ab13717d77ec9d437d912188ad22f296
 MISC metadata.xml 520 BLAKE2B d4eba07a3598f2fd073fb11a885ccb303a30624ea396fe43799348bc7284375d7223f0553cb01b582d5ceb7daa402878c89290eb27a7e6797d366c5bc1146e91 SHA512 19cdd8b9200c01945b48efbd52b78a45ee681244076bde7045d8d737d00fc7fe41cce6845459cccc2e4ff7b4be1e42eb3c6b14f43165435a9122ff266bbf0b15
diff --git a/media-libs/libopenshot/libopenshot-0.2.2.ebuild b/media-libs/libopenshot/libopenshot-0.2.2.ebuild
index e559f5c2384f..f011d7adca61 100644
--- a/media-libs/libopenshot/libopenshot-0.2.2.ebuild
+++ b/media-libs/libopenshot/libopenshot-0.2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit cmake-utils python-single-r1 toolchain-funcs versionator
 
diff --git a/media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild b/media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild
index e0d560596b94..0905430c03b8 100644
--- a/media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild
+++ b/media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
-inherit cmake-utils python-single-r1 toolchain-funcs
+inherit cmake python-single-r1 toolchain-funcs
 
 COMMIT="0d4ea7fe71e88bcee4a7fd1404bd52c8e2169997"
 
@@ -64,7 +64,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	# https://github.com/OpenShot/libopenshot/issues/17
 	use test || cmake_comment_add_subdirectory tests
 }
@@ -73,23 +73,23 @@ src_configure() {
 	local mycmakeargs=(
 		-DENABLE_RUBY=OFF # TODO: add ruby support
 		-DENABLE_PYTHON=$(usex python)
-		$(cmake-utils_use_find_package imagemagick ImageMagick)
+		$(cmake_use_find_package imagemagick ImageMagick)
 	)
 	use python && mycmakeargs+=(
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
 		-DPYTHON_LIBRARY="$(python_get_library_path)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_make doc
+	cmake_src_compile
+	use doc && cmake_build doc
 }
 
 src_test() {
-	cmake-utils_src_make os_test
+	cmake_build os_test
 }
 
 src_install() {
@@ -97,6 +97,6 @@ src_install() {
 	use examples && DOCS+=( src/examples/ )
 	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
 
-	cmake-utils_src_install
+	cmake_src_install
 	use python && python_optimize
 }
diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index 3bc2a4501a97..cfe519fcd55a 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -1,4 +1,6 @@
 DIST libplacebo-v1.21.0.tar.gz 326918 BLAKE2B fe9500de23487d7d5dfc51d9f94dd3d33d22bdac3005fc3334814c53a76a46cebd40655675b5172f058d02dd865385a993b3c52a863b9e9b32ac0bc4801e0126 SHA512 5de95b8cc48ba4ec9bc3afb8c8f2c4fae0d53ce6e69ffb53884c3a3ee2580998bae46b8934e462740b6c9c2e66e3c5d5f009f9b0f8ad2cb7b4fba829891cf333
-EBUILD libplacebo-1.21.0-r1.ebuild 1315 BLAKE2B 6f07c094d183b1e7a001ef98e109625d7efcd3b3effbe635a848fa179641022e946cfcf27d986f79dde07e9881f4cfae26a6810b2b1ab5faaf7332999ce99266 SHA512 2d7a8ffd725a7d77021bf0728caab1b2c2b6586f9104615022d7c9f3ebbd0e77d6e81cbdfbbaadba4427f4f075e68bb64f83c284fb1e1d99f27b60063a8f3e76
-EBUILD libplacebo-9999.ebuild 1310 BLAKE2B 9a3c9efe511c8e2503432691a7cd0cdf20934954ed46a56e98b0d34ed8894796210c0a47c28d457555d931278d0012fe075aa0c9d46a5bcb8f86c396ae9c23c7 SHA512 ef9b721876b4dcc3c721e41f8c9ea4f2249c280851d143e05fade381f08663c7e061c23853d3f01a2959d940d2ba07c36896992b72adc049ab1571c0d63c7147
+DIST libplacebo-v1.29.1.tar.gz 330673 BLAKE2B 3094f167afb45097ef6e494d7f6f6d61b7ee4ed00bab9f1d33bfd27b032020489eb43005a30a44934416dc52577eb7fc66baf367fdfda71652e97214d87023df SHA512 9f09560832a88e670d6c31e9f5b9cbc03de437bfb19ceb0985140307b5cdf20e2050a1dab5d07f18258dfa3e5429a51f1d3d54532099be4bfc6a0dafe3ffd516
+EBUILD libplacebo-1.21.0-r1.ebuild 1313 BLAKE2B 2acee78d091349c05b03b55b3d95139f9aa66415ba0552193e33bc4a17d5a733606658c5877b6a4531aab0c3d107399ce7369b9395c0fd49ff38a6cc8b7377dd SHA512 974c4f9bc20fdb4d5b6ba160bd2f5a14bb8bf66cbac6d47a9593b11da1bd08ec47f28f7ba8d6ea8fb73cbe001b7465029c1e6f3a127b1dcda5b1e6bd18b47ce5
+EBUILD libplacebo-1.29.1.ebuild 1352 BLAKE2B 5cf388f4558397830d49861aa3c5ae68f5a7a0897e655f1a9b4555691b3bc43138a8eef79ebe390eb98928e086cdf16272040f6951f2fb4b26be45d52add9f93 SHA512 cb3ac24c758b608dbfc7531c160d7176031c62e6d6cff7cf6cc3e66267006842936a7586173af2f03f533b7f7a730e34097feb8a73525dbded67c09a81fd52a1
+EBUILD libplacebo-9999.ebuild 1382 BLAKE2B d794c5b51c899763c67fcf463c65b4e4e303cc0e608d8c724d1e07cbd3370b781791f4da2bbcb1635270778fc323a2e634b1198417d2f942b5fda155733864ae SHA512 da4e1fb4cff1fca7f2b81b5436b7764c6a11abdc7185f7e404c785cefbba0a5526e07bdca4c8622d2caaf69d69ccfabbddc4f8080e2043d7fa8fc7b7021b732d
 MISC metadata.xml 807 BLAKE2B f04df70a40523ad668bfa7dda7c841ce098f2105d2bc94ab6291bb194bf1fec18445b779952db33614d685ee0964c7ac6b7666b3d8cf89f8bd9391b1ccd2c553 SHA512 48d5e93ca7e964d80dc579789c6f626f9590d102b451c4f0fced538aed1301e0cb7f93fce4d03deaddb72dcad22489aa3846d8fa8ac443fcdbc4fcb90ef19040
diff --git a/media-libs/libplacebo/libplacebo-1.21.0-r1.ebuild b/media-libs/libplacebo/libplacebo-1.21.0-r1.ebuild
index 04411d8db985..a6faa8fb9ec6 100644
--- a/media-libs/libplacebo/libplacebo-1.21.0-r1.ebuild
+++ b/media-libs/libplacebo/libplacebo-1.21.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.gz"
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
diff --git a/media-libs/libplacebo/libplacebo-1.29.1.ebuild b/media-libs/libplacebo/libplacebo-1.29.1.ebuild
new file mode 100644
index 000000000000..ee1709c707f2
--- /dev/null
+++ b/media-libs/libplacebo/libplacebo-1.29.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.gz"
+	S="${WORKDIR}/${PN}-v${PV}"
+fi
+
+inherit meson multilib-minimal
+
+DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
+HOMEPAGE="https://github.com/haasn/libplacebo"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/$(ver_cut 2)" # libplacebo.so version
+IUSE="glslang lcms +shaderc test +vulkan"
+REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )"
+
+RDEPEND="glslang? ( dev-util/glslang[${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}"
+BDEPEND="virtual/pkgconfig"
+
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature glslang)
+		$(meson_feature lcms)
+		$(meson_feature shaderc)
+		$(meson_feature vulkan)
+		$(meson_use test tests)
+	)
+	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/libplacebo/libplacebo-9999.ebuild b/media-libs/libplacebo/libplacebo-9999.ebuild
index 1b5d610f2596..0d2846316839 100644
--- a/media-libs/libplacebo/libplacebo-9999.ebuild
+++ b/media-libs/libplacebo/libplacebo-9999.ebuild
@@ -18,6 +18,7 @@ DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
 HOMEPAGE="https://github.com/haasn/libplacebo"
 
 LICENSE="LGPL-2.1+"
+# Please add a sub-slot for releases depending on libplacebo.so version
 SLOT="0"
 IUSE="glslang lcms +shaderc test +vulkan"
 REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )"
diff --git a/media-libs/libpostproc/Manifest b/media-libs/libpostproc/Manifest
index dbdfad768724..03b763c09d62 100644
--- a/media-libs/libpostproc/Manifest
+++ b/media-libs/libpostproc/Manifest
@@ -1,5 +1,5 @@
 AUX libpostproc-10.20140517-support-MMXEXT.patch 976 BLAKE2B 529f8770ea4424506d16ad2a68d04948d4e0570f2ab95548d37398e9c878d412d37799c05402225c4775a4074362167dd9ec890af3a661711d45a863a814d6c6 SHA512 18e7c377e4d67f43e39307670a10f23795df441173456c6f57098f259a78ebc93e43ef884cc7b518275d3886e4bd8ccb2d952855c41f5857ceccd5c289ce0177
 DIST libpostproc-10.20140517.tar.xz 65556 BLAKE2B 374dc84fb52f32958bcf9daeaabf2be1405d444f72d1f1ccb22e42b657489adad55199e5be27fa80cdcc21ed4480bae901925fbd833bcd30625d82720d481800 SHA512 0d6dca077c99ac569d892bc92cd08c6bf3e3a5e30e623ced20227b5bd1bd1aa3ecd150bfc900659accd77b997eb64b4d6f0538f9b6161d190ef6c69dcaf47893
 EBUILD libpostproc-10.20140517-r1.ebuild 2355 BLAKE2B 1874052a6f8d2759b2a3ddc7419a89cab0ac0594c6d7025cafc15ea98af660b2cceae9d4908c98d3d1c78bec01dd88b0a62cb395aaef907a4f703c8082474a48 SHA512 85e9e0d8a6ba71885c95ca29683f8fe3273cf65febbec4578d35f4bab4904947ec843a99d5d75e0160795243684a5f4249590e8d8c88bd9055887c911b6f0267
-EBUILD libpostproc-9999.ebuild 2294 BLAKE2B 2ae2ef65943be3fac273c4c8ef103cda020da8a8bcdbbb203c93ca8fbe89baa4fa4d7f94a72f96ab43634e521183bab8b76089fb28bd0398eecb345adf71f98f SHA512 ccaa388c17cd8e29457c26678c6102792a17de7310841fb84da1f97982039b5beae84383a974dfcdec24653ea7e4d8ba2b89877feb3469230a159b241602ef61
+EBUILD libpostproc-9999.ebuild 2292 BLAKE2B 645eced47a3e77faf9b32ec8c84c656fe909f83adfcf466b2ebdad986f288ef33aa0c0c3609f4a0f821f3a9ad4a4e45e0c3bc5b03099a6b3dcdedd1a8a2e4866 SHA512 28d605b8e61bca3bff79fad005aaeaf075e7b44dda03b5f5a2593224c77718652ec5fbf286c71334d8096b2399a97744df8df0ec386e4a7e348a94277734bb1c
 MISC metadata.xml 405 BLAKE2B 5249780527d1e7eb098411f01da236035ae3d9459da2fb7c69194a758e84a92bd02338e5d23490f310b1b59eedca9b2e7333d96d4cd18a055da40da1bcdaa2c3 SHA512 f6a4bb0b0fe497133fe3a1d4781472ccbdf30ab5e9c9aabb272b990bd7c5f048da8c430212dfb3b0f41f2a5ad5ebf3c6ae774474601e250444324ef4faf9ccab
diff --git a/media-libs/libpostproc/libpostproc-9999.ebuild b/media-libs/libpostproc/libpostproc-9999.ebuild
index cdce6896ff15..1ce9ec065f89 100644
--- a/media-libs/libpostproc/libpostproc-9999.ebuild
+++ b/media-libs/libpostproc/libpostproc-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-2"
+	SCM="git-r3"
 	EGIT_REPO_URI="https://github.com/lu-zero/postproc.git"
 fi
 
diff --git a/media-libs/libqaccessibilityclient/Manifest b/media-libs/libqaccessibilityclient/Manifest
index 433e8616fc48..86c3dc0f1438 100644
--- a/media-libs/libqaccessibilityclient/Manifest
+++ b/media-libs/libqaccessibilityclient/Manifest
@@ -1,3 +1,3 @@
 DIST libqaccessibilityclient-0.4.1.tar.xz 105280 BLAKE2B 7e8332e4d27e96c0728cecf73f13e9213f264e588dba321f0c0877954400c227e17e8bd4468b2567626407d2a283290e3b9752170ae602c6370d08beec7387d0 SHA512 d5c168ff39f4bb67f18120eea50f8e02a85d464a5bb6479c48dfdb02ea9bf0cc379cbed4da7d882b718a1e1723d3a00528fcb26903b617b43029fde25e82cb3c
-EBUILD libqaccessibilityclient-0.4.1.ebuild 628 BLAKE2B de5ad3ad92a64641da50d2bf44d5ecbc0a5a67d87004aacf850797694d27974130bd0e73bb9944abf487b6a74639d0c13fbabb196bda60e8e70b86a3f307b04f SHA512 55e7df2b5665f715e4e4e94315e2c5a434e25b417565d6678d0247f8d31d121951531805f7fb645479542d1f062e1ad84fb3b3dfcb4ae1cb2e34933eb2abeb2f
+EBUILD libqaccessibilityclient-0.4.1.ebuild 609 BLAKE2B e376de0b1913f65d7df0b84f432e32da3eff07bfaaf0e67ffc2bf6542895db34f3b7b98983a21889bd8081249580edbb544aad977fcf7034fab0d0d4e90f217c SHA512 87cd8c1d3330a7b2e6e31ce1796744fbd2a07a625a62c558a0ac46abb9551d4ec5599ea135b6b5d234fdc734f8b7dca06e65c823dfd5666f926be78f2ce98956
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.1.ebuild b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.1.ebuild
index fd12c42aff63..0350acacd33e 100644
--- a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.1.ebuild
+++ b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.1.ebuild
@@ -1,26 +1,26 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-ECM_KDEINSTALLDIRS="false"
-KDE_TEST="true"
-KDE_EXAMPLES="true"
+ECM_EXAMPLES="true"
+ECM_TEST="true"
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
 
 DESCRIPTION="Library for writing accessibility clients such as screen readers"
-HOMEPAGE="https://accessibility.kde.org/ https://cgit.kde.org/libqaccessibilityclient.git"
+HOMEPAGE="https://cgit.kde.org/libqaccessibilityclient.git"
 SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
+SLOT="5"
 KEYWORDS="amd64 arm64 x86"
-IUSE=""
 
 DEPEND="
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
 "
 RDEPEND="${DEPEND}"
 
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index e509f5dbffd8..75a01055f4e7 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -8,7 +8,7 @@ AUX libsndfile-1.0.28-CVE-2018-13139.patch 921 BLAKE2B 4fe567555b1c6e5a0c8098eee
 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
 DIST libsndfile-1.0.29_pre2_p20191024.tar.gz 720981 BLAKE2B 9f1dcf3d3669b66d8582d50b62ff863facd7125432a84a3e1e3fb0f817554f260f42948b4479371fb0967dcc75bedc6c49afffc6bee3f973a875d72d2e508210 SHA512 e37b385b90cadc97348db03b6c5ae7a8fcee17ded60f54d1508adddb8e2dc604ea44b60a0fe08627e81c0faa83997cdafb0b0ecf8574f901bf5e8a1819a63998
-EBUILD libsndfile-1.0.28-r4.ebuild 1884 BLAKE2B ea5d664ee95cd264267d074bf377a355274c01d0bfd4a40c19874a13639f9f77c5664a89648ed6faf88c0f791e0721795365b55d7b6a1cd710ac60b2b6922622 SHA512 4646f97f3422af125ab670c1f1a42a09dc196edffc8079b2c2a20cf410cb35353ac3569810a199a40c83caec98ecf8b72ff30690a1f72c229224595e5f4a3d59
-EBUILD libsndfile-1.0.29_pre2_p20191024.ebuild 1687 BLAKE2B a3fe4bedc6d27b449ea40a50d35e7515d57630ea0513dc369832e6fd92d76e57c553eb16d5dab2690a805b509688901242c9caef3a7db5287451cfd4cbc795e0 SHA512 00361770d156b0de88342563823e2dd89f7518dd66d7ee84582673438cd3e4d4c3dff518e64cd49e8d331fce60e80bf376e8a8f8b68d9df182a1b4231460f1ac
-EBUILD libsndfile-9999.ebuild 1832 BLAKE2B ba038c4a827819e70c727d7fc825d4bfdd0c3e6af349d454f516d4e5dc2307c87847b24c71e0301344305abde6c8ade16ce5cefabab85fad4e562196ce1d6aad SHA512 45812d6b37c1f44f585fea20b5b1a2419a89e9f1f413840e4eae69e6c72cf932006c2b8b1403b746d489ed87c259e04a9e0d785e3e3a4a2fb6ee2f05787c41ba
+EBUILD libsndfile-1.0.28-r4.ebuild 1877 BLAKE2B 15113d4db89e0f958b561d9a81d388a78b2e44dbbd3bd7679c0d7fc36e4b9ebd3ac02b61a1d0bf846abdfc41b1a1aad6a4af72a0a4eb917147b2d2de7edc0008 SHA512 c2331cb7f67fd93775ee3ab114d5737e53d877df8b6adfd5d78e2dcabb4ec16f239ae4db7f3d441ef8b77a8d5303a2923cf35691bf5709ce3f4456437b536f8d
+EBUILD libsndfile-1.0.29_pre2_p20191024.ebuild 1680 BLAKE2B f9b2e314166905dd9bf06fed23dddf8ada32db1a5cf5cd400c7010fe2b1734b5d260ff4579526a7825c6d6ef3523178e8f957b2d4fa1d02dac6363131b923b52 SHA512 abd08750bf6b02dab4ec12241bc3a5afc697405ee10107260deb828d9303b50bf5c38fea7457d1dba57ea0a5c1c17b35cc3152a7e375b30d59aaebc41a045dab
+EBUILD libsndfile-9999.ebuild 1825 BLAKE2B fdb4c8b69bc59fe5e5d90da4e8820c3ff1f48a78588d3014abf1b2fb174c70d30e0a4c67ccd52437aa3c96c779fe65c2464bd79e1dae4960dbaf9c828934563f SHA512 0469a8114758a3f9a14bdbbb8dcd15572edb381e5fc33bc9c18495a49bae472abfaf7dc24e46595840c5c7def73254c0a19c206095b64f2c1da287fd3a39f2f3
 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 e5bd250a8826..43baa85f6f37 100644
--- a/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit python-any-r1 multilib-minimal
 
diff --git a/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild b/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild
index 7a297f49c677..435eb04300a8 100644
--- a/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
 
 inherit autotools python-any-r1 multilib-minimal
 
diff --git a/media-libs/libsndfile/libsndfile-9999.ebuild b/media-libs/libsndfile/libsndfile-9999.ebuild
index 78bd34280491..1409be979875 100644
--- a/media-libs/libsndfile/libsndfile-9999.ebuild
+++ b/media-libs/libsndfile/libsndfile-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
 
 if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index 5227588f8b8e..c010412838b9 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -1,4 +1,3 @@
-AUX libv4l-1.14.1-sysmacros.patch 808 BLAKE2B 1dc608e836120e65140ffed8f9f4d19868eafbfb2e729665ad553fc44da4386d2197eb327f3f36ffafe8af45bea7adff72808d7cd7890e05c7fe5f3ba570ff8c SHA512 593f53b92ce947b1c2f75e7e1090b3f1e9ff3c39a69fcb96c4a6f1825db947b92bf4d45b93dc14eef7f439104d4a4090ef1823a38bd5e39687587afd6657671a
 AUX libv4l-1.6.2-sysmacros.patch 1821 BLAKE2B 9242ec9dccf2b14ab4d3ebc1246035ec3a1816d0b0389577638949cf8e493074132b7c13db6c1ca360ad5e2a2de271166126110d2f237d068185aeb2c3293c4b SHA512 ff6addf5d8e8da4f8502f1af8f21de60c9579da11b3aa3145d42030387bdcdd7c6263d5b6cdcba302ea8b8b3a578dbd17d75e11250d4074df2b6ca59d6de1d55
 DIST v4l-utils-1.10.1.tar.bz2 1352235 BLAKE2B 7ececae8ad5ebd999070b0c3626fdf5b0a4bc81562d2c2a712ff9625025d3e6c4ff664ba85998dedaa1ee77295d3cea39306305c20573c07156a07ec0ac8d10a SHA512 524bfd4e93e82f2dd55f0baa3e8be5850d4675b46fd0197b6d1287fc0d502c6b5c64bdf461af9630345f2d847d6aa5b6dc483693cee452da0b6729f156a5d98d
 DIST v4l-utils-1.16.3.tar.bz2 1894961 BLAKE2B 71c674abbb3415e592354998e1baa3eedbb4be21757bef80b463ea987e9fc231789e6b333b37d0d9916cb30729e04951dc9f1755ab00a82502fdc415b00cb9a2 SHA512 404672d18d94861c6957ea3a15a6a48f238d3859940810952a5a8cc33b57f1a360d1a19af28405c01b073c0ece90c5995a71dbe6544b30bdb8eace7daeb4bc0b
diff --git a/media-libs/libv4l/files/libv4l-1.14.1-sysmacros.patch b/media-libs/libv4l/files/libv4l-1.14.1-sysmacros.patch
deleted file mode 100644
index b8190507fc7d..000000000000
--- a/media-libs/libv4l/files/libv4l-1.14.1-sysmacros.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: v4l-utils-1.14.1/lib/libv4lconvert/control/libv4lcontrol.c
-===================================================================
---- v4l-utils-1.14.1.orig/lib/libv4lconvert/control/libv4lcontrol.c
-+++ v4l-utils-1.14.1/lib/libv4lconvert/control/libv4lcontrol.c
-@@ -20,9 +20,7 @@
-  */
- 
- #include <sys/types.h>
--#if defined(MAJOR_IN_SYSMACROS)
- #include <sys/sysmacros.h>
--#endif
- #include <sys/mman.h>
- #include <fcntl.h>
- #include <sys/stat.h>
-Index: v4l-utils-1.14.1/utils/v4l2-ctl/v4l2-ctl.cpp
-===================================================================
---- v4l-utils-1.14.1.orig/utils/v4l2-ctl/v4l2-ctl.cpp
-+++ v4l-utils-1.14.1/utils/v4l2-ctl/v4l2-ctl.cpp
-@@ -21,6 +21,7 @@
-  */
- 
- #include <unistd.h>
-+#include <sys/sysmacros.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index 73b4aff93724..69af921c380c 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -1,23 +1,10 @@
 AUX libvpx-1.3.0-sparc-configure.patch 406 BLAKE2B 02b1f0484a9659fdc90eb567db517a8b63f679521ae9ab510bfaa88b9fd5e1430d0eceeb8e4a138b00cb43ac4a1db6451dd29a808367973dc885fe5b9eacd665 SHA512 159ba5577fc0eee3e958740d8607a7570f374a8f64a36f1e7832a126482ec0bb96ba2be451eefdf50d84a412a2be73ae75da3d69da78ec13dfe0e24a14685035
 AUX libvpx-1.7.0-CVE-2019-9232_9325_9371_9433.patch 8035 BLAKE2B 785a8769741e5af10ce0f18f6ef9f091d1335ca1c8515c9b653d3a177a620a8b3360b7df03f058b63e42259d6e4ccb6863e0ec9acd69886627a222ea3b8beb2d SHA512 b5af677b7f8fc6c61ea1c99c094103549cbe1a0163da70f51d4c34eec40b507a7bf8f84f97ee141a15c33bfaf2a6cb36c572a08465407fb17eb9b6a1364a3819
 AUX libvpx-1.8.0-ppc64le-disable-vsx.patch 978 BLAKE2B 6432379ff15f7e8da2b162c8b8f0d9d89c13cb18497b638b3b772aba979533e2abf7a4db0f9f9636e9c44460dc5968cf24f6fe1984a67d7188d27972671469b0 SHA512 d558f7b53d3158bb3f0c67cb0018f484282102fef6267af02a2009e3285d0930d11ed6f846ee8f9e353a25496fe5f2c6bccbab6acd8f472a2b2b1511b57ad360
-DIST libvpx-1.5.0.tar.bz2 1906571 BLAKE2B 1e4e2d7ac6ae046d733361d644a9c36b84f03353fd55bc938b064bcba565d943affa6866df4e9c23b3a1120bf34ad660932bad8c9d8e480d42cdf96b4b937d49 SHA512 5a952aa53e539a130d316723d424fa02a8f42a450950d74a16d8abc5df569ba5559b3b09a32140b638d7a0cd54be1c7b0f8306ad286825bc1281f513bb665fc5
-DIST libvpx-1.6.0.tar.bz2 1943026 BLAKE2B 1fbea27d73b2120ed807108b8ba09c4118e2d8381fdcbbf8661c5fd664e6272d6c14b73c7b8317b97fa51b212d3ea2429819e0e17adf6afcb8d0f5fb6dd9a68a SHA512 dd753372a156bbf7ceb4090276e5fb32b4c8581c93925dded93efee74153b5eb24ee8c3d8ee6339a6878482f0ecf178a2befeeb36e17eada6c440b48c60e9162
-DIST libvpx-1.6.1.tar.bz2 1959534 BLAKE2B 67f73ffd2569bde46db98e7fcb36f7b37d33927fad8c3916ebe1810e63e7aae963bd39ba1f399be079ea4c9f52736f98a603c810f9412643a91166dfb09ed895 SHA512 1a4b009fe1737715c6563a79848126a5859394a5074b1e9cca9bc2e213df90890c15e708040d5f2c96c7c21e268f51e1352ac6911514bf891a4bf3eea154159d
 DIST libvpx-1.7.0.tar.gz 2679797 BLAKE2B de7992adb517e375c5be2a9facf2b4a73174adcaef11185ed6d3102c2f6b73f378b0d415c5e3a4d915b3a6889bd8b31ba3e8c007a87a433a345ef7696a1dd899 SHA512 8b3b766b550f8d86907628d7ed88035f9a2612aac21542e0fd5ad35b905eb82cbe1be02a1a24afce7a3bcc4766f62611971f72724761996b392136c40a1e7ff0
-DIST libvpx-1.8.0.tar.gz 2879302 BLAKE2B a6113115b4d3668951b084250ca3e9bafeb1a4c54cb0c5516d6d24a88105f13b5b458dd0b57088eddb64deb0096a2023968588cc7dc69aa0cd0799caa71f9fc0 SHA512 77477ec7059de1d90f048c10783b4adce463a84c9c828f125686e533f5bc8c9eeab8a1747df5c928e0869ccf855a9af5608199c8c376a75d35659f719ee870ef
 DIST libvpx-1.8.1.tar.gz 2922587 BLAKE2B c9526616f81b6b343c9597f1f0b368f76f8f6b2b5a9e207b2e8f0a2b5e14a49b7e4f61cc88ce8f9b78e04f82149f46de4bd09baa0d45b26942a3e5ca821e8e10 SHA512 615476a929e46befdd4782a39345ce55cd30176ecb2fcd8a875c31694ae2334b395dcab9c5ba58d53ceb572ed0c022d2a3748ca4bbd36092e22b01cf3c9b2e8e
-DIST libvpx-testdata-1.5.0.tar.bz2 117022525 BLAKE2B d0b5e96694d84d825b874df208dc3b3156ab0d5e9d567e1e05cdc7b88f47126917b84178748f0971ce14d58ee031906b72070bec622983ec56244159b8b759ee SHA512 58abcea159d1f709c2b9b52e8ae381481ed0ee1f43972f5e52d628754844ed23f5f77180a9c3f950a19fd8e2eaec406288d9ec65a42c9d6d080a6948827698bb
-DIST libvpx-testdata-1.6.0.tar.bz2 121020858 BLAKE2B 93bbaa4514e46b762fbf86d66394b228d62c19906dc79c5c661feedf088d09d4b6c2ac908dc8b1ac4236a801047d5d608b17a8bc0fa5bd5ca0c992cd0729fc7a SHA512 639e229bd97e7a92a29e636f548234a87dbe63673d968cdfbec1faf9ccb0ee2087ad00b0a5bfb1581bea6b17e70bb449e9a046da4d9891f59ec79773ece4294e
-DIST libvpx-testdata-1.6.1.tar.bz2 158774682 BLAKE2B 0ba1897e015c69cbf98b645cc634f98fdaf58aa814ad2cf93ee1812a38d279a570b856017822db0b21215c0e6d2d069c3f40692317c885ffbc3b59c236a754ba SHA512 9038774a6955cb6664ea664b4d8e08b0e7a2acba85429da9fd84f522bc7a03d57f6d9f1302481136a718507113babbe4786ff7a648130298ad2c0b3cbe8e82ab
 DIST libvpx-testdata-1.7.0.tar.xz 238790100 BLAKE2B 1d14e794341d35402eaf54d398ebed56b0983908e397ae677737e0f313ea0bfc9c4a39be91765b02a07a8eb9b55529d5f998efcc87b1b493b0e326e02193d982 SHA512 1556345e41674f0846a7419828972ec27c3c37fe270fa1deb45e03665f60ec088d79134aee0d2e27003b130636eeed4a15ea3f701c9d7014f3ca2785467767a8
 DIST libvpx-testdata-1.8.0.tar.xz 418337232 BLAKE2B 1336e522f18a8f7812b4e7e4de7b27d32778c38fe902c62a4415a17e857868bfcdcbdcab528617db89e9f57449a486333feccffc4a250bfe79fc460c790071ed SHA512 991066467121614106455522b3651f194b45a37125c1b4e6bade59044756f26d914c95388e3c0bd3dc22159525aa6478df36801767bb7506fa7e77b93c6c2ede
-EBUILD libvpx-1.5.0.ebuild 3915 BLAKE2B 98f43ae75951e17166aebc7a6c40cde4ac168863c610e2fc60bcb649e08c8c3e7d030fbfb78950e547549baa6a6df6f0611769101984ac64a5367a032a6daef0 SHA512 101877539c05bb97c3234b8aa0c8ed46c4b969b9f0ae32edc70b9034111ccd1ae44a08c7868166bd075f0625cd8ff4147d0d5fcf8c8db52724a2df6c61f01ca7
-EBUILD libvpx-1.6.0-r1.ebuild 3558 BLAKE2B 150582b4051286e64cec38e74eab4018ac92057dd0aca9130ade453fb84b675ba020d82172767640fdc61473b2d7af0a7f4cbab471423d08dcec021d092af84e SHA512 95faa07a5af9756da211420c569dd0b86e914cf46aa1b7bcaf54d36fa08309d845290132d422d86438da29b4c4ef483cc592bc30ae9ca19080897714ff7ca442
-EBUILD libvpx-1.6.1.ebuild 3885 BLAKE2B 0bb9632f5447b2c971aaa77814d28b5308f87e06a796f730847c9ab28acf09de2e2cfb2235a8cd9180c4f63b1d12d7b972d95efa914d4afc4800a136885ee56c SHA512 c9dd758c70c7ce7c860a5317e9cfeb4d6ff6b1e5c5ea54f0243a2d32235ee54f5a86224e886407bc8041bb64c80ddbbb2f4aec733efc83dabd3cc35dc16008bc
-EBUILD libvpx-1.7.0-r1.ebuild 4031 BLAKE2B d6cab663af32978afce7d5a0b980e03c97e54616e3c403336e4ff24a63eac982581a4e4225a1bf84ad9901215ae66f71ac5146a445780ad8468ea0f34301a539 SHA512 5953ac2b45206c732946393642e2e76e8e5879953f085e02f64d5828779a119dc3fb349029d27503bb8b3db08611d5f44730b07ae882219b9c6e65452d6e2b0a
-EBUILD libvpx-1.7.0.ebuild 3973 BLAKE2B 54e102f568d08e9ca88b7f3a85ad1238883de4ae8a06fec512b03a259f36da5812222963bad7dbd609e451f4955de8ef232e5f4df5ce2ac93cfc40ba714fd8ba SHA512 33ab3e5fc9a499cd1c1569db1f34bc1c0010f6d594aab04f153a66f1a0f66a1eb720bc10dafa00a7467a81e99e223515bf775b97d89a7d2993fa02d3e31020dc
-EBUILD libvpx-1.8.0-r1.ebuild 3449 BLAKE2B 144fc11e58fda1072b202c641f5cbdc410c76b61e84f06058d687f0946aa5453b32842e6609d7abc1fc4da25ee93fb94b079a90e6ea3227261054911232e3480 SHA512 5042b06590b9c773ab8ad5a7a6cf6eaf8c1e2881800beb7c47471b9d8fc362031f9443de23c792399835d68487110156fe3943885b227e1336a227ce3b3b02e2
-EBUILD libvpx-1.8.0.ebuild 4014 BLAKE2B 570a0a597ebdf08e6e07be7cd65f5878a199849ee22a6c19e50c5ff922dc936604287019569b9bda9223225a6d60515d563b7a38e633b4ae59d9cf7bf72a2165 SHA512 26cd790ac6c76bb5203f568118835bb9e9087b9c2c4f130116568ff3fbf5110396af12711e51334a3cfa7ddcc0bb8bccbc34f310b18014e8948f1068cee8bd40
+EBUILD libvpx-1.7.0-r1.ebuild 4030 BLAKE2B b068ddc908ce2a871334d23847c370c680b08807d0e0d01bc14e667b0a81915d5c69f1269faa2a6c1df5db8f92c9825a76fd59cf8c51b150365eef895346b779 SHA512 e6161812899d964644974946b0d1c2c95ff28d658f6a7acbf404804493fc1019e184aeb3012edca14e054623ac7cb26487d0d6cf25925f05ae83b626584c137d
 EBUILD libvpx-1.8.1.ebuild 3387 BLAKE2B 7043498569960ffaaec8a29e4289790af78b856c5b7f49ee4a966d1b6dd8750dbca10dc19ab10fa9a935d2fd655e86988c689ab54ce386dc9e87e5bb5e6a0d3b SHA512 9c5eb382a9706f491892697a1721a12bd6b057b8e91a7fbd8e02e420128ac2ab91d549271924af9d1babc6754407e56911a8b968b44b86ec4deb9b57f3dfa6ed
 MISC metadata.xml 664 BLAKE2B 78c866b8ee8a4b266156652bd6352d1ad0b7f28c88922dd31868623b1eca6530aab0a391c7264e5f1dffb9c1379adeb3b115846e99e1ab8a2ae1e58f527234ca SHA512 96644cef2185474da831eb928645cb7607216242097e8d1f1b887071817e282e22ae5646583208bfacf4467029b9dc2d3cfb888bba085bbf5b493dc98c3a7ef9
diff --git a/media-libs/libvpx/libvpx-1.5.0.ebuild b/media-libs/libvpx/libvpx-1.5.0.ebuild
deleted file mode 100644
index 700c5256f736..000000000000
--- a/media-libs/libvpx/libvpx-1.5.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib toolchain-funcs multilib-minimal
-
-LIBVPX_TESTDATA_VER=1.5.0
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="https://chromium.googlesource.com/webm/${PN}.git"
-elif [[ ${PV} == *pre* ]]; then
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="amd64 arm arm64 ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-else
-	SRC_URI="https://storage.googleapis.com/downloads.webmproject.org/releases/webm/${P}.tar.bz2"
-	KEYWORDS="amd64 arm arm64 ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-# generated by: make LIBVPX_TEST_DATA_PATH=libvpx-testdata testdata + tar'ing
-# it.
-SRC_URI="${SRC_URI}
-	test? ( mirror://gentoo/${PN}-testdata-${LIBVPX_TESTDATA_VER}.tar.bz2 )"
-
-DESCRIPTION="WebM VP8 Codec SDK"
-HOMEPAGE="https://www.webmproject.org"
-
-LICENSE="BSD"
-SLOT="0/3"
-IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 static-libs svc test +threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="abi_x86_32? ( dev-lang/yasm )
-	abi_x86_64? ( dev-lang/yasm )
-	abi_x86_x32? ( dev-lang/yasm )
-	x86-fbsd? ( dev-lang/yasm )
-	amd64-fbsd? ( dev-lang/yasm )
-	doc? (
-		app-doc/doxygen
-		dev-lang/php
-	)
-"
-
-REQUIRED_USE="
-	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
-	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/libvpx-1.3.0-sparc-configure.patch" # 501010
-}
-
-multilib_src_configure() {
-	unset CODECS #357487
-
-	# let the build system decide which AS to use (it honours $AS but
-	# then feeds it with yasm flags without checking...) #345161
-	tc-export AS
-	case "${CHOST}" in
-		i?86*) export AS=yasm;;
-		x86_64*) export AS=yasm;;
-	esac
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=384585
-	# https://bugs.gentoo.org/show_bug.cgi?id=465988
-	# copied from php-pear-r1.eclass
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/
-	addpredict /var/lib/net-snmp/mib_indexes
-	addpredict /session_mm_cli0.sem
-
-	# Build with correct toolchain.
-	tc-export CC CXX AR NM
-	# Link with gcc by default, the build system should override this if needed.
-	export LD="${CC}"
-
-	local myconf
-	if [ "${ABI}" = "${DEFAULT_ABI}" ] ; then
-		myconf+=" $(use_enable doc install-docs) $(use_enable doc docs)"
-	else
-		# not needed for multilib and will be overwritten anyway.
-		myconf+=" --disable-examples --disable-install-docs --disable-docs"
-	fi
-
-	# https://bugs.gentoo.org/569146
-	export LC_COLLATE=C
-
-	# #498364: sse doesn't work without sse2 enabled,
-	"${S}/configure" \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--enable-pic \
-		--enable-vp8 \
-		--enable-vp9 \
-		--enable-shared \
-		--extra-cflags="${CFLAGS}" \
-		$(use_enable cpu_flags_x86_avx avx) \
-		$(use_enable cpu_flags_x86_avx2 avx2) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable postproc) \
-		$(use cpu_flags_x86_sse2 && use_enable cpu_flags_x86_sse sse || echo --disable-sse) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable cpu_flags_x86_sse3 sse3) \
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1) \
-		$(use_enable cpu_flags_x86_ssse3 ssse3) \
-		$(use_enable svc experimental) $(use_enable svc spatial-svc) \
-		$(use_enable static-libs static) \
-		$(use_enable test unit-tests) \
-		$(use_enable threads multithread) \
-		${myconf} \
-		|| die
-}
-
-multilib_src_compile() {
-	# build verbose by default and do not build examples that will not be installed
-	emake verbose=yes GEN_EXAMPLES=
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" \
-		emake verbose=yes GEN_EXAMPLES=  LIBVPX_TEST_DATA_PATH="${WORKDIR}/${PN}-testdata" test
-}
-
-multilib_src_install() {
-	emake verbose=yes GEN_EXAMPLES= DESTDIR="${D}" install
-	[ "${ABI}" = "${DEFAULT_ABI}" ] && use doc && dohtml docs/html/*
-}
diff --git a/media-libs/libvpx/libvpx-1.6.0-r1.ebuild b/media-libs/libvpx/libvpx-1.6.0-r1.ebuild
deleted file mode 100644
index 4d34056abc3e..000000000000
--- a/media-libs/libvpx/libvpx-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs multilib-minimal
-
-LIBVPX_TESTDATA_VER=1.6.0
-
-DESCRIPTION="WebM VP8 and VP9 Codec SDK"
-HOMEPAGE="https://www.webmproject.org"
-SRC_URI="https://storage.googleapis.com/downloads.webmproject.org/releases/webm/${P}.tar.bz2
-	test? ( mirror://gentoo/${PN}-testdata-${LIBVPX_TESTDATA_VER}.tar.bz2 )"
-
-LICENSE="BSD"
-SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 +highbitdepth static-libs svc test +threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="abi_x86_32? ( dev-lang/yasm )
-	abi_x86_64? ( dev-lang/yasm )
-	abi_x86_x32? ( dev-lang/yasm )
-	x86-fbsd? ( dev-lang/yasm )
-	amd64-fbsd? ( dev-lang/yasm )
-	doc? (
-		app-doc/doxygen
-		dev-lang/php
-	)
-"
-
-REQUIRED_USE="
-	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
-	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
-"
-
-PATCHES=(
-	"${FILESDIR}/libvpx-1.3.0-sparc-configure.patch" # 501010
-)
-
-src_configure() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=384585
-	# https://bugs.gentoo.org/show_bug.cgi?id=465988
-	# copied from php-pear-r1.eclass
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/
-	addpredict /var/lib/net-snmp/mib_indexes
-	addpredict /session_mm_cli0.sem
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	unset CODECS #357487
-
-	# let the build system decide which AS to use (it honours $AS but
-	# then feeds it with yasm flags without checking...) #345161
-	tc-export AS
-	case "${CHOST}" in
-		i?86*) export AS=yasm;;
-		x86_64*) export AS=yasm;;
-	esac
-
-	# Build with correct toolchain.
-	tc-export CC CXX AR NM
-	# Link with gcc by default, the build system should override this if needed.
-	export LD="${CC}"
-
-	local myconf
-	if multilib_is_native_abi; then
-		myconf+=" $(use_enable doc install-docs) $(use_enable doc docs)"
-	else
-		# not needed for multilib and will be overwritten anyway.
-		myconf+=" --disable-examples --disable-install-docs --disable-docs"
-	fi
-
-	# #498364: sse doesn't work without sse2 enabled,
-	"${S}/configure" \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--enable-pic \
-		--enable-vp8 \
-		--enable-vp9 \
-		--enable-shared \
-		--extra-cflags="${CFLAGS}" \
-		$(use_enable cpu_flags_x86_avx avx) \
-		$(use_enable cpu_flags_x86_avx2 avx2) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable postproc) \
-		$(use cpu_flags_x86_sse2 && use_enable cpu_flags_x86_sse sse || echo --disable-sse) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable cpu_flags_x86_sse3 sse3) \
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1) \
-		$(use_enable cpu_flags_x86_ssse3 ssse3) \
-		$(use_enable svc experimental) $(use_enable svc spatial-svc) \
-		$(use_enable static-libs static) \
-		$(use_enable test unit-tests) \
-		$(use_enable threads multithread) \
-		$(use_enable highbitdepth vp9-highbitdepth) \
-		${myconf} \
-		|| die
-}
-
-multilib_src_compile() {
-	# build verbose by default and do not build examples that will not be installed
-	emake verbose=yes GEN_EXAMPLES=
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" \
-		emake verbose=yes GEN_EXAMPLES=  LIBVPX_TEST_DATA_PATH="${WORKDIR}/${PN}-testdata" test
-}
-
-multilib_src_install() {
-	emake verbose=yes GEN_EXAMPLES= DESTDIR="${D}" install
-	multilib_is_native_abi && use doc && dodoc -r docs/html
-}
diff --git a/media-libs/libvpx/libvpx-1.6.1.ebuild b/media-libs/libvpx/libvpx-1.6.1.ebuild
deleted file mode 100644
index 2a780b5ad0e4..000000000000
--- a/media-libs/libvpx/libvpx-1.6.1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs multilib-minimal
-
-# To create a new testdata tarball:
-# 1. Unpack source tarbll or checkout git tag
-# 2. export LIBVPX_TEST_DATA_PATH=libvpx-testdata
-# 3. configure --enable-unit-tests --enable-vp9-highbitdepth
-# 4. make testdata
-# 5. tar -cjf libvpx-testdata-${PV}.tar.bz2 libvpx-testdata
-
-LIBVPX_TESTDATA_VER=1.6.1
-
-DESCRIPTION="WebM VP8 and VP9 Codec SDK"
-HOMEPAGE="https://www.webmproject.org"
-SRC_URI="https://storage.googleapis.com/downloads.webmproject.org/releases/webm/${P}.tar.bz2
-	test? ( mirror://gentoo/${PN}-testdata-${LIBVPX_TESTDATA_VER}.tar.bz2 )"
-
-LICENSE="BSD"
-SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 +highbitdepth static-libs svc test +threads"
-
-REQUIRED_USE="
-	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
-	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
-	test? ( threads )
-"
-
-# Disable test phase when USE="-test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="abi_x86_32? ( dev-lang/yasm )
-	abi_x86_64? ( dev-lang/yasm )
-	abi_x86_x32? ( dev-lang/yasm )
-	x86-fbsd? ( dev-lang/yasm )
-	amd64-fbsd? ( dev-lang/yasm )
-	doc? (
-		app-doc/doxygen
-		dev-lang/php
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/libvpx-1.3.0-sparc-configure.patch" # 501010
-)
-
-src_configure() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=384585
-	# https://bugs.gentoo.org/show_bug.cgi?id=465988
-	# copied from php-pear-r1.eclass
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/
-	addpredict /var/lib/net-snmp/mib_indexes
-	addpredict /session_mm_cli0.sem
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	unset CODECS #357487
-
-	# let the build system decide which AS to use (it honours $AS but
-	# then feeds it with yasm flags without checking...) #345161
-	tc-export AS
-	case "${CHOST}" in
-		i?86*) export AS=yasm;;
-		x86_64*) export AS=yasm;;
-	esac
-
-	# Build with correct toolchain.
-	tc-export CC CXX AR NM
-	# Link with gcc by default, the build system should override this if needed.
-	export LD="${CC}"
-
-	local myconf
-	if multilib_is_native_abi; then
-		myconf+=" $(use_enable doc install-docs) $(use_enable doc docs)"
-	else
-		# not needed for multilib and will be overwritten anyway.
-		myconf+=" --disable-examples --disable-install-docs --disable-docs"
-	fi
-
-	# #498364: sse doesn't work without sse2 enabled,
-	"${S}/configure" \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--enable-pic \
-		--enable-vp8 \
-		--enable-vp9 \
-		--enable-shared \
-		--extra-cflags="${CFLAGS}" \
-		$(use_enable cpu_flags_x86_avx avx) \
-		$(use_enable cpu_flags_x86_avx2 avx2) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable postproc) \
-		$(use cpu_flags_x86_sse2 && use_enable cpu_flags_x86_sse sse || echo --disable-sse) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable cpu_flags_x86_sse3 sse3) \
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1) \
-		$(use_enable cpu_flags_x86_ssse3 ssse3) \
-		$(use_enable svc experimental) $(use_enable svc spatial-svc) \
-		$(use_enable static-libs static) \
-		$(use_enable test unit-tests) \
-		$(use_enable threads multithread) \
-		$(use_enable highbitdepth vp9-highbitdepth) \
-		${myconf} \
-		|| die
-}
-
-multilib_src_compile() {
-	# build verbose by default and do not build examples that will not be installed
-	emake verbose=yes GEN_EXAMPLES=
-}
-
-multilib_src_test() {
-	local -x LD_LIBRARY_PATH="${BUILD_DIR}"
-	local -x LIBVPX_TEST_DATA_PATH="${WORKDIR}/${PN}-testdata"
-	emake verbose=yes GEN_EXAMPLES= test
-}
-
-multilib_src_install() {
-	emake verbose=yes GEN_EXAMPLES= DESTDIR="${D}" install
-	multilib_is_native_abi && use doc && dodoc -r docs/html
-}
diff --git a/media-libs/libvpx/libvpx-1.7.0-r1.ebuild b/media-libs/libvpx/libvpx-1.7.0-r1.ebuild
index ecb112e13f96..c260444eab02 100644
--- a/media-libs/libvpx/libvpx-1.7.0-r1.ebuild
+++ b/media-libs/libvpx/libvpx-1.7.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/webmproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="amd64 ~arm arm64 ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 +highbitdepth static-libs svc test +threads"
 
 REQUIRED_USE="
diff --git a/media-libs/libvpx/libvpx-1.7.0.ebuild b/media-libs/libvpx/libvpx-1.7.0.ebuild
deleted file mode 100644
index ed1286201bc2..000000000000
--- a/media-libs/libvpx/libvpx-1.7.0.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs multilib-minimal
-
-# To create a new testdata tarball:
-# 1. Unpack source tarbll or checkout git tag
-# 2. export LIBVPX_TEST_DATA_PATH=libvpx-testdata
-# 3. configure --enable-unit-tests --enable-vp9-highbitdepth
-# 4. make testdata
-# 5. tar -cjf libvpx-testdata-${MY_PV}.tar.bz2 libvpx-testdata
-
-LIBVPX_TESTDATA_VER=1.7.0
-
-DESCRIPTION="WebM VP8 and VP9 Codec SDK"
-HOMEPAGE="https://www.webmproject.org"
-SRC_URI="https://github.com/webmproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( mirror://gentoo/${PN}-testdata-${LIBVPX_TESTDATA_VER}.tar.xz )"
-
-LICENSE="BSD"
-SLOT="0/5"
-KEYWORDS="amd64 arm arm64 ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 +highbitdepth static-libs svc test +threads"
-
-REQUIRED_USE="
-	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
-	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
-	test? ( threads )
-"
-
-# Disable test phase when USE="-test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="abi_x86_32? ( dev-lang/yasm )
-	abi_x86_64? ( dev-lang/yasm )
-	abi_x86_x32? ( dev-lang/yasm )
-	x86-fbsd? ( dev-lang/yasm )
-	amd64-fbsd? ( dev-lang/yasm )
-	doc? (
-		app-doc/doxygen
-		dev-lang/php
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/libvpx-1.3.0-sparc-configure.patch" # 501010
-)
-
-src_configure() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=384585
-	# https://bugs.gentoo.org/show_bug.cgi?id=465988
-	# copied from php-pear-r1.eclass
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/
-	addpredict /var/lib/net-snmp/mib_indexes
-	addpredict /session_mm_cli0.sem
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	unset CODECS #357487
-
-	# #498364: sse doesn't work without sse2 enabled,
-	local myconfargs=(
-		--prefix="${EPREFIX}"/usr
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		--enable-pic
-		--enable-vp8
-		--enable-vp9
-		--enable-shared
-		--extra-cflags="${CFLAGS}"
-		$(use_enable cpu_flags_x86_avx avx)
-		$(use_enable cpu_flags_x86_avx2 avx2)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable postproc)
-		$(use cpu_flags_x86_sse2 && use_enable cpu_flags_x86_sse sse || echo --disable-sse)
-		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable cpu_flags_x86_sse3 sse3)
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
-		$(use_enable cpu_flags_x86_ssse3 ssse3)
-		$(use_enable svc experimental) $(use_enable svc spatial-svc)
-		$(use_enable static-libs static)
-		$(use_enable test unit-tests)
-		$(use_enable threads multithread)
-		$(use_enable highbitdepth vp9-highbitdepth)
-	)
-
-	# let the build system decide which AS to use (it honours $AS but
-	# then feeds it with yasm flags without checking...) #345161
-	tc-export AS
-	case "${CHOST}" in
-		i?86*) export AS=yasm;;
-		x86_64*) export AS=yasm;;
-	esac
-
-	# powerpc toolchain is not recognized anymore, #694368
-	[[ ${CHOST} == powerpc-* ]] && myconfargs+=( --force-target=generic-gnu )
-
-	# Build with correct toolchain.
-	tc-export CC CXX AR NM
-	# Link with gcc by default, the build system should override this if needed.
-	export LD="${CC}"
-
-	if multilib_is_native_abi; then
-		myconfargs+=( $(use_enable doc install-docs) $(use_enable doc docs) )
-	else
-		# not needed for multilib and will be overwritten anyway.
-		myconfargs+=( --disable-examples --disable-install-docs --disable-docs )
-	fi
-
-	"${S}"/configure "${myconfargs[@]}"
-}
-
-multilib_src_compile() {
-	# build verbose by default and do not build examples that will not be installed
-	emake verbose=yes GEN_EXAMPLES=
-}
-
-multilib_src_test() {
-	local -x LD_LIBRARY_PATH="${BUILD_DIR}"
-	local -x LIBVPX_TEST_DATA_PATH="${WORKDIR}/${PN}-testdata"
-	emake verbose=yes GEN_EXAMPLES= test
-}
-
-multilib_src_install() {
-	emake verbose=yes GEN_EXAMPLES= DESTDIR="${D}" install
-	multilib_is_native_abi && use doc && dodoc -r docs/html
-}
diff --git a/media-libs/libvpx/libvpx-1.8.0-r1.ebuild b/media-libs/libvpx/libvpx-1.8.0-r1.ebuild
deleted file mode 100644
index f0bd95847496..000000000000
--- a/media-libs/libvpx/libvpx-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-inherit toolchain-funcs multilib-minimal
-
-# To create a new testdata tarball:
-# 1. Unpack source tarbll or checkout git tag
-# 2. export LIBVPX_TEST_DATA_PATH=libvpx-testdata
-# 3. configure --enable-unit-tests --enable-vp9-highbitdepth
-# 4. make testdata
-# 5. tar -cjf libvpx-testdata-${MY_PV}.tar.xz libvpx-testdata
-
-LIBVPX_TESTDATA_VER=1.8.0
-
-DESCRIPTION="WebM VP8 and VP9 Codec SDK"
-HOMEPAGE="https://www.webmproject.org"
-SRC_URI="https://github.com/webmproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( mirror://gentoo/${PN}-testdata-${LIBVPX_TESTDATA_VER}.tar.xz )"
-
-LICENSE="BSD"
-SLOT="0/6"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc +highbitdepth postproc static-libs svc test +threads"
-
-REQUIRED_USE="test? ( threads )"
-
-# Disable test phase when USE="-test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="abi_x86_32? ( dev-lang/yasm )
-	abi_x86_64? ( dev-lang/yasm )
-	abi_x86_x32? ( dev-lang/yasm )
-	x86-fbsd? ( dev-lang/yasm )
-	amd64-fbsd? ( dev-lang/yasm )
-	doc? (
-		app-doc/doxygen
-		dev-lang/php
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/libvpx-1.3.0-sparc-configure.patch" # 501010
-	"${FILESDIR}/libvpx-1.8.0-ppc64le-disable-vsx.patch" #688138
-)
-
-src_configure() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=384585
-	# https://bugs.gentoo.org/show_bug.cgi?id=465988
-	# copied from php-pear-r1.eclass
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/
-	addpredict /var/lib/net-snmp/mib_indexes
-	addpredict /session_mm_cli0.sem
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	unset CODECS #357487
-
-	# #498364: sse doesn't work without sse2 enabled,
-	local myconfargs=(
-		--prefix="${EPREFIX}"/usr
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		--enable-pic
-		--enable-vp8
-		--enable-vp9
-		--enable-shared
-		--extra-cflags="${CFLAGS}"
-		$(use_enable postproc)
-		$(use_enable svc experimental)
-		$(use_enable static-libs static)
-		$(use_enable test unit-tests)
-		$(use_enable threads multithread)
-		$(use_enable highbitdepth vp9-highbitdepth)
-	)
-
-	# let the build system decide which AS to use (it honours $AS but
-	# then feeds it with yasm flags without checking...) #345161
-	tc-export AS
-	case "${CHOST}" in
-		i?86*) export AS=yasm;;
-		x86_64*) export AS=yasm;;
-	esac
-
-	# powerpc toolchain is not recognized anymore, #694368
-	[[ ${CHOST} == powerpc-* ]] && myconfargs+=( --force-target=generic-gnu )
-
-	# Build with correct toolchain.
-	tc-export CC CXX AR NM
-	# Link with gcc by default, the build system should override this if needed.
-	export LD="${CC}"
-
-	if multilib_is_native_abi; then
-		myconfargs+=( $(use_enable doc install-docs) $(use_enable doc docs) )
-	else
-		# not needed for multilib and will be overwritten anyway.
-		myconfargs+=( --disable-examples --disable-install-docs --disable-docs )
-	fi
-
-	echo "${S}"/configure "${myconfargs[@]}" >&2
-	"${S}"/configure "${myconfargs[@]}"
-}
-
-multilib_src_compile() {
-	# build verbose by default and do not build examples that will not be installed
-	emake verbose=yes GEN_EXAMPLES=
-}
-
-multilib_src_test() {
-	local -x LD_LIBRARY_PATH="${BUILD_DIR}"
-	local -x LIBVPX_TEST_DATA_PATH="${WORKDIR}/${PN}-testdata"
-	emake verbose=yes GEN_EXAMPLES= test
-}
-
-multilib_src_install() {
-	emake verbose=yes GEN_EXAMPLES= DESTDIR="${D}" install
-	multilib_is_native_abi && use doc && dodoc -r docs/html
-}
diff --git a/media-libs/libvpx/libvpx-1.8.0.ebuild b/media-libs/libvpx/libvpx-1.8.0.ebuild
deleted file mode 100644
index a05ed4eb72ff..000000000000
--- a/media-libs/libvpx/libvpx-1.8.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-inherit toolchain-funcs multilib-minimal
-
-# To create a new testdata tarball:
-# 1. Unpack source tarbll or checkout git tag
-# 2. export LIBVPX_TEST_DATA_PATH=libvpx-testdata
-# 3. configure --enable-unit-tests --enable-vp9-highbitdepth
-# 4. make testdata
-# 5. tar -cjf libvpx-testdata-${MY_PV}.tar.xz libvpx-testdata
-
-LIBVPX_TESTDATA_VER=1.8.0
-
-DESCRIPTION="WebM VP8 and VP9 Codec SDK"
-HOMEPAGE="https://www.webmproject.org"
-SRC_URI="https://github.com/webmproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( mirror://gentoo/${PN}-testdata-${LIBVPX_TESTDATA_VER}.tar.xz )"
-
-LICENSE="BSD"
-SLOT="0/6"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 +highbitdepth static-libs svc test +threads"
-
-REQUIRED_USE="
-	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
-	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
-	test? ( threads )
-"
-
-# Disable test phase when USE="-test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="abi_x86_32? ( dev-lang/yasm )
-	abi_x86_64? ( dev-lang/yasm )
-	abi_x86_x32? ( dev-lang/yasm )
-	x86-fbsd? ( dev-lang/yasm )
-	amd64-fbsd? ( dev-lang/yasm )
-	doc? (
-		app-doc/doxygen
-		dev-lang/php
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/libvpx-1.3.0-sparc-configure.patch" # 501010
-	"${FILESDIR}/libvpx-1.8.0-ppc64le-disable-vsx.patch" #688138
-)
-
-src_configure() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=384585
-	# https://bugs.gentoo.org/show_bug.cgi?id=465988
-	# copied from php-pear-r1.eclass
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/
-	addpredict /var/lib/net-snmp/mib_indexes
-	addpredict /session_mm_cli0.sem
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	unset CODECS #357487
-
-	# #498364: sse doesn't work without sse2 enabled,
-	local myconfargs=(
-		--prefix="${EPREFIX}"/usr
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		--enable-pic
-		--enable-vp8
-		--enable-vp9
-		--enable-shared
-		--extra-cflags="${CFLAGS}"
-		$(use_enable cpu_flags_x86_avx avx)
-		$(use_enable cpu_flags_x86_avx2 avx2)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable postproc)
-		$(use cpu_flags_x86_sse2 && use_enable cpu_flags_x86_sse sse || echo --disable-sse)
-		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable cpu_flags_x86_sse3 sse3)
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
-		$(use_enable cpu_flags_x86_ssse3 ssse3)
-		$(use_enable svc experimental)
-		$(use_enable static-libs static)
-		$(use_enable test unit-tests)
-		$(use_enable threads multithread)
-		$(use_enable highbitdepth vp9-highbitdepth)
-	)
-
-	# let the build system decide which AS to use (it honours $AS but
-	# then feeds it with yasm flags without checking...) #345161
-	tc-export AS
-	case "${CHOST}" in
-		i?86*) export AS=yasm;;
-		x86_64*) export AS=yasm;;
-	esac
-
-	# powerpc toolchain is not recognized anymore, #694368
-	[[ ${CHOST} == powerpc-* ]] && myconfargs+=( --force-target=generic-gnu )
-
-	# Build with correct toolchain.
-	tc-export CC CXX AR NM
-	# Link with gcc by default, the build system should override this if needed.
-	export LD="${CC}"
-
-	if multilib_is_native_abi; then
-		myconfargs+=( $(use_enable doc install-docs) $(use_enable doc docs) )
-	else
-		# not needed for multilib and will be overwritten anyway.
-		myconfargs+=( --disable-examples --disable-install-docs --disable-docs )
-	fi
-
-	"${S}"/configure "${myconfargs[@]}"
-}
-
-multilib_src_compile() {
-	# build verbose by default and do not build examples that will not be installed
-	emake verbose=yes GEN_EXAMPLES=
-}
-
-multilib_src_test() {
-	local -x LD_LIBRARY_PATH="${BUILD_DIR}"
-	local -x LIBVPX_TEST_DATA_PATH="${WORKDIR}/${PN}-testdata"
-	emake verbose=yes GEN_EXAMPLES= test
-}
-
-multilib_src_install() {
-	emake verbose=yes GEN_EXAMPLES= DESTDIR="${D}" install
-	multilib_is_native_abi && use doc && dodoc -r docs/html
-}
diff --git a/media-libs/libxmlbird/Manifest b/media-libs/libxmlbird/Manifest
index af2a884c97ef..001ceda63308 100644
--- a/media-libs/libxmlbird/Manifest
+++ b/media-libs/libxmlbird/Manifest
@@ -1,5 +1,5 @@
 AUX libxmlbird-1.2.0-configure-valac.patch 1789 BLAKE2B 3c073ca4e985e2037f8b7775a0276ff32a1bad71550b4d4ab78ee508492e06e6f040c2cc4ab7507d157c44ae67b17a7a46c066347a1894520d567de8b92a4f5c SHA512 b3b3642b3b0a9c3c18ccdeddd67b08078473ccf4db6de6e33b41c84ef119b13e25034e2c77e958df5e9ca93eb189b89c3b542a58f2e63d039438a21ef6c19d66
 AUX libxmlbird-1.2.0-libdir.patch 7266 BLAKE2B dbed29bdfae04523e0872433f7cff41e56e7478fccb58effa3ba386a04ba853c637bbc10e904994a0f420103c5dc2371712aa33cf891ff935b9af6ccb07b6a24 SHA512 a879ca5fc70be9a9a3baa7311032b166bc88e6f655e195b57447c665fbe3241dc48235a0f849d9fed4542e09937b150cb7e93f75906668d11fead010318e42a9
 DIST libxmlbird-1.2.0.tar.xz 20004 BLAKE2B da712a82b85188b76943c105cf99f1d366d2dec24c67ce515666a1341dbeef512df62fe5c1407f8b125dd28b662877ca474d422336d789852e822066b5449e3f SHA512 0677004a79194dde87f27387ae1faeb19aa2ecd985664ad4f3f7576d39f71e0d05215c92bb15f3e3f1a4053e27025fd1a4151f1ba12774cfa789d47648097e5b
-EBUILD libxmlbird-1.2.0.ebuild 1247 BLAKE2B 4d4c92cc3b36cc24f2a674ae7eabf131ddb949681a74b8657054696db516c0f56684c5b20843f0ae1c3842461fde7ad6a9a7e666e3b2771a91c2905a83f93280 SHA512 0853c014fa570c66d0b102645df3b0612476f2e93a938b3810703a90b7900584526eadc39e41f6b69f72f21b0b4bebdf5dac2c6be1ee931ab8592d16d7aaecaa
+EBUILD libxmlbird-1.2.0.ebuild 1240 BLAKE2B f5ba74dd5408395ed4c688ca040224710a9bbf01027b958033a8fc732b6e169264d6bddea95bac0e839ec5a5fbe8c0ee7361c4a6d5048dbf743bc81c90ee9af4 SHA512 d05c30a724ca589eb413132a10cc3608f4077c965eef046e07171fefb0febe64d9c166ecfc574176fd2182e4980348c385d6ead228ccf2ce7861103246f384dd
 MISC metadata.xml 351 BLAKE2B bf15ddb7c39336982fa14d3de2aa0043bda64382be7a2b0ba6154839fcef9569c2b6c41d92fdff90abb87c0d7c9b0383e35d5aa402f760ed4feeff0601575bd9 SHA512 9538a6f758475b5381770ba633843b88a4d1b5e780d6822faca6e1c0f576c0e49d1eb44f152b08a89eb092adbc29541b6736362d1ac8c804a8e7f66dc4b69496
diff --git a/media-libs/libxmlbird/libxmlbird-1.2.0.ebuild b/media-libs/libxmlbird/libxmlbird-1.2.0.ebuild
index d011f660996e..8ad6be3e7fe5 100644
--- a/media-libs/libxmlbird/libxmlbird-1.2.0.ebuild
+++ b/media-libs/libxmlbird/libxmlbird-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit python-any-r1 vala toolchain-funcs multilib eutils multiprocessing
 
diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index 0f66a1f595cc..4ee6cb698497 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -1,4 +1,6 @@
 AUX includedir.patch 403 BLAKE2B 27bf2e0e9dfb44bc62d518ac1282cc2b4d2c77a368c6b6ac7c1b09e24183eb8c40871f1c591000879c043ef322bde90c6ee2a6313d37ecb4fc9626f8a66717ab SHA512 c0aed82243a8a5a5155ba5b39e8283b9f24de498cd0a02e1f3907f5bd0c4b92e1dde9c8a7501784da49b3365ddca0fc0aa2d986119bc4543aa2aefeea46f27de
 DIST lilv-0.24.4.tar.bz2 252209 BLAKE2B 71142f6a458a0edbb2087ac6eb6323b6ae4c53e45db22a616f00b22f818f507aa724ebf576f09654a98812b8b9a73689720677e64c715fbf7cd49ba26c7ddb11 SHA512 cb909c83dbac36b51a206fe508aec51e52ddf068f9a159d053888594402def8d140aae0d9e1e1866e722396f7ec8dea4b86d4c1b958f56eb3193b78307918a89
-EBUILD lilv-0.24.4-r1.ebuild 1632 BLAKE2B ec9110400bfd23e9c3ffe718a4e6cfaeaa9e8525a8a46b3b6b067a5248d9c2c91c600622636c4a94ed14b0b60d7f80dcdafaabc1ccd5d5ff800e9c75fdc92417 SHA512 75eaa825908a6804468c25abe199ab93eb89f3540d2090628dd843e2351564ebbc94d54ce2ea79c199c68743201aeff0757d743792e0c2296aad3e70b3568c92
+DIST lilv-0.24.6.tar.bz2 541765 BLAKE2B fb3532b1a19c790207b894f88ea7d4f714bef8e9f743ca27f6eca36fe44da6e92bce47931791dfb0096e03f9efdf569b1f3f514debb1538c2727c65f61697627 SHA512 0cf89d7dac97727e744579d3f4f4b330f56cf72f1a30bd03abfd645233aaf04e9bbf2abf460a0e4b963ed40e1ae78ed5f36127553bdab16e3e7dd3e93b70cdad
+EBUILD lilv-0.24.4-r1.ebuild 1628 BLAKE2B 116594b63150c2b1bb13b736f5d9f959aa4d65764c77957fb4151bd9f6710af9bead3c8bde94016ba1c7441f500e7c020bf0d80399b999dd25932fd0fd4b43e9 SHA512 27a9709462d11d4fd91465bf3ebec85d471f7c0e3ae7779fa788965693a96a3dca28842334d9a32773c265fc674202079a8dafedb4bdbcf841e0905b580c334d
+EBUILD lilv-0.24.6.ebuild 1770 BLAKE2B e61f14fb2d5167e89704587c9cc3ecb8c31f633622380d821acf37cf3661fc695265ae0872953e088d416d9e57913636110631263fe23f2bc8bdf7841876bdad SHA512 29e8aab0bd67795d6c6cb22a4aa9040660fdb8b92c61b4944c942ef537ca6d25d754209703f9d42058f5748326775ab7038ed0b24a6097adf51ce9c1c256d834
 MISC metadata.xml 626 BLAKE2B 07ffc634a72982335c60d71732dca314e28b08ed40fe892f33514f0d13ac9e141fcb6a1d0507b6f35f4d6db963865ed87acb70aa8f2c1d20ff72eb4e62006841 SHA512 e2cd8e2459104889e6cc759146f86874a78784c07b966de2f6a18302098a028e7176270565922a44a72ada23eabbf5de919271296374d9547262684611ee74ce
diff --git a/media-libs/lilv/lilv-0.24.4-r1.ebuild b/media-libs/lilv/lilv-0.24.4-r1.ebuild
index e94612339761..cf787989c907 100644
--- a/media-libs/lilv/lilv-0.24.4-r1.ebuild
+++ b/media-libs/lilv/lilv-0.24.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit python-any-r1 waf-utils bash-completion-r1 multilib-build multilib-minimal
diff --git a/media-libs/lilv/lilv-0.24.6.ebuild b/media-libs/lilv/lilv-0.24.6.ebuild
new file mode 100644
index 000000000000..1189d6b58278
--- /dev/null
+++ b/media-libs/lilv/lilv-0.24.6.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-any-r1 waf-utils bash-completion-r1 multilib-build multilib-minimal
+
+DESCRIPTION="Library to make the use of LV2 plugins as simple as possible for applications"
+HOMEPAGE="http://drobilla.net/software/lilv/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc +dyn-manifest static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/serd-0.30.0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/sord-0.16.0-r1[${MULTILIB_USEDEP}]
+	media-libs/libsndfile
+	>=media-libs/lv2-1.16.0[${MULTILIB_USEDEP}]
+	media-libs/sratom[${MULTILIB_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	doc? ( app-doc/doxygen )
+	test? ( dev-python/unittest2 )
+"
+
+PATCHES=( "${FILESDIR}/includedir.patch" )
+
+src_prepare() {
+	default
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--no-bash-completion \
+		$(multilib_native_usex doc --docs "") \
+		$(usex test --test "") \
+		$(usex static-libs --static "") \
+		$(usex dyn-manifest --dyn-manifest "")
+}
+
+multilib_src_compile() {
+	./waf build || die
+}
+
+multilib_src_test() {
+	./waf test || die
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+}
+
+multilib_src_install_all() {
+	sed -i "/lv2jack/d" utils/lilv.bash_completion
+	newbashcomp utils/lilv.bash_completion lv2info
+
+	dodir /etc/env.d
+	echo "LV2_PATH=${EPREFIX}/usr/$(get_libdir)/lv2" > "${ED}/etc/env.d/60lv2"
+
+	python_optimize
+}
diff --git a/media-libs/lsp-plugins/Manifest b/media-libs/lsp-plugins/Manifest
index f2b36057f8cd..b6b849acbe08 100644
--- a/media-libs/lsp-plugins/Manifest
+++ b/media-libs/lsp-plugins/Manifest
@@ -1,5 +1,7 @@
+DIST lsp-plugins-1.1.10.tar.gz 53837323 BLAKE2B d890e80d2c6bf871053bd53994af597e653c19894b64df8396c54e1b70bd716adacb8ff7ce7946098d96ca64fe0e03aafc7d4d52af342b67b2551fb0dadaff42 SHA512 aedc6a6a421bfb1ad964f6963793cdb2616456044736745a1c3dc27e947b1d6395de1942c2525bc983e654df5335d35466eed16b8f31612119284b024bdce6c2
 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.10.ebuild 1032 BLAKE2B aa79896ebb5cd7eb2e2067268db7e67f07ba90f000a0f26d0af43cc06ec36b825db98e9aa3280dc777a9651b863ea68ab0e97ccf1093bfa3a032b77d08394a14 SHA512 c185dad8e7ca7aa71007d7f3c6a9d135c56891a8902849a463d057868fbf7a0b17ced33af49df1e8d5dace8907a29f8cbe12b9205c668d7e23dc111f0d3d29c9
 EBUILD lsp-plugins-1.1.5-r2.ebuild 1252 BLAKE2B 2c1f932eea9632a89c4f56b9abc40cef06fd81f8e7126a6b81b4942f3a7e7c657a6967f1aa91fce4f68da6593f9b7dcbf0dc1bdaf6737cd3e3326d743a7b771c SHA512 54e4e0b0ff4eb94e1598a06ba4b5a4799e90220e12d57c53d760d585dcc7a41f71a6e26aedd1a53914b515438524e40bb5fd7667583263e018b0a5e636de2aa8
 EBUILD lsp-plugins-1.1.7-r1.ebuild 1030 BLAKE2B 083c311a6afd08bf1d92b2b600dbb8da7ab2292e88d11b039781ca04cbc15b320234cbd9879a63d72846878ec6a2f42c92c471e37ac37676d78bb072b7751e8b SHA512 5d5f2ae554d6f512cbc925b602fac88b0f12a764b9aa7bda184f7d154c5dc234094673589f1bfd57899a391ef35195ad3c68d41546e633e5e640db404204c554
 EBUILD lsp-plugins-9999.ebuild 1032 BLAKE2B aa79896ebb5cd7eb2e2067268db7e67f07ba90f000a0f26d0af43cc06ec36b825db98e9aa3280dc777a9651b863ea68ab0e97ccf1093bfa3a032b77d08394a14 SHA512 c185dad8e7ca7aa71007d7f3c6a9d135c56891a8902849a463d057868fbf7a0b17ced33af49df1e8d5dace8907a29f8cbe12b9205c668d7e23dc111f0d3d29c9
diff --git a/media-libs/lsp-plugins/lsp-plugins-1.1.10.ebuild b/media-libs/lsp-plugins/lsp-plugins-1.1.10.ebuild
new file mode 100644
index 000000000000..bae36037133c
--- /dev/null
+++ b/media-libs/lsp-plugins/lsp-plugins-1.1.10.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/lv2/Manifest b/media-libs/lv2/Manifest
index 9c8805efe575..51d45b872e7e 100644
--- a/media-libs/lv2/Manifest
+++ b/media-libs/lv2/Manifest
@@ -1,6 +1,6 @@
 AUX lv2-1.16.0-python3.patch 855 BLAKE2B 9b6e74afdca510e3f7e43cf99eff7168db2e738bf12697b435accb54037611f2e24cc842b06abe3789503a1cc0a1ca74f50edf55d26dd7712406ba817f4959c0 SHA512 756c794acbdb2941553a60d1966635a66b44ff7209019fc9516d66baffa6101071f0f412b675823d32ad48c47d533a29cbeadc56459e88435509032569d62fbf
 DIST lv2-1.14.0.tar.bz2 386438 BLAKE2B e09e6c2b1bbf24d5896e7803b970fd8877a5b6a9ded0fcf294561c365d5f0b2e89503c0306b02dd956f7ac6ebd9df4ca0c0a17564ef3851443d81847dd41b261 SHA512 6991d848ed9f04a48ca3070efc15af83431f680aa8a8559a02b1666f7b8d43af8e089f78c3b14ad3345dac32fd1c8ad0faf3a3f56dddc07c6f0e0aeef4077498
 DIST lv2-1.16.0.tar.bz2 502116 BLAKE2B 00b364311f61b1a9f251d8eb3e27b66d4a59e313006df549dbb80fc6a1106b588bc59c7766910037ee093254d96e508f8538615666833b0c00c8282301bfe0e4 SHA512 ead6d590cded5dd7a548d6ffe0f2f9f8efadfa7bb9e8b4fa0aea6664ccdfbb3ca697514bddebe695a9442fba5b62714b5cd45c1bf7d0aaef12ffe50972c2d88c
-EBUILD lv2-1.14.0-r1.ebuild 1327 BLAKE2B 9d8d72738728c102b12eac16275f3c2a49c9e634bec2220a916d0a43930d2950a929a5853f8c902d35c076a9e946576b31f02541b1a382fa2f4da654b21c4f14 SHA512 5cee8e2342ecdec9fa459a6e417ab152eed31a5bf114ad531988cf63cc7eba7ce296aa0c0fb7e231f14c9a08726a74d8579abe9c357c4d575ef60494db672779
-EBUILD lv2-1.16.0.ebuild 1332 BLAKE2B 7159f58d88e0fd1e48538a8e36dcdc0105e1782ad0bd898f61bfedf123c14771d0a322a40f20c6b9095aaa1299f56cc4a843fa4721ea6744992908b9236cc335 SHA512 ced3ea94265707f07ba7562156646cea47e18a5d50b7494392dd37ae1dfc5553a4a4c21a6bbafed8cb1b5e0ac4ed3ba6254244deac3df2d021065314fa538def
+EBUILD lv2-1.14.0-r1.ebuild 1323 BLAKE2B 5c26e5a003d83a0edb5dcd40ed52c5a1cb3863ee505c1902c4866f774c073c29fc7bd65dcfe555481332388885a886b4c0daab1af489d2b565ca62c44cf00af1 SHA512 a768fea0e501b8e24d43dd14821a1852ba3f0d8622da10eda1b75b620ddd81ad0ea79329bb2b6307b7b88aaaecb1e3b0b2b773e94776a8eb5f196b5d996acd0f
+EBUILD lv2-1.16.0.ebuild 1330 BLAKE2B 7471c6013dfab0551556c8d24c0b05b868d0179e5f97682fa772384aef2d4127f9efcd259c091542f836536b674f82c4cf34d26e9558a6b3b95d5a9a8768054c SHA512 224cc2ab06aa6cc4eef26b2b4d598cbb749c30ccc3eabe496e0dab361a468dafd2900dfd13318309e600e7259e6b2a86b650740acbc2357cf8c385bd94d660e1
 MISC metadata.xml 340 BLAKE2B e8469f758a451316b9d89c286f2d47c82b62d57ff9d43a6f2f93da8cf0abb5579fa8e568d8e6422e5d144a368310ccdec6e89ce2672f53b9db149bbf838afa68 SHA512 a31345dfd0bb1ac92461cd26ffcd20197775288be0ee4a2d660e90b8655f5288166c9613ba42ef3eef6dff6c97d268ffc85af3429eb093ffb29ad9581a5fa33d
diff --git a/media-libs/lv2/lv2-1.14.0-r1.ebuild b/media-libs/lv2/lv2-1.14.0-r1.ebuild
index e1a94a58d6ac..f2a97edd8042 100644
--- a/media-libs/lv2/lv2-1.14.0-r1.ebuild
+++ b/media-libs/lv2/lv2-1.14.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit python-single-r1 waf-utils multilib-build multilib-minimal
diff --git a/media-libs/lv2/lv2-1.16.0.ebuild b/media-libs/lv2/lv2-1.16.0.ebuild
index 9284873bc1ff..73231267157f 100644
--- a/media-libs/lv2/lv2-1.16.0.ebuild
+++ b/media-libs/lv2/lv2-1.16.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit python-single-r1 waf-utils multilib-build multilib-minimal
diff --git a/media-libs/mediastreamer/Manifest b/media-libs/mediastreamer/Manifest
deleted file mode 100644
index 51fbe097b5fd..000000000000
--- a/media-libs/mediastreamer/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX mediastreamer-2.9.0-ffmpeg3.patch 16778 BLAKE2B 43f6502123f3e452a900a6b93578ee1aec721a50ffe2917c3fa0b996a3f11432a2a9be5382742eb6bfc74fb10256bbdea19491323f9817ba825b759b8086965a SHA512 15170cf0089fde5ace41b7c9d9b155fc42b621691a7b86b08414139b4a6a896c4fe4a8de6f082039044699761774ac02c75e0e637b7d813a1228bc9fd8ab0b83
-AUX mediastreamer-2.9.0-ffmpeg4.patch 781 BLAKE2B 70a920a6957e88266eab3b1dfafc74410c95ee655b57318d6ac31c93a4629d44ae72714097aa66137703b2084809da5e18a2e86e8d3ab04f289f91e1632ffd93 SHA512 0f8287ce1552b13a78a5e570095eb3dbf447cfac46302691eeb14baadbc22f9eed7335a9abb5acc59b362e01ba5a0a281796898c9238d2d1ae2a9be8913016b3
-AUX mediastreamer-2.9.0-libav9.patch 4535 BLAKE2B a4808495632059169c52261504fe1c0d1a1d100fce5981e1285f67dac9582e323569b99aafbdfa36be929de7eb8e582495301820a0f87d61dd606fe549f4db3b SHA512 1fe44aeac23c0f97a2cba2e7312ed57833b0d7a2bf382de7727000c833159ae3123cc2c4b22b00a9977c9481a633efaad8c0d4615f0e6118baf3c326ccdb5fde
-AUX mediastreamer-2.9.0-tests.patch 587 BLAKE2B a8cdf7645cc2555e05aa7ca08c3da2525cfc184f1037d2d84f59d3ff48e8af67c59da5f6c24ac9a76472aa72ba2fb4aa9443ac50f11294e31fd1c1ec32634c99 SHA512 9298a6b2979c7f0f7a119a0bf5c943f9e03d860d4ea82de23a224b288e9e953da22bde5c1d01aa6b357dd897d5cda7fd9ca91ff05d6e1d54100f48f82e6b0011
-AUX mediastreamer-2.9.0-underlinking.patch 1969 BLAKE2B 6c820661cc5cb0c8dee4523e9b8b0cd91131ba41e2d537da60cb58fc921a4dae59ae0ca9133503df3ab834c05a1077c8df3fd01278bf2f1239d8204c3d2cdad1 SHA512 35103d8fc617d8202031cb9157e757d9a4822ad90595b2842a0715420c69b60bc4c99bedf0d4b6aee419c3a663104e8d0f05c743c7a374c3ae3bc5d7630a761e
-AUX mediastreamer-2.9.0-v4l-automagic.patch 1563 BLAKE2B 142852a63e1aaf4166464a3f9411ec3d91ddb4b2e2880d5bac8b2cdc4aba5b5a0b18830f975401b35bfde23409215f40a2ed8ec8847e8173f36bf1ff021e592f SHA512 0de2d426e0b9594695fea4c3cfe5fb832d351380c53ed671ede2c4c7d0142205af22c3fc9048812bbcd2e20c6b3f7fb8828baa4704466e2da1906112193d7dcf
-AUX mediastreamer-2.9.0-xxd.patch 642 BLAKE2B eba083c86b405da0aa7a96b192e70e87a45d25a98f13cb93d2b13c85d7e9e59ddfcbf59f73aec859d725ed6ee4bff015cde0d22cdcff1325e6893c965a2b29b2 SHA512 763a8d90b278b75574c8a3cd14a780ec069f3bb6267e4ae5425ead390b274662a6c31ca924b418df5454cd7a842929dbadf621acb65e52c5af7835a2bc21bca2
-DIST mediastreamer-2.9.0.tar.gz 3578877 BLAKE2B 14db241196f5d98cd7fc06ebe9e59317d47248a6c0ba103c4382ad5a2e48ebf87293f344320215380a0b9ddf76c7d4986db2c27cf114734d883505424c21a6a7 SHA512 8c31ab07c659dce84c410dfb5814b6cdf3defcd4055814922f58e2886bfeecfd5bab294c408858a29e72fcf53f35a1f7748113e1f2863baa329daedae07ef2f0
-EBUILD mediastreamer-2.9.0-r2.ebuild 4632 BLAKE2B bc01612ebcf29e8aadca6c0d248a5a568f0fffb842769c55091f041d286d3a27bd445f925643a71bd4d1af66cb5da65b7de3624ce7450c3f0b9f146a8ed2471f SHA512 2f18923cd2f37a1e1028f2c4ccd4834e170f6314798290435a9862b11dc72187f54dda8291f51ce086f4d5125f91bfd9d7f409192c563bb8c2cc1e70f4ed10c2
-MISC metadata.xml 815 BLAKE2B 9bf63033f9e0b69f3f6e8d0d66534c6c93408cb33bdad955b42a536767cf0c641c00dd8430cab979bd1adc9a1a3d717e49e5ee6b3e35d30741d9db6abfea2a8e SHA512 97b32950d71cf40df5df5488aff7fa56914deb1e76bc7779d67442d19609892240ff8dfe037c69d88b5c5b11b155cbfcfd2e4c09365eb9a7a7a65a8226ad39e9
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.9.0-ffmpeg3.patch b/media-libs/mediastreamer/files/mediastreamer-2.9.0-ffmpeg3.patch
deleted file mode 100644
index a536270897bb..000000000000
--- a/media-libs/mediastreamer/files/mediastreamer-2.9.0-ffmpeg3.patch
+++ /dev/null
@@ -1,482 +0,0 @@
-Index: mediastreamer-2.9.0/src/utils/ffmpeg-priv.h
-===================================================================
---- mediastreamer-2.9.0.orig/src/utils/ffmpeg-priv.h
-+++ mediastreamer-2.9.0/src/utils/ffmpeg-priv.h
-@@ -69,9 +69,6 @@ static inline int avcodec_decode_video2(
- 	return avcodec_decode_video(avctx,picture, got_picture_ptr,avpkt->data,avpkt->size);
- }
- #endif
--#if (LIBAVCODEC_VERSION_MAJOR >= 56)
--#include <libavcodec/old_codec_ids.h>
--#endif
- #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,25,0)
- #define CodecID AVCodecID
- #endif
-Index: mediastreamer-2.9.0/src/videofilters/h264dec.c
-===================================================================
---- mediastreamer-2.9.0.orig/src/videofilters/h264dec.c
-+++ mediastreamer-2.9.0/src/videofilters/h264dec.c
-@@ -56,7 +56,7 @@ static void ffmpeg_init(){
- static void dec_open(DecData *d){
- 	AVCodec *codec;
- 	int error;
--	codec=avcodec_find_decoder(CODEC_ID_H264);
-+	codec=avcodec_find_decoder(AV_CODEC_ID_H264);
- 	if (codec==NULL) ms_fatal("Could not find H264 decoder in ffmpeg.");
- 	avcodec_get_context_defaults3(&d->av_context, NULL);
- 	error=avcodec_open2(&d->av_context,codec, NULL);
-@@ -119,7 +119,7 @@ static mblk_t *get_as_yuvmsg(MSFilter *f
- 		s->outbuf.w=ctx->width;
- 		s->outbuf.h=ctx->height;
- 		s->sws_ctx=sws_getContext(ctx->width,ctx->height,ctx->pix_fmt,
--			ctx->width,ctx->height,PIX_FMT_YUV420P,SWS_FAST_BILINEAR,
-+			ctx->width,ctx->height,AV_PIX_FMT_YUV420P,SWS_FAST_BILINEAR,
-                 	NULL, NULL, NULL);
- 	}
- #if LIBSWSCALE_VERSION_INT >= AV_VERSION_INT(0,9,0)	
-@@ -272,7 +272,7 @@ static void dec_process(MSFilter *f){
- 				int len;
- 				int got_picture=0;
- 				AVPacket pkt;
--				avcodec_get_frame_defaults(&orig);
-+				av_frame_unref(&orig);
- 				av_init_packet(&pkt);
- 				pkt.data = p;
- 				pkt.size = end-p;
-Index: mediastreamer-2.9.0/src/videofilters/jpegwriter.c
-===================================================================
---- mediastreamer-2.9.0.orig/src/videofilters/jpegwriter.c
-+++ mediastreamer-2.9.0/src/videofilters/jpegwriter.c
-@@ -36,9 +36,9 @@ typedef struct {
- 
- static void jpg_init(MSFilter *f){
- 	JpegWriter *s=ms_new0(JpegWriter,1);
--	s->codec=avcodec_find_encoder(CODEC_ID_MJPEG);
-+	s->codec=avcodec_find_encoder(AV_CODEC_ID_MJPEG);
- 	if (s->codec==NULL){
--		ms_error("Could not find CODEC_ID_MJPEG !");
-+		ms_error("Could not find AV_CODEC_ID_MJPEG !");
- 	}
- 	f->data=s;
- }
-@@ -96,7 +96,7 @@ static void jpg_process(MSFilter *f){
- 			avctx->height=yuvbuf.h;
- 			avctx->time_base.num = 1;
- 			avctx->time_base.den =1;
--			avctx->pix_fmt=PIX_FMT_YUVJ420P;
-+			avctx->pix_fmt=AV_PIX_FMT_YUVJ420P;
- 
- 			error=avcodec_open2(avctx,s->codec,NULL);
- 			if (error!=0) {
-@@ -105,7 +105,7 @@ static void jpg_process(MSFilter *f){
- 				av_free(avctx);
- 				return;
- 			}
--			sws_ctx=sws_getContext(avctx->width,avctx->height,PIX_FMT_YUV420P,
-+			sws_ctx=sws_getContext(avctx->width,avctx->height,AV_PIX_FMT_YUV420P,
- 				avctx->width,avctx->height,avctx->pix_fmt,SWS_FAST_BILINEAR,NULL, NULL, NULL);
- 			if (sws_ctx==NULL) {
- 				ms_error(" sws_getContext() failed.");
-@@ -126,13 +126,18 @@ static void jpg_process(MSFilter *f){
- 			}
- 			sws_freeContext(sws_ctx);
- 			
--			avcodec_get_frame_defaults(&pict);
-+			av_frame_unref(&pict);
- 			avpicture_fill((AVPicture*)&pict,(uint8_t*)jpegm->b_rptr,avctx->pix_fmt,avctx->width,avctx->height);
--			error=avcodec_encode_video(avctx, (uint8_t*)comp_buf,comp_buf_sz, &pict);
-+			AVPacket pkt;
-+			av_init_packet(&pkt);
-+			pkt.buf = (uint8_t*)comp_buf;
-+			pkt.size = comp_buf_sz;
-+			int got_packet;
-+			error=avcodec_encode_video2(avctx, &pkt, &pict, &got_packet);
- 			if (error<0){
- 				ms_error("Could not encode jpeg picture.");
--			}else{
--				if (fwrite(comp_buf,error,1,s->file)>0){
-+			}else if(got_packet){
-+				if (fwrite(comp_buf,pkt.size,1,s->file)>0){
- 					ms_message("Snapshot done");
- 				}else{
- 					ms_error("Error writing snapshot.");
-Index: mediastreamer-2.9.0/src/videofilters/nowebcam.c
-===================================================================
---- mediastreamer-2.9.0.orig/src/videofilters/nowebcam.c
-+++ mediastreamer-2.9.0/src/videofilters/nowebcam.c
-@@ -61,7 +61,7 @@ static mblk_t *jpeg2yuv(uint8_t *jpgbuf,
- 	struct SwsContext *sws_ctx;
- 	AVPacket pkt;
- 	MSPicture dest;
--	AVCodec *codec=avcodec_find_decoder(CODEC_ID_MJPEG);
-+	AVCodec *codec=avcodec_find_decoder(AV_CODEC_ID_MJPEG);
- 
- 	if (codec==NULL){
- 		ms_error("Could not find MJPEG decoder in ffmpeg.");
-@@ -84,9 +84,9 @@ static mblk_t *jpeg2yuv(uint8_t *jpgbuf,
- 	}
- 	ret=ms_yuv_buf_alloc(&dest, reqsize->width,reqsize->height);
- 	/* not using SWS_FAST_BILINEAR because it doesn't play well with
--	 * av_context.pix_fmt set to PIX_FMT_YUVJ420P by jpeg decoder */
-+	 * av_context.pix_fmt set to AV_PIX_FMT_YUVJ420P by jpeg decoder */
- 	sws_ctx=sws_getContext(av_context.width,av_context.height,av_context.pix_fmt,
--		reqsize->width,reqsize->height,PIX_FMT_YUV420P,SWS_BILINEAR,
-+		reqsize->width,reqsize->height,AV_PIX_FMT_YUV420P,SWS_BILINEAR,
-                 NULL, NULL, NULL);
- 	if (sws_ctx==NULL) {
- 		ms_error("jpeg2yuv: ms_sws_getContext() failed.");
-Index: mediastreamer-2.9.0/src/videofilters/videodec.c
-===================================================================
---- mediastreamer-2.9.0.orig/src/videofilters/videodec.c
-+++ mediastreamer-2.9.0/src/videofilters/videodec.c
-@@ -40,7 +40,7 @@ typedef struct DecState{
- 	YuvBuf outbuf;
- 	mblk_t *yuv_msg;
- 	struct SwsContext *sws_ctx;
--	enum PixelFormat output_pix_fmt;
-+	enum AVPixelFormat output_pix_fmt;
- 	uint8_t dci[512];
- 	int dci_size;
- 	uint64_t last_error_reported_time;
-@@ -58,7 +58,7 @@ static void dec_init(MSFilter *f, enum C
- 	s->codec=cid;
- 	s->input=NULL;
- 	s->yuv_msg=NULL;
--	s->output_pix_fmt=PIX_FMT_YUV420P;
-+	s->output_pix_fmt=AV_PIX_FMT_YUV420P;
- 	s->snow_initialized=FALSE;
- 	s->outbuf.w=0;
- 	s->outbuf.h=0;
-@@ -77,19 +77,19 @@ static void dec_init(MSFilter *f, enum C
- }
- 
- static void dec_h263_init(MSFilter *f){
--	dec_init(f,CODEC_ID_H263);
-+	dec_init(f,AV_CODEC_ID_H263);
- }
- 
- static void dec_mpeg4_init(MSFilter *f){
--	dec_init(f,CODEC_ID_MPEG4);
-+	dec_init(f,AV_CODEC_ID_MPEG4);
- }
- 
- static void dec_mjpeg_init(MSFilter *f){
--	dec_init(f,CODEC_ID_MJPEG);
-+	dec_init(f,AV_CODEC_ID_MJPEG);
- }
- 
- static void dec_snow_init(MSFilter *f){
--	dec_init(f,CODEC_ID_SNOW);
-+	dec_init(f,AV_CODEC_ID_SNOW);
- }
- 
- static void dec_uninit(MSFilter *f){
-@@ -134,10 +134,10 @@ static void dec_preprocess(MSFilter *f){
- 	s->first_image_decoded = FALSE;
- 	if (s->av_context.codec==NULL){
- 		/* we must know picture size before initializing snow decoder*/
--		if (s->codec!=CODEC_ID_SNOW){
-+		if (s->codec!=AV_CODEC_ID_SNOW){
- 			error=avcodec_open2(&s->av_context, s->av_codec,NULL);
- 			if (error!=0) ms_error("avcodec_open2() failed: %i",error);
--			if (s->codec==CODEC_ID_MPEG4 && s->dci_size>0){
-+			if (s->codec==AV_CODEC_ID_MPEG4 && s->dci_size>0){
- 				s->av_context.extradata=s->dci;
- 				s->av_context.extradata_size=s->dci_size;
- 			}
-@@ -643,8 +643,8 @@ static void dec_process_frame(MSFilter *
- 	
- 	if (f->desc->id==MS_H263_DEC_ID) inm=skip_rfc2429_header(inm);
- 	else if (f->desc->id==MS_H263_OLD_DEC_ID) inm=skip_rfc2190_header(inm);
--	else if (s->codec==CODEC_ID_SNOW && s->input==NULL) inm=parse_snow_header(s,inm);
--	else if (s->codec==CODEC_ID_MJPEG && f->desc->id==MS_JPEG_DEC_ID) inm=read_rfc2435_header(s,inm);
-+	else if (s->codec==AV_CODEC_ID_SNOW && s->input==NULL) inm=parse_snow_header(s,inm);
-+	else if (s->codec==AV_CODEC_ID_MJPEG && f->desc->id==MS_JPEG_DEC_ID) inm=read_rfc2435_header(s,inm);
- 
- 	if (inm){
- 		/* accumulate the video packet until we have the rtp markbit*/
-Index: mediastreamer-2.9.0/src/videofilters/videoenc.c
-===================================================================
---- mediastreamer-2.9.0.orig/src/videofilters/videoenc.c
-+++ mediastreamer-2.9.0/src/videofilters/videoenc.c
-@@ -223,19 +223,19 @@ static void enc_init(MSFilter *f, enum C
- }
- 
- static void enc_h263_init(MSFilter *f){
--	enc_init(f,CODEC_ID_H263P);
-+	enc_init(f,AV_CODEC_ID_H263P);
- }
- 
- static void enc_mpeg4_init(MSFilter *f){
--	enc_init(f,CODEC_ID_MPEG4);
-+	enc_init(f,AV_CODEC_ID_MPEG4);
- }
- 
- static void enc_snow_init(MSFilter *f){
--	enc_init(f,CODEC_ID_SNOW);
-+	enc_init(f,AV_CODEC_ID_SNOW);
- }
- 
- static void enc_mjpeg_init(MSFilter *f){
--	enc_init(f,CODEC_ID_MJPEG);
-+	enc_init(f,AV_CODEC_ID_MJPEG);
- }
- 
- static void prepare(EncState *s){
-@@ -243,7 +243,7 @@ static void prepare(EncState *s){
- 	const int max_br_vbv=128000;
- 
- 	avcodec_get_context_defaults3(c, NULL);
--	if (s->codec==CODEC_ID_MJPEG)
-+	if (s->codec==AV_CODEC_ID_MJPEG)
- 	{
- 		ms_message("Codec bitrate set to %i",c->bit_rate);
- 		c->width = s->vsize.width;  
-@@ -251,7 +251,7 @@ static void prepare(EncState *s){
- 		c->time_base.num = 1;
- 		c->time_base.den = (int)s->fps;
- 		c->gop_size=(int)s->fps*5; /*emit I frame every 5 seconds*/
--		c->pix_fmt=PIX_FMT_YUVJ420P;
-+		c->pix_fmt=AV_PIX_FMT_YUVJ420P;
- 		s->comp_buf=allocb(c->bit_rate*2,0);
- 		return;
- 	}
-@@ -269,7 +269,7 @@ static void prepare(EncState *s){
- 
- 	/* ffmpeg vbv rate control consumes too much cpu above a certain target bitrate.
- 	We don't use it above max_br_vbv */
--	if (s->codec!=CODEC_ID_SNOW && s->maxbr<max_br_vbv){
-+	if (s->codec!=AV_CODEC_ID_SNOW && s->maxbr<max_br_vbv){
- 		/*snow does not like 1st pass rate control*/
- 		c->rc_max_rate=c->bit_rate;
- 		c->rc_min_rate=0;
-@@ -285,9 +285,9 @@ static void prepare(EncState *s){
- 	c->time_base.num = 1;
- 	c->time_base.den = (int)s->fps;
- 	c->gop_size=(int)s->fps*10; /*emit I frame every 10 seconds*/
--	c->pix_fmt=PIX_FMT_YUV420P;
-+	c->pix_fmt=AV_PIX_FMT_YUV420P;
- 	s->comp_buf=allocb(c->bit_rate*2,0);
--	if (s->codec==CODEC_ID_SNOW){
-+	if (s->codec==AV_CODEC_ID_SNOW){
- 		c->strict_std_compliance=-2;
- 	}
- 	
-@@ -304,7 +304,7 @@ static void prepare_h263(EncState *s){
- #endif
- 	c->rtp_payload_size = s->mtu/2;
- 	if (s->profile==0){
--		s->codec=CODEC_ID_H263;
-+		s->codec=AV_CODEC_ID_H263;
- 	}else{
- 		/*
- 		c->flags|=CODEC_FLAG_H263P_UMV;
-@@ -313,7 +313,7 @@ static void prepare_h263(EncState *s){
- 		c->flags|=CODEC_FLAG_OBMC;
- 		c->flags|=CODEC_FLAG_AC_PRED;
- 		*/
--		s->codec=CODEC_ID_H263P;
-+		s->codec=AV_CODEC_ID_H263P;
- 	}
- }
- 
-@@ -331,13 +331,13 @@ static void enc_preprocess(MSFilter *f){
- 	EncState *s=(EncState*)f->data;
- 	int error;
- 	prepare(s);
--	if (s->codec==CODEC_ID_H263P || s->codec==CODEC_ID_H263)
-+	if (s->codec==AV_CODEC_ID_H263P || s->codec==AV_CODEC_ID_H263)
- 		prepare_h263(s);
--	else if (s->codec==CODEC_ID_MPEG4)
-+	else if (s->codec==AV_CODEC_ID_MPEG4)
- 		prepare_mpeg4(s);
--	else if (s->codec==CODEC_ID_SNOW){
-+	else if (s->codec==AV_CODEC_ID_SNOW){
- 		/**/
--	}else if (s->codec==CODEC_ID_MJPEG){
-+	}else if (s->codec==AV_CODEC_ID_MJPEG){
- 		/**/
- 	}else {
- 		ms_error("Unsupported codec id %i",s->codec);
-@@ -724,12 +724,12 @@ static void split_and_send(MSFilter *f,
- 	uint8_t *psc;
- 	uint32_t timestamp=f->ticker->time*90LL;
- 	
--	if (s->codec==CODEC_ID_MPEG4 || s->codec==CODEC_ID_SNOW)
-+	if (s->codec==AV_CODEC_ID_MPEG4 || s->codec==AV_CODEC_ID_SNOW)
- 	{
- 		mpeg4_fragment_and_send(f,s,frame,timestamp);
- 		return;
- 	}
--	else if (s->codec==CODEC_ID_MJPEG)
-+	else if (s->codec==AV_CODEC_ID_MJPEG)
- 	{
- 		mblk_t *lqt=NULL;
- 		mblk_t *cqt=NULL;
-@@ -765,7 +765,7 @@ static void split_and_send(MSFilter *f,
- 
- static void process_frame(MSFilter *f, mblk_t *inm){
- 	EncState *s=(EncState*)f->data;
--	AVFrame pict;
-+	AVFrame pict = {};
- 	AVCodecContext *c=&s->av_context;
- 	int error;
- 	mblk_t *comp_buf=s->comp_buf;
-@@ -774,7 +774,7 @@ static void process_frame(MSFilter *f, m
- 
- 	ms_yuv_buf_init_from_mblk(&yuv, inm);
- 	/* convert image if necessary */
--	avcodec_get_frame_defaults(&pict);
-+	av_frame_unref(&pict);
- 	avpicture_fill((AVPicture*)&pict,yuv.planes[0],c->pix_fmt,c->width,c->height);
- 	
- 	/* timestamp used by ffmpeg, unset here */
-@@ -789,7 +789,7 @@ static void process_frame(MSFilter *f, m
- 		s->req_vfu=FALSE;
- 	}
- 	comp_buf->b_rptr=comp_buf->b_wptr=comp_buf->b_datap->db_base;
--	if (s->codec==CODEC_ID_SNOW){
-+	if (s->codec==AV_CODEC_ID_SNOW){
- 		//prepend picture size
- 		uint32_t header=((s->vsize.width&0xffff)<<16) | (s->vsize.height&0xffff);
- 		*(uint32_t*)comp_buf->b_wptr=htonl(header);
-@@ -797,10 +797,15 @@ static void process_frame(MSFilter *f, m
- 		comp_buf_sz-=4;
- 	}
- 
--	error=avcodec_encode_video(c, (uint8_t*)comp_buf->b_wptr,comp_buf_sz, &pict);
-+	AVPacket pkt;
-+	av_init_packet(&pkt);
-+	pkt.data = (uint8_t*)comp_buf->b_wptr;
-+	pkt.size = comp_buf_sz;
-+	int got_packet;
-+	error=avcodec_encode_video2(c, &pkt, &pict, &got_packet);
- 
- 	if (error<=0) ms_warning("ms_AVencoder_process: error %i.",error);
--	else{
-+	else if(got_packet){
- 		s->framenum++;
- 		if (s->framenum==1){
- 			video_starter_first_frame (&s->starter,f->ticker->time);
-@@ -808,7 +813,7 @@ static void process_frame(MSFilter *f, m
- 		if (c->coded_frame->pict_type==FF_I_TYPE){
- 			ms_message("Emitting I-frame");
- 		}
--		comp_buf->b_wptr+=error;
-+		comp_buf->b_wptr+=pkt.size;
- 		split_and_send(f,s,comp_buf);
- 	}
- 	freemsg(inm);
-@@ -837,7 +842,7 @@ static int enc_get_br(MSFilter *f, void
- 
- static int enc_set_br(MSFilter *f, void *arg){
- 	EncState *s=(EncState*)f->data;
--	bool_t snow=s->codec==CODEC_ID_SNOW;
-+	bool_t snow=s->codec==AV_CODEC_ID_SNOW;
- 	s->maxbr=*(int*)arg;
- 	if (s->av_context.codec!=NULL){
- 		/*when we are processing, apply new settings immediately*/
-@@ -847,11 +852,11 @@ static int enc_set_br(MSFilter *f, void
- 		ms_filter_unlock(f);
- 		return 0;
- 	}
--	if (s->maxbr>=1024000 && s->codec!=CODEC_ID_H263P){
-+	if (s->maxbr>=1024000 && s->codec!=AV_CODEC_ID_H263P){
- 		s->vsize.width = MS_VIDEO_SIZE_SVGA_W;
- 		s->vsize.height = MS_VIDEO_SIZE_SVGA_H;
- 		s->fps=25;
--	}else if (s->maxbr>=800000 && s->codec!=CODEC_ID_H263P){
-+	}else if (s->maxbr>=800000 && s->codec!=AV_CODEC_ID_H263P){
- 		s->vsize.width = MS_VIDEO_SIZE_VGA_W;
- 		s->vsize.height = MS_VIDEO_SIZE_VGA_H;
- 		s->fps=25;
-@@ -864,7 +869,7 @@ static int enc_set_br(MSFilter *f, void
- 		s->vsize.height=MS_VIDEO_SIZE_CIF_H;
- 		s->fps=17;
- 		s->qmin=3;
--	}else if (s->maxbr>=170000 && s->codec!=CODEC_ID_H263P && s->codec!=CODEC_ID_H263){
-+	}else if (s->maxbr>=170000 && s->codec!=AV_CODEC_ID_H263P && s->codec!=AV_CODEC_ID_H263){
- 		s->vsize.width=MS_VIDEO_SIZE_QVGA_W;
- 		s->vsize.height=MS_VIDEO_SIZE_QVGA_H;
- 		s->fps=15;
-@@ -1075,15 +1080,15 @@ MSFilterDesc ms_mjpeg_enc_desc={
- 
- void __register_ffmpeg_encoders_if_possible(void){
- 	ms_ffmpeg_check_init();
--	if (avcodec_find_encoder(CODEC_ID_MPEG4))
-+	if (avcodec_find_encoder(AV_CODEC_ID_MPEG4))
- 		ms_filter_register(&ms_mpeg4_enc_desc);
--	if (avcodec_find_encoder(CODEC_ID_H263)){
-+	if (avcodec_find_encoder(AV_CODEC_ID_H263)){
- 		ms_filter_register(&ms_h263_enc_desc);
- 		ms_filter_register(&ms_h263_old_enc_desc);
- 	}
--	if (avcodec_find_encoder(CODEC_ID_SNOW))
-+	if (avcodec_find_encoder(AV_CODEC_ID_SNOW))
- 		ms_filter_register(&ms_snow_enc_desc);
--	if (avcodec_find_encoder(CODEC_ID_MJPEG))
-+	if (avcodec_find_encoder(AV_CODEC_ID_MJPEG))
- 	{
- 		ms_filter_register(&ms_mjpeg_enc_desc);
- 	}
-Index: mediastreamer-2.9.0/src/voip/msvideo.c
-===================================================================
---- mediastreamer-2.9.0.orig/src/voip/msvideo.c
-+++ mediastreamer-2.9.0/src/voip/msvideo.c
-@@ -351,21 +351,21 @@ void ms_rgb_to_yuv(const uint8_t rgb[3],
- int ms_pix_fmt_to_ffmpeg(MSPixFmt fmt){
- 	switch(fmt){
- 		case MS_RGBA32:
--			return PIX_FMT_RGBA;
-+			return AV_PIX_FMT_RGBA;
- 		case MS_RGB24:
--			return PIX_FMT_RGB24;
-+			return AV_PIX_FMT_RGB24;
- 		case MS_RGB24_REV:
--			return PIX_FMT_BGR24;
-+			return AV_PIX_FMT_BGR24;
- 		case MS_YUV420P:
--			return PIX_FMT_YUV420P;
-+			return AV_PIX_FMT_YUV420P;
- 		case MS_YUYV:
--			return PIX_FMT_YUYV422;
-+			return AV_PIX_FMT_YUYV422;
- 		case MS_UYVY:
--			return PIX_FMT_UYVY422;
-+			return AV_PIX_FMT_UYVY422;
- 		case MS_YUY2:
--			return PIX_FMT_YUYV422;   /* <- same as MS_YUYV */
-+			return AV_PIX_FMT_YUYV422;   /* <- same as MS_YUYV */
- 		case MS_RGB565:
--			return PIX_FMT_RGB565;
-+			return AV_PIX_FMT_RGB565;
- 		default:
- 			ms_fatal("format not supported.");
- 			return -1;
-@@ -375,19 +375,19 @@ int ms_pix_fmt_to_ffmpeg(MSPixFmt fmt){
- 
- MSPixFmt ffmpeg_pix_fmt_to_ms(int fmt){
- 	switch(fmt){
--		case PIX_FMT_RGB24:
-+		case AV_PIX_FMT_RGB24:
- 			return MS_RGB24;
--		case PIX_FMT_BGR24:
-+		case AV_PIX_FMT_BGR24:
- 			return MS_RGB24_REV;
--		case PIX_FMT_YUV420P:
-+		case AV_PIX_FMT_YUV420P:
- 			return MS_YUV420P;
--		case PIX_FMT_YUYV422:
-+		case AV_PIX_FMT_YUYV422:
- 			return MS_YUYV;     /* same as MS_YUY2 */
--		case PIX_FMT_UYVY422:
-+		case AV_PIX_FMT_UYVY422:
- 			return MS_UYVY;
--		case PIX_FMT_RGBA:
-+		case AV_PIX_FMT_RGBA:
- 			return MS_RGBA32;
--		case PIX_FMT_RGB565:
-+		case AV_PIX_FMT_RGB565:
- 			return MS_RGB565;
- 		default:
- 			ms_fatal("format not supported.");
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.9.0-ffmpeg4.patch b/media-libs/mediastreamer/files/mediastreamer-2.9.0-ffmpeg4.patch
deleted file mode 100644
index 7a164d51639f..000000000000
--- a/media-libs/mediastreamer/files/mediastreamer-2.9.0-ffmpeg4.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/videofilters/nowebcam.c b/src/videofilters/nowebcam.c
-index 60e38530..52cc3359 100644
---- a/src/videofilters/nowebcam.c
-+++ b/src/videofilters/nowebcam.c
-@@ -32,7 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- #ifndef NO_FFMPEG
- #include "ffmpeg-priv.h"
- #else
--#define FF_INPUT_BUFFER_PADDING_SIZE 32
-+#define AV_INPUT_BUFFER_PADDING_SIZE 32
- #endif
- 
- #if TARGET_OS_IPHONE
-@@ -1740,7 +1740,7 @@ mblk_t *ms_load_jpeg_as_yuv(const char *jpgpath, MSVideoSize *reqsize){
- 			m=ms_load_generate_yuv(reqsize);
- 			return m;
- 		}
--		jpgbuf=(uint8_t*)ms_malloc0(statbuf.st_size + FF_INPUT_BUFFER_PADDING_SIZE);
-+		jpgbuf=(uint8_t*)ms_malloc0(statbuf.st_size + AV_INPUT_BUFFER_PADDING_SIZE);
- 		if (jpgbuf==NULL)
- 		{
- 			close(fd);
-\ No newline at end of file
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.9.0-libav9.patch b/media-libs/mediastreamer/files/mediastreamer-2.9.0-libav9.patch
deleted file mode 100644
index 078f360b3382..000000000000
--- a/media-libs/mediastreamer/files/mediastreamer-2.9.0-libav9.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-diff --git a/src/videofilters/h264dec.c b/src/videofilters/h264dec.c
-index 38881c1..f306723 100644
---- a/src/videofilters/h264dec.c
-+++ b/src/videofilters/h264dec.c
-@@ -58,10 +58,10 @@ static void dec_open(DecData *d){
- 	int error;
- 	codec=avcodec_find_decoder(CODEC_ID_H264);
- 	if (codec==NULL) ms_fatal("Could not find H264 decoder in ffmpeg.");
--	avcodec_get_context_defaults(&d->av_context);
--	error=avcodec_open(&d->av_context,codec);
-+	avcodec_get_context_defaults3(&d->av_context, NULL);
-+	error=avcodec_open2(&d->av_context,codec, NULL);
- 	if (error!=0){
--		ms_fatal("avcodec_open() failed.");
-+		ms_fatal("avcodec_open2() failed.");
- 	}
- }
- 
-diff --git a/src/videofilters/jpegwriter.c b/src/videofilters/jpegwriter.c
-index 891f618..96f5d7f 100644
---- a/src/videofilters/jpegwriter.c
-+++ b/src/videofilters/jpegwriter.c
-@@ -90,7 +90,7 @@ static void jpg_process(MSFilter *f){
- 			mblk_t *jpegm;
- 			struct SwsContext *sws_ctx;
- 			
--			AVCodecContext *avctx=avcodec_alloc_context();
-+			AVCodecContext *avctx=avcodec_alloc_context3(NULL);
- 			
- 			avctx->width=yuvbuf.w;
- 			avctx->height=yuvbuf.h;
-@@ -98,9 +98,9 @@ static void jpg_process(MSFilter *f){
- 			avctx->time_base.den =1;
- 			avctx->pix_fmt=PIX_FMT_YUVJ420P;
- 
--			error=avcodec_open(avctx,s->codec);
-+			error=avcodec_open2(avctx,s->codec,NULL);
- 			if (error!=0) {
--				ms_error("avcodec_open() failed: %i",error);
-+				ms_error("avcodec_open2() failed: %i",error);
- 				cleanup(s,NULL);
- 				av_free(avctx);
- 				return;
-diff --git a/src/videofilters/nowebcam.c b/src/videofilters/nowebcam.c
-index 60e3853..329c453 100644
---- a/src/videofilters/nowebcam.c
-+++ b/src/videofilters/nowebcam.c
-@@ -68,9 +68,9 @@ static mblk_t *jpeg2yuv(uint8_t *jpgbuf, int bufsize, MSVideoSize *reqsize){
- 		return NULL;
- 	}
- 
--	avcodec_get_context_defaults(&av_context);
--	if (avcodec_open(&av_context,codec)<0){
--		ms_error("jpeg2yuv: avcodec_open failed");
-+	avcodec_get_context_defaults3(&av_context, NULL);
-+	if (avcodec_open2(&av_context,codec,NULL)<0){
-+		ms_error("jpeg2yuv: avcodec_open2 failed");
- 		return NULL;
- 	}
- 	av_init_packet(&pkt);
-diff --git a/src/videofilters/videodec.c b/src/videofilters/videodec.c
-index 494debf..c52e207 100644
---- a/src/videofilters/videodec.c
-+++ b/src/videofilters/videodec.c
-@@ -53,7 +53,7 @@ static void dec_init(MSFilter *f, enum CodecID cid){
- 	DecState *s=(DecState *)ms_new0(DecState,1);
- 	ms_ffmpeg_check_init();
- 	
--	avcodec_get_context_defaults(&s->av_context);
-+	avcodec_get_context_defaults3(&s->av_context, NULL);
- 	s->av_codec=NULL;
- 	s->codec=cid;
- 	s->input=NULL;
-@@ -135,8 +135,8 @@ static void dec_preprocess(MSFilter *f){
- 	if (s->av_context.codec==NULL){
- 		/* we must know picture size before initializing snow decoder*/
- 		if (s->codec!=CODEC_ID_SNOW){
--			error=avcodec_open(&s->av_context, s->av_codec);
--			if (error!=0) ms_error("avcodec_open() failed: %i",error);
-+			error=avcodec_open2(&s->av_context, s->av_codec,NULL);
-+			if (error!=0) ms_error("avcodec_open2() failed: %i",error);
- 			if (s->codec==CODEC_ID_MPEG4 && s->dci_size>0){
- 				s->av_context.extradata=s->dci;
- 				s->av_context.extradata_size=s->dci_size;
-@@ -225,8 +225,8 @@ static mblk_t * parse_snow_header(DecState *s,mblk_t *inm){
- 			int error;
- 			s->av_context.width=h>>16;
- 			s->av_context.height=h&0xffff;
--			error=avcodec_open(&s->av_context, s->av_codec);
--			if (error!=0) ms_error("avcodec_open() failed for snow: %i",error);
-+			error=avcodec_open2(&s->av_context, s->av_codec, NULL);
-+			if (error!=0) ms_error("avcodec_open2() failed for snow: %i",error);
- 			else {
- 				s->snow_initialized=TRUE;
- 				ms_message("Snow decoder initialized,size=%ix%i",
-diff --git a/src/videofilters/videoenc.c b/src/videofilters/videoenc.c
-index da35592..09dcc9d 100644
---- a/src/videofilters/videoenc.c
-+++ b/src/videofilters/videoenc.c
-@@ -242,7 +242,7 @@ static void prepare(EncState *s){
- 	AVCodecContext *c=&s->av_context;
- 	const int max_br_vbv=128000;
- 
--	avcodec_get_context_defaults(c);
-+	avcodec_get_context_defaults3(c, NULL);
- 	if (s->codec==CODEC_ID_MJPEG)
- 	{
- 		ms_message("Codec bitrate set to %i",c->bit_rate);
-@@ -348,9 +348,9 @@ static void enc_preprocess(MSFilter *f){
- 		ms_error("could not find encoder for codec id %i",s->codec);
- 		return;
- 	}
--	error=avcodec_open(&s->av_context, s->av_codec);
-+	error=avcodec_open2(&s->av_context, s->av_codec, NULL);
- 	if (error!=0) {
--		ms_error("avcodec_open() failed: %i",error);
-+		ms_error("avcodec_open2() failed: %i",error);
- 		return;
- 	}
- 	video_starter_init(&s->starter);
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.9.0-tests.patch b/media-libs/mediastreamer/files/mediastreamer-2.9.0-tests.patch
deleted file mode 100644
index 3bcb8bd36618..000000000000
--- a/media-libs/mediastreamer/files/mediastreamer-2.9.0-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d9f448013bd5ea92ce42c99ef3338932ec694b62 Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@gentoo.org>
-Date: Wed, 9 Oct 2013 21:18:28 +0200
-Subject: [PATCH] fix tests
-
----
- configure.ac | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 4b923a9..4aec221 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -873,6 +873,9 @@ case "$target_os" in
- 		#hack for macport
- 		CUNIT_LIBS+=" -lncurses"
- 	;;
-+	*linux*)
-+		CUNIT_LIBS+=" -lncurses"
-+	;;
- 	*mingw*)
- 		CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0501"
- 		LIBS="$LIBS -lws2_32 -liphlpapi"
--- 
-1.8.3.2
-
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.9.0-underlinking.patch b/media-libs/mediastreamer/files/mediastreamer-2.9.0-underlinking.patch
deleted file mode 100644
index 19d6af803c2c..000000000000
--- a/media-libs/mediastreamer/files/mediastreamer-2.9.0-underlinking.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 497ad9c27385c02f4f038b6e787ada9c7b6f8373 Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@gentoo.org>
-Date: Wed, 9 Oct 2013 18:24:28 +0200
-Subject: [PATCH] fix underlinking
-
----
- configure.ac    | 20 ++++++++++++++++++++
- src/Makefile.am |  2 +-
- 2 files changed, 21 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9f402bd..4b923a9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -893,6 +893,26 @@ fi
- 
- AM_CONDITIONAL(BUILD_TESTS,test x$found_cunit = xyes)
- 
-+dnl Check for clock_gettime, in libc for FreeBSD, in rt for linux,
-+dnl in rt for Solaris 7, in posix4 for Solaris 2.5.1
-+LIB_CLOCK_GETTIME=
-+clk_saved_libs=$LIBS
-+AC_SEARCH_LIBS([clock_gettime], [rt posix4],
-+    [test "$ac_cv_search_clock_gettime" = "none required" ||
-+    LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
-+AC_SUBST([LIB_CLOCK_GETTIME])
-+
-+AC_MSG_CHECKING([for working clock_gettime])
-+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]],
-+    [[clock_gettime(CLOCK_REALTIME, 0);]])], [gnupg_cv_clock_gettime=yes], [gnupg_cv_clock_gettime=no])
-+AC_MSG_RESULT($gnupg_cv_clock_gettime)
-+
-+if test x"$gnupg_cv_clock_gettime" = xyes; then
-+    AC_DEFINE([HAVE_CLOCK_GETTIME], 1,
-+    [Define to 1 if you have the `clock_gettime' function.])
-+fi
-+LIBS=$clk_saved_libs
-+
- 
- dnl ##################################################
- dnl # Check for doxygen
-diff --git a/src/Makefile.am b/src/Makefile.am
-index a315e92..a5e144c 100755
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -266,7 +266,7 @@ voipdescs.h:	Makefile $(libmediastreamer_voip_la_SOURCES)
- 	awk 'BEGIN { print("MSFilterDesc * ms_voip_filter_descs[]={") } { printf("&%s,\n",$$1) } END{ print("NULL\n};\n") } ' $$builddir/voipdescs.txt >> $$builddir/$@
- 
- 
--libmediastreamer_base_la_LIBADD=	$(ORTP_LIBS)
-+libmediastreamer_base_la_LIBADD=	$(ORTP_LIBS) @LIB_CLOCK_GETTIME@
- libmediastreamer_base_la_LDFLAGS= -no-undefined -version-info $(LIBMEDIASTREAMER_SO_VERSION)
- 
- if !BUILD_WIN32
--- 
-1.8.3.2
-
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.9.0-v4l-automagic.patch b/media-libs/mediastreamer/files/mediastreamer-2.9.0-v4l-automagic.patch
deleted file mode 100644
index c590aef3b713..000000000000
--- a/media-libs/mediastreamer/files/mediastreamer-2.9.0-v4l-automagic.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From b99ddff6f322c8b466f3cdfd71b0d629cea33aac Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@gentoo.org>
-Date: Wed, 9 Oct 2013 18:12:46 +0200
-Subject: [PATCH] Support disabling V4L support completely
-
----
- configure.ac | 18 +++++++++++++++---
- 1 file changed, 15 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 94b6f18..9f402bd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -746,6 +746,16 @@ PACKAGE_DATA_DIR="$prefix/share"
- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR,  "${package_prefix}/share" ,[path of data])
- AC_SUBST(PACKAGE_DATA_DIR)
- 
-+AC_ARG_ENABLE(v4l,
-+      [  --disable-v4l       Disable usage of v4l],
-+      [case "${enableval}" in
-+        yes) v4l=yes ;;
-+        no)  v4l=no ;;
-+        *) AC_MSG_ERROR(bad value ${enableval} for --disable-v4l) ;;
-+      esac],[v4l=yes])
-+
-+if test "$v4l" = "yes" ; then
-+
- dnl check for video4linux headers
- AC_CHECK_HEADERS(linux/videodev.h linux/videodev2.h)
- if test "${ac_cv_header_linux_videodev_h}" = "yes" ; then
-@@ -759,9 +769,6 @@ else
- 	found_v4l2=no
- fi
- 
--AM_CONDITIONAL(BUILD_V4L1, test x$found_v4l1 = xyes )
--AM_CONDITIONAL(BUILD_V4L2, test x$found_v4l2 = xyes )
--
- AC_ARG_ENABLE(libv4l1,
- 	[AS_HELP_STRING([--disable-libv4l1], [Disable usage of libv4l1, really discouraged])],
- 	[case "${enableval}" in
-@@ -805,6 +812,11 @@ this check.
- 	fi
- fi
- 
-+fi
-+
-+AM_CONDITIONAL(BUILD_V4L1, test x$found_v4l1 = xyes )
-+AM_CONDITIONAL(BUILD_V4L2, test x$found_v4l2 = xyes )
-+
- 
- AC_PATH_PROG(PCAP,pcap-config,false)
- AM_CONDITIONAL(HAVE_PCAP, test $PCAP != false)
--- 
-1.8.3.2
-
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.9.0-xxd.patch b/media-libs/mediastreamer/files/mediastreamer-2.9.0-xxd.patch
deleted file mode 100644
index 2337e1343002..000000000000
--- a/media-libs/mediastreamer/files/mediastreamer-2.9.0-xxd.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Oct 11 11:37:19 UTC 2013
-Subject: avoid dependency on vim-core
-
---- mediastreamer-2.9.0/src/Makefile.am
-+++ mediastreamer-2.9.0/src/Makefile.am
-@@ -385,9 +385,9 @@
- yuv2rgb.fs.h: yuv2rgb.fs
- 	builddir=`pwd` && \
- 	cd $(top_srcdir)/src && \
--	xxd -i yuv2rgb.fs | sed s/}\;/,0x00}\;/ > $$builddir/yuv2rgb.fs.h
-+	xxdi.pl yuv2rgb.fs | sed s/}\;/0x00}\;/ > $$builddir/yuv2rgb.fs.h
- 
- yuv2rgb.vs.h: yuv2rgb.vs
- 	builddir=`pwd` && \
- 	cd $(top_srcdir)/src && \
--	xxd -i yuv2rgb.vs | sed s/}\;/,0x00}\;/ > $$builddir/yuv2rgb.vs.h
-+	xxdi.pl yuv2rgb.vs | sed s/}\;/0x00}\;/ > $$builddir/yuv2rgb.vs.h
diff --git a/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild b/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild
deleted file mode 100644
index e74122e5af50..000000000000
--- a/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools ltprune
-
-DESCRIPTION="Mediastreaming library for telephony application"
-HOMEPAGE="https://www.linphone.org/"
-SRC_URI="mirror://nongnu/linphone/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/3"
-KEYWORDS="amd64 arm64 ppc ppc64 x86"
-# Many cameras will not work or will crash an application if mediastreamer2 is
-# not built with v4l2 support (taken from configure.ac)
-# TODO: run-time test for ipv6: does it really need ortp[ipv6] ?
-IUSE="+alsa amr bindist coreaudio debug doc examples +filters g726 g729 gsm ilbc
-	ipv6 libav ntp-timestamp opengl opus +ortp oss pcap portaudio pulseaudio sdl
-	+speex static-libs test theora upnp v4l video x264 X"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( oss alsa portaudio coreaudio pulseaudio )
-	opengl? ( video )
-	theora? ( video )
-	v4l? ( video )
-	video? ( || ( opengl sdl X ) )
-	X? ( video )"
-
-RDEPEND="
-	alsa? ( media-libs/alsa-lib )
-	g726? ( >=media-libs/spandsp-0.0.6_pre1 )
-	gsm? ( media-sound/gsm )
-	opus? ( media-libs/opus )
-	ortp? ( >=net-libs/ortp-0.21.0:=[ipv6?] )
-	pcap? ( sys-libs/libcap )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.21 )
-	speex? (
-		>=media-libs/speex-1.2.0
-		media-libs/speexdsp
-	)
-	upnp? ( net-libs/libupnp:0 )
-	video? (
-		libav? ( >=media-video/libav-9.12:0= )
-		!libav? ( >=media-video/ffmpeg-1.2.6-r1:0= )
-		opengl? (
-			media-libs/glew:=
-			virtual/opengl
-			x11-libs/libX11
-		)
-		sdl? ( media-libs/libsdl[video,X] )
-		theora? ( media-libs/libtheora )
-		v4l? (
-			media-libs/libv4l
-			sys-kernel/linux-headers
-		)
-		X? (
-			x11-libs/libX11
-			x11-libs/libXv
-		)
-	)
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( >=dev-util/cunit-2.1_p2[ncurses] )
-	video? ( dev-util/xxdi )
-	X? ( x11-base/xorg-proto )
-"
-PDEPEND="
-	amr? ( !bindist? ( media-plugins/mediastreamer-amr ) )
-	g729? ( !bindist? ( media-plugins/mediastreamer-bcg729 ) )
-	ilbc? ( media-plugins/mediastreamer-ilbc )
-	video? ( x264? ( media-plugins/mediastreamer-x264 ) )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-v4l-automagic.patch"
-	"${FILESDIR}/${P}-libav9.patch"
-	"${FILESDIR}/${P}-underlinking.patch"
-	"${FILESDIR}/${P}-tests.patch"
-	"${FILESDIR}/${P}-xxd.patch"
-	"${FILESDIR}/${P}-ffmpeg3.patch"
-	"${FILESDIR}/${P}-ffmpeg4.patch"
-)
-
-src_prepare() {
-	default
-
-	# variable causes "command not found" warning and is not
-	# needed anyway
-	sed -i \
-		-e 's/$(ACLOCAL_MACOS_FLAGS)//' \
-		Makefile.am || die
-
-	# respect user's CFLAGS
-	sed -i \
-		-e "s:-O2::;s: -g::" \
-		configure.ac || die "patching configure.ac failed"
-
-	# change default paths
-	sed -i \
-		-e "s:\(prefix/share\):\1/${PN}:" \
-		configure.ac || die "patching configure.ac failed"
-
-	# fix doc installation dir
-	sed -i \
-		-e "s:\$(pkgdocdir):\$(docdir):" \
-		help/Makefile.am || die "patching help/Makefile.am failed"
-
-	# fix html installation dir
-	sed -i \
-		-e "s:\(doc_htmldir=\).*:\1\$(htmldir):" \
-		help/Makefile.am || die "patching help/Makefile.am failed"
-
-	# linux/videodev.h dropped in 2.6.38
-	sed -i \
-		-e 's:linux/videodev.h ::' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-		--datadir="${EPREFIX}"/usr/share/${PN}
-		# arts is deprecated
-		--disable-artsc
-		# don't want -Werror
-		--disable-strict
-		--disable-libv4l1
-		# don't use bundled libs
-		--enable-external-ortp
-		$(use_enable alsa)
-		$(use_enable coreaudio macsnd)
-		$(use_enable debug)
-		$(use_enable filters)
-		$(use_enable g726 spandsp)
-		$(use_enable gsm)
-		$(use_enable ipv6)
-		$(use_enable ntp-timestamp)
-		$(use_enable opengl glx)
-		$(use_enable opus)
-		$(use_enable ortp)
-		$(use_enable oss)
-		$(use_enable pcap)
-		$(use_enable portaudio)
-		$(use_enable pulseaudio)
-		$(use_enable sdl)
-		$(use_enable speex)
-		$(use_enable static-libs static)
-		$(use_enable theora)
-		$(use_enable upnp)
-		$(use_enable v4l)
-		$(use_enable v4l libv4l2)
-		$(use_enable video)
-		$(use_enable X x11)
-		$(use_enable X xv)
-		$(use doc || echo ac_cv_path_DOXYGEN=false)
-	)
-
-	# Mac OS X Audio Queue is an audio recording facility, available on
-	# 10.5 (Leopard, Darwin9) and onward
-	if use coreaudio && [[ ${CHOST} == *-darwin* && ${CHOST##*-darwin} -ge 9 ]]
-	then
-		myeconfargs+=( --enable-macaqsnd )
-	else
-		myeconfargs+=( --disable-macaqsnd )
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	default
-	cd tester || die
-	./mediastreamer2_tester || die
-}
-
-src_install() {
-	default
-	prune_libtool_files
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins tester/*.c
-	fi
-}
diff --git a/media-libs/mediastreamer/metadata.xml b/media-libs/mediastreamer/metadata.xml
deleted file mode 100644
index dd4bdefeb442..000000000000
--- a/media-libs/mediastreamer/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>bircoph@gentoo.org</email>
-		<name>Andrew Savchenko</name>
-	</maintainer>
-	<use>
-		<flag name="amr">Use of AMR Narrow Band codec plugin</flag>
-		<flag name="filters">Enable compilation of filters</flag>
-		<flag name="g726">Support g726 codec</flag>
-		<flag name="g729">Use g726 codec plugin</flag>
-		<flag name="ilbc">Use of iLBC (RFC3951) codec plugin</flag>
-		<flag name="ntp-timestamp">Turn on NTP timestamping on received
-			packet</flag>
-		<flag name="ortp">Enable usage of <pkg>net-libs/ortp</pkg></flag>
-		<flag name="pcap">Enable usage of <pkg>net-libs/libpcap</pkg></flag>
-		<flag name="video">Enable video support</flag>
-	</use>
-</pkgmetadata>
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 12aecffa5cc0..56a7f98a1c46 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,8 +1,14 @@
 DIST mesa-19.1.8.tar.xz 10945480 BLAKE2B df2ce0561cd0a61f0f35a406a5a9b2384c0c5869efadabfa40b07cf96a592214aa5c6d03423598c531f117075c3b59aa5af6f9b1c5dfa5914aabe41f60b592a0 SHA512 3bcc90c17cf966ce3399434ca2d4f363c5778e52c56b8184d6cdf22ef2e4a4fdb9c3fbff5c98efc856e3535f81259608a6daa74af1f3bdce30ea251d86435c74
 DIST mesa-19.2.7.tar.xz 11460812 BLAKE2B 27408d28d24ea397a0e60d1e4dc56ebe11c269720c31285794e611f41db6f2691c914892910b468210bb43f2111e5caf210e0dac287fb28a24825ad54e5643cc SHA512 87a82664381432e956ee23dc92bec5accf667606232e38d9458d67132c16fdc44584f65671293b83f00c58ad7742b80e942a5d1bd66d457705be60aaaf35395b
+DIST mesa-19.2.8.tar.xz 11462168 BLAKE2B c49d6d3d10b4c85534a75e4bea29fc8b7526c784af5068764de623d40cbb59ecb96beb1969fa1a13815b6bd259bb98faaf42e4969792c6a75ce702d4b2e57155 SHA512 9bedc2f1a5296da96c1a2a491edaea701e70f683b26eac076e8cbef2230156d5d5ddb2330c3a2530afd4982a9893d76ded8d54bc73a98c846de0c3dfa3634c43
 DIST mesa-19.3.0.tar.xz 11831372 BLAKE2B 97584bd68558e37d20d6e719610066ca2e3df83a26034e2f9b78022d5e5e7b97d12c70e05d8dd2f542f6db5311c4213a1f72afaea1ace4a2bf4ff561bcda2fe6 SHA512 69c4519540118fb3d50d718d92f443051c149633cf4291a07706c6d45cd6ad1f6f3b91446de2d31a9082efe9e3b4ce35b7472830e152ba655d83a91c2ed3c042
-EBUILD mesa-19.1.8.ebuild 14241 BLAKE2B dbdd629eb1f7ec6ad67de25e693e5a05217e425f107ced5cae65e8410112b686cbd1f71098eda8943ba728f0e038860e347c147fa75b1e6e67e7420d2421576f SHA512 b5b86b2f9866bcc8494493bd38bc9cdba20596f129fafcb37804758a387d4d2d61ca17d2f06876029b59619ce2699f0334d6ec7198b2758924f5d4c1c26c8d45
-EBUILD mesa-19.2.7.ebuild 14529 BLAKE2B 32f66c7981c79569b03e561fad1dff4a6bc2cef2ab895732f354d60c25e61df34ee045e782f5f0151f13f1dd348824367b0ed6b6d6b81e21a8d959dda3df9e7a SHA512 ba0d797949a1b1be41cf1436dac3ff41d5708148a3c3647c8ce91ef1a22a78a44e418306aec62bac72fd23b534764de78bdf53e9de8173f7fd3fd53dbe05fdb9
-EBUILD mesa-19.3.0.ebuild 14446 BLAKE2B d52f2def07a716c08f2cf78885b11b780929a828c24bd04f865afdd6a880466d790c601d40fefcd5afe923490d140760369b06059a8356d974e352c4de07b554 SHA512 012f9d14ae4cc04c40d5fb48d97b2880f11712530709830561f9adde6ee075bc6cdad6fbd7c1091fc4093d46b950d700d650b555068febad7ee442cb1a0177f6
-EBUILD mesa-9999.ebuild 14366 BLAKE2B 20bd843874b3f1f2ec5883542e38ff5678e80076597c91971574ab8be7e8771910dcb8163319ccb1c0eacf6b0c73c0e0545b9408d3bcfbb5bd2feddc207b6d90 SHA512 cbe36fd52e933d6f757bf38ba1badd7b4488662b7b0db627df57800b981b800faa1ff7c8d930e983615fb2285c76cc9dbac1980ed0b2cc3e66b58b5f4c8b79e7
+DIST mesa-19.3.1.tar.xz 11831968 BLAKE2B f4e70543bc48efa6888559606c660a837df25ceeabf4bf2141d7470f37f90e19a9d85da7c3b4f8d1b4c86d02245dbc8d58401caf9ab099609a501fc86b391987 SHA512 338d2e37122ef22cc4e27a2f3c39e23e419703a507ace99383c749a563936c5f0428cce9a68ac80d0bd2ff57be8a55f42aee0ed6d16bf6b77b4e59d428729568
+DIST mesa-19.3.2.tar.xz 11834324 BLAKE2B 114912816a08424da1d55c65d8ff4fb97d58022f5968d37938055e0b0fcdfeeebdbdca3c28d187fd85aaf6385d3a1bfbfe3f011f410e9a991519d34cb81697b5 SHA512 fb69999fa7a15cd6f2c254fb6e8fe635e56dc49a5c2c762a96c77815cbad77060b8f81a02e67ac9ec58092ab866e080fb928086a5ac1e61c3efe882e5825cd28
+EBUILD mesa-19.1.8.ebuild 14231 BLAKE2B eae53b217681c3896d34dbe2d01863f1976056e4321e08ae38e802ab7571e868f7cdf2975454889443439a90c2320c00a416a6354e51e02c45921df551dc156d SHA512 38b8eb8c1f46d414f5c449a20863ac8826b4a67d71eed1920b0bb6dd81abd3ed6a53fddf1fe7a0a5012d0dc3924f2bd6911d5e484df091b1cc37df7d8a802707
+EBUILD mesa-19.2.7.ebuild 14519 BLAKE2B ca7e19c8a1a3faa0cd8fc94f453e92c869f9488ed1c1c4161abae3359c5acb88d9cdf0e808317ec1ba39e2dcda915cf3a4248e754ea6a17ea324c798cded7c9d SHA512 4e498abe3486cce1de5e12f2ee512610be9902199d6769803a66e9ad290861c9003c628adb9601c5023d298e9746a05e7217e592f8460fdf0e18974f29d234a9
+EBUILD mesa-19.2.8.ebuild 14496 BLAKE2B 1135c0e5ac0a205e7e8fa5ad581b2d4d5b08447c71c76be0d97281de65b58ef7531442d61ad8ae248e4488d1664defba56831beb994473488a9ca0ce35d2b4b0 SHA512 0428f593206f9582a8f083fca0148dcd82b1d77776fb0f766f80157f35f7756c075f0dba18e474e94f11ee28ba750eff8890d78ee0d5abf861e0722090329f7e
+EBUILD mesa-19.3.0.ebuild 14436 BLAKE2B 5ed549fc99dc1a4e4ccaf56a795df093977e0e53d22d3eff37cd87610187e9f0cd35c06da9d42a724cdb83677cce7b243621d3104e9fc12ed890e8ec10b78498 SHA512 29ee1a66079d701a2166ec1b77a95b2cf49670de66443006465a5e61d92d57ce7da8a41f71a3e54ba2c2a010e63215ca6c8a9b0de728f4aaf9636d095c87c8a6
+EBUILD mesa-19.3.1.ebuild 14436 BLAKE2B 5ed549fc99dc1a4e4ccaf56a795df093977e0e53d22d3eff37cd87610187e9f0cd35c06da9d42a724cdb83677cce7b243621d3104e9fc12ed890e8ec10b78498 SHA512 29ee1a66079d701a2166ec1b77a95b2cf49670de66443006465a5e61d92d57ce7da8a41f71a3e54ba2c2a010e63215ca6c8a9b0de728f4aaf9636d095c87c8a6
+EBUILD mesa-19.3.2.ebuild 14486 BLAKE2B 33d8a963751b081b312b15f53d109bfc3d365d9d44c8c75a2d39a3ef9f06259c9e22d725a57b9003966c4206d5335345795ac7f466d5dbc45623ce198d60657f SHA512 b4cfe959b194238f61da07496eb594391f0de2f50864b47f6cbfa3fdd890b89bbf8d691bd6ba0f3c619972a6d2f52e5b2bf8113fea54856957ebad254b96b28b
+EBUILD mesa-9999.ebuild 14406 BLAKE2B aef0a523345e97e224a43acb4be1d6c17276c469c16bbbed21fa63c2a6c9a2ee0f524ced9466a45c15625f9ed8517f2e1481207fe325b0f1910286fd783497d9 SHA512 447d20652c4c061f422455c9b0775e4d3fef07550a0234a24828eafc207a4626f3745f231b25b3f13dd5e544f9134a2f2f59fe69c88d6fbc7b73e17474b316bd
 MISC metadata.xml 2000 BLAKE2B c38c6f85a08bdb71f3921847d03c8a2849a43def253c200cb3f21d68142f3a5065cb2e1a2170093d91f3aba34c99fdd9bab840f2bc62ce05f11484b2edb3cb40 SHA512 d55b9c0ff6a97d995a150ee10643c869359370222ab29712da25f69c5671a4e6988e2d508c956082cc7165db96f42289d25daecf230d36efe2240e4f377d1c72
diff --git a/media-libs/mesa/mesa-19.1.8.ebuild b/media-libs/mesa/mesa-19.1.8.ebuild
index 9f078435bae0..614f679a8280 100644
--- a/media-libs/mesa/mesa-19.1.8.ebuild
+++ b/media-libs/mesa/mesa-19.1.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit llvm meson multilib-minimal pax-utils python-any-r1
 
diff --git a/media-libs/mesa/mesa-19.2.7.ebuild b/media-libs/mesa/mesa-19.2.7.ebuild
index 9fb49167ff44..c548c3393ada 100644
--- a/media-libs/mesa/mesa-19.2.7.ebuild
+++ b/media-libs/mesa/mesa-19.2.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit llvm meson multilib-minimal pax-utils python-any-r1
 
diff --git a/media-libs/mesa/mesa-19.2.8.ebuild b/media-libs/mesa/mesa-19.2.8.ebuild
new file mode 100644
index 000000000000..5b6f69890c4d
--- /dev/null
+++ b/media-libs/mesa/mesa-19.2.8.ebuild
@@ -0,0 +1,548 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( 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"
+	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-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost 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 selinux test unwind vaapi valgrind
+	vdpau vulkan vulkan-overlay wayland +X xa xvmc"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vulkan? ( dri3
+			  || ( video_cards_i965 video_cards_iris video_cards_radeonsi )
+			  video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_iris?   ( gallium )
+	video_cards_lima?   ( gallium )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_panfrost? ( gallium )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	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 )
+	xa? ( X )
+	xvmc? ( X )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.99"
+RDEPEND="
+	!app-eselect/eselect-mesa
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	libglvnd? (
+		>=media-libs/libglvnd-1.2.0-r1[${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}]
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+	X? (
+		>=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}]
+	)
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="10"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:10[${MULTILIB_USEDEP}]
+		sys-devel/llvm:9[${MULTILIB_USEDEP}]
+		sys-devel/llvm:8[${MULTILIB_USEDEP}]
+		sys-devel/llvm:7[${MULTILIB_USEDEP}]
+	)
+	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	llvm? (
+		opencl? (
+			video_cards_r600? (
+				${CLANG_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${CLANG_DEPSTR}
+					)
+				)
+			)
+		)
+		!opencl? (
+			video_cards_r600? (
+				${LLVM_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${LLVM_DEPSTR}
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	usr/lib*/libglapi.so.0.0.0
+	usr/lib*/libGLESv1_CM.so.1.1.0
+	usr/lib*/libGLESv2.so.2.0.0
+	usr/lib*/libGL.so.1.2.0
+	usr/lib*/libOSMesa.so.8.0.0
+	libglvnd? ( usr/lib/libGLX_mesa.so.0.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:${LLVM_SLOT}[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${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 -b ">=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=surfaceless$(use X && echo ",x11")$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_use llvm)
+			$(meson_use lm-sensors lmsensors)
+			$(meson_use unwind libunwind)
+		)
+
+		if use video_cards_iris ||
+		   use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=false)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_lima ||
+		   use video_cards_panfrost ||
+		   use video_cards_vc4 ||
+		   use video_cards_vivante; then
+			gallium_enable -- kmsro
+		fi
+
+		gallium_enable video_cards_lima lima
+		gallium_enable video_cards_panfrost panfrost
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_iris iris
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_iris intel
+		vulkan_enable video_cards_radeonsi amd
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
+	fi
+
+	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=$(usex X dri disabled)
+		-Dshared-glapi=true
+		$(meson_use dri3)
+		$(meson_use egl)
+		$(meson_use gbm)
+		$(meson_use gles1)
+		$(meson_use gles2)
+		$(meson_use libglvnd glvnd)
+		$(meson_use selinux)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		$(meson_use vulkan-overlay vulkan-overlay-layer)
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+
+	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/pkgconfig/{egl,gl}.pc
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson test -v -C "${BUILD_DIR}" -t 100
+}
+
+pkg_postinst() {
+	if ! use libglvnd; then
+		# Switch to the xorg implementation.
+		echo
+		eselect opengl set --use-old ${OPENGL_DIR}
+	fi
+}
+
+# $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.3.0.ebuild b/media-libs/mesa/mesa-19.3.0.ebuild
index 199a28668ea7..1e41fad57ba1 100644
--- a/media-libs/mesa/mesa-19.3.0.ebuild
+++ b/media-libs/mesa/mesa-19.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit llvm meson multilib-minimal pax-utils python-any-r1
 
diff --git a/media-libs/mesa/mesa-19.3.1.ebuild b/media-libs/mesa/mesa-19.3.1.ebuild
new file mode 100644
index 000000000000..1e41fad57ba1
--- /dev/null
+++ b/media-libs/mesa/mesa-19.3.1.ebuild
@@ -0,0 +1,546 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( 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"
+	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-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost 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 selinux test unwind vaapi valgrind
+	vdpau vulkan vulkan-overlay wayland +X xa xvmc"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vulkan? ( dri3
+			  || ( video_cards_i965 video_cards_iris video_cards_radeonsi )
+			  video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_iris?   ( gallium )
+	video_cards_lima?   ( gallium )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_panfrost? ( gallium )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	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 )
+	xa? ( X )
+	xvmc? ( X )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
+RDEPEND="
+	!app-eselect/eselect-mesa
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	libglvnd? (
+		>=media-libs/libglvnd-1.2.0-r1[${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}]
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+	X? (
+		>=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}]
+	)
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="9"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:9[${MULTILIB_USEDEP}]
+		sys-devel/llvm:8[${MULTILIB_USEDEP}]
+	)
+	sys-devel/llvm:=[${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}
+	gallium? (
+		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}
+	valgrind? ( dev-util/valgrind )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	usr/lib*/libglapi.so.0.0.0
+	usr/lib*/libGLESv1_CM.so.1.1.0
+	usr/lib*/libGLESv2.so.2.0.0
+	usr/lib*/libGL.so.1.2.0
+	usr/lib*/libOSMesa.so.8.0.0
+	libglvnd? ( usr/lib/libGLX_mesa.so.0.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:${LLVM_SLOT}[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${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 -b ">=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=surfaceless$(use X && echo ",x11")$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_use llvm)
+			$(meson_use lm-sensors lmsensors)
+			$(meson_use unwind libunwind)
+		)
+
+		if use video_cards_iris ||
+		   use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=false)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_lima ||
+		   use video_cards_panfrost ||
+		   use video_cards_vc4 ||
+		   use video_cards_vivante; then
+			gallium_enable -- kmsro
+		fi
+
+		gallium_enable video_cards_lima lima
+		gallium_enable video_cards_panfrost panfrost
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_iris iris
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_iris intel
+		vulkan_enable video_cards_radeonsi amd
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
+	fi
+
+	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=$(usex X dri disabled)
+		-Dshared-glapi=true
+		$(meson_use dri3)
+		$(meson_use egl)
+		$(meson_use gbm)
+		$(meson_use gles1)
+		$(meson_use gles2)
+		$(meson_use libglvnd glvnd)
+		$(meson_use selinux)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		$(meson_use vulkan-overlay vulkan-overlay-layer)
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+
+	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/pkgconfig/{egl,gl}.pc
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson test -v -C "${BUILD_DIR}" -t 100
+}
+
+pkg_postinst() {
+	if ! use libglvnd; then
+		# Switch to the xorg implementation.
+		echo
+		eselect opengl set --use-old ${OPENGL_DIR}
+	fi
+}
+
+# $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.3.2.ebuild b/media-libs/mesa/mesa-19.3.2.ebuild
new file mode 100644
index 000000000000..26304ad69b1a
--- /dev/null
+++ b/media-libs/mesa/mesa-19.3.2.ebuild
@@ -0,0 +1,547 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+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"
+	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-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost 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 selinux test unwind vaapi valgrind
+	vdpau vulkan vulkan-overlay wayland +X xa xvmc"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vulkan? ( dri3
+			  || ( video_cards_i965 video_cards_iris video_cards_radeonsi )
+			  video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_iris?   ( gallium )
+	video_cards_lima?   ( gallium )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_panfrost? ( gallium )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	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 )
+	xa? ( X )
+	xvmc? ( X )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
+RDEPEND="
+	!app-eselect/eselect-mesa
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	libglvnd? (
+		>=media-libs/libglvnd-1.2.0-r1[${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}]
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+	X? (
+		>=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}]
+	)
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="9"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:9[${MULTILIB_USEDEP}]
+		sys-devel/llvm:8[${MULTILIB_USEDEP}]
+	)
+	sys-devel/llvm:=[${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}
+	gallium? (
+		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}
+	valgrind? ( dev-util/valgrind )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	usr/lib*/libglapi.so.0.0.0
+	usr/lib*/libGLESv1_CM.so.1.1.0
+	usr/lib*/libGLESv2.so.2.0.0
+	usr/lib*/libGL.so.1.2.0
+	usr/lib*/libOSMesa.so.8.0.0
+	libglvnd? ( usr/lib/libGLX_mesa.so.0.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:${LLVM_SLOT}[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${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 -b ">=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=surfaceless$(use X && echo ",x11")$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_use llvm)
+			$(meson_use lm-sensors lmsensors)
+			$(meson_use unwind libunwind)
+		)
+
+		if use video_cards_iris ||
+		   use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=false)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_lima ||
+		   use video_cards_panfrost ||
+		   use video_cards_vc4 ||
+		   use video_cards_vivante; then
+			gallium_enable -- kmsro
+		fi
+
+		gallium_enable video_cards_lima lima
+		gallium_enable video_cards_panfrost panfrost
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_iris iris
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_iris intel
+		vulkan_enable video_cards_radeonsi amd
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
+	fi
+
+	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=$(usex X dri disabled)
+		-Dshared-glapi=true
+		$(meson_use dri3)
+		$(meson_use egl)
+		$(meson_use gbm)
+		$(meson_use gles1)
+		$(meson_use gles2)
+		$(meson_use libglvnd glvnd)
+		$(meson_use selinux)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		$(meson_use vulkan-overlay vulkan-overlay-layer)
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+
+	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/pkgconfig/{egl,gl}.pc
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson test -v -C "${BUILD_DIR}" -t 100
+}
+
+pkg_postinst() {
+	if ! use libglvnd; then
+		# Switch to the xorg implementation.
+		echo
+		eselect opengl set --use-old ${OPENGL_DIR}
+	fi
+}
+
+# $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 db1fd34bf9ab..b1dbf709f8e2 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit llvm meson multilib-minimal pax-utils python-any-r1
 
@@ -108,6 +108,7 @@ RDEPEND="
 		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
 		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
 	)
+	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
 	wayland? (
 		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
 		>=dev-libs/wayland-protocols-1.8
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 5590874a83a9..1ded80de56ea 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -8,5 +8,6 @@ DIST mlt-6.16.0.tar.gz 1414374 BLAKE2B 6c031360721d535e95cbaf890c1f42f5f5dd914e0
 DIST mlt-6.18.0.tar.gz 1430398 BLAKE2B 43d33756ace75dd38c7a223ff297323d3f47d8b7cdf2791709ee8cafcfed56c345b49ac3943ad4c49123e69a182dbb551cc93b1f56358fb96966e1b336691d90 SHA512 af6042fa554a7bf87060aaab401c51111fd03a1e50037024662fe727a2281c218f62db07f2c44db62d46f2b9ff67d4599f7aaccc2b337e20394383a24e3c5953
 EBUILD mlt-6.16.0-r1.ebuild 5786 BLAKE2B ae4e3dfe044d0152c8a8ccb66537a04cdf0fa08e869363b532de982a043febba7995922c6fe0f2a01b946794c1fcf936dc0120f7e7edc5359b17956cd78a42e8 SHA512 10f48c97e90a2be760c4f720c391f3b399811ba6b0deca9e3035b9d6cb5c5c39c29fc17f6731c620d160709de32031e5bd49f469db7399ee2d834973794ef01c
 EBUILD mlt-6.16.0-r2.ebuild 5786 BLAKE2B 0da11c4a284784930dfd45e5ecb2090db7362b58fb3f30c62fe10f936dd93d672342d4891eb95a852476d31b83f792fdf878dd8a9c7c3685eb77eaa2ecb5115d SHA512 1937fb2777d0b6fedd732d1ae1f14ad2c05d2b6ee045472819882d9bdd5ed73f282421a3a07c2d606e7f7ac03ff03cca1a31ff57630bfb152e8f313b3c74b865
+EBUILD mlt-6.18.0-r1.ebuild 5367 BLAKE2B ce8a2e80bb22f9ab460c35b04ad57b0ebb6a343ff44a9ea20c62a3446f6249bcc48963f77e4f15e70ba9bd6745daeafb5a77524cac02349a7aea5299b388b7c4 SHA512 f72bf7a26c3a690ecab27fbf9c2025f13f01300291c128dec256c4f2fe431a73584e385cf33cdbe101dbb2457ddba14daa38151e4a9e16253fde4ba06aa220d6
 EBUILD mlt-6.18.0.ebuild 5367 BLAKE2B 0eb03e758bd30a27616d715589d17f33b3ac1d07cad905513e25b5eb3acad8512a86ddc52f810ebb577c8e3ef8ccdfb6b44262889e9d472914e7bb2648a18de9 SHA512 dce80d749ac175cf49d435c81d938181ac6c91e4d76c96bc26d9b2ef3a2ec5e6c29d4ce7fe0e772084cb3b0d197efbbb6f761510d1c7ffa92ea825c45eb2e0ab
 MISC metadata.xml 1595 BLAKE2B 63b95c943ec9860db5c68d7ffcf683381bb0e859afe333263afc51f9e985a9f4263279aded8288ec03511d8d56d12415f5590529a4de0009ff21bb890bc1febe SHA512 7f7005732163a00fcd0ff1d21608c26296f87e0658fad912e35724b61c9072ceb67f1a515b0445159192f4959be87a63a01b717c8fe63a64aa8ceb3081cb11f8
diff --git a/media-libs/mlt/mlt-6.18.0-r1.ebuild b/media-libs/mlt/mlt-6.18.0-r1.ebuild
new file mode 100644
index 000000000000..b9fd74d531fc
--- /dev/null
+++ b/media-libs/mlt/mlt-6.18.0-r1.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+# this ebuild currently only supports installing ruby bindings for a single ruby version
+# so USE_RUBY must contain only a single value (the latest stable) as the ebuild calls
+# /usr/bin/${USE_RUBY} directly
+USE_RUBY="ruby26"
+inherit python-single-r1 qmake-utils ruby-single toolchain-funcs
+
+DESCRIPTION="Open source multimedia framework for television broadcasting"
+HOMEPAGE="https://www.mltframework.org/"
+SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg
+fftw frei0r gtk jack kdenlive kernel_linux libav libsamplerate lua melt opencv opengl python
+qt5 rtaudio ruby sdl vdpau vidstab xine xml"
+# java perl php tcl
+
+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
+DEPEND="
+	>=media-libs/libebur128-1.2.2:=
+	ffmpeg? (
+		libav? ( >=media-video/libav-12:0=[vdpau?] )
+		!libav? ( media-video/ffmpeg:0=[vdpau?,-flite] )
+	)
+	fftw? ( sci-libs/fftw:3.0= )
+	frei0r? ( media-plugins/frei0r-plugins )
+	gtk? (
+		media-libs/libexif
+		x11-libs/gtk+:2
+		x11-libs/pango
+	)
+	jack? (
+		>=dev-libs/libxml2-2.5
+		media-libs/ladspa-sdk
+		virtual/jack
+	)
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
+	lua? ( >=dev-lang/lua-5.1.4-r4:= )
+	opencv? ( >=media-libs/opencv-3.2.0:= )
+	opengl? ( media-video/movit )
+	python? ( ${PYTHON_DEPS} )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		media-libs/libexif
+		x11-libs/libX11
+	)
+	rtaudio? (
+		>=media-libs/rtaudio-4.1.2
+		kernel_linux? ( media-libs/alsa-lib )
+	)
+	ruby? ( ${RUBY_DEPS} )
+	sdl? (
+		media-libs/libsdl2[X,opengl,video]
+		media-libs/sdl2-image
+	)
+	vidstab? ( media-libs/vidstab )
+	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
+	xml? ( >=dev-libs/libxml2-2.5 )"
+#	java? ( >=virtual/jre-1.5 )
+#	perl? ( dev-lang/perl )
+#	php? ( dev-lang/php )
+#	sox? ( media-sound/sox )
+#	tcl? ( dev-lang/tcl:0= )
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README docs/{framework,melt,mlt{++,-xml}}.txt )
+
+PATCHES=( "${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
+	for x in python lua; do
+		sed -i "/mlt.so/s/ -lmlt++ /& ${CFLAGS} ${LDFLAGS} /" src/swig/$x/build || die
+	done
+
+	sed -i -e "s/env ruby/${USE_RUBY}/" src/swig/ruby/* || die
+
+	use python && python_fix_shebang src/swig/python
+}
+
+src_configure() {
+	tc-export CC CXX
+
+	local myconf=(
+		--enable-gpl
+		--enable-gpl3
+		--enable-motion-est
+		--target-arch=$(tc-arch)
+		--disable-kde
+		--disable-sdl
+		--disable-swfdec
+		$(use_enable debug)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable ffmpeg avformat)
+		$(use_enable fftw plus)
+		$(use_enable frei0r)
+		$(use_enable gtk gtk2)
+		$(use_enable jack jackrack)
+		$(use_enable kdenlive)
+		$(use_enable libsamplerate resample)
+		$(use_enable melt)
+		$(use_enable opencv)
+		$(use_enable opengl)
+		$(use_enable qt5 qt)
+		$(use_enable rtaudio)
+		$(use_enable sdl sdl2)
+		$(use_enable vidstab vid.stab )
+		$(use_enable xine)
+		$(use_enable xml)
+		--disable-sox
+	)
+		#$(use_enable sox) FIXME
+
+	use compressed-lumas && myconf+=( --luma-compress )
+	use ffmpeg && myconf+=( --avformat-swscale )
+	use vdpau && myconf+=( --avformat-vdpau )
+
+	if use qt5 ; then
+		myconf+=(
+			--qt-includedir=$(qt5_get_headerdir)
+			--qt-libdir=$(qt5_get_libdir)
+		)
+	fi
+
+	if use amd64 || use x86 ; then
+		myconf+=( $(use_enable cpu_flags_x86_mmx mmx) )
+	else
+		myconf+=( --disable-mmx )
+	fi
+
+	if ! use melt ; then
+		sed -i -e "s;src/melt;;" Makefile || die
+	fi
+
+	# TODO: add swig language bindings
+	# see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
+
+	local swig_lang=()
+	# TODO: java perl php tcl
+	for i in lua python ruby ; do
+		use $i && swig_lang+=( $i )
+	done
+	[[ -z "${swig_lang}" ]] && swig_lang=( none )
+
+	econf "${myconf[@]}" --swig-languages="${swig_lang[*]}"
+
+	sed -i -e s/^OPT/#OPT/ config.mak || die
+}
+
+src_install() {
+	default
+
+	dodir /usr/share/${PN}
+	insinto /usr/share/${PN}
+	doins -r demo
+
+	docinto swig
+
+	# Install SWIG bindings
+	if use lua; then
+		cd "${S}"/src/swig/lua || die
+		exeinto $(pkg-config --variable INSTALL_CMOD lua)
+		doexe mlt.so
+		dodoc play.lua
+	fi
+
+	if use python; then
+		cd "${S}"/src/swig/python || die
+		python_domodule mlt.py _mlt.so
+		chmod +x "${D}$(python_get_sitedir)/_mlt.so" || die
+		dodoc play.py
+		python_optimize
+	fi
+
+	if use ruby; then
+		cd "${S}"/src/swig/ruby || die
+		local rubydir=$("${EPREFIX}"/usr/bin/${USE_RUBY} -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')
+		exeinto "${rubydir#${EPREFIX}}"
+		doexe mlt.so
+		dodoc play.rb thumbs.rb
+	fi
+	# TODO: java perl php tcl
+}
diff --git a/media-libs/mutagen/Manifest b/media-libs/mutagen/Manifest
index 8184a2324f43..74fa26d3fa84 100644
--- a/media-libs/mutagen/Manifest
+++ b/media-libs/mutagen/Manifest
@@ -1,5 +1,5 @@
 DIST mutagen-1.42.0.tar.gz 925894 BLAKE2B fe85f2c47a19276078183f426450ca50ccabab64eec39dfb1535054ee6571b01375210b164dc6c824f74631eb8393c8d5d48b7a7a29443349f30fdb627a74b6f SHA512 26c307023d1ff29c0377cdee1317732a8aba70433a3679127a3d9c8cc5df9e81d143700e7e74a42975485b0510d8bd09dc2b5ec9a737442a6e676f1f0b14c80a
 DIST mutagen-1.43.0.tar.gz 1143839 BLAKE2B 044906b730763e001fa2cb863c8bb1fec45713aca57b6311f783f66218e4f3410987d04d56a1e4fbf41a229860bbb574b4077401e1f2384e70d80fdc9f3b23ad SHA512 66df63705a43befa9cf6688bc8b3acc4fd1559eb28920c105b47a97c35422b5e19527051445daa7aed66facc2e4c14d71058f8560bbd564fecbe56a076491e3f
-EBUILD mutagen-1.42.0.ebuild 1112 BLAKE2B 28bc67b081ca28b47f15914302430a0c61c9e39bb0fa378c1c2b8e9bae8e1dd585dd75dd15ee26c81d3c0a3a8c3217a77d72a24c50111dc355d5a2ddc23b6b66 SHA512 c5732bd4121d30f3765b575f2f0ca9e4fdb26e7633f03a0bdf8206de28cfd1a6c073156f6c48d911558a0bd3287f3db9fd54ed6acb05f1778ef950b837cc1ca4
-EBUILD mutagen-1.43.0.ebuild 1128 BLAKE2B 63d399f144426a96e851b030a9e187fbf8b3afa6826f8f4dd8e09f1547fdaa63777de094bd942d51b735df94d5aee323f3baadf448018e81e217e6cf599b901c SHA512 17f9e619bac15c0b3a3dc89ae7d8c9524dba190b34d227b3276f0bc3a380ffa57bbe5d3e219aa9766ab3a85212cf101d19b753c60af08a9ece0a00f21baef4b6
+EBUILD mutagen-1.42.0.ebuild 1108 BLAKE2B bd63053e9639194b7bab6c26257861dad179a91679e2fc666b6014de1d9075082ff66d559c84afceb0f179a09e3560dd200c4ec2a9541a295c2d36d1e95b99bf SHA512 79db3b89762b97b02c25617a3d90b41c812d3d8591987b9dcb11cd4ad9d9b06146762d8bb37cc77ee1add49909556b8dc2cdff4f2a47d063db77858a8f254d82
+EBUILD mutagen-1.43.0.ebuild 1123 BLAKE2B f99c4390487eb2dd15409b9d05f9fc0e4f6c79b16286ec6221af0c77c7e6bf301e24b697d81e2cb9a492f6b6cec2d4fd4d33082df2d64506281a17c7955a54f4 SHA512 0cb98efc5ac9c27063c33afe4853360c453126abf1d1ed6545ef8230b2a1ceb03714a14607af5879d416e627d2970d5427a75ab1a2066e8b3ccb1424a29001eb
 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 e5926fd19733..20c4f908dc65 100644
--- a/media-libs/mutagen/mutagen-1.42.0.ebuild
+++ b/media-libs/mutagen/mutagen-1.42.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/media-libs/mutagen/mutagen-1.43.0.ebuild b/media-libs/mutagen/mutagen-1.43.0.ebuild
index 43af0777006e..1070b0307c47 100644
--- a/media-libs/mutagen/mutagen-1.43.0.ebuild
+++ b/media-libs/mutagen/mutagen-1.43.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
 inherit distutils-r1
 
 DESCRIPTION="Audio metadata tag reader and writer implemented in pure Python"
@@ -12,7 +12,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 fd929ae5a053..fa46843f3e5a 100644
--- a/media-libs/nv-codec-headers/Manifest
+++ b/media-libs/nv-codec-headers/Manifest
@@ -1,5 +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 791 BLAKE2B 1a30ee929c9619f0497c4912b709b3e860227ef5daf466e9319bb4799aaf6de7b377324f779d674b78b45ae23041d65188a4ede6827a1cf35cd913ad36a2c9fb SHA512 258ad2e47ed9dcfabe870010f15670e318d064e35bbc1ed60347b48b91d0be65c941125794e817df013851263657628ee844e08d1c000390ad244960f5b58675
-EBUILD nv-codec-headers-9.0.18.1.ebuild 793 BLAKE2B 997d73669a55c2a20c137352617fbe1464abc5780292956142140564b93c2f5892ea6823e90471275f736cce50469a720f31af63f246410369659c5b7e45e1a2 SHA512 62085b502bbd0e034241c8a2c05f9535ec82908eab2cdfb634ec6286fa01be56587575518b49c6572776dfaa1d8d49b353adfc1558f0206107a48e0b2022d6a8
+EBUILD nv-codec-headers-9.0.18.1.ebuild 791 BLAKE2B 883e69bfc8304eff9f48c6095f2356df69ad16f6cfcfe2f4ef23cc648641a69ea9a3f50740e1f1b8305e00d72e10812d69714603bd96c8f2dc42e0322a5b66b4 SHA512 0a947197e469c989d2fe76adc2f303c96ce6e9d441521daa7ca87c4aaf99d7890d19b59c3727d83be54bef1b2279097033d5441ba274b9212958289086e453e6
 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
index ccb9128d4c71..feb6261732fa 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/FFmpeg/nv-codec-headers/releases/download/n${PV}/${P
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index fb5210768df3..8f0a8c4f04cf 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1,5 +1,5 @@
 DIST openal-soft-1.19.1.tar.bz2 577310 BLAKE2B f6ed5b2bce1bfcaa7f8085375d5d3e3323ea2f03896ba871fe3ec247e6e1bf524a9c5180399b0f0908aa69756a1f2ee8095f14a69e6a7eac55a25cc7c2ac545b SHA512 356a3f12bbe284bfac71f4f2a9f83d084083a832012222e73743042ac27812cf051c12b0ddcf53c010ff77e44ae2e9033cea9b9324d316a22a59a154307a64a4
 DIST openal-soft-1.20.0.tar.bz2 587550 BLAKE2B 4ce0b520db65e0298d334bae104dc0e38c2daf41680e40c259451741f7d4c8b06948f00b96efb31aec528e18b65e3f7099ea8b2fbc4cef963cf9a912f51c276a SHA512 7b103ffeeb8a6541d4bd31245ca5e34fec27d121fe04c21655480fb3907604f4171f912411f1e49622ec27db79d6cb85eb452ed78523abc906f18af57ffb755e
 EBUILD openal-1.19.1.ebuild 2077 BLAKE2B 0b4662acd038afe04f3593f1627390bafd3f4097748374610cb45a8d7e279e28311dbed3509d2c88f85ebecfa461e8f08dd7353c6767109f7104a41bd634dcbf SHA512 c2ec4077de6e8a6bf5531dece9e96a91c4e6f48be9f7c21c1b58aaba79cb4a5d40f034fa9882ccd7b374e70ff471db5e1a637455f3110dced494188aa7181505
-EBUILD openal-1.20.0.ebuild 2086 BLAKE2B 6d937eeb2dffd84196cee5906824c2592f445c98edaf2cf587e04d40c0b7f17a4ecca5d71a47b94407c594e3cb827c2f744122b6f99d6f02f4b6db33171f4532 SHA512 5dffc94f24fc3084c5f1642efd4cb91af44d0c2aef47e5865e40c98f4fa6a7120b02d7ea495673b4d713d0fa1f568c160500a90c22be2a5d65c9c0d905497dd5
+EBUILD openal-1.20.0.ebuild 2099 BLAKE2B 17c841b2ecb157cf63a167f45bb3d22603eff8021c0f1ab9b16c54951eed7aec161c42b4a1f5a6115e97090c0fd693e6fa88dfc8a2cafc22f12ee1c7bad9e46d SHA512 bc98e08a934610eb550fac4c2634835ed1500e77c841363ff130a2a5cb1d57cb25c0a8b89c5a2c19c2bc456cdfd11d417f5ad84facb76326d6153b05809a60b8
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/openal/openal-1.20.0.ebuild b/media-libs/openal/openal-1.20.0.ebuild
index ba3fa7758905..6f24d010fd56 100644
--- a/media-libs/openal/openal-1.20.0.ebuild
+++ b/media-libs/openal/openal-1.20.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 MY_P="${PN}-soft-${PV}"
@@ -60,7 +61,7 @@ src_configure() {
 
 		use cpu_flags_arm_neon && mycmakeargs+=( -DALSOFT_CPUEXT_NEON=$(usex cpu_flags_arm_neon) )
 
-		cmake-utils_src_configure
+		cmake_src_configure
 	}
 
 	multilib_parallel_foreach_abi my_configure
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 606abc47e7d2..42a465a1d70e 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -4,6 +4,6 @@ AUX opencolorio-1.1.0-remove-building-of-bundled-programs.patch 6108 BLAKE2B dfd
 AUX opencolorio-1.1.0-use-GNUInstallDirs-and-fix-cmake-install-location.patch 4002 BLAKE2B 8cadf37f7e4ccc2f14268ef71c5765fa43493f6c93ce651d1d2a7a2d5859238ba77802907ee84b0d5efcd6bd75f4ccd13d585f7822a4c8d285be586207e58752 SHA512 37f852d4f0620dd799a7aa09f0c651c72a311656c6ecb72429a440563ca936852a1227a92dca01afd97632f401babf875796f222a82362727ff7074bbe251ac5
 AUX opencolorio-1.1.0-yaml-cpp-0.6.patch 2315 BLAKE2B eaaa69e7bd76a1c40ad823eb1be9cec93d69c0b024521e31d17aa6f5b2c1e29607cf3d238cac1aba19cec3149450b1ab15d1236332ff807bdb872db62f00b3b7 SHA512 2436a404581b26db6416b013ce9de8302c20878d1c956f5ddb40c2d590c0df7a2a8c3108590330598441db51f4aae9b6d485af8b7034b22316fa42ccdc801fa5
 DIST opencolorio-1.1.0.tar.gz 13826812 BLAKE2B 555a5ac393170503c944c3471ea482b1a22be7c98ee7b81af37f52db185c8b61c5318102c139a8711f4828d306b6c4322f5d839c4df08ce41ebbb9dcb2bda152 SHA512 909874a9f91a8d229622810fc70233680c6e75203bd8555179322de2873da00bf302432e19f189b787ffcda3157ddec1e4601c97f75a36e16f644fe7d42f6998
-EBUILD opencolorio-1.1.0-r1.ebuild 2383 BLAKE2B 5c0a4c1ac134f2ab61970aca9398ae71a699ca383e199e2293a47a92d6fd5846f5ba1953060711f637adbe4b7200dd7aa47c975c5e0e78b98287622a9d59f198 SHA512 115b9f8bbae000d7107f11c1301868cfdccb2546be430fdf1c889068641eedee67ebda7fcd4b878c9fa96bb579a6c02a985671cc1bd95bcc0cc3e4615a9137ed
-EBUILD opencolorio-1.1.0-r2.ebuild 2339 BLAKE2B e5cf51d096154dd71e62c3ca117e5352a78c40e8c22ab29442f96ac82412ddeddf7d54c484cac29df91ad9751225effd393fc79a9f40a9dd5d0c759168abaa0b SHA512 e40cb52a227faf01396fb60c26b52276e333f24e255d3c396d8e2e342905a8b1b49688924a0b81717bd177ce1a9cd93bc95f26915488b3053336ce160e9d4285
+EBUILD opencolorio-1.1.0-r1.ebuild 2379 BLAKE2B 62458752aa6186796c4ef748540dfdb4f65e63444f718a8b9f1b0cb3541b03b715c78370c0d3cb80f3a7e690d7a5688219d2ad6065d0069fb0f32f800ce07726 SHA512 79548d1da6ecffff53b5f8808cc01afb576f838d29560f83c5a94a6ad0157d8475b265c4463bdd3785485f2785500dafe1f054fd4e4d7e32b6917ab09df55cc9
+EBUILD opencolorio-1.1.0-r2.ebuild 2276 BLAKE2B 5b3d711abf82405d1017b05f2ccc84af0aea31c723772ff039c9559ed0d85c455ab7e60e92d460ddd9ef2590f37484333ab45021532201e4bf50eb48c434e2df SHA512 98bbf80a62b5cc7e9025a9a60f4c88bc58627be0ba44f7ad8d30d1baeb60ebab7194bbfdb1fb1e8ddb1992a2ba7d341e3244b2d60ad49a8123d7c4c43fb908d9
 MISC metadata.xml 551 BLAKE2B b7a648f31772a6a72121dda8736a96e5c54189b20f1eea1600222b27385b695644887a9f084ba7a01c7a530593aa28a2319353c0fdb6e549a03a85fc8a7a1cf4 SHA512 ddd9c8afeb0540e663b3e963f926247da21c72574459cb2f82dc956476fce18f5eb0e2b140ccdbadc98f71b5b855f674d227271f9ff781f689126afbc555f846
diff --git a/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild b/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild
index 86efd8a9f584..b7a14f97a4f0 100644
--- a/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild
+++ b/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 # Compatibility with Python 3 is declared by upstream, but it is broken in fact, check on bump
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit cmake-utils python-single-r1 vcs-snapshot
 
diff --git a/media-libs/opencolorio/opencolorio-1.1.0-r2.ebuild b/media-libs/opencolorio/opencolorio-1.1.0-r2.ebuild
index df5ac185621f..3476ab8992ec 100644
--- a/media-libs/opencolorio/opencolorio-1.1.0-r2.ebuild
+++ b/media-libs/opencolorio/opencolorio-1.1.0-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
-inherit cmake-utils flag-o-matic python-single-r1
+inherit cmake flag-o-matic python-single-r1
 
 DESCRIPTION="A color management framework for visual effects and animation"
 HOMEPAGE="http://opencolorio.org/"
@@ -57,7 +57,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	use python && python_fix_shebang .
 }
@@ -84,8 +84,7 @@ src_configure() {
 		-DOCIO_BUILD_PYGLUE=$(usex python)
 		-DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
 		-DOCIO_BUILD_TESTS=$(usex test)
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
 		-DCMAKE_DISABLE_FIND_PACKAGE_LATEX=ON # They don't build
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 2bade290b159..47802506eeb7 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -28,7 +28,7 @@ DIST opencv-4.1.2_contrib.tar.gz 60881937 BLAKE2B c461aaa62306b226bde9211e2d611d
 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 5918 BLAKE2B 3ffd92b751e983cddd74e26d48e532973110a8fcd715641ead732bf4a1ed4802ac2c0385769d061f6632e33dfc1bf26758815bf1a896d020ef628de7df28c8d2 SHA512 0fae932f9326429f7c37a698c89b9cbf4da0c2e73640992211d9a8b7a5ce8b61d5e75d30f4f376345a992285fe40395b117c968daaf9e7db9b4cc52ff621bee8
-EBUILD opencv-3.4.1-r7.ebuild 18656 BLAKE2B 72a9b18ac85f3d627175c29b8070f300223f6976d2dcfbdd772b0206c6991e46fa3e88327ed1c57608d33f26881dc41eaa4361addc23f33f1176257580341558 SHA512 80b39a5636dab7b4b2a552530fb1c92697ac7cdf43e3570fe4b9df2f7dad8c0e93845aa2e665b2c82442ff577870324eb316d144efe1a49f428cb80ab6d46579
-EBUILD opencv-4.1.2-r1.ebuild 18341 BLAKE2B 34f53688a7455de79067fa64539fcd407e0728defa630896cf7b4a8cb48e33dc03a29329bb9d59840a3b84a15aff9ea23f00caadb7f98e0ca8744032c15f8d57 SHA512 b4978f9fea42ab88d9556a9a79a1132911cadf093ce075f28c00b3bb95c853c52a37a989c6d71e1ebcf79ae4b0f77f86902522dac4752a4619a111798978b664
-EBUILD opencv-4.1.2-r2.ebuild 18382 BLAKE2B 4ffa8be3cf757ede27a22a996fea11f6dfaf322370d57fb86547a517407c88a1c3be791147645d42b065a002e3f75cdc789ddc3bef6ac8b6d31a0bb2deb3e41d SHA512 2bfb067b584bec7272874a53a4a21a62767a927ee35254f27cf3f5898fbf230daba5caa39298f3f6a24aba07f56ed37b0db3bccb3097ccc4e52ca80877a58b1f
+EBUILD opencv-3.4.1-r7.ebuild 18654 BLAKE2B 52807881ae13d8ee1e2b258bdf851e20b06835fb0a44f21d74ec55bc0c83e337129f7a839fb449cd33bbdca82ac4edd14e3938c70e34d605384bbd9f15de8b47 SHA512 e5186a0e176414f6fee3a7dbdc347af3a41a67c88a1c8f926e91e8371f6beee8d25ac58069b847a360c5fa7e830be9ead7eb4d581af3526f8824e878f816505b
+EBUILD opencv-4.1.2-r1.ebuild 18339 BLAKE2B cbb1a364eb6bca79a8eb58631c3d96ba69a9693e1f06a158b1d0dbd67252690f578ec2bd646d46240098834cde7ca5973931468aeaff20ffe6c4ddc9fe0feab7 SHA512 c98af3f9be8fe0f64749ebe7a1011d72ce0a064b4e24c92d1e7662b4fb8ebe028abc42ee4130a3cfe73110a02c051ced3512b601fe00f26941037177c5d62caf
+EBUILD opencv-4.1.2-r2.ebuild 18380 BLAKE2B 7a6939adbc5f95d4f6c80f4f686500bdfa158259e519e988098a21c456a79c20a89a27b996810ea0a8162b7b5651e93640af4a5f6737ad9a3b68a4099a3f39a1 SHA512 92c2cf2416a0fc2052649af75997bfa9ba79c4595b453aa34c3c205127c5d80dc4004211fcd2c24e1fea85067589829f25a99f1fa38ac0062f13bbcd9491be43
 MISC metadata.xml 2728 BLAKE2B aff1160741e363d0bfd7b7d6c96a28025f885a785c6d106e5fb2dd5704883d2542ad627cdaf0d8c612522720006a1df18104fa225cf47eb0e5aff029b8ebc6fb SHA512 924e3f9c58cee3e00ed7f3690444637f0889cc9140cd5ca14fcff8fd35d84724703516f07c803c79c242e209f50edf24b7156ca4ad79fffbc19e1166d4e730bd
diff --git a/media-libs/opencv/opencv-3.4.1-r7.ebuild b/media-libs/opencv/opencv-3.4.1-r7.ebuild
index 12cd224b4001..8800d1d31bf6 100644
--- a/media-libs/opencv/opencv-3.4.1-r7.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 inherit java-pkg-opt-2 java-ant-2 python-r1 toolchain-funcs cmake-multilib
diff --git a/media-libs/opencv/opencv-4.1.2-r1.ebuild b/media-libs/opencv/opencv-4.1.2-r1.ebuild
index 02fb2d8d7340..a3e0bc94089a 100644
--- a/media-libs/opencv/opencv-4.1.2-r1.ebuild
+++ b/media-libs/opencv/opencv-4.1.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit java-pkg-opt-2 java-ant-2 python-r1 toolchain-funcs cmake-multilib
 
diff --git a/media-libs/opencv/opencv-4.1.2-r2.ebuild b/media-libs/opencv/opencv-4.1.2-r2.ebuild
index c97e2fcb3f48..c803c7aadfd4 100644
--- a/media-libs/opencv/opencv-4.1.2-r2.ebuild
+++ b/media-libs/opencv/opencv-4.1.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit java-pkg-opt-2 java-ant-2 python-r1 toolchain-funcs cmake-multilib
 
diff --git a/media-libs/openicc/Manifest b/media-libs/openicc/Manifest
index d7ca066972c6..d74349f6dfd7 100644
--- a/media-libs/openicc/Manifest
+++ b/media-libs/openicc/Manifest
@@ -1,4 +1,4 @@
 AUX openicc-0.1.0-buildsystem.patch 8257 BLAKE2B c979455e7136e47fa7d82f23f81e6b49373455fa03191f6eb2f2cb56d52bb403d4198df3739d29d6b74f841a0901ca4b1c4d7fd35354581f93176958ecc0ba6e SHA512 880b47966eb8350b245dd7f9124d715d2915b40d962bcf550c52defa832132e9d79c269bd31b58844cfe2b582d528d76bc7eca84a92acd75c5d2165117d4fefc
 DIST openicc-0.1.0.tar.gz 193974 BLAKE2B c256d1aa6fe9ccff15650cd72ddc25392961da62a3621541e672b6e0942f24b7d7be032557038d789932530e185f340ec35414739c2402bae637bdd73af2b029 SHA512 81df4545694e920bea0b24535c1c8d06327f87dee465883c4e3209d7348ab2220f94b9e9785d9da68c5e023e9a59512d5e15b4ad8f82e256b63b7c28459fd029
-EBUILD openicc-0.1.0.ebuild 1093 BLAKE2B 20f0ace51a67c57f032029eff41553610ad3e1f6612a1fda0cd742ad609cafdb026eb0e8c749c69d8b09324e99290b2cfc8075e054b43064bd3134be0443929a SHA512 50ec9fd91b0e991f0ea38830049cd482c3daec571680501f87c88231f2914be2269be4933a86ef0b6203270408fcea4fc15113d77b3ee1dd27ec7c059e162db5
+EBUILD openicc-0.1.0.ebuild 1106 BLAKE2B 10eded582abac0c870a2c27d0e7f2afe7d1b7524e06a06337423a293ef750a05f3b7da7a297cb16e49b8dca7c6eb776c17058427d5a71ed00751183c8ddb83f9 SHA512 7b67f34984dde57148e3e563fd39d6cd8ef3c3c429dceebeb83caa67f1921000a7ea59b3cc738ca2db3f671ed2aacc6e73180d14812fce870ecfca2060195fb8
 MISC metadata.xml 332 BLAKE2B 37d73e61e45957551d87dc0737f0ce43f4087517129b65d3fd43af0f3d28f1ea831f63eb39b8ba0749dff1308123ab7b5de60916a34578a08c40f6815eb577be SHA512 1976c2a94f105bdcfec12732c170797877cde03acb4f102b167df60c0aa4587877e71c1e414f19bca608feb26521522fb65d31f2742c3d48985bc535c07226c5
diff --git a/media-libs/openicc/openicc-0.1.0.ebuild b/media-libs/openicc/openicc-0.1.0.ebuild
index a3bda95e3ab8..e6f43adc3073 100644
--- a/media-libs/openicc/openicc-0.1.0.ebuild
+++ b/media-libs/openicc/openicc-0.1.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="Config database to store, share and manipulate colour management informations"
@@ -43,5 +44,5 @@ multilib_src_configure() {
 		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(multilib_native_usex doc OFF ON)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 0125858abdda..c8e578523957 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,4 +1,4 @@
 AUX openimageio-1.8.17-boostpython.patch 1177 BLAKE2B 80946ef94801bf1a37cfd2930ae33bd3d331dafd458a3665e4ce28f4379143175edc6b1e096f44b51ef4a53551a5f5de52bfeb59aff990b45ad198d7b75b6e14 SHA512 4aae9f6078ff5877ca44e74c7047f0bfe279b7de6bd0c8b8dbf9f3d98b6bfde671e22e91cc66995527eb853e13917e3bb79be88987abe20570439ce57dda96c6
 DIST openimageio-1.8.17.tar.gz 27835527 BLAKE2B e524d171bb918a46aed3c5f329bc8d10853d8b170c1e9b4a6edad72db66b3a03ea32eba4338577a667254e884daebf6b5b33a70090b953a5b5e269d874c91852 SHA512 e58cad9458d71a845c3214675a41e0cffe0509fd52a95ef5a44af0015ef25a1145f9ebb50ff1f5e7200ae0a46efb40e851855f53c55d058c0bc5654a072bdbf7
-EBUILD openimageio-1.8.17-r1.ebuild 3139 BLAKE2B 992dc6542e252c123f8695f90476e74bdb9755ae7351d02cba70578fef2b8e3ab6838e6c9affa1590cfb0e7b536e2a6bc94650077557b7fad74e291715d7088f SHA512 30b75485e0dd1eb476cf75a34727214c64f391e3144e810883240732ad2bae74db23bf22c0aa2865fd05acee3358f868de2e5c5dc77329065791074959bae8fc
+EBUILD openimageio-1.8.17-r1.ebuild 3119 BLAKE2B f992d53f71e632e67a2afc5e2af5ce06ac8fd490b589edf3f79457c1831d01e0750b062b85aabe0cdebaa51ec83ba844e6c2cb32d8eb7bd5a3cb1b55bad1973e SHA512 2d97256cfedb97c0a7cba097f2eaa2e1089cd3e87e64fa637ef17d6ed3f667fca66b58f6da1bfd383bca23ec08f1e6aeaabca0961a3ba244f746bb2936b88284
 MISC metadata.xml 840 BLAKE2B b1eb9cb3531989610d82fdbff7e56f87e5ad059c8afd6f7c9f513bc5ef6c7eda497dc06a52e32e5da9cc0231cb1d3acd6ca1ddf4792de002273c599824336e0f SHA512 d183b91af486faaced4d6613eddb1f5e5a0b8007a4cb719875cb858bb1135b4db4c5ee4e70cf9db9e4468a4f044e150fcc6e54670b42f4748ba210d5bde778dd
diff --git a/media-libs/openimageio/openimageio-1.8.17-r1.ebuild b/media-libs/openimageio/openimageio-1.8.17-r1.ebuild
index 0ce713b21a93..f31b4ebc5951 100644
--- a/media-libs/openimageio/openimageio-1.8.17-r1.ebuild
+++ b/media-libs/openimageio/openimageio-1.8.17-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-inherit cmake-utils python-single-r1
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+inherit cmake python-single-r1
 
 DESCRIPTION="A library for reading and writing images"
 HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
@@ -81,7 +81,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	cmake_comment_add_subdirectory src/fonts
 }
 
@@ -121,5 +121,5 @@ src_configure() {
 		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 3b2fdafc68f1..28f8254af543 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -3,5 +3,5 @@ DIST openjpeg-1.5.2.tar.gz 1385702 BLAKE2B 936ab6e0fb48f2839df13113c716c39b9572b
 DIST openjpeg-2.3.1.tar.gz 2214401 BLAKE2B ecc7e573592a5302dcdbade791f6aa6e48f6791c7412fdd44976f3619c8fc0cca7d904fa42013f33ab17dd0f569a76d3c49a73eccaf0a749d34f305362367af9 SHA512 339fbc899bddf2393d214df71ed5d6070a3a76b933b1e75576c8a0ae9dfcc4adec40bdc544f599e4b8d0bc173e4e9e7352408497b5b3c9356985605830c26c03
 DIST openjpeg-data_20180620.tar.gz 497894373 BLAKE2B 3a596f8f9ee56037bf567b6f2d3731b97299dba24e0c9d3562d38c15ddf58d352a918edaccb528f054cf288f87d6362d90d3450d4a5b968e9c8dfe05f54d89fe SHA512 32189a10c4d8cf00c23cda455f9e4353deb2175189d85f9b3aab1c4375a02a491ec2de89815725ebbcaea86c2c7ab274b89ee2583ffd8bf0dc32d4fc2d8f7507
 EBUILD openjpeg-1.5.2-r1.ebuild 1926 BLAKE2B ecaa03b2f054924e3ac9b24e035dabbf287e05d948b32645a18e2234d8376ffc2b8381985608598d0cecbdf683e60173b38f712ef9be7f1ebb8404e66bdf86fd SHA512 e2ebb2fc49222f9983d839384e1e5405a349905193dcaf3c6fe19087522f5d59bf3631a43a2bec8caaf2366e076b162945debc5ea099a2b78a110ea35380e8b7
-EBUILD openjpeg-2.3.1.ebuild 4177 BLAKE2B 3bbe63e5a9c4a2d1a97fd8781fa93d1f5da6b0d3e83e19aa190a5ae68c14014509b4d9386cf96c38fd36996cd352fa45e2833dae898752132b5f35790245a839 SHA512 a76c784db55c6a428aba9988f91858707d967e15a5147331d27188da3c767d8246f521a7e00f512b8d672f3f2b41c3d1b9a0bd47a2bfeb4740712e715c0c5c2b
+EBUILD openjpeg-2.3.1.ebuild 4184 BLAKE2B ef545cbba0fa2eab6e3bde7b69d5d2bb6e2cb183daad6030be9b563071469054e16285085be45f3d8dfc2a94095a6b3d5a9888521e43e7c32ca2f70cc32a30e1 SHA512 7daa903ac91e4ec9bc4b99d1c37e39ca52c62f11c04bd8baf4261773737d6446d41d66df0a53e02227e4cc7a7c126fd0821a32e75e7d3b869c3ffe54cb480032
 MISC metadata.xml 455 BLAKE2B ee0da6c575d6fd05b1aa361cb11e09eaffc18f24f57010a66c31127bd1e55073262c1c0789f07779ef864d6cb27670e8653c6b1269681b5b6497185b5d0583aa SHA512 b956f115708b8afff16126117cacfa9bb51fb55660e19cb6b295081d81790c5c6e8858bc28193f3d9a5b0da66189490938c83c32124e33dedb37ea4a8c8ef99d
diff --git a/media-libs/openjpeg/openjpeg-2.3.1.ebuild b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
index ff710267180c..28d53f909b25 100644
--- a/media-libs/openjpeg/openjpeg-2.3.1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 # Make sure that test data are not newer than release;
@@ -41,7 +42,7 @@ src_prepare() {
 			die "Failed to rename test data"
 	fi
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 multilib_src_configure() {
@@ -53,7 +54,7 @@ multilib_src_configure() {
 		-DBUILD_STATIC_LIBS=$(usex static-libs)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_test() {
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 0987499b6e51..657b5bedde19 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -5,7 +5,7 @@ DIST osl-1.10.5.tar.gz 13543151 BLAKE2B 3c67834d9ab6d4d725ecde622c402707593b9aaf
 DIST osl-1.8.12.tar.gz 14572814 BLAKE2B edf742b104e723e1e3e56b2fb28b1cd4c81921b04a00b8c0f58cf174105a78881283837b550fb4a67d38f5f0a37327fac7a17310974895ed747e8813e6c8ad7b SHA512 29bb0a23d9e1aa445e87b7080be056f939a1828fa87f001cc1503a8c76d21a5620c69146158d27800db71b1abee71a0c39804d85aea7b5899b0cb7ca1c617b56
 DIST osl-1.9.6.tar.gz 14765052 BLAKE2B c6c82d02d49d263361b5b3ba03fca8f35f16199d7d30bbeb50a6b2ee16efcb06ddddc9ce515f749b38b2428365c27a23bf673e9be64d1453c7a49ab0f0d09002 SHA512 e2eb8487038795630bfb38cfb7a39f0cc6877f83689d1e00327b9d95c4b5270c263546a02dff1511272d1d2f429757e11fa28095f9d16cb170b777b531678961
 DIST osl-1.9.9.tar.gz 14771575 BLAKE2B ffbfa935c0d6568c9b35048d5b05965abc75775f4a4f56a434a331a45f4963b3e5cb74fb965748a5fb94cdd3a4201a4745ce564646cbbe535ca2646a734dc33c SHA512 7f3a16bc654676f8e82bf87a2c33914997f1468772ad27bf284c848e9b02adddaf37cb6ef8bde16c81b9076247bca5463a1a5660023efd67d9ac20969ae99647
-EBUILD osl-1.10.5.ebuild 2062 BLAKE2B 167bf475ea3f3f3f3d25d434bf002b4f14335589bb71ec8b1814cbb99eca56a4955c537c89d6c15fe0f53cc7315da130a90edfe5a71708840199244706406692 SHA512 6368edc1cb48259111d8764cd36771ac4b519335a24990042d7fc0513ff4a27d081052d3b0e6261045ec7e943004dd10ec9e2a03f2ba31b755473584b600eaba
+EBUILD osl-1.10.5.ebuild 2007 BLAKE2B 317b1927339cd25fdb5d9033a15bcefb40ee73e590b2f66873f98d3d224bccfaec4c2a4f607ac114829356b7d94eccb062abd8410047cefab3f3579f92e7ed56 SHA512 c7a42a034f42ab3e28de5c67d482eb39d0a5396abd98e53ed8e2f39fa30b0f17c51f6c6aebbad7cd53db3af0f33b2caf055a42d9e02d6ee6dd309083b845a61f
 EBUILD osl-1.8.12.ebuild 1784 BLAKE2B c01cae7aec718f704fe017dc0f3273db7e3046fa276b4b82030dafc4a59ab641b7faa20a7ce2735d52347a30b1188458a9b9f6316bd96bc406e3363018a51350 SHA512 d5148e294ac96cfd06639927af0b3d03a00193d1ffbf55b65e51e717e8ed72fc15cb81b3e418bcd9bde102ad8ede59b92aff966ae0dbb3e366f120706b119fa4
 EBUILD osl-1.9.6.ebuild 1748 BLAKE2B e6b99e1822ced26cf8d6e138f46d4c5e038f078e0b697ecd40e6cde3870efa945160af3cf83f675825fe5a878b5e5bd6a7ec8caea79d4961a0da23130d2d652b SHA512 d0ce4444dc300b869a520a7bc50ea1d95a0ac0342684495c0742a62e55a8f0cb9453ad71fa2ca0ba412970d7d0323409ae8eff99862908d80a24977ce3babaa5
 EBUILD osl-1.9.9.ebuild 1720 BLAKE2B 22d51d110a3128ece31bc2f0155e94f996ae65f2adc42690053305d4b8304737b82a991431114f48524fe5c1ab6b8643899e02a99a341ff5bf653fbff7990b91 SHA512 914cbed1d6020934a8139d8b7a553a275c09c4fa89178237c7105845e6e3cec86c5e1b163ec261a82237d0505c04b624f75294868d2ab469656b639bcefdb0c5
diff --git a/media-libs/osl/osl-1.10.5.ebuild b/media-libs/osl/osl-1.10.5.ebuild
index c5326986b7a6..190989d2cc9e 100644
--- a/media-libs/osl/osl-1.10.5.ebuild
+++ b/media-libs/osl/osl-1.10.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-utils llvm toolchain-funcs
+inherit cmake llvm toolchain-funcs
 
 # check this on updates
 LLVM_MAX_SLOT=8
@@ -73,7 +73,6 @@ src_configure() {
 	local gcc=$(tc-getCC)
 	# LLVM needs CPP11. Do not disable.
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
 		-DENABLERTTI=OFF
 		-DINSTALL_DOCS=$(usex doc)
 		-DLLVM_STATIC=ON
@@ -84,5 +83,5 @@ src_configure() {
 		-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-libs/oyranos/Manifest b/media-libs/oyranos/Manifest
index d9e8451edab0..dafcace3f48c 100644
--- a/media-libs/oyranos/Manifest
+++ b/media-libs/oyranos/Manifest
@@ -1,5 +1,7 @@
+AUX oyranos-0.9.6-mesa-18.3.1.patch 834 BLAKE2B f8cae2cdb21c4588cc1f89c9989ea95c71d200b69d1341fbdaf7dda2a17278350bec2b887f9965cd7838b4ca67d710588bb978a0805b66927afc5f29777e51c7 SHA512 6d590754543b94a8a2558a92dc0610a2df37a55a05ddfabf166004fc6fff29a38b4e5919a91b0dd1a03256da349a8167790e2eceeb00519df7de2ad95eeb08b9
+AUX oyranos-0.9.6-underlinking.patch 1064 BLAKE2B e05060b0bd88b8ca3edb36f2e9d86b5d2296e16f13420a14473a7b0273bf9b53fdea57cbd6ae4828c3b63d4ec8025757e5b9a4858378861d42f83f537155b2fc SHA512 19b22636294c74a44cad38ff4e795a110154349e89715104afd014a219e254a3749a1e9e59b37ce14f01fe22653c6ae062e11e587456b19c8012cc1315699b09
 DIST oyranos-0.9.6-patches.tar.xz 11680 BLAKE2B 2e082ce2bd091dcb59a92662ec813504fbacf03d452f54260434c3abcd63523b1c718055bb0ea2576202b3f85b4af2b36975902163991e4fe82e8e52f714cf5a SHA512 3c99296188cac1dedbf597208ecf2a3e50a3717b305e0919894d633b2ee4ac7ad9c72daae54535c6f81f49f650db4f2367c4d810156a7a3c9d71f1ccfbfbe493
 DIST oyranos-0.9.6.tar.gz 2247841 BLAKE2B b086104e2de949ec08a452fbab16c219daf36a69771f766fafeccffcdb45b74ff9b4d7754f45896c04d04f3fa78fb1faa1ae898b0594d172dd5e6355ca58af9b SHA512 593aa8ae24e4834fae8fceb72540a9334469c0ed977877da1c359613be7d77053d07fdbff3075380c8af425c8877171f126217b3a91ec511daaaac4ce4a3d111
-EBUILD oyranos-0.9.6-r1.ebuild 2732 BLAKE2B 0ca09c3d16074206b922d7bb80940d24e7c0fc090606949e1116c50a1208dd507f224b8b5fffb08f618e818c2ecd6d34f748d768d7b5b0e785958490a6b2af05 SHA512 d2a7e3c754974a2bef6c8f47c331a43437eae4176e042d857f2441ad4899dd44e5cd0f880cd6787ea3fbf7d9fc4f1459276e45c031a90bebcb9ba19364f4822f
-EBUILD oyranos-9999.ebuild 2645 BLAKE2B 93eb8738c198b753535d90824713dd042b82ea5e0aa41045148f8c08f8a7df18072991e39aa9c0adba36c421b299f616448a4cc774d3bd5538c7c226eed51e70 SHA512 ecc3a301e27e646c6d0624eae679f59c1a36eeefc0c1a9ee170e08447c9b0d26c090abc44bee82ae43171f0979c2b04380cff9436a64863cf88e7196c92ce296
+EBUILD oyranos-0.9.6-r1.ebuild 2818 BLAKE2B 1306b22453dfa535ee4713ceb7435eb069f79c077b7b8ce426b9b67d829e3adba811808e2bb25227d555162567588aa7ac8dbecc6501699033e083cf0ebca582 SHA512 b8081efd598425c490831cc4ea93ce2d8edfde46df4d54b67cdb131c1ec8ff4a7f526a78edb0ba943b3c87ecf79cc23e0e6cb9917a02ca681a03f5944eedfe96
+EBUILD oyranos-9999.ebuild 2640 BLAKE2B a20355ed811718826051659b1f809b5f2ec9e0d6ec496783a79f39d84e184a29368a48977d90bf975b25cd18f5042dadcd47cf17369cf0024d550de37aab2454 SHA512 e21797926479e96829500abec17d16980a98e331c85dddc4c60de04c99bd1d18c4f63bb478ee8e214515394680c2cdf4af020471b5342400be083aad1dc07749
 MISC metadata.xml 251 BLAKE2B 0999a9b822622949e7ddd1e5d5b77cd32cf1f689c715a8e9d4c2a4a312d8f59bf2efd06c84f52d71b05149e51514c4f4cecaf30a2c8ab391dcb3a5f7957d7b7e SHA512 bd232a6e37c4b956d15fd9fb66e3b7698c41747b9d3a1b474e8f41a1d7a0d841308526f9ba6a5b250f0140c1af47353bb0adc2e08d09bf8ef52c7b09e66ab891
diff --git a/media-libs/oyranos/files/oyranos-0.9.6-mesa-18.3.1.patch b/media-libs/oyranos/files/oyranos-0.9.6-mesa-18.3.1.patch
new file mode 100644
index 000000000000..83ed82a5629a
--- /dev/null
+++ b/media-libs/oyranos/files/oyranos-0.9.6-mesa-18.3.1.patch
@@ -0,0 +1,24 @@
+From ac7bdc35ea376f938ad223b0156a04a2af6d2eff Mon Sep 17 00:00:00 2001
+From: Kai-Uwe Behrmann <ku.b@gmx.de>
+Date: Fri, 28 Dec 2018 00:14:24 +0100
+Subject: [PATCH] * [exmpl]: update GLee.h to Mesa-18.3.1
+
+the include guards of system files changed
+---
+ src/examples/image_display/GLee.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/examples/image_display/GLee.h b/src/examples/image_display/GLee.h
+index 2edca003..01b19c68 100644
+--- a/src/examples/image_display/GLee.h
++++ b/src/examples/image_display/GLee.h
+@@ -61,7 +61,9 @@
+ 	#include <OpenGL/gl.h>
+ #else // GLX
+ 	#define __glext_h_  /* prevent glext.h from being included  */
++	#define __gl_glext_h_
+ 	#define __glxext_h_ /* prevent glxext.h from being included */
++	#define __glx_glxext_h_
+ 	#define GLX_GLXEXT_PROTOTYPES
+ 	#include <GL/gl.h>
+ 	#include <GL/glx.h>
diff --git a/media-libs/oyranos/files/oyranos-0.9.6-underlinking.patch b/media-libs/oyranos/files/oyranos-0.9.6-underlinking.patch
new file mode 100644
index 000000000000..b25a36cf79e9
--- /dev/null
+++ b/media-libs/oyranos/files/oyranos-0.9.6-underlinking.patch
@@ -0,0 +1,16 @@
+Index: oyranos-0.9.6/src/modules/color/modules/CMakeLists.txt
+===================================================================
+--- oyranos-0.9.6.orig/src/modules/color/modules/CMakeLists.txt
++++ oyranos-0.9.6/src/modules/color/modules/CMakeLists.txt
+@@ -74,9 +74,9 @@ SET( OY_MODULE oydi )
+ SET( OY_MODULE_LIB ${PACKAGE_NAME}_${OY_MODULE}${OY_MODULE_NAME} )
+ ADD_LIBRARY( ${OY_MODULE_LIB}
+              SHARED ${PACKAGE_NAME}_cmm_${OY_MODULE}.c )
+-TARGET_LINK_LIBRARIES ( ${OY_MODULE_LIB} ${PROJECT_NAME} ${EXTRA_LIBS} ${XCM_LIBRARIES} ${XFIXES_LIBRARIES} )
++TARGET_LINK_LIBRARIES ( ${OY_MODULE_LIB} ${PROJECT_NAME} ${EXTRA_LIBS} ${XCM_LIBRARIES} ${XFIXES_LIBRARIES} ${X11_LIBRARIES} )
+ INSTALL (TARGETS ${OY_MODULE_LIB} DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OY_CMMSUBPATH})
+-SET( OY_MODULE_LIBRARIES ${OY_MODULE_LIBRARIES} ${XCM_LIBRARIES} ${XFIXES_LIBRARIES} )
++SET( OY_MODULE_LIBRARIES ${OY_MODULE_LIBRARIES} ${XCM_LIBRARIES} ${XFIXES_LIBRARIES} ${X11_LIBRARIES} )
+ 
+ SET( OY_MODULE oyra )
+ SET( OY_MODULE_LIB ${PACKAGE_NAME}_${OY_MODULE}${OY_MODULE_NAME} )
diff --git a/media-libs/oyranos/oyranos-0.9.6-r1.ebuild b/media-libs/oyranos/oyranos-0.9.6-r1.ebuild
index 05b026fa3e9d..4eee55d10f7d 100644
--- a/media-libs/oyranos/oyranos-0.9.6-r1.ebuild
+++ b/media-libs/oyranos/oyranos-0.9.6-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=6
@@ -12,7 +12,7 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindXcm FindCUPS"
-inherit cmake-utils flag-o-matic
+inherit cmake-utils flag-o-matic xdg
 
 DESCRIPTION="Colour management system allowing to share settings across apps and services"
 HOMEPAGE="https://www.oyranos.org/"
@@ -69,7 +69,11 @@ DOCS=( {AUTHORS,ChangeLog,README}.md )
 
 RESTRICT="test"
 
-PATCHES=( "${WORKDIR}/patches" )
+PATCHES=(
+	"${WORKDIR}/patches"
+	"${FILESDIR}/${P}-mesa-18.3.1.patch" # bug 671996
+	"${FILESDIR}/${P}-underlinking.patch"
+)
 
 src_prepare() {
 	# remove bundled libs
@@ -77,7 +81,7 @@ src_prepare() {
 	cmake-utils_src_prepare
 }
 
-multilib_src_configure() {
+src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
 		-DUSE_SYSTEM_ELEKTRA=ON
diff --git a/media-libs/oyranos/oyranos-9999.ebuild b/media-libs/oyranos/oyranos-9999.ebuild
index a44af27aa9ea..9d14bb4f921a 100644
--- a/media-libs/oyranos/oyranos-9999.ebuild
+++ b/media-libs/oyranos/oyranos-9999.ebuild
@@ -11,7 +11,7 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindXcm FindCUPS"
-inherit cmake-utils flag-o-matic
+inherit cmake-utils flag-o-matic xdg
 
 DESCRIPTION="Colour management system allowing to share settings across apps and services"
 HOMEPAGE="https://www.oyranos.org/"
@@ -74,7 +74,7 @@ src_prepare() {
 	cmake-utils_src_prepare
 }
 
-multilib_src_configure() {
+src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
 		-DUSE_SYSTEM_ELEKTRA=ON
diff --git a/media-libs/partio/Manifest b/media-libs/partio/Manifest
index d59878984d61..982e007ced68 100644
--- a/media-libs/partio/Manifest
+++ b/media-libs/partio/Manifest
@@ -1,7 +1,7 @@
 AUX partio-1.1.0-Rename-partconv.patch 2459 BLAKE2B d811f5174dd2c5e158e7985e8fdea520faeb248249b88c8ebec37dc91f50312ed44d39563142cb3a28fa07ce9b6907824835484881782ceac9b8894978bcb061 SHA512 1965a236f43092c05c940c0f2b33d9c77066ed5fbf3b1753bcf5d9b13c8e5a6e60ef41ba13c9471d1d26d1dc74fead52d0ef1c18f04b1f942345fd1412b0c932
 DIST partio-1.1.0_p20170829.tar.gz 275959 BLAKE2B 441c2d0ab9dd91fa52a826d49f7448dc4d5d0a8d6b72bdb58793dd3c97d86739b25e582bdff41160599489a2835ad8e68676012cb70ef8edff062df3205ab209 SHA512 daedb23ae2b89d3f2ef36ef13afc624a663b3fab91c22f9a454439ff3bc194b78a87e37c9133f6948567ab3b183eff960bb51951b0427cff8c1c29099b6578d6
 DIST partio-1.5.4.tar.gz 291617 BLAKE2B 638fae984d392e1e6c95862ad9a8dd8b8a0d80b2c83dfd03e887af36e420d15fd67f0b2c71e5e8c335668b512660bf14f03a1329ac0d7a48431674a51043585d SHA512 967da5b648b19c45bd0c3c8ff56f891e2d54a07b2cd113f18d5d0b646cbfabd968e31ee48c0e167bf9a911d8d5af42d5291b355da305a2b9134fa78fc23e5636
-EBUILD partio-1.1.0_p20170829.ebuild 1053 BLAKE2B 155ea504acb3b14457a34f151b190eb6b96e5ce0c4a1046fab08c0be80c6f32bf2abdda8c678c7e1010451b0c075d59ef53b48ff847cc51dd11c1b23745f08ed SHA512 9dfd4a750fa6cb158f7ebb3d010dfc1f820962aae514ffa7a91acd8b94aeda8b85c83ef809b7d958525dbe09779a9b9863714f99fd13be2a90d778fe40a853d8
-EBUILD partio-1.5.4.ebuild 867 BLAKE2B 65f9802bd80a02087bb8cadf530908a165ed4c0b984b963862684e68839994db4dad20f3e7d57d97aa56a5b77c63bb168c1fde0a38eafa3d15c5c37f8239aad2 SHA512 827505c7b1f01db93722d4e7b5034d759d3ae880afcf6671bf46bf6c097fbc272e4e38d77f2880d8b1ee33e303612d674d400fa7844e2e718ea671894e5a87c1
-EBUILD partio-9999.ebuild 869 BLAKE2B fd5b476407d8454ff3941cd60754e9d421c589a9293431b092e471c39a32d07c9f79b716b0a637e0c9a25a6e9a3604819b4d20dc1d62ea32d94ba7ddcd18b1c7 SHA512 e2ed573172e87366a20bb36c1c30a28dc659cc5a7566bc7787f66d05d1a4d94ec55cbc629879bc54449bfdf1d28a7cadcb0bbbb0b29c55b46df864c8033a21d7
+EBUILD partio-1.1.0_p20170829.ebuild 1049 BLAKE2B 59be45fbfe12dd538ccac9af82587f956dff90bed589d4a8d065a04aff7c240eddf56e32d3f7ec04208b3e31a8d05390c005cbedcaf40a9f2897adae0a3e08ab SHA512 2c9c46ccd43dfb00eb12039e446f8354e22b0be240f9897a8aa016a59dad5388bce12eb4612c9f6f0e80dcdff33bc2b6d6318c49d6f89aeb893737c9c0b7f95f
+EBUILD partio-1.5.4.ebuild 845 BLAKE2B ba0da04deba2306dfe4a59ed7442549e1ce06dc959157ec1e96169638209280ae54837fa60e3a5e0c08e5cb2e33966125bc2bb3c194b9aef2190ef058dfbf97d SHA512 2905032ff5f5d7f287a84a9f82a27109a667c5fe0e6077ab2d22ef54bccaee8908d0a8df8efab56cdcff37f68ab575f09042e262ce00757d4740026954c5cc8c
+EBUILD partio-9999.ebuild 847 BLAKE2B a2fcce51d829c0af80ebf23ceb8b6e35fc0de12700539b07c770a0c751f70d6f88493c7d7b27b4ebf41b99e372d23f8f38c4021ef0354081e2970d97ce6da80c SHA512 7abd0bcdee18c4704a2a75f62207ee56c822c334f7b9d5b74e1a0110c6f9fe29c9d9f5165ea3ca200d0fc8bcefaa635fb7f7338008526320099629dd4f2b3f8a
 MISC metadata.xml 528 BLAKE2B 76f098570ed5ad0be85fb87b6696903e3b111e6d2d157679a835faa6dea65633c75d18560c486750063703a9b5899747df90fdfadebab38af3688d625b5df2ad SHA512 c9f2d206bc6921c783d1d72134c3a9acd7350c80f2ecb26f45d7617dc2d352f7d84134858956569f084dd444f2a01d186c97b3a83c07b45a468d48579fa01658
diff --git a/media-libs/partio/partio-1.1.0_p20170829.ebuild b/media-libs/partio/partio-1.1.0_p20170829.ebuild
index 8a58104a26c1..51dabc8a8473 100644
--- a/media-libs/partio/partio-1.1.0_p20170829.ebuild
+++ b/media-libs/partio/partio-1.1.0_p20170829.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit cmake-utils vcs-snapshot python-single-r1
 
diff --git a/media-libs/partio/partio-1.5.4.ebuild b/media-libs/partio/partio-1.5.4.ebuild
index 84a164057290..3fea34e9cdae 100644
--- a/media-libs/partio/partio-1.5.4.ebuild
+++ b/media-libs/partio/partio-1.5.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit cmake-utils python-single-r1
+PYTHON_COMPAT=( python{2_7,3_6} )
+inherit cmake python-single-r1
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -35,7 +35,7 @@ DEPEND="${RDEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package doc Doxygen)
+		$(cmake_use_find_package doc Doxygen)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-libs/partio/partio-9999.ebuild b/media-libs/partio/partio-9999.ebuild
index 1b109fd6da7f..e081be1b58f9 100644
--- a/media-libs/partio/partio-9999.ebuild
+++ b/media-libs/partio/partio-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit cmake-utils python-single-r1
+PYTHON_COMPAT=( python{2_7,3_6} )
+inherit cmake python-single-r1
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -35,7 +35,7 @@ DEPEND="${RDEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package doc Doxygen)
+		$(cmake_use_find_package doc Doxygen)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-libs/portmidi/Manifest b/media-libs/portmidi/Manifest
index b6ee70d6de4d..1c34c9546314 100644
--- a/media-libs/portmidi/Manifest
+++ b/media-libs/portmidi/Manifest
@@ -1,5 +1,7 @@
-AUX portmidi-217-cmake.patch 13124 BLAKE2B ccbc53bd6a740fd87789931869aa29d66c3e4b404851f8f465f713fb0bdad2756ba77267396e5f966ae266c1f05b7972f5abd5559ba7f1358e50cf65e3825e63 SHA512 36392c6e5e9f21d8791866f22345569346e4827bbb3525c119f2a28d8ec1d055988a360c2f53323f1d12f8294896656044c5890cabedd7fb6c2f730f5d72e4cb
+AUX portmidi-217-cmake.patch 13905 BLAKE2B faa559f25b1acec63f17a6b6dcbd228eff2cb50447ba72ea4108c86f36b8142fac54c90e5480d74278e0fa0b28bad68f4f1bfac192434840893dc9039243284f SHA512 b60da799041d6dc4a1bf82981d904cf9bbbaed021397cd2235dc25b18b7c830576ecce8fa0c6992249e03ab84579eff795ae33a8e0d091dcda8ee856491420d4
 AUX portmidi-217-python.patch 764 BLAKE2B bcf569bab2c105f99b7a3b10c0124fa22b7fb0d9d494024c17c01f3bb6641441f1942b4dae76725835e880c4ed90c03e151f218b4eec78b29fdefc343cc00b30 SHA512 5f5e582d1769c995038d1b073eb603e313f1a49b5d7cb832de9f2aef003dfcf34bcd848337dc180ee23bf87ad631887584d339474c45e57b6a78d179c929ec43
+AUX portmidi-217-r3-python.patch 1568 BLAKE2B 039c2bde15d5aaef1f255a0166c3563fcbfe3439dc2dced93b5228e5f5b747c47b70b7a25574d3116652aa3ae7177fbdd95aa03e29f65a05cddbe056b7b7e9e9 SHA512 210db5901f5d31c2e686aaca850f972ae2083834b3599e5e71acbb21374f8136306e087f62d2307767c8f0eb2fddf5a6115486258aaa16aefd4199b6d21f42e2
 DIST portmidi-src-217.zip 1030830 BLAKE2B ab197c7f9a5c2b4d2740d56841459fbac97d510e4d12e5d0cd7cecc0ba6035929b6596140d42c575a9513862a66127d19253dbee1d3a7b7b84b69c88fec7fcae SHA512 d08d4d57429d26d292b5fe6868b7c7a32f2f1d2428f6695cd403a697e2d91629bd4380242ab2720e8f21c895bb75cb56b709fb663a20e8e623120e50bfc5d90b
 EBUILD portmidi-217-r2.ebuild 3050 BLAKE2B ea034c6366908edeab906b8cd5ee58f1bf75aa1f2a29d7766db7ae94d3576c587a409a96d54704cd8b84e34d4430b0c1e557e2f93be5607bec40803d40afe1eb SHA512 a69e6ca91231cbce5efa1cff3c305ff34ec029c1a113fcf1090dd3ea232f2050dc0e8dd60bae225e20e5c93d1aefd2c568dab897a020485f92b61b0c0ab5dabe
+EBUILD portmidi-217-r3.ebuild 3157 BLAKE2B b61c1d362aacaea932666f97e9cea5554db4c67fc81395eafb6b6ed8c03834a5b9f9bdc3b913c6448a12fbc21d29b4939c4aa559239920659226f1cf2378a968 SHA512 517a5528d1fe9f8451b4d9e60664d7f3414d0d0f1febc838cd1bc3dd9229cfe8c4cc0cb0052a10c78bd8f057e1bc7e0d61e7b737dd2dbbb45fcd797124b3c105
 MISC metadata.xml 436 BLAKE2B abc47a4c2597048c3e2037006db7811d99cb1ce5c35d83dec30fc415f6d419344bf283d580c153309bb7934b6a12fae878cd480f6c12be76deb52bd5494e2c5c SHA512 a7f6997ff7647e20526181189d5d38ebd944648a508a90ab42ada4dfec84f5165a25b07f5738880a9dcbf424e2b74ac7c3224f6b8d47d9c8a7f3fa7c02c02cbc
diff --git a/media-libs/portmidi/files/portmidi-217-cmake.patch b/media-libs/portmidi/files/portmidi-217-cmake.patch
index e741e6576f66..7618ee5af952 100644
--- a/media-libs/portmidi/files/portmidi-217-cmake.patch
+++ b/media-libs/portmidi/files/portmidi-217-cmake.patch
@@ -1,6 +1,8 @@
---- portmidi/CMakeLists.txt
-+++ portmidi/CMakeLists.txt
-@@ -9,12 +9,11 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4919b78..9dc6e58 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -9,12 +9,11 @@ if(UNIX)
    set(CMAKE_BUILD_TYPE Release CACHE STRING 
        "Semicolon-separate list of supported configuration types")
    # set default directories but don't override cached values...
@@ -16,7 +18,7 @@
        CACHE STRING "executables go here")
  
  else(UNIX)
-@@ -68,10 +67,20 @@
+@@ -68,10 +67,20 @@ endif(UNIX)
  include_directories(pm_common porttime)
  add_subdirectory(pm_common)
  
@@ -39,9 +41,11 @@
 +  add_subdirectory(pm_java)
 +endif(PORTMIDI_ENABLE_JAVA)
  
---- portmidi/pm_common/CMakeLists.txt
-+++ portmidi/pm_common/CMakeLists.txt
-@@ -44,9 +44,6 @@
+diff --git a/pm_common/CMakeLists.txt b/pm_common/CMakeLists.txt
+index e171047..d23442d 100644
+--- a/pm_common/CMakeLists.txt
++++ b/pm_common/CMakeLists.txt
+@@ -44,9 +44,6 @@ set(CMAKE_C_FLAGS_RELEASE "${DEFAULT_RELEASE_FLAGS} ${LINUX_FLAGS}"
  
  # first include the appropriate system-dependent file:
  if(UNIX)
@@ -51,7 +55,7 @@
    if(APPLE)
      set(MACSRC pmmacosxcm pmmac readbinaryplist finddefault)
      prepend_path(LIBSRC ../pm_mac/ ${MACSRC})
-@@ -62,19 +59,23 @@
+@@ -62,19 +59,23 @@ if(UNIX)
                               ${COREMIDI_LIB} ${CORESERVICES_LIB}
          CACHE INTERNAL "")
  
@@ -85,7 +89,7 @@
  
      set(LINUXSRC pmlinuxalsa pmlinux finddefault)
      prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC})
-@@ -88,10 +89,12 @@
+@@ -88,10 +89,12 @@ else(UNIX)
      # /MD is multithread DLL, /MT is multithread. Change to static:
      include(../pm_win/static.cmake)
      
@@ -101,7 +105,7 @@
  
      set(WINSRC pmwin pmwinmm)
      prepend_path(LIBSRC ../pm_win/ ${WINSRC})
-@@ -99,29 +102,43 @@
+@@ -99,29 +102,43 @@ else(UNIX)
      set(PM_NEEDED_LIBS winmm.lib)
    endif(WIN32)
  endif(UNIX)
@@ -160,9 +164,11 @@
  # .h files installed by pm_dylib/CMakeLists.txt, so don't need them here
  #  INSTALL(FILES portmidi.h ../porttime/porttime.h
  #    DESTINATION /usr/local/include)
---- portmidi/pm_dylib/CMakeLists.txt
-+++ portmidi/pm_dylib/CMakeLists.txt
-@@ -39,9 +39,6 @@
+diff --git a/pm_dylib/CMakeLists.txt b/pm_dylib/CMakeLists.txt
+index f693dd6..c0e1449 100644
+--- a/pm_dylib/CMakeLists.txt
++++ b/pm_dylib/CMakeLists.txt
+@@ -39,9 +39,6 @@ set(CMAKE_C_FLAGS_RELEASE "${DEFAULT_RELEASE_FLAGS} ${LINUX_FLAGS}"
  
  # first include the appropriate system-dependent file:
  if(UNIX)
@@ -172,7 +178,7 @@
    if(APPLE)
      set(MACSRC pmmacosxcm pmmac readbinaryplist finddefault)
      prepend_path(LIBSRC ../pm_mac/ ${MACSRC})
-@@ -63,7 +60,8 @@
+@@ -63,7 +60,8 @@ if(UNIX)
      message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT})
    else(APPLE)
      # LINUX settings...
@@ -182,7 +188,7 @@
      # message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH})
      # message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH})
      # note: should use JAVA_JVM_LIB_PATH, but it is not set properly
-@@ -75,11 +73,8 @@
+@@ -75,11 +73,8 @@ if(UNIX)
      # JAVA_INCLUDE_PATH2; if no, then we need to make both JAVA_INCLUDE_PATH
      # and JAVA_INCLUDE_PATH2 set by user (will need clear documentation
      # because JAVA_INCLUDE_PATH2 is pretty obscure)
@@ -196,7 +202,7 @@
  
      set(LINUXSRC pmlinuxalsa pmlinux finddefault)
      prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC})
-@@ -91,13 +86,15 @@
+@@ -91,13 +86,15 @@ else(UNIX)
    if(WIN32)
      # /MDd is multithread debug DLL, /MTd is multithread debug
      # /MD is multithread DLL, /MT is multithread 
@@ -218,7 +224,7 @@
  
      set(WINSRC pmwin pmwinmm)
      prepend_path(LIBSRC ../pm_win/ ${WINSRC})
-@@ -106,7 +103,10 @@
+@@ -106,7 +103,10 @@ else(UNIX)
      # message(STATUS "JAVAVM_LIB: " ${JAVAVM_LIB})
    endif(WIN32)
  endif(UNIX)
@@ -229,7 +235,7 @@
  
  # this completes the list of library sources by adding shared code
  set(SHARED_FILES pmutil portmidi)
-@@ -120,8 +120,8 @@
+@@ -120,8 +120,8 @@ target_link_libraries(portmidi-dynamic ${PM_NEEDED_LIBS})
  # install the libraries (Linux and Mac OS X command line)
  if(UNIX)
    INSTALL(TARGETS portmidi-dynamic
@@ -241,9 +247,11 @@
 -    DESTINATION /usr/local/include)
 +    DESTINATION include)
  endif(UNIX)
---- portmidi/pm_java/CMakeLists.txt
-+++ portmidi/pm_java/CMakeLists.txt
-@@ -5,43 +5,24 @@
+diff --git a/pm_java/CMakeLists.txt b/pm_java/CMakeLists.txt
+index a350620..9cbee1c 100644
+--- a/pm_java/CMakeLists.txt
++++ b/pm_java/CMakeLists.txt
+@@ -5,43 +5,24 @@ if(UNIX)
      # java not dealt with in CMake -- see pm_mac/pm_mac.xcodeproj
    else(APPLE)
      # linux
@@ -303,16 +311,22 @@
    endif(APPLE)
  endif(UNIX)
  # In windows, use pm_java/make.bat
---- portmidi/pm_test/CMakeLists.txt
-+++ portmidi/pm_test/CMakeLists.txt
-@@ -12,8 +12,8 @@
+diff --git a/pm_test/CMakeLists.txt b/pm_test/CMakeLists.txt
+index b89074b..236ff49 100644
+--- a/pm_test/CMakeLists.txt
++++ b/pm_test/CMakeLists.txt
+@@ -10,10 +10,12 @@ if(WIN32)
+ include(../pm_win/static.cmake)
+ endif(WIN32)
  
++set(CMAKE_SKIP_BUILD_RPATH TRUE)
++
  macro(make_a_test name)
    add_executable(${name} ${name}.c)
 -  target_link_libraries(${name} portmidi-static ${PM_NEEDED_LIBS})
 -  add_dependencies(${name} portmidi-static)
-+  target_link_libraries(${name} portmidi ${PM_NEEDED_LIBS})
-+  add_dependencies(${name} portmidi)
++  target_link_libraries(${name} portmidi-dynamic ${PM_NEEDED_LIBS})
++  add_dependencies(${name} portmidi-dynamic)
  endmacro(make_a_test)
  
  make_a_test(test)
diff --git a/media-libs/portmidi/files/portmidi-217-r3-python.patch b/media-libs/portmidi/files/portmidi-217-r3-python.patch
new file mode 100644
index 000000000000..cfc6b24e9487
--- /dev/null
+++ b/media-libs/portmidi/files/portmidi-217-r3-python.patch
@@ -0,0 +1,50 @@
+diff --git a/pm_python/setup.py b/pm_python/setup.py
+index 14ab1c7..5b1e7c0 100644
+--- a/pm_python/setup.py
++++ b/pm_python/setup.py
+@@ -15,12 +15,10 @@ except ImportError:
+ 
+ 
+ DESCRIPTION = open('README_PYTHON.txt').read()
+-CHANGES = open('CHANGES.txt').read()
+-TODO = open('TODO.txt').read()
+ 
+ EXTRAS = {}
+ 
+-long_description = DESCRIPTION + CHANGES + TODO
++long_description = DESCRIPTION
+ #import sys
+ #if "checkdocs" in sys.argv:
+ #    print long_description
+@@ -142,7 +140,7 @@ PACKAGEDATA.update(EXTRAS)
+ 
+ 
+ if sys.platform == 'win32':
+-    print "Found Win32 platform"
++    print("Found Win32 platform")
+     EXTENSION = dict(
+         ext_modules=[ 
+             Extension("pyportmidi._pyportmidi", [os.path.join("pyportmidi", "_pyportmidi.pyx")],
+@@ -154,7 +152,7 @@ if sys.platform == 'win32':
+         ]
+     )
+ elif sys.platform == 'darwin':
+-    print "Found darwin (OS X) platform"
++    print("Found darwin (OS X) platform")
+     library_dirs = ["/usr/local/lib"]
+     include_dirs = ["/usr/local/include"]
+     EXTENSION = dict(
+@@ -169,11 +167,12 @@ elif sys.platform == 'darwin':
+         ]
+     )
+ else:
+-    print "Assuming Linux platform"
++    print("Assuming Linux platform")
+     EXTENSION = dict(
+         ext_modules=[ 
+             Extension("pyportmidi._pyportmidi", [os.path.join("pyportmidi", "_pyportmidi.pyx")],
+                       library_dirs=["./linux"],
++                      include_dirs=["../pm_common", "../porttime"],
+                       libraries = ["portmidi", "asound", "pthread"]
+                       )
+         ]
diff --git a/media-libs/portmidi/portmidi-217-r3.ebuild b/media-libs/portmidi/portmidi-217-r3.ebuild
new file mode 100644
index 000000000000..27dd06fd49d7
--- /dev/null
+++ b/media-libs/portmidi/portmidi-217-r3.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_OPTIONAL=1
+# ninja: error: build.ninja:521: multiple rules generate pm_java/pmdefaults.jar [-w dupbuild=err]
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake desktop xdg distutils-r1 java-pkg-opt-2
+
+DESCRIPTION="Library for real time MIDI input and output"
+HOMEPAGE="http://portmedia.sourceforge.net/"
+SRC_URI="mirror://sourceforge/portmedia/${PN}-src-${PV}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+IUSE="debug doc java python static-libs test-programs"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="
+	app-arch/unzip
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	python? ( >=dev-python/cython-0.12.1[${PYTHON_USEDEP}] )
+"
+CDEPEND="
+	media-libs/alsa-lib
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.8 )
+"
+DEPEND="
+	${CDEPEND}
+	java? ( >=virtual/jdk-1.8 )
+"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+	# fix parallel make failures, fix java support, and allow optional
+	# components like test programs and static libs to be skipped
+	"${FILESDIR}"/${P}-cmake.patch
+
+	# add include directories and remove references to missing files
+	"${FILESDIR}"/${PF}-python.patch
+)
+
+pkg_setup() {
+	use java && java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# install wrapper for pmdefaults
+	if use java ; then
+		cat > pm_java/pmdefaults/pmdefaults <<-EOF
+			#!/bin/sh
+			java -Djava.library.path="${EPREFIX}/usr/$(get_libdir)/" \\
+				-jar "${EPREFIX}/usr/share/${PN}/lib/pmdefaults.jar"
+		EOF
+		[[ $? -ne 0 ]] && die "cat pmdefaults failed"
+	fi
+}
+
+src_configure() {
+	if use debug ; then
+		CMAKE_BUILD_TYPE=Debug
+	else
+		CMAKE_BUILD_TYPE=Release
+	fi
+
+	local mycmakeargs=(
+		-DPORTMIDI_ENABLE_JAVA=$(usex java)
+		-DPORTMIDI_ENABLE_STATIC=$(usex static-libs)
+		-DPORTMIDI_ENABLE_TEST=$(usex test-programs)
+	)
+
+	if use java ; then
+		mycmakeargs+=(-DJAR_INSTALL_DIR="${EPREFIX}/usr/share/${PN}/lib")
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use python ; then
+		sed -i -e "/library_dirs=.*linux/s#./linux#${CMAKE_BUILD_DIR}#" pm_python/setup.py || die
+		pushd pm_python > /dev/null
+		distutils-r1_src_compile
+		popd > /dev/null
+	fi
+
+	if use doc ; then
+		doxygen || die "doxygen failed"
+		pushd latex > /dev/null
+		VARTEXFONTS="${T}"/fonts emake
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	dodoc CHANGELOG.txt README.txt pm_linux/README_LINUX.txt
+
+	use doc && dodoc latex/refman.pdf
+
+	if use python ; then
+		pushd pm_python > /dev/null
+		distutils-r1_src_install
+		popd > /dev/null
+	fi
+
+	if use java ; then
+		newdoc pm_java/README.txt README_JAVA.txt
+		newicon pm_java/pmdefaults/pmdefaults-icon.png pmdefaults.png
+		make_desktop_entry pmdefaults Pmdefaults pmdefaults "AudioVideo;Audio;Midi;"
+	fi
+
+	if use test-programs ; then
+		exeinto /usr/$(get_libdir)/${PN}
+		local app
+		for app in latency midiclock midithread midithru mm qtest sysex test ; do
+			doexe "${BUILD_DIR}"/${app}
+		done
+	fi
+}
diff --git a/media-libs/ptex/Manifest b/media-libs/ptex/Manifest
index b31dcc42b77b..a576712d4d2e 100644
--- a/media-libs/ptex/Manifest
+++ b/media-libs/ptex/Manifest
@@ -1,4 +1,4 @@
 AUX ptex-2.3.2-cxx11.patch 828 BLAKE2B e445858c625de0c924a412690cbf2f1bed6ee4fd7efafd60765a4f43fa204ba474cdf2944acf3eb94b061df6c39cd9016413e6c5d73da3813144fa289746ceb4 SHA512 53d6e66dd4a35dc2e16e5f227a24ec90d3f7667c5f80dc3d7321086b4efb4d63451783450a02a389c09a3faa6808cd90e89e2097390ef9881ffe313fbfd8c6d1
 DIST ptex-2.3.2.tar.gz 308550 BLAKE2B 7b3145dbf9d2c13140c3f20ed606ee911deed3c38fd30adfbb01b58c3af5794dbd4e0fa1fbab6e8ae83556a0ffec725bf077271abf752f1271ed721ca200a1ff SHA512 dbc557dc5e1761204ee3483af9bf4ff1504cbd7955e0405dc27a51f7182e2445e41db086b2792c2491aa2cbaddc74e523170a4b3d25e44d332123d5b7081f4b9
-EBUILD ptex-2.3.2.ebuild 791 BLAKE2B 503764f19394ed110997c6f3d0930b7fd75103a310277d566202b84a0b788cbd3f0dc57dddb492e21f845fc063ff6deedb1971c5ecc376e531d86ff9ad378255 SHA512 1e879f58054fff1f8eb94e4708b1e0d81be1734ea80821a0f146cbebe6f2a662d16925ef40925b8cea946cd24f21623c4518dc611e21944c5974a0478ed9f519
+EBUILD ptex-2.3.2.ebuild 773 BLAKE2B 9eb6b631020ba8a9e6b9aa5f969948bd2b58567f3a8088f5f33b9e3ed1dc5f794ecac9e2be92aca418cd7d711cf8cacca429441ef46a505ff2d839caf1998e58 SHA512 e811c246db191f2bb4f48995c7039f01858e66ef0e7dec0c33a1a8bab452ec592a46401a811f333dd67af58ccbb15ea4bc2d6dcd5a0c6f7c246efe2a21d38c71
 MISC metadata.xml 534 BLAKE2B d9d8317a223ac27c1cf5fc77bd3dcf3110c7731627386bbe1516dc0d9d045f2e0c0e87aa92ed0ed822a623b3f589b533c2abd8d02482a608ab0f8a03d1f07104 SHA512 771a753ed93fd77790488a5cfd596a8bdf5719f208b86c984fb71cafd42fae6382016597adcbaa696570d5a5124ea06cf3e28519413cf4df1bd326c543dd8b59
diff --git a/media-libs/ptex/ptex-2.3.2.ebuild b/media-libs/ptex/ptex-2.3.2.ebuild
index 48580481fd2b..20e552cd3441 100644
--- a/media-libs/ptex/ptex-2.3.2.ebuild
+++ b/media-libs/ptex/ptex-2.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Per-Face Texture Mapping for Production Rendering"
 HOMEPAGE="http://ptex.us/"
@@ -27,7 +27,7 @@ src_prepare() {
 	cat <<-EOF > version || die
 	${PV}
 	EOF
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -35,5 +35,5 @@ src_configure() {
 		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/html"
 		-DPTEX_BUILD_STATIC_LIBS=$(usex static-libs)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-libs/pyliblo/Manifest b/media-libs/pyliblo/Manifest
index 49b4207d0bbc..b0ef213e6bc8 100644
--- a/media-libs/pyliblo/Manifest
+++ b/media-libs/pyliblo/Manifest
@@ -1,3 +1,3 @@
 DIST pyliblo-0.10.0.tar.gz 29702 BLAKE2B 6120003aba9990a4c9d84050a3501e4f2bb345d7b454f47ca2689091c3dcfa1c59c85ff8c2a7b7d0e7a6b9ee87c291ebceddf09cd9a1a39a0706ae463394e407 SHA512 d2a3d47f6c52d310104256d33fbd5d652ae6bc8cde32c2d3b2f3f407b8a4aba99028e57cd466804d266f63468a6c792760f28a43dbabcfa3330e0a852ee4d4e3
-EBUILD pyliblo-0.10.0-r1.ebuild 525 BLAKE2B 70f86ab9c9431ce5ef0946b704602d0f9887618b20530c40b05eafbdd1561fb37ba16ebb3193f163a4c8a0983d2de0d1ba3dcc15b52a3b36fde5072c6b9f32e5 SHA512 d90afe286c0f6255ba1a7e0d49f1b7ea3ea8269154e25943250ede7e584e3cec3004077bcfb34280ab79e9cb89208225203f9d0c3cc5692ac783fc6fd94b88a8
+EBUILD pyliblo-0.10.0-r1.ebuild 521 BLAKE2B 0167a689e060dfbb1ce00e14a557894dcf4053f7c533a82ab4b7a785dd99ea98deb779b65dd2c985de691942b1c1c4452932c78a2d53ec30d7881879fcd6eb38 SHA512 01e2e5545285b23711349cfc92f8925b7e4ac968ef496e94a2a6782e2228a3eabb283197ddd89019cdaf12cd41d51d167add58c920d1fbbb1e5f1f9f3dea7a54
 MISC metadata.xml 443 BLAKE2B 0f5ca85fdee859d34612857810740cc23f7e82c757596afbcf33b4825908295d2d49f93ab27acf2e5ce66a1999deded0c30a7d90d2fdf88a609ac19e7d073bea SHA512 258fb4656807e957ee2172da4cebc2533e8367ccad076cbebd6e221cf76df046b748711d4d7abd73bb3c76e13102710beae0eb2ce74378bf1f15a2b8e9f41d2d
diff --git a/media-libs/pyliblo/pyliblo-0.10.0-r1.ebuild b/media-libs/pyliblo/pyliblo-0.10.0-r1.ebuild
index 1ec36208367a..ee8e08b5fa22 100644
--- a/media-libs/pyliblo/pyliblo-0.10.0-r1.ebuild
+++ b/media-libs/pyliblo/pyliblo-0.10.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="A Python wrapper for the liblo OSC library"
diff --git a/media-libs/qhull/Manifest b/media-libs/qhull/Manifest
index 9831b093417a..0d4257c3babd 100644
--- a/media-libs/qhull/Manifest
+++ b/media-libs/qhull/Manifest
@@ -1,4 +1,4 @@
 AUX qhull-2012.1-64bit.patch 1509 BLAKE2B d5f50bfb5229109f13ac88f46eff36d130830339c43265981b00a8e5defaf3229cd50870e379e13a2726312efd8a15e99a2683c3b3a9b1eb9bf1503b7f6b1fbe SHA512 e23c7bb4d6fb64a77647980e045b36df4f596eb64a32b27d7d6462cb2f5f7a35e0fa9985e885ed58222ec1741b2a2d1806bba155f1042bd470dcd5c721ac48c5
 DIST qhull-2015.2.tar.gz 1010153 BLAKE2B 854d1897ad5a92b2e13f6b2304d707b21023a47d60fcc7065b487c24dad06fa016536311e224155b879ad699c046f15991a840f5f04283ffdeef8a68dfbf7c15 SHA512 a544f88b5fbabc592fdc4c5533ba58a8f856e018b85128f43d0532a1143123ceb0d5ca9ae1d27722efa5d08092c017bf7715c157d1019f447e6746f23f02dcd4
-EBUILD qhull-2015.2.ebuild 1022 BLAKE2B 29f417a5154e7d2b785e2b7462cc536a1bb0be920d6dd96b3f1e4cb2403b38261c6e4cfae36118b5ac239d0bf6e862b64d68f751b0d578a050f87b8478b3fa4a SHA512 8e2e24ba4e043a9c48ec602a2c567e517248133ade0e18dcb05a2da60b0f1355875944644d2640bb182a7fc2b7dfd85e16b031eafe06c842b1c76ea4dda1c658
+EBUILD qhull-2015.2.ebuild 1031 BLAKE2B c37c0c49c714db2792a9d9ba9230da53cbb9f55d552b80f18be02e9d3c0d52b94edbd3af7dc1325378d722425da4994ffb6e294f978a36c9bea0b4ed7fbaac00 SHA512 56ac0c935f044fd0db30c73327ae4c0de2abcf3ebf860d606bbeb8f9dfd5704895d13d362901f49f9f91f7c6eea60dbb0b470bcbfbd2780813ea612cbfb47850
 MISC metadata.xml 977 BLAKE2B 57a86855387223c875830b8d60eb02f89f469dc4949f094255f43e0251cb537049d0a99a0eb9500c639730f6a0db518ec2b3a4ae050e3c9ea2f508cdbe790e98 SHA512 6e676d2faff561e67e077869a61747c834131ea67acb098497153c98d3bca38032ffa2ab57d6b612cfa4f1fbdb8b05b0c9a9132ab0cdeae5579bdac236b9a1f2
diff --git a/media-libs/qhull/qhull-2015.2.ebuild b/media-libs/qhull/qhull-2015.2.ebuild
index cdcf4f62489e..cfe8eae85ee3 100644
--- a/media-libs/qhull/qhull-2015.2.ebuild
+++ b/media-libs/qhull/qhull-2015.2.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils flag-o-matic
 
 DESCRIPTION="Geometry library"
 HOMEPAGE="http://www.qhull.org"
-SRC_URI="${HOMEPAGE}/download/${PN}-2015-src-7.2.0.tgz -> ${P}.tar.gz"
+SRC_URI="http://www.qhull.org/download/${PN}-2015-src-7.2.0.tgz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
diff --git a/media-libs/qimageblitz/Manifest b/media-libs/qimageblitz/Manifest
index a30d620e73bd..54802a4fdfff 100644
--- a/media-libs/qimageblitz/Manifest
+++ b/media-libs/qimageblitz/Manifest
@@ -1,5 +1,5 @@
 AUX qimageblitz-0.0.6_p20131029-cxx11.patch 390 BLAKE2B 8e338b462d69dd320e4545ac2a0d22ef3b258bf817d7e5eb8f9a16936c00d76b5366a73703e9710148447afb856a9d6873e697917d7600e61d2185ad1612a00e SHA512 e8cc1d28b93f05375c293c4ccedcf2f41be282106cec1afd6e3c81c7fc569a5b3ec33c1dc3876e6745ec5fd08ec8044ff4296859cdfee4ce966f7ce56e03f9d7
 AUX qimageblitz-0.0.6_p20131029-gcc.patch 693 BLAKE2B 73f99f9160db49fb9946c409c5e05b1559f391ad264b219b87a3efebc1edd3995ca8f8edd31d9d52bd3391ffc40c8d22964d6b76a152fe0364b472b5ddcec0ee SHA512 a189c0e44d09fb0b0fbd4c46e7fd4fb98a2af485174af2a8bbd176ccd4d4abd55f364236b6113b6ef32681d30131ff4c698b098f3c13fcac2544ef1a123f641e
 DIST qimageblitz-0.0.6_p20131029.tar.xz 43428 BLAKE2B 6a10f12236d759cb2999f807ae05345ad91ca2a3f965fa8ae6d38431a4a91439242ceac2facce67b46a5260cef11a4a5fdceccff73260235658830262fc909cc SHA512 2a32105aed52ea33fbd46702a2b7cdd9671efef9bb52209ede534abc95ac40dd9ae2bd22cf09b30a309337653c4a754c50ef3fe4ad0aad7d4ffd0b5994a85981
-EBUILD qimageblitz-0.0.6_p20131029.ebuild 1025 BLAKE2B 21c9a3a225ad6f74301d172861a01d55cdb52e8be4c6e99ee1f0d3f924050296c84fd6338e882c33e31958f347bbbc50168243fdf2d9428b051b9cb21fb26f45 SHA512 522cb2a88e82226233dca5eabb108a4aac6d9f769223a4060f0d4b3a7fe3434396ecaeea5df2208e043d8f7b230e952b9d9c77f90c7afa664ab34feccfb5f830
+EBUILD qimageblitz-0.0.6_p20131029.ebuild 1013 BLAKE2B afc3da6fd21b256f64cfe54d98de6cb6573a6e30bdbf567dfdd6c3b1e9d515d76963fe4ee7d3050654b0993cdd612e9b4537c526c1d94c023b7f18345852e72b SHA512 bd7f308a0a1f675cd1c3bd228e8ed886e76bca2e01622947a86fca46745dbd89db80317010ee685e04e419c20977c03f324533444b396471d607c1cd299151d9
 MISC metadata.xml 245 BLAKE2B 7d8aa6c42d332c65c417fb557b95907322f61713c6ee71b25af3944be1f2c693e2110598f877c28fe2bbef4a9fd064fe97c24a92092599d1c2df69e3e3676a60 SHA512 90bcfe500baf163912aaffc9958c9724c4a97cfca294cae6c2eea938f4ca7668c84b132b6dce55767efa47a28b9e87bb75e79634b59079ab8ef3eff3ea95968e
diff --git a/media-libs/qimageblitz/qimageblitz-0.0.6_p20131029.ebuild b/media-libs/qimageblitz/qimageblitz-0.0.6_p20131029.ebuild
index bbbf7fcfea31..c6a9d624180f 100644
--- a/media-libs/qimageblitz/qimageblitz-0.0.6_p20131029.ebuild
+++ b/media-libs/qimageblitz/qimageblitz-0.0.6_p20131029.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Graphical effect and filter library by KDE"
 HOMEPAGE="https://websvn.kde.org/trunk/kdesupport/qimageblitz/"
@@ -36,5 +36,5 @@ src_configure() {
 	)
 	use ppc && mycmakeargs+=( -DHAVE_ALTIVEC=$(usex altivec) )
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-libs/qt-gstreamer/Manifest b/media-libs/qt-gstreamer/Manifest
index e14fa78b0a80..3bdf9feb5224 100644
--- a/media-libs/qt-gstreamer/Manifest
+++ b/media-libs/qt-gstreamer/Manifest
@@ -4,5 +4,5 @@ AUX qt-gstreamer-1.2.0-gstreamer15.patch 1494 BLAKE2B 1be10fb02d4a68406b17ccc758
 AUX qt-gstreamer-1.2.0-gstreamer16.patch 853 BLAKE2B c25bd3018d1c20b601e9490a665014795114931158ef5cecb9ed3c27e9704483ab5a16fa89058d2cf87b7a63b0ec4644379861991bdb659b840494af1be7091d SHA512 118d8e3c4253f458206615b9b70dff839e492c4628275dfa2dd49705d1ca85dee16a2878d7af84ee8709c88b89d78b41afab65ea72786bce07d446142bbd4128
 AUX qt-gstreamer-1.2.0-qt-5.11b3.patch 1834 BLAKE2B 9869694e31a546d1c31bc965c7e0f44de28f5566076cee8d1bb36f274f42757256d5c77e4bf7be23e12260d235eb72868252a5b920a293adc71520bd91c70e3c SHA512 235418641f23e5bbbceef53f561bdfd3b06b5d247c8d81cfb5b72388f494142458bb0171e5b146f8be9613d22a5c286eec6730414d7cbd35b62744dcfc87e667
 DIST qt-gstreamer-1.2.0.tar.xz 313632 BLAKE2B e41fd7073e223a06b0115025dcfcd637f4803f953b4fe175f5b05713bd5282c7fa12039d5a5b4c98eff5a181bbb7cd4140a0f1de32a8aadeef5d7217b339eadf SHA512 ae58c72765d590b84fa8709b45934ac464d7e00dba862783a2c4fe9d41afd09c6e5f95523cdf465fcfd2c6fa705335071b101912c42cd6c1fd15ae207b0864c7
-EBUILD qt-gstreamer-1.2.0-r4.ebuild 1135 BLAKE2B 158fb805fd8339a456f4b978d9e55ff86adc3ba496da0265543e63fc0bcf672a3118fe4466816c0ef4d4d23035f0c4cfcce4e2efd2b825b7419757b1a7a4252e SHA512 670dbd2d811fd2f6361fb7a89814d0c15fb46285d73fb7866ec5825905c7e2c62116dfe517afb0c504835558fa1ed09075fbc6d9d2b409d68435375732a81c9a
+EBUILD qt-gstreamer-1.2.0-r4.ebuild 1123 BLAKE2B 583ac048cb44e6b69fcbfe8d5f93e1473a4e168d6bbb9ef62bd9b4bb32ab50a0efbf08e7a7d2a9beb798ef2b2e8c81d53ad4477319520e66657f6658fdf431ec SHA512 f0353caf6f5e89ac278649391d1d28ff570c2dc751df0b6dafaa72197df3a0bf07cd284c3a130b096326053b51f6a83b383aa6041794fffb543f3c16b7c08e84
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild
index 4adb838f82d5..11c5d26ece1f 100644
--- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild
+++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="C++ bindings for GStreamer with a Qt-style API"
 HOMEPAGE="https://gstreamer.freedesktop.org/modules/qt-gstreamer.html"
@@ -50,5 +50,5 @@ src_configure() {
 		-DQTGSTREAMER_TESTS=$(usex test)
 		-DQT_VERSION=5
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-libs/qtav/Manifest b/media-libs/qtav/Manifest
index e05d3ea98fc4..5730839d13bf 100644
--- a/media-libs/qtav/Manifest
+++ b/media-libs/qtav/Manifest
@@ -1,7 +1,9 @@
 AUX qtav-1.12.0-ffmpeg4-1.patch 1225 BLAKE2B 392c7290067aef2132e7024e268af250221b4138942c882b3c6955616f66561a067520f389731b53cc689e96cbbd43d1294a25efcdb4bdd61275f5d067a92014 SHA512 a46d37f00f92860d0b4e9d7c0bb2ec2aabf9517b39876b0ade58081955005eb8be7b4c18d16abcdaf98441c6179924b0bd1974041ede04467e7b7f5953a4fe8b
 AUX qtav-1.12.0-ffmpeg4-2.patch 5467 BLAKE2B b638548b1b66aeef0d10f381a2484528c93be1b14e6eb1099c36b77d9667ae4c20dd69279ba7e182da95be1e76048edac3e221f7a545563b2fe860d58814e0a0 SHA512 cc1c57444cae170498e2eff713c68106e3b829db3334f40a63530466a7a8c92532b41ee47a58e10676b8515929e6d3b5b1865c7842e3eaa676d7f89d820137c8
 AUX qtav-1.12.0-multilib.patch 716 BLAKE2B 4cb5518cb14e91963e5371eafdf3f02452fb32add562a54e9d5eb17d3da603e6bdbcf2544ef60667390de0a44475d9b0457c8664f40b982162a569846b511adf SHA512 0b9db739ab6b4a23d653de56d993f44a6e8d108df3a635a2ebc822bdcc2ac1006643f31ceda8a94626a84aa8556b45ab5aa72aec20d990cf09e7396191bac3bb
+AUX qtav-1.12.0-qt5.14.patch 443 BLAKE2B 80f2e2da6ef67cdd300257aba988dcdcb0a6a5215b806c862cf0a7d2fba7652aae27f5aa568f0bfbb1067b768be4c4d1a1458dab3e468cb7f55a1938e1c63b81 SHA512 1976e312bad83d0493be3af8652d537cca8905a1559d6dd021e4a3c234ac3e65e5743db6f2ac28bfd69ef8c2e0021b7d2144c8a4efea72dcc718bfc53e6d2370
 DIST qtav-1.12.0-capi.h-b43aa93.xz 6120 BLAKE2B b2aca6c4ae70e227728bf908a7b5b9ad9fcb4ba52a254362eaaefaa9480c6a1c551bf47f02f8a44273952bf2816d2dbc7dc92142264892547d4fe602184b5fba SHA512 f5e458b157a5f343bc5d4133cfe45ffefb5c6cbb902b41ae6b9d9349e31ca7ac5a2746addc4fef89fb74856f5db7691cf174d82e88b51cc0b7a356c4fdab5aa7
 DIST qtav-1.12.0.tar.gz 998117 BLAKE2B 85f8a470333e683353c305b06cec10f65b553c26b05fad4824d8f05f6aeb1fc2622ab8b60ba42a35260402a950bf41458e90342be6c53cbdb8400642c2d09741 SHA512 f273d10a4fe9126cd7d7b1293c087527bf898513e8add7958d905b6039b0c9c3891ea751c40e4c13ba683febff73912322953b151a131726ef8b44db199e0f32
+EBUILD qtav-1.12.0-r1.ebuild 1468 BLAKE2B 916ed84118e1164614ffaff4e5f4c755227f295f6618ea0a9bb6a145b6c5a31fdf168bdbf75dc79fdfd5aa4146cac4426508740a060b347110f546a0c08c319e SHA512 37daa499a74172264e47a7f9eeaf8a27898472eea56270dccdb2f89d0e0682c74f3156812190d6583ab7d7d3c46b6720fe12e075e7708b081409da447c9bf5c7
 EBUILD qtav-1.12.0.ebuild 1452 BLAKE2B 9002c43be94e25f31e50f8ad5d081cc6cbc824c245d84fe4fe843f2d8a21484c904b64f07b0d236a9f5d9aba18989e233d555f70d000547bc6a7f570411e6d5f SHA512 4c176409df4009c3b73d2461f738e8c7808906671b4628edebe598662631766b26a776cabec06104e6b3359c2c302a2a0ff7670dec8e1c438a1cc7f82f397ac1
 MISC metadata.xml 389 BLAKE2B 6f4c10122acf9e5b30236f531b433ffc9cc46f9ddd6e6322bb5e17c70f60ba6ad0966eb93af1946a1df67e03cde1921ef24bad93fc115d5af84be848cbb04585 SHA512 145488dd0015ae2b014509610c33cf28e4e46e966bd37073d1199230297e66df520f3ac0afedd63c8eac20a7aa02ee492e5ad0658aa3b6fd660bd685b984161c
diff --git a/media-libs/qtav/files/qtav-1.12.0-qt5.14.patch b/media-libs/qtav/files/qtav-1.12.0-qt5.14.patch
new file mode 100644
index 000000000000..bf546c9e068d
--- /dev/null
+++ b/media-libs/qtav/files/qtav-1.12.0-qt5.14.patch
@@ -0,0 +1,12 @@
+diff -ub -purN -x '*~' a/qml/SGVideoNode.cpp b/qml/SGVideoNode.cpp
+--- a/qml/SGVideoNode.cpp	2017-06-21 03:47:15.000000000 +0200
++++ b/qml/SGVideoNode.cpp	2020-01-07 05:37:05.304897727 +0100
+@@ -25,6 +25,8 @@
+ #include "QtAV/VideoFrame.h"
+ #include <QtCore/QScopedPointer>
+ #include <QtGui/QOpenGLFunctions>
++#include <QtQuick/QSGMaterialType>
++#include <QtQuick/QSGMaterial>
+ #include <QtQuick/QSGMaterialShader>
+ 
+ // all in QSGRenderThread
diff --git a/media-libs/qtav/qtav-1.12.0-r1.ebuild b/media-libs/qtav/qtav-1.12.0-r1.ebuild
new file mode 100644
index 000000000000..cac2cb204608
--- /dev/null
+++ b/media-libs/qtav/qtav-1.12.0-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="QtAV"
+CAPI_HASH="b43aa93"
+inherit cmake
+
+DESCRIPTION="Multimedia playback framework based on Qt + FFmpeg"
+HOMEPAGE="https://www.qtav.org"
+SRC_URI="https://github.com/wang-bin/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+https://dev.gentoo.org/~johu/distfiles/${P}-capi.h-${CAPI_HASH}.xz"
+
+LICENSE="GPL-3+ LGPL-2.1+"
+SLOT="0/1"
+KEYWORDS="~amd64"
+IUSE="gui libav opengl portaudio pulseaudio vaapi"
+REQUIRED_USE="gui? ( opengl )"
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	gui? ( dev-qt/qtsql:5 )
+	libav? (
+		media-video/libav:=
+		x11-libs/libX11
+	)
+	!libav? ( media-video/ffmpeg:= )
+	opengl? ( dev-qt/qtopengl:5 )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-multilib.patch
+	"${FILESDIR}"/${P}-ffmpeg4-{1,2}.patch # bugs 660852, 670765
+	"${FILESDIR}"/${P}-qt5.14.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+	cp "${WORKDIR}/${P}-capi.h-${CAPI_HASH}" contrib/capi/capi.h \
+		|| die "Failed to add missing header"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=OFF
+		-DBUILD_EXAMPLES=OFF
+		-DBUILD_PLAYERS=$(usex gui)
+		-DBUILD_QT5OPENGL=$(usex opengl)
+		-DHAVE_PORTAUDIO=$(usex portaudio)
+		-DHAVE_PULSE=$(usex pulseaudio)
+		-DHAVE_VAAPI=$(usex vaapi)
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/rlottie/Manifest b/media-libs/rlottie/Manifest
index 94a57457553c..b2d46a48e842 100644
--- a/media-libs/rlottie/Manifest
+++ b/media-libs/rlottie/Manifest
@@ -1,4 +1,4 @@
 AUX rlottie-0.0.1_pre20190920-disable-werror.patch 420 BLAKE2B 3b3173c4514227de44f1f953678dcce871b3df07ccbb617d0f8a18763f66dadf584fdacd8eeb31a8391a5b8a8a1c00a05137790ad09662e093eb7888f8f0bb4d SHA512 893b5a658a63e8fe4f62e72e967d9e89eaef8184680c1b753fbc0c0893078bbf963967dd4dadff6a94150b7b15c0b6c7ee7cd54631b6874aa3cf3d21989746ed
 DIST rlottie-0.0.1_pre20191214.tar.gz 7898743 BLAKE2B 16f2456d60ebb2e81cca7017e9f8f32f137cc0b9e94f023b9b85c47354fdf07fed3ad8c07d9236560784866a3585f19d768e25655f5807ce89f40895141ca67f SHA512 f8876b1660c531a20e2b54523c93c2cae9a7f53b516707ae614369b6ecddd9281ed672bd27398829f02b55eb20e59dce7a5cb93104026df11690a18a3caadafc
-EBUILD rlottie-0.0.1_pre20191214.ebuild 899 BLAKE2B e79f232f004cd5ace053775398fe435f38d8eefcfeaed1a154c12116c669126c0cdfa6253e4733755db6518762e70e509231f3ab9b55949fadd3a2068f3b1097 SHA512 3c4fd4571ec1325722218a9755a9828ceff87649d86d94f86e2e38ca3837f5b8ca942750ccc7e933b82c8f2d46564a0e8f289b9280abc89ec291558e41e17335
+EBUILD rlottie-0.0.1_pre20191214.ebuild 897 BLAKE2B 4d43af1abd34ad29de0043b6955e62957b07ca656f57d85967c24178484686da905f1f42a203f1153964d2f972fdd2582412bd9716c5c38a7e1f4b9e90ebdbc1 SHA512 668b1688afde98ed617cefe7a635d5647c6321af96cc9673435e1a3db41babbc12cc90ee57814d0f7432c7907dad8322a650351d7aa7cf16c627284782a10159
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/media-libs/rlottie/rlottie-0.0.1_pre20191214.ebuild b/media-libs/rlottie/rlottie-0.0.1_pre20191214.ebuild
index df2d12389f47..a649acce0686 100644
--- a/media-libs/rlottie/rlottie-0.0.1_pre20191214.ebuild
+++ b/media-libs/rlottie/rlottie-0.0.1_pre20191214.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Samsung/rlottie/archive/${MY_COMMIT}.tar.gz -> ${P}.
 
 LICENSE="BSD FTL LGPL-2.1 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/media-libs/rtaudio/Manifest b/media-libs/rtaudio/Manifest
index a66af2f452d6..a3a744b26e4f 100644
--- a/media-libs/rtaudio/Manifest
+++ b/media-libs/rtaudio/Manifest
@@ -1,7 +1,10 @@
 AUX rtaudio-4.1.2-cflags.patch 405 BLAKE2B cb495081882e3df93c29e8b4cff0d71e70a7f0ef3937338345a3956f4dfd32f8bea28d316a5ad9dfdc8a984d62942b42805df1b6e0f3e9a4575033fdf35b327c SHA512 6958533ff2a33bd5e1daf18206ffa816d279b9f39993cbd3987148228099f08910df0e243dbdd1112bdcd6e8fe554dbea9dfc79ef9217695c76996c817310375
 AUX rtaudio-4.1.2-configure.patch 3054 BLAKE2B a1ea744db19ba3f59229d738cf4ec1aefd71d38c29ede28d13d403db69ee7c4dbb72c8c91fb3048b183086e7aea08224ed7b1be5711f57a95d609e19805e0b0e SHA512 d359742fa55d7d188a0032f512165cb73300fff3e85e03221a7b30340941fab5149645fe8683cad79f26c5ebdcfcef1a591cc16d0096fb0d5a699e6e7a819ed9
+AUX rtaudio-5.1.0-cflags.patch 416 BLAKE2B 6bc60ee1056a56e84a349b9677ab20a00f50fc22e053e0a2a29167db5f631f57749e96c73bbe585adaa346b878b43c5529f10f18b7153b79c10a4ac418d3c04e SHA512 7afad0bf9b562a9ed91567509aacc94d0cb3d95d8241e2bb14b6c826a499a296b99b7ee13317b65fb3bf4bc2526f357c1a34a290290b3fbd82810a43c820fdbf
 DIST rtaudio-4.1.2.tar.gz 682382 BLAKE2B ddfb0797db8ffef9a73b1af1864a7e9ec5028ff92473a82c8198fc0e8cce35e76ce820487b750988a91b7a519230659f446f2644288b0347c12c2f72b03fd45d SHA512 1e7f7f0f4dc451d023a7c8ab287fe63034cf6b4e18fe138bab253c307d6dd0cddb669b031f6c21325aaac0ce53002acd2a17dd1e47bd8ac2cb14e058cfce1a21
 DIST rtaudio-5.0.0.tar.gz 615284 BLAKE2B ffb21042896b868b5368708594e050773ea23638e5eca8ea4c63204ee8ad3e433e26f1cc7f359a113df3a962dcaceaff72846346357c9e134c30dde89813cf0a SHA512 390b6c454c42cf066fa94af397b784430dadc1650de320be377b7bbd09eda8705936bff3ee4327358815c3d5247a38fead81c8778cd85db30a12a6ace742c84a
+DIST rtaudio-5.1.0.tar.gz 655613 BLAKE2B 9fee4a42a2fc040d3f8c8a18c4ef361bfd9cab22df189f6aff23098e299424d8cb4b54075f33ee4f1ab1f851125194228f65814838b091144431bd891a4c7dfe SHA512 221636cfac2286e17f1f2312be2094b6c89087230b95b649661f9ce91356c77fdd8996fd031f0895aba0b50e8091491cdf393a6aeee6f8508ed320180d8fccf6
 EBUILD rtaudio-4.1.2.ebuild 1215 BLAKE2B 64056fa39e7213a87d46a333eccc254c5084285d69c263b423081c8f3882bf57ab4656fc9c822052dab469e4dccaf259f6ca96931792e8eb37c0ec5a51c86774 SHA512 4c238c75367fde305cab267d2aea1b6ac27d84213e9fa4e0e66af47150dca9fb4bac4714ee8dc26118d796eab473040ee118824046ddadbf96684bf55cd42710
 EBUILD rtaudio-5.0.0.ebuild 1181 BLAKE2B 22500844a4cdcc82419f02af2da7c4bfcfcdcfa63b29b92df796f6f3192cae6fda870d258818d3f1e4ed4eead0f6fa544fe8d2bf46244c3356fbb0e66bcf35e6 SHA512 90901e14e75cc8fa3cee6f3cd4652740a1853737b4cbaaf38b1e56af7c3c4653150ada18d84212dbba811af1373131c00a2b5e18510e1a67cb129b6ebf6ab044
+EBUILD rtaudio-5.1.0.ebuild 1157 BLAKE2B f985435b0540995c4b04442e9f79754ce55de84bb6f8700edaa1189f790222cbee0128695cc4f84f18c91df90a4be333a87421ab97618b3d35dc7b9930213df4 SHA512 40c98e4b8e037bfa5c8b207c0b459dda4b2311e21369e23e9e9cee18fd5569cc826f5ca5c409152c38721f82699647acd8d579b7af82a0e3c438f8329aad5067
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/rtaudio/files/rtaudio-5.1.0-cflags.patch b/media-libs/rtaudio/files/rtaudio-5.1.0-cflags.patch
new file mode 100644
index 000000000000..0304c57b4dbc
--- /dev/null
+++ b/media-libs/rtaudio/files/rtaudio-5.1.0-cflags.patch
@@ -0,0 +1,17 @@
+diff --git a/configure.ac b/configure.ac
+index 43c054a..27a809a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -101,12 +101,10 @@ AS_CASE([${enable_debug}],
+   [ yes ], [
+     AC_MSG_RESULT([yes])
+     AC_DEFINE([__RTAUDIO_DEBUG__])
+-    debugflags="${debugflags} -g -O0"
+     object_path=Debug
+   ],
+   [ no ], [
+     AC_MSG_RESULT([no!])
+-    debugflags="${debugflags} -O3"
+   ], [
+     AC_MSG_RESULT([no])
+   ])
diff --git a/media-libs/rtaudio/rtaudio-5.1.0.ebuild b/media-libs/rtaudio/rtaudio-5.1.0.ebuild
new file mode 100644
index 000000000000..b58111fc01a0
--- /dev/null
+++ b/media-libs/rtaudio/rtaudio-5.1.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A set of cross-platform C++ classes for realtime audio I/O"
+HOMEPAGE="https://www.music.mcgill.ca/~gary/rtaudio/"
+SRC_URI="https://www.music.mcgill.ca/~gary/${PN}/release/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/6"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+alsa doc jack pulseaudio static-libs"
+REQUIRED_USE="|| ( alsa jack pulseaudio )"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	jack? (
+		media-libs/alsa-lib
+		virtual/jack
+	)
+	pulseaudio? ( media-sound/pulseaudio )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cflags.patch
+)
+
+src_prepare() {
+	default
+
+	# don't rebuild docs
+	export ac_cv_prog_DOXYGEN=
+
+	eautoreconf
+}
+
+src_configure() {
+	# OSS support requires OSSv4
+	local myconf=(
+		$(use_enable static-libs static)
+		$(use_with jack)
+		$(use_with alsa)
+		$(use_with pulseaudio pulse)
+		--without-oss
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc README.md doc/release.txt
+	if use doc; then
+		dodoc -r doc/html
+		dodoc -r doc/images
+	fi
+
+	find "${D}" -name "*.la" -delete
+}
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index b739d91798ae..8ee38b32466a 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -3,6 +3,6 @@ AUX shaderc-2019.0-fix-build-against-new-glslang.patch 2158 BLAKE2B df0c6cc0067c
 AUX shaderc-2019.0-fix-glslang-link-order.patch 1030 BLAKE2B 281fc55196762ffbc08daa63a401e13330719c50f9e0f5f30199f9fc96c3c00148eb3a6efb0f4e083eea0a53a19a3f65e0f3e52d995356279a18cf8596029bb3 SHA512 c4fbc5db2a40adc45cdb470c1fc09f65bee38b1f46da84a47c60db3ba081b536539f40567c28111fb598fe6a6ba47602cff3b2835247460d08bab5d5e3ea28c4
 DIST shaderc-2018.0.tar.gz 206013 BLAKE2B b45fb6e959f621566817f8e31b1947e479b6ea392eb64f334dca9ad24cc4e8b736dd236e634de3f96342f48d8138722a2b769efb9db65025def5ed59bf5b911b SHA512 7a420fde73c9f2aae3f13558d538a1f4ae43bba19e2b4d2da8fbbd017e9e4f328ece5f330f1bbcb9fe84c91b7eb84b9158dc2e3d144c82939090a0fa6f5b4ef0
 DIST shaderc-2019.0.tar.gz 232620 BLAKE2B 53fd0967fe22e5a89783fccb485dc07c31a18eb328c6cf7244349714c6774d1877c1fbae0b8ffcf47d189f1e0c5f2d501f027ff3aa05bdd59950d49a4084e9b5 SHA512 c76887ad0a96145211b6550b0dfe63091df9e1463f9a3140aba2d1982c33e98ad14fb4bcf9ce2281433fc77626fc892c268d0636b9f348a159dd06e3f41b461a
-EBUILD shaderc-2018.0.ebuild 1982 BLAKE2B 65f9c467b19222fc0d74454ae5564fe9f807cf4ec03f204b1dea7cef0c3898146b690771787953be671b9adcd4d77624a56ab209cd91055edf89b54914af202f SHA512 89ec6b3a50cff8021cf51eea7c11ac6c106f6e6a9bf0fae44ef881749ece590660947a86bd358089c87ea3c623f4f5268602241f16ccd9885fef10e3caf7af20
-EBUILD shaderc-2019.0-r1.ebuild 2091 BLAKE2B 02f511ed0dbc836471ce55ffa74b72bd299e3f26a8322168f4c385de47f9329be32ddf2f14c4dda11411c43e70ac4e8be69a85e86de602d0c8c1fbc03b26244b SHA512 51353ec7681d2e4a1c85a6cdb2adc428b885ad49faf9ccdb85b0ec478218cbb3e203669235567baa34f97550e4c1bd2d9d00bd9a375099866c2f5be4b2a21fbf
+EBUILD shaderc-2018.0.ebuild 1978 BLAKE2B f85b80ca81fa6ef8206a75525063c2e574498290b607e40f4bf98ac9c6dd09f6ca770ec56d83ac86f43c02ad9ff4411569b36f6c2ee2fab4d52a29f2885dbe0f SHA512 994a1b17f26fca6767f4ce3fe1779895955a8e8a4d48c51c78eec352314c238fa98a5145746e31e787618831551caf7d7145f40f6bb941493207c0fdcc87fc5a
+EBUILD shaderc-2019.0-r1.ebuild 2085 BLAKE2B 92c60e5103ec3bb8eb3a40be7b8de11b7ae1045dec1f1d10f762d503ddb4913852538e43746dc9e9376f76f1795e4d93d3508779a4462b39df1604212af67d82 SHA512 8387bbfc8e76865bc19de3c926f33f5005c50e24bfd9e09bee0801970fe63d349e37c4c4821128a7730037424c470185d21bcd16ab31b446202f4e6b8f1f7469
 MISC metadata.xml 335 BLAKE2B 295aaacdd867834ddc93fd5f52a7d5c50b14a63936e4f97f5cba62d7ddc47fda07dc620203f6e27adf01d8df13b5d9c2b0f5621a0d21bb53f8b846b78023ddfa SHA512 f9b82e65002f90c0e253b712ac3a11c483a3d7bb1750d46f3d8bf4de577927421e6e1cb3c3403afb89a8168e02e9b3736cc21adf6994827a17a82b237a8973a5
diff --git a/media-libs/shaderc/shaderc-2018.0.ebuild b/media-libs/shaderc/shaderc-2018.0.ebuild
index 1f712cb201dd..93d43a06d61e 100644
--- a/media-libs/shaderc/shaderc-2018.0.ebuild
+++ b/media-libs/shaderc/shaderc-2018.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit cmake-multilib python-any-r1
 
diff --git a/media-libs/shaderc/shaderc-2019.0-r1.ebuild b/media-libs/shaderc/shaderc-2019.0-r1.ebuild
index a1cb035a3150..2c48717338f0 100644
--- a/media-libs/shaderc/shaderc-2019.0-r1.ebuild
+++ b/media-libs/shaderc/shaderc-2019.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit cmake-multilib python-any-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest
index 09945a6676b4..256934103cb4 100644
--- a/media-libs/simage/Manifest
+++ b/media-libs/simage/Manifest
@@ -1,10 +1,11 @@
 AUX simage-1.7.0-libpng15.patch 572 BLAKE2B 7f4eacdd5aac3e6634fd26824d0dfb7ec779fcf6be86e642f2870c62b1f0bd86b1ef767e19034e05fd62cba9904ef45e13a85be7657e00133febb67b0469c337 SHA512 0a867187b0dbc644182784e56dfd26b51f48c9355b01228fe3386fab05cee084e0066d4b18eb3f63110a25c0d2abf8f8b214d9b94e2e7dc7438e90308653e4e8
 AUX simage-1.7.0-pkgconfig-partial.patch 467 BLAKE2B a2957c1d5fc6939df7ecb1bb15743253294142a87f98d4043368f189dc4f5ee302de16e84572a69e3ea5755124326fb075b2e45d3574a1759c899d9e96eaf828 SHA512 791db9c02fc0dc7526ed43b340ab6f92baea91a5bf9005099f6adf1550a7ab73ef36790d2e761f0b50b88098e9124f3035ff21149cca00d819c2262d8e180618
 AUX simage-1.7.1-cmake-automagic-deps.patch 2730 BLAKE2B f4948226c05c123a92d7221d6e670e1d9bcbea326c34fcb7615e69493fab14707be47965ec68a0fa2d1ec71bfc08d74c772730acf78dd8da1062d833205eceb0 SHA512 81ad61d683915b803909729a69bf5496254920ab0d40ce1186fae838eadda831ef9d8cc1138624145f2e1e88dbfd75852f3c97da0316bc6a85cd23d55d5f1a5d
+AUX simage-1.7.1-disable-examples.patch 1803 BLAKE2B 93c4ef68fa3e2e1db406c7fd3fe67096e9a70692e1a8c35c0391e38be5335072aa87ae5fb41cc1a3b3b0fac06df9c525566d1b7efab3db1f4cde2ca7b3530d74 SHA512 5046fec14950e1cec25ac0576197208dad05cc862c8c59b405db38586c91fd5dbd1b2793551901f34312eabb4cd6dfb7a84f8620372a7d6aefafd6490f6a7847
 AUX simage-1.7.1-disable-gif-quantize-buffer.patch 1054 BLAKE2B 15c0cf6c1ca78798e3c93034e7e4d17e1bf5ba5f9921f307e52b87f9d3e02babfac83e40eed401f98db8a225f404fa248957f41b03e360541e46bc62c893d099 SHA512 4a25f0f54a609c613e4f7baaf87a694e246b0c283cf85195e6d272826deb95dda9106125925188e785a2c64c2ed9633465ceb76b2b816e463cfa063ec16dffdc
-AUX simage-1.7.1-fix-examples-linking.patch 963 BLAKE2B e1f39f1bcf1d32d872a73304331fc0dcf88e7067b9086d48de6e0d239b805291be5b328b09c33a9d9f9d6b6278ab1d36cde261665789fd21b1742fef9dadeb43 SHA512 c586e6c760aa42b79f164af97d7a198ffeda6156fee94af6cd50eb61a76fc6c8d0c70ea4752486658be6a280cfab9d53327f1f653cd9dd8beb222e5ef9ab4843
+AUX simage-1.7.1-tests-conditional.patch 1757 BLAKE2B 59bb06980457f85c68670d02efdb3ddf149576d9f8728a33e7a0e97e736454b3858ba3eb123e6239f89006c836cb640b49238ffa733fe97ea65a5ca871712005 SHA512 3063e47ac6a7e90ce27f93d8046d897d203756b52008ed867061260378858b2b0c6b0cf6cb87a846f2f98cf2e595f2e4b4a468a32e34e9676d16848c387cd46e
 DIST simage-1.7.0.tar.gz 752602 BLAKE2B feca31f8d41ae67271e43c9c664243d872985068ffc8496d43c9b59a47ae5c3067956acced3ff9abbdc5a360aec662e3972a93d8523a704a72ac9d12dd4cfaa0 SHA512 944ec009dd7041692073ddd9795fdd633fe3bc9101f1c1234e8be3746487a9431aecf52abde01563e719153fbe1ca7d29f9b64042e4a64ea08d6cb14666dd89f
 DIST simage-1.7.1-src.zip 4145907 BLAKE2B 99f5f5f46530c2600d47ab0bb080d69281447ee96a2bb9b63ebe5a5c56e235f34ca8bd97b0d6adedf061fe221a61d144d4ccce00123941a9c74d72b1f190030d SHA512 b3c81fa363cd570b3512cd2984f154b83876353ec389dc35afcac4e4ddf8d301eef5b0f8df93c38b9caa6afd81fbe53d3943ad05e041b77734f03c26d2e12867
 EBUILD simage-1.7.0-r1.ebuild 1774 BLAKE2B 672761903a9a91db1c92d6cd0248902b1c9c5612cc95bb8f7b543991672b9dfc761c29ea89f432f02c119170c8c7539830d00fa811dc06675ba19dd2d9cdb0d4 SHA512 609cdd06c38fab358d4f6aaa469dec35e14789a7ec2ab459f80f3065ca9341a9801d7c6e48490fd436d667f71dfda51396474f25fe4481dbadfca27928c3f394
-EBUILD simage-1.7.1-r1.ebuild 1808 BLAKE2B 243ac483497cb66689c41d792992ec0133042243118eacb37fee19791a1aa4f2b4359bf5fd8d7dc28c5107abc6c1617ed49d02f52189aac84fb07712404073fe SHA512 91bb1af84eeaf86fc14b583dad3cd236b0d0dbe5b1bbafddb916b43e2fe5d633111c5c7f8c4c1ded5ea485ed04eaa5b56013dbf00334d3148dfde4bb0a436c7b
+EBUILD simage-1.7.1-r1.ebuild 2175 BLAKE2B 78d7d95b1121df159983b79dfdd93182424c40c5a85010b408f789ca522abf9920a135245a4089ab360df3f7df33f8ae8a3a2c0283de2c69598bcb3fe5bea458 SHA512 b5ac712222fff11ce87dd3b2fdbe340ef8bfa49001f348a8c26b87f64c3e3d216af92107032aebaceff8de9980150ba7a64b331f544b8edf11ab64b2e64d77d9
 MISC metadata.xml 298 BLAKE2B 312f7a48552438ce1231a58486f19aca02bbb281b72733645ffad42a3f82df778145bfc66a61c1216e47bd68e54668725fe08274482be7fb3997c99bf3089fdc SHA512 b72572413e5e40d55658049b4624de687dd1011553fc384deb0c837830b6f82d060b6356ad25e803f27d3be697b07a8c3fbc45932d20d89e4d9918ed6fecd84a
diff --git a/media-libs/simage/files/simage-1.7.1-disable-examples.patch b/media-libs/simage/files/simage-1.7.1-disable-examples.patch
new file mode 100644
index 000000000000..9e43e073ccd1
--- /dev/null
+++ b/media-libs/simage/files/simage-1.7.1-disable-examples.patch
@@ -0,0 +1,44 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5536922..07df95a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -482,23 +482,23 @@ endif()
+ # Build examples
+ # ############################################################################
+ 
+-set(SIMAGE_EXAMPLE_SOURCE
+-  ${CMAKE_CURRENT_SOURCE_DIR}/examples/audio2raw.c
+-  ${CMAKE_CURRENT_SOURCE_DIR}/examples/img2avi.c
++#set(SIMAGE_EXAMPLE_SOURCE
++#  ${CMAKE_CURRENT_SOURCE_DIR}/examples/audio2raw.c
++#  ${CMAKE_CURRENT_SOURCE_DIR}/examples/img2avi.c
+ #  ${CMAKE_CURRENT_SOURCE_DIR}/examples/mpeg2enc.cpp # requires Coin to build
+-  ${CMAKE_CURRENT_SOURCE_DIR}/examples/simage-convert.c
+-  ${CMAKE_CURRENT_SOURCE_DIR}/examples/simage-read-line-test.c
+-)
+-
+-foreach(_source ${SIMAGE_EXAMPLE_SOURCE})
+-  get_filename_component(_example ${_source} NAME_WE)
+-  add_executable(${_example} ${_source})
+-  target_compile_definitions(${_example} PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES)
+-  target_link_libraries(${_example} simage)
+-  if(UNIX)
+-    target_link_libraries(${_example} m)
+-  endif()
+-endforeach()
++#  ${CMAKE_CURRENT_SOURCE_DIR}/examples/simage-convert.c
++#  ${CMAKE_CURRENT_SOURCE_DIR}/examples/simage-read-line-test.c
++#)
++
++#foreach(_source ${SIMAGE_EXAMPLE_SOURCE})
++#  get_filename_component(_example ${_source} NAME_WE)
++#  add_executable(${_example} ${_source})
++#  target_compile_definitions(${_example} PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES)
++#  target_link_libraries(${_example} simage)
++#  if(UNIX)
++#    target_link_libraries(${_example} m)
++#  endif()
++#endforeach()
+ 
+ # ############################################################################
+ # Build tests
diff --git a/media-libs/simage/files/simage-1.7.1-fix-examples-linking.patch b/media-libs/simage/files/simage-1.7.1-fix-examples-linking.patch
deleted file mode 100644
index 756ddea5c73f..000000000000
--- a/media-libs/simage/files/simage-1.7.1-fix-examples-linking.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8225dc4..de89fd0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -494,7 +494,7 @@ foreach(_source ${SIMAGE_EXAMPLE_SOURCE})
-   get_filename_component(_example ${_source} NAME_WE)
-   add_executable(${_example} ${_source})
-   target_compile_definitions(${_example} PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES)
--  target_link_libraries(${_example} simage)
-+  target_link_libraries(${_example} simage sndfile)
-   if(UNIX)
-     target_link_libraries(${_example} m)
-   endif()
-@@ -507,7 +507,7 @@ endforeach()
- enable_testing()
- 
- add_executable(loaders tests/loaders.c)
--target_link_libraries(loaders simage)
-+target_link_libraries(loaders simage sndfile)
- target_compile_definitions(loaders PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES)
- if(UNIX)
-   target_link_libraries(loaders m)
diff --git a/media-libs/simage/files/simage-1.7.1-tests-conditional.patch b/media-libs/simage/files/simage-1.7.1-tests-conditional.patch
new file mode 100644
index 000000000000..ced49159ba69
--- /dev/null
+++ b/media-libs/simage/files/simage-1.7.1-tests-conditional.patch
@@ -0,0 +1,52 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5536922..b6de403 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -504,25 +504,28 @@ endforeach()
+ # Build tests
+ # ############################################################################
+ 
+-enable_testing()
+-
+-add_executable(loaders tests/loaders.c)
+-target_link_libraries(loaders simage)
+-target_compile_definitions(loaders PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES)
+-if(UNIX)
+-  target_link_libraries(loaders m)
+-endif()
+-
+-add_test(
+-  loaders
+-  ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/loaders
+-  ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.gif
+-  ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.jpg
+-  ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.png
+-  ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.rgb
+-  ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.tga
+-  ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.tif
+-)
++if(TESTS)
++  enable_testing()
++
++  add_executable(loaders tests/loaders.c)
++  target_link_libraries(loaders simage)
++  target_compile_definitions(loaders PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES)
++  if(UNIX)
++    target_link_libraries(loaders m)
++    target_link_libraries(loaders sndfile)
++  endif()
++
++  add_test(
++    loaders
++    ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/loaders
++    ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.gif
++    ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.jpg
++    ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.png
++    ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.rgb
++    ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.tga
++    ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.tif
++  )
++endif()
+ 
+ # Add a target to generate API documentation with Doxygen
+ if(SIMAGE_BUILD_DOCUMENTATION)
diff --git a/media-libs/simage/simage-1.7.1-r1.ebuild b/media-libs/simage/simage-1.7.1-r1.ebuild
index e6405b2179ab..34859fa678e4 100644
--- a/media-libs/simage/simage-1.7.1-r1.ebuild
+++ b/media-libs/simage/simage-1.7.1-r1.ebuild
@@ -12,8 +12,12 @@ SRC_URI="https://bitbucket.org/Coin3D/simage/downloads/${P}-src.zip"
 LICENSE="public-domain mpeg2enc"
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
-IUSE="debug gif jpeg png qt5 sndfile tiff vorbis"
+IUSE="debug gif jpeg png qt5 sndfile test tiff vorbis"
+RESTRICT="!test? ( test )"
 
+BDEPEND="
+	app-arch/unzip
+"
 RDEPEND="
 	gif? ( media-libs/giflib )
 	jpeg? ( virtual/jpeg:0= )
@@ -31,14 +35,18 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	app-arch/unzip
+	test? ( media-libs/libsndfile )
 "
 
 S="${WORKDIR}/${PN}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-cmake-automagic-deps.patch"
-	"${FILESDIR}/${P}-fix-examples-linking.patch"
+	# examples need to link against libsndfile unconditionally so either we could
+	# make the dep unconditional or not build the examples. i chose the latter way.
+	# btw, examples are not installed anyway, they are just compiled.
+	"${FILESDIR}/${P}-disable-examples.patch"
+	"${FILESDIR}/${P}-tests-conditional.patch"
 	"${FILESDIR}/${P}-disable-gif-quantize-buffer.patch"
 )
 
@@ -68,6 +76,7 @@ src_configure() {
 		-DSIMAGE_RGB_SUPPORT=ON
 		-DSIMAGE_TGA_SUPPORT=ON
 		-DSIMAGE_XWD_SUPPORT=ON
+		-DTESTS=$(usex test)
 	)
 
 	cmake-utils_src_configure
diff --git a/media-libs/skstream/Manifest b/media-libs/skstream/Manifest
deleted file mode 100644
index 2411f499a22c..000000000000
--- a/media-libs/skstream/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX skstream-0.3.9-test.patch 565 BLAKE2B 776d0b9d2dd2efbacc6f6a838aa90abe787bd4a09e2913dbd4f7238dd23e4dfe9b1b4dffea2e4e6748f85294f151d19d19d73f8890507c044f3fc237a904f0db SHA512 88f66feefeaaecc19190ee2eded9fd935c3a81aab89bd339fdc5c10f51e949c5f560912c248f75f9291ffddb94c62d0825a25c3158bab6ea64c5ccd4f5353562
-DIST skstream-0.3.9.tar.bz2 326088 BLAKE2B 8eac32ad80c2ca6f3026a10facbc34f7d2a1f113c5b8ee1a550118c13b1819f79b4846082099685d37ab43bf57f6e9da0262d19d3aa1c1bdbace2892f07e0794 SHA512 88cf67a76c9983eaa50d2350a6895a1782e77d9e9794084999770989436a3306d1f4d4d4a6ddfa199235f1dc0518d65988cd1956fdd2ce5306fd6b2246db91d9
-EBUILD skstream-0.3.9.ebuild 562 BLAKE2B 312991fbe4f1615bb44ed5659efa937d1775b082c34ab0e78be075f5935bcdb168f58bf477a02f0e6cbf3afd0237ba49113acfd304697191f6770c7e887ca2b9 SHA512 017d9ebb41a32a311c75bcbea58e89f4971bf8d1dc1aa5003093fc13fbb3ad40a3e1dd719c162cfb0822ef2c33eda5531954d0e093922efcd438456b3feee8db
-MISC metadata.xml 297 BLAKE2B 5b10a51b749a46d330855e89fe7fe2f7a06a4ab9d2d497bc09add82ecbd0d84d3088bc60f7f4d5022191aac8a31f258a0b8605d89a78908118fd89ded0b75497 SHA512 3bc0a3cb0bcf72257ec7d027cc751e538b2f31be039b4e9b86ffaf127e358f37eaf4e9caff7d933d7a86a7ab2d4ff24b6034f776a89854cd516e4d0d45d380c6
diff --git a/media-libs/skstream/files/skstream-0.3.9-test.patch b/media-libs/skstream/files/skstream-0.3.9-test.patch
deleted file mode 100644
index b89aa3c0644e..000000000000
--- a/media-libs/skstream/files/skstream-0.3.9-test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/test/childskstreamtest.h
-+++ b/test/childskstreamtest.h
-@@ -109,9 +109,6 @@
-     //some macros for building the suite() method
-     CPPUNIT_TEST_SUITE(tcpskstreamtest);
-     CPPUNIT_TEST(testConstructor_1);
--    CPPUNIT_TEST(testConstructor_2);
--    CPPUNIT_TEST(testOpen);
--    CPPUNIT_TEST(testOpenNonblock);
-     CPPUNIT_TEST_SUITE_END();
- 
-     private: 
-@@ -245,7 +242,6 @@
- {
-     //some macros for building the suite() method
-     CPPUNIT_TEST_SUITE(rawskstreamtest);
--    CPPUNIT_TEST(testConstructor_1);
-     CPPUNIT_TEST_SUITE_END();
- 
-     public:
diff --git a/media-libs/skstream/metadata.xml b/media-libs/skstream/metadata.xml
deleted file mode 100644
index 1da2723d41e6..000000000000
--- a/media-libs/skstream/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>tupone@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">worldforge</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-libs/skstream/skstream-0.3.9.ebuild b/media-libs/skstream/skstream-0.3.9.ebuild
deleted file mode 100644
index 37ecfd729421..000000000000
--- a/media-libs/skstream/skstream-0.3.9.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="FreeSockets - Portable C++ classes for IP (sockets) applications"
-HOMEPAGE="https://www.worldforge.org/"
-SRC_URI="mirror://sourceforge/worldforge/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-util/cppunit )"
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${P}-test.patch )
-
-src_configure() {
-	# bug 651840
-	append-cxxflags -std=c++11
-
-	default
-}
diff --git a/media-libs/sratom/Manifest b/media-libs/sratom/Manifest
index f0b04465bb2b..8341c4d517fe 100644
--- a/media-libs/sratom/Manifest
+++ b/media-libs/sratom/Manifest
@@ -1,3 +1,5 @@
 DIST sratom-0.6.0.tar.bz2 149340 BLAKE2B c661e0c4fba0cdf6cfb8a7dba90ff92135422557a0721bc394c7500853aeb9370554df8a02b7faea2fa222b96db36b20b265cc1fa50e6e06655946dbe992f815 SHA512 899bb01896e2b65b69482041c7e06edc9e45e9a3466392c82a58f16dfc71462a6c3e3e16a5aa50a6347c8366ea72898468910a59a084762f75eb8c7031ceacf8
-EBUILD sratom-0.6.0-r1.ebuild 1238 BLAKE2B f8e1e6bee9fc63df46598097b8beca466489cbebf50a424c2c8f42080150cfc2d2adda0315abf75ae8f82421cf865dbfdef2775fd2ae3cca9615e97281b0cc39 SHA512 573283d49db0f40d337f32b603d2c5d6889e796e58ad904be5392a0d69068077a23c0e21b3d0b5039d8a8acbde14ed30060dc2d97053648c1c2301ed83ae1146
+DIST sratom-0.6.4.tar.bz2 339707 BLAKE2B acf29c7dd3c4e23bf20ef2811706abdd3543d0fc380183f7f419932c3178ff5e2f6d95c57bad2ef991dbc1e32c6e8a3645238c7b42dfd204942dbc4c05270652 SHA512 6462d8d33ed7ddaa2aea267fab14c9a15bfc077a4f8d26eb493be4c48c95d8dcec614f540bd82fe22aecca641771326a44d175c3991cd473ae371062c78aaac3
+EBUILD sratom-0.6.0-r1.ebuild 1234 BLAKE2B 4441e222a5f333643269ce435728b8aafb2809adf2ce07d652b2a543356c3b47bc9e040a0663f002e18011f692e707ee29ed973c9dfb4581c5cf5ef3ca0def30 SHA512 6d60470d6c308e082e0a1838594178d10f885090169576fa4cedf299cfeac35c176a6c023e260cc1301befab63b93c4ef1152751b5c5b7f8833422da01c2c790
+EBUILD sratom-0.6.4.ebuild 1237 BLAKE2B e42f100ae60a5f5eaab4a4ee34fce2552edad94a6fa0fc9da9dce260bfb13d21dfba1efef430953567c2e441bfd589e917cf75ba530a5f78c6c21a5f3373b755 SHA512 061ad0e7bcd266cf78585ccd69973423f7c207e26566d164fe3ba9ddc3f1f4ad30a49bcae6ec88223e7edba7ddb546197be950f0b8a6770966ab865734dfc0f6
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/sratom/sratom-0.6.0-r1.ebuild b/media-libs/sratom/sratom-0.6.0-r1.ebuild
index 2d1ccb39a811..bf5311f1bfaf 100644
--- a/media-libs/sratom/sratom-0.6.0-r1.ebuild
+++ b/media-libs/sratom/sratom-0.6.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE='threads(+)'
 inherit python-any-r1 waf-utils multilib-build multilib-minimal
 
diff --git a/media-libs/sratom/sratom-0.6.4.ebuild b/media-libs/sratom/sratom-0.6.4.ebuild
new file mode 100644
index 000000000000..53a13bb862ac
--- /dev/null
+++ b/media-libs/sratom/sratom-0.6.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE='threads(+)'
+inherit python-any-r1 waf-utils multilib-build multilib-minimal
+
+DESCRIPTION="Library for serialising LV2 atoms to/from RDF, particularly the Turtle syntax"
+HOMEPAGE="http://drobilla.net/software/sratom/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=media-libs/lv2-1.16.0
+	>=dev-libs/serd-0.30.0
+	>=dev-libs/sord-0.14.0"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig"
+
+DOCS=( "NEWS" "README.md" )
+
+src_prepare() {
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--docdir=/usr/share/doc/${PF} \
+		$(multilib_native_usex doc --docs "") \
+		$(usex test --test "") \
+		$(usex static-libs --static "")
+}
+
+multilib_src_test() {
+	./waf test || die
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+	default
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+	default
+}
diff --git a/media-libs/suil/Manifest b/media-libs/suil/Manifest
index 7c86f0f71247..78db636e209a 100644
--- a/media-libs/suil/Manifest
+++ b/media-libs/suil/Manifest
@@ -1,5 +1,5 @@
 DIST suil-0.10.0.tar.bz2 159059 BLAKE2B 1293d817df7e60cd89946c3f5b0e6689b0942284cc2f25a93bce830e9f43db1e93067d1a9e85cf201ab8bf580cafefe06c46cf100a855a590a58022f3036d3db SHA512 721b73d987c1712e82493386e5d71957002c8a713595fce4372f1a5eb306c64a559db1ca794cec96295f72e22a9c0e9193f9a68b7f5846f2db45ce16b253fbea
 DIST suil-0.10.6.tar.bz2 347615 BLAKE2B 667379c6290c4c1e03168911fa58b991e95bbc7c7477606e42ba39d33645f4580ea09051d294f24cdbb3b2df9ed1d415b73eda3ec1f593fed2e7f2d9ff2a85c3 SHA512 b23ffe0c0ae25467b2cd60117a2efa8c13132c8e5612619e4c9ad2cc228b835f1c7fd384db62b74d4a327e3708f189b6a91f972756fcafe501308adb732c3b36
-EBUILD suil-0.10.0.ebuild 989 BLAKE2B 3fa97fb8f0e10db7688d06cf8fc8159ca0a22c6ed340e3dc0c8c2d9c5043754b6b021be78b436200376c67b3fe64bbfe503b3267164c792adf91692d1ef2ba8f SHA512 a37178f3fbda6b2fdbbdb798bd8cfc1435b0a8e88259f499e5adde28b83ad39907c2c246cb1559cb395616827403de9513a02c48a1e3c506a2d01e60aecf390b
-EBUILD suil-0.10.6.ebuild 1027 BLAKE2B d2eb1ff6f98ae004bfd7162cd8819f487fc8eee47d63927cb6cc4ce41bc56a20ba00a537dc0c1096792ef7c993e3df50e1c8e6ad77fa9a3fb9313b038b0b602e SHA512 f88d82dd60decf19e1efa8928cbf748ec10db86fc7064e7dc65ec380d61992b06c1811677f5e50c1eb125870041a7c9d1685735ad3d36b34cf22e0bddf6ac82a
+EBUILD suil-0.10.0.ebuild 984 BLAKE2B b35418ccb188e9a0b331fa85d06bee6804e3f0354af14bd68e6508b70ca4686d17ef93b223e9fb9a68cded0dfd0930ed8980cd1b2387e2138979c0650a8d15b3 SHA512 3e28070a9692a32e8d0d8560f1202702207655838f3c9e26cecbabf58232eb945de1226298b11d00c72df7b17b7972c4a36562193aae9d18a1f04b431136b422
+EBUILD suil-0.10.6.ebuild 1025 BLAKE2B 6ec6e298880c7267553a1577747f79effbfe2055efbfbdf948ff8e2610447be9edf0e70d109fbcd915b76498dd28028f2fa09363c8c8c155ad39e91f993393df SHA512 f3efd4286e39e07678481f14001de11141ba8f8f397e9b791f158c212318f706ffd755eb2f5f2b99bd3d7aefc28315dc0b577e5ff6c54aa4ceafbfe7b7d55a0e
 MISC metadata.xml 491 BLAKE2B 8d423d4bd56c2fc586cac7dfeef9ba125799795a02f8f7303d1e657e83181ad68eae5e20cc75806fefbe1296f0eabc632fee3824b9b36e7ccef0a22e04fe4081 SHA512 c56784f3b84159aaa284b5b04ce4d2110d78acb536ea9dd60d5043199a061171dfd0272f4d810e7ac68025fb906cc021b36f099ea966bc87e0de8f57464a88c3
diff --git a/media-libs/suil/suil-0.10.0.ebuild b/media-libs/suil/suil-0.10.0.ebuild
index 01f73203c66d..f9f344f49c6a 100644
--- a/media-libs/suil/suil-0.10.0.ebuild
+++ b/media-libs/suil/suil-0.10.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit flag-o-matic python-any-r1 waf-utils
@@ -14,7 +14,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc gtk qt5"
 
 RDEPEND=">=media-libs/lv2-1.12.0
diff --git a/media-libs/suil/suil-0.10.6.ebuild b/media-libs/suil/suil-0.10.6.ebuild
index ff3178b1579b..da5bc4e5b3e9 100644
--- a/media-libs/suil/suil-0.10.6.ebuild
+++ b/media-libs/suil/suil-0.10.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit flag-o-matic python-any-r1 waf-utils
diff --git a/media-libs/taglib-extras/Manifest b/media-libs/taglib-extras/Manifest
index 6896a20338f8..eefe7cd87932 100644
--- a/media-libs/taglib-extras/Manifest
+++ b/media-libs/taglib-extras/Manifest
@@ -1,4 +1,4 @@
 AUX taglib-extras-1.0.1-taglib110.patch 1221 BLAKE2B 9777a4031c09284fa959ced28e356af87de9c7799dea5f01c7674ef7cff0bd86320db694d27d5327692414fbc85ffb8bc8f898a4d1a1d900f6411e02ac25f2de SHA512 1099cd225ed9b248b71d10d4526272e2cc4df8a3f86f0bf464e21b10ff1166576f7e06763fe19a1b1caedc3711f5832dd0270d27d25d793437dba8c9b6fabbbf
 DIST taglib-extras-1.0.1.tar.gz 31363 BLAKE2B 19150c26d06fad281f172c7f360155ced709d461b26431adf3a02d34cf029237855b21980b0bd2de026420a3f3a45bb0bc9fde3a5f6091f1219eff51a55f9b56 SHA512 282f9c9cde81a250d8d6f4416658167665044d53cd10d8ecfa490df60a1fb95e1309feb17f69963f8dbfccc83ebb76af7275c25339931117435f34a56c4f1a65
-EBUILD taglib-extras-1.0.1-r1.ebuild 498 BLAKE2B 0a7bfbc30feeea55b8db13fcdbaf14d922ef079b0efb6fb4c733e67dc077db1a5627bbfe8c7c15dddeeffe2a849171fd7dd5f5794a3ff3fd3ebbd04a8dc5c611 SHA512 fb66321c348db627035ef133b92d114021097707aa5723240e7e9300deba6bc3a844d4a2df3b2d61c265c53fc4fa01840c2d394684482b84cb1323ef179d42a4
+EBUILD taglib-extras-1.0.1-r1.ebuild 492 BLAKE2B 710f60684ae2e750bef2b4691b85a5616ed3e822c49e5b0d6b7e005c810eb88e8f8a8bcc798614e7ca2f435ff50574fabc606a5e19b70db7c6c54a112f9d6b23 SHA512 531e58c4352d6b2bd490af7a38ba98fa4a427b414eb4eca5b077d61f24abc5d03b0ad8f6531f69c9de0b721aadecba0aaa5264c465e177460e70f5de9a6bb9ca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/taglib-extras/taglib-extras-1.0.1-r1.ebuild b/media-libs/taglib-extras/taglib-extras-1.0.1-r1.ebuild
index f63c5f1bc002..9c38a368dd06 100644
--- a/media-libs/taglib-extras/taglib-extras-1.0.1-r1.ebuild
+++ b/media-libs/taglib-extras/taglib-extras-1.0.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Unofficial taglib plugins maintained by the Amarok team"
 HOMEPAGE="https://websvn.kde.org/trunk/kdesupport/taglib-extras/"
diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest
index 97737fd3b645..70c264ea587c 100644
--- a/media-libs/taglib/Manifest
+++ b/media-libs/taglib/Manifest
@@ -2,5 +2,5 @@ AUX taglib-1.11-install-examples.patch 371 BLAKE2B ee42b80e8c6093dbfc4c89c25bcb6
 AUX taglib-1.11.1_p20181028-libdir.patch 721 BLAKE2B de84d157b6da665c6e2dee504bfd68409500fa00366d83adc67735bfb7962cdadcfa6e3ff838115521f66db12ae2d8ef9963981f452944b100e475653fb9064c SHA512 fa9082f58257a3250a54eba49dc1b0d6f25e59f2fa500a7d41571b7c5fa8b2e8e5a7d4426ee2046dbe556c3dd2cf1c271cb4e0e1e9b78b8733a84de9420974ab
 AUX taglib-1.11.1_p20181028-version-1.11.2.patch 486 BLAKE2B a0b9021a01268eaeb32cb7a6b333b54df522aaf9d07d9b89870f0dbc38a9648ab9173a916bd8a29537b454631be5cd32c2dfb256ebf2f2b86000fec8d2f32bb6 SHA512 e5c3d814ae7c4b2cb84eded86e909d2db985ec21409767a9bdd502d562b55edf30c74834e2829199f1fd20ca8b1dab832a78b05246ae82fe6ff94cb1266d98d0
 DIST taglib-1.11.1_p20190920.tar.gz 1290100 BLAKE2B 38f65450b5e7c33b14187ab461bfd18d77f93d1ecab5ccf0c898ca6e67fd05aebac09318d4e1cabf1fdbca38800332ef9d0d5d1317087e69672734d1dec1dfe2 SHA512 4f7ad2a0713d38e8885b10d08041abdfb6c669369edd16e8345d7d679c16c15f191ca378e6690e06347f29e0e9cadebcb95ba26dc583c1127c4531558df27173
-EBUILD taglib-1.11.1_p20190920-r1.ebuild 1349 BLAKE2B 372e6d1cb55a390b161c8625c96396319975910a55fb006ea07979f905db6dc40ae5c77bd29f6a5134086cdb59e5647ee0d7aa6f8f6993264a9901c649caf3d0 SHA512 68a8f7c57864b84777fc2d728b255aefb1155eb030e7c80dae892e346c49352c64fa8ec6dca5372420004cfdf939a0426683a51810541dbad83f8083de0d7c1f
+EBUILD taglib-1.11.1_p20190920-r1.ebuild 1356 BLAKE2B 7c9aeebfd5ba6e4fe8e17bceaeabb6b47d79db12a40fb3c2520da5148b79f031f2189c5dc7c0ea3c67f1606c283f3d06ae16b5be715fa9a3616985b82995b7ec SHA512 108bfad2b7b9872b9068bd895a6abb0838c79122a92007be39f5f0bb81a287ef111dbc77d74d7db7ca1d88b59f186ac96130a5d936990a5c215f6e4dcabc9107
 MISC metadata.xml 327 BLAKE2B 3972cb6de796dc7ba0d48715a30f265c10bfebe2e192d634267ffa0dc2323283b16c38f9bd891dbd1b7c646929e41116a5924d426fb1df46e63f3a4b4f5920be SHA512 05909165d6fff2283a6d55d1c454d97541e4e5ac35a6997123f548b3a86d108231928a4136cea35a323c942a82d50072f66840347fd1b651d4c1f3a53928c721
diff --git a/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild b/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild
index 5cac4484ce05..f6f6fbf93eb2 100644
--- a/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild
+++ b/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 COMMIT=54508df30bc888c4d2359576ceb0cc8f2fa8dbdf
 inherit cmake-multilib
 
@@ -35,7 +36,7 @@ MULTILIB_CHOST_TOOLS=(
 S="${WORKDIR}/${PN}-${COMMIT}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -e "s/BUILD_TESTS AND NOT BUILD_SHARED_LIBS/BUILD_TESTS/" \
 		-i CMakeLists.txt \
@@ -48,5 +49,5 @@ multilib_src_configure() {
 		-DBUILD_TESTS=$(usex test)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-libs/vidstab/Manifest b/media-libs/vidstab/Manifest
index e45022e9bfa9..35e9551684ad 100644
--- a/media-libs/vidstab/Manifest
+++ b/media-libs/vidstab/Manifest
@@ -2,6 +2,6 @@ AUX vidstab-1.1.0-tests-1.1.0-fix-test_motiondetect-without-openmp.patch 804 BLA
 AUX vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch 903 BLAKE2B 5eb6f0970a6d3a3ead1f7efbd6746a5de1feb0db57cc03e62d7670633fb0ddf8d810b5913e5c819c6ba57204b566f5592c4d8b86368f7776d1d7bb4eac83d39b SHA512 c8f59b8c954f4207c1c946db88c1af2f1110ed37d68ad7cc1962be9d6b1659b4833ae4257b359b25d5f1ede65ff87447a94d2d39c0028f9a3bbd7cf4a69d5bd7
 AUX vidstab-1.1.0-tests-use-sse2-only-if-available.patch 1047 BLAKE2B 198d481a781186583b0f842f677e540e0f58fbf0f146d32ed1d5c47675f02ef3e7d7457674ef87104e28d0afd5931c9c082569fd86c0e594302e1513f9a9f281 SHA512 a09f845947bc9c22700a998e2fa985f735d42146745de0b6686d61b14ef7aecb4229842b35caab8a79f874c5875241a87e0a9556ca326d54358648b515be5e5d
 DIST vidstab-1.1.0.tar.gz 77736 BLAKE2B 382cec922e9e7d521f49b431a5ddb246e331e186bf11707221a6bae0ce6544278a4c855c35e0346a78e4be105057c01ad7d53671ea22cbd2500aba4640cc96c7 SHA512 e82a4b6dd854b8415952cc0a8bdea06c01ff40a497c8e98177831e29031ec535b9f47cc30d5444c47bfd91871615a1662e3991185e9eb179acf37ea601073cdf
-EBUILD vidstab-1.1.0-r2.ebuild 1768 BLAKE2B f126fb8c0bfe63e3deb83d6a956e94a1b2b8dd20523af1e13d26abdc56245dd889e02b9cdac69d2a71241c575ace678c00fc7427742674bc389867e84f138f94 SHA512 7e7b96d5e7852b08ebfafa761d20deb9d4889f58e68f5ff355085a9a495c17c479f17c8a2ef9a19561dbd3d8b3d7b5b76e78b26e3b56291d33f333486a53ea82
-EBUILD vidstab-9999.ebuild 1528 BLAKE2B 384143417b094da0cbb1299f6789ef890f81fa1efa0b13ab314e8831360b19312b28c92bb49efd97450260f42a9499e7c1533d586e762eac0c99654c1206cb97 SHA512 f72ca678d3999a9f2a0d194383529a08526d22dee764ac95097d0e57f7808d172d1da2e825842cd8c73b4504c097721aa47846a308fa124bb834ec4768c5be53
+EBUILD vidstab-1.1.0-r2.ebuild 1728 BLAKE2B 49e16de164597925753546848583fb0137d7efab4326f9146619851e4a54c46652834d93cbeb2372a20b4b1601702e49863d980c6320931d4657c972d18842d7 SHA512 08516c6cc56ce41e3573065dbd10e348eab4b6622956cb22414c210832dfe014aada87634f9e69f068e5cf6636709abf22363532397077956483c01845778862
+EBUILD vidstab-9999.ebuild 1488 BLAKE2B 8ca0ef4a84ac3cc69d8ca213fabc74e7b7ba61e51da5f6df38705c10e09838f365492f17cc4996a9767a046fae3136d3949bc4a4d9bdfd2b8d36ecea4711e894 SHA512 e8520fc327a58ed6b255c7a679f86bfff448147394b8cac3ebf4909df2bfe73ab1411b6b553a33d61167c3fa83640c8eefd0dfa7c0d0c767fe5f8eb25a4a6529
 MISC metadata.xml 584 BLAKE2B dfcfa874a9ee0f9cbc884646e9ca898a3caa58eeb17b55459c9e591144d124c2e476f65c88e6994a183204e555ead73d9411bc4e663af307a17e967f5f8b7316 SHA512 48868512f6f5ad2c60e7ef6b092682f73df8540c785bef65f75a2777978612d449d83bcdf350887f4da9c9069c3ff13b25050180c5de9698d7a269c232fb1bfb
diff --git a/media-libs/vidstab/vidstab-1.1.0-r2.ebuild b/media-libs/vidstab/vidstab-1.1.0-r2.ebuild
index 7f3c294a36f2..cae1d960c4b3 100644
--- a/media-libs/vidstab/vidstab-1.1.0-r2.ebuild
+++ b/media-libs/vidstab/vidstab-1.1.0-r2.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-
+CMAKE_ECLASS=cmake
 inherit cmake-multilib toolchain-funcs
 
 DESCRIPTION="Video stabilization library"
@@ -36,7 +35,7 @@ src_prepare() {
 		sed -E 's#(add_definitions.* )-g #\1#' -i ${FILE_TO_PATCH} || die
 		sed -E 's#(add_definitions.* )-O3 #\1#' -i ${FILE_TO_PATCH} || die
 	done
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -55,7 +54,7 @@ multilib_src_test() {
 	)
 	local CMAKE_USE_DIR="${CMAKE_USE_DIR}/tests"
 	local BUILD_DIR="${BUILD_DIR}/tests"
-	cmake-utils_src_configure
-	cmake-utils_src_make
+	cmake_src_configure
+	cmake_build
 	"${BUILD_DIR}"/tests || die
 }
diff --git a/media-libs/vidstab/vidstab-9999.ebuild b/media-libs/vidstab/vidstab-9999.ebuild
index f4bd05f45203..333dd3d6be2f 100644
--- a/media-libs/vidstab/vidstab-9999.ebuild
+++ b/media-libs/vidstab/vidstab-9999.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-
+CMAKE_ECLASS=cmake
 inherit cmake-multilib toolchain-funcs
 
 DESCRIPTION="Video stabilization library"
@@ -31,7 +30,7 @@ src_prepare() {
 		sed -E 's#(add_definitions.* )-g #\1#' -i ${FILE_TO_PATCH} || die
 		sed -E 's#(add_definitions.* )-O3 #\1#' -i ${FILE_TO_PATCH} || die
 	done
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -50,7 +49,7 @@ multilib_src_test() {
 	)
 	local CMAKE_USE_DIR="${CMAKE_USE_DIR}/tests"
 	local BUILD_DIR="${BUILD_DIR}/tests"
-	cmake-utils_src_configure
-	cmake-utils_src_make
+	cmake_src_configure
+	cmake_build
 	"${BUILD_DIR}"/tests || die
 }
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index d9b23bf7f1e8..04cf2bde27d7 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -5,7 +5,6 @@ AUX vigra-1.11.1-lib_suffix.patch 1032 BLAKE2B ce1b73b89c4d10c3b2ef3185a3c9a7ca7
 AUX vigra-1.11.1-python3.7.patch 1254 BLAKE2B 24e23db29992efa86154edb402e250c782160ba5208fd7b2dd1c1eb0526b51633014cd488b5f8abd808bb2fc54b20866111281447fc45683d70a9a8bd93f0854 SHA512 9cbaacf2b6e3bd892b930c48d2371fe96b9cfecc69c8d0c982972c412f1157a73648672f42e73df1cd5ce0753c69907faaca38e35bdd54952a753af7054e17fe
 AUX vigra-1.11.1-sphinx.ext.pngmath.patch 1411 BLAKE2B 6ffdd2f40ac982d693a6e71a89754d453202ba70e6ae65b3b45d64add3d2cc7a9710773e94b0604cb67dadb53ea27912ccce7fe844e6264f7c989bb96149cbcc SHA512 4e0ade84985ecc9c7c45afd949671b9cbc041db486c29732b17c1b62eadfdf6e299396a18686c03c3ed4e2b3ac6d830a8e224c56e3b8d20361c2f5e5fcc14650
 DIST vigra-1.11.1-src.tar.gz 55119047 BLAKE2B c67dc61515075843faacb4ee054f3e28b4edd033dc6cb89d3c591827309eafa697b839ca85ff7c68d6aff9d7e08b1d3db73d50e6c3b065a5210b64a90e242444 SHA512 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3
-EBUILD vigra-1.11.1-r2.ebuild 3819 BLAKE2B 583c605773456bc4cc866548bb8ac584a72e8d3619d829446b824b2ca426e1a260e0bf05911b53ac5816e91a55a812e49080c9a464b4540b0433122b78d4b9db SHA512 f8bce7ed99e4c1662b2242c0a251e8654260ff92ea52a0d67bdf8e8456bc4f07225bd92667a888fc2cb6c4ede387f07a51084c8d2e9b7d46453dabd519acc456
-EBUILD vigra-1.11.1-r3.ebuild 3553 BLAKE2B 96598be9b6e1ab1d2b883e769e1dc6e30d426ec5b90fc91209d30bf68925c59b69c461c627c4faa843860ca10349bd8d5b3ac0cee383178c6d584464595bef1c SHA512 6ca93606b50d6bbde4712192ab86260d5c8c5014b39a02984b17000d4906b5ca4fa552bb68b7253b617a99cb05c5351e1d482af6e7081d9126e4a8662a4f6160
+EBUILD vigra-1.11.1-r3.ebuild 3550 BLAKE2B adfeb786c9b5d64448fa4f63e0c51c295b65d40ed92cde73c8924f4e9777d450f7c2c25709c7479dfa8841c5c6282fa47e6a6f85a207ff01bcfe42680e78ed24 SHA512 eccd61434bcd23f22edad9458c4389f091efd6fb2892d6de044cec0668968d70618f6c4ed4940d185bc7e8117ec5e7ed92d99ccf95f0b79bf1790b9e35d3d23e
 EBUILD vigra-9999.ebuild 3905 BLAKE2B 5df7ecdb49b73ebd5885fe959265306ae4c7cd3eca7c9002c373dba19dbd84bf483b13fcb9eb41e4f367f75492d26686d6d15faf18602bffe16f23a18ea62b58 SHA512 715d241d3fe38f88010c2604321dd7a77d920c1df9ff795ad0b6fca82b445c279a4585398fbe6913235ff18b9506bd7b8a868f02dc66a39102546cdbeb8942d2
 MISC metadata.xml 413 BLAKE2B 985f005fa338d566dddb20126e0a83cb8e9ec5aa4ac9ed2d5ec6a42743eeb92f521375b74f8caaa94500c42450d68d0a4bf5c036c9a2909e13c922f50896824a SHA512 e5c2a32f7495cfceffc8da8464131b918134b7255fbcde9a10175a24698f5a6aff17630436935c6cda7d8a3cd8b182c299845a24528f3a9c40dff1022dce4f71
diff --git a/media-libs/vigra/vigra-1.11.1-r2.ebuild b/media-libs/vigra/vigra-1.11.1-r2.ebuild
deleted file mode 100644
index 757fe839d198..000000000000
--- a/media-libs/vigra/vigra-1.11.1-r2.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P}-src"
-MY_V="${PV//\./-}"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,xml"
-inherit cmake-utils python-r1
-
-DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
-HOMEPAGE="https://ukoethe.github.io/vigra/"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/ukoethe/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${MY_V}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind +zlib"
-
-REQUIRED_USE="
-	doc? ( hdf5 fftw ${PYTHON_REQUIRED_USE} )
-	python? ( hdf5 ${PYTHON_REQUIRED_USE} )
-	test? ( hdf5 python fftw )"
-
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		>=dev-python/sphinx-1.1.3-r5
-	)
-	test? (
-		>=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}]
-		valgrind? ( dev-util/valgrind )
-	)
-"
-# runtime dependency on python:2.7 is required by the vigra-config script
-DEPEND="
-	dev-lang/python:2.7
-	fftw? ( sci-libs/fftw:3.0 )
-	hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] )
-	jpeg? ( virtual/jpeg:0 )
-	openexr? (
-		media-libs/openexr:=
-		media-libs/ilmbase:=
-	)
-	png? ( media-libs/libpng:0= )
-	python? (
-		dev-libs/boost:=[python?,${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	tiff? ( media-libs/tiff:0= )
-	zlib? ( sys-libs/zlib )
-"
-RDEPEND="${DEPEND}"
-
-# Severely broken, also disabled in Fedora, bugs #390447, #653442
-RESTRICT="test"
-
-PATCHES=(
-	# git master
-	"${FILESDIR}/${P}-fix-incorrect-template-parameter-type.patch"
-	"${FILESDIR}/${P}-boost-python.patch"
-	# TODO: upstream
-	"${FILESDIR}/${P}-lib_suffix.patch"
-	"${FILESDIR}/${P}-sphinx.ext.pngmath.patch" # thanks to Debian; bug 678308
-)
-
-pkg_setup() {
-	if use python || use doc; then
-		python_setup
-	fi
-}
-
-src_prepare() {
-	vigra_disable() {
-		if ! use ${1}; then
-			sed -e "/^VIGRA_FIND_PACKAGE.*${2:-$1}/Is/^/#disabled by USE=${1}: /" \
-				-i CMakeLists.txt || die "failed to disable ${1}"
-		fi
-	}
-
-	cmake-utils_src_prepare
-
-	if [[ ${PV} != *9999 ]]; then
-		rm -r doc || die "failed to remove shipped docs"
-	fi
-
-	vigra_disable fftw fftw3
-	vigra_disable fftw fftw3f
-	vigra_disable jpeg
-	vigra_disable png
-	vigra_disable tiff
-	vigra_disable zlib
-
-	# Don't use python_fix_shebang because we can't put this behind USE="python"
-	sed -i -e '/env/s:python:python2:' config/vigra-config.in || die
-
-	use test || cmake_comment_add_subdirectory test
-}
-
-src_configure() {
-	vigra_configure() {
-		local mycmakeargs=(
-			-DAUTOEXEC_TESTS=OFF
-			-DDOCDIR="${BUILD_DIR}/doc"
-			-DDOCINSTALL="share/doc/${PF}"
-			-DWITH_HDF5=$(usex hdf5)
-			-DWITH_OPENEXR=$(usex openexr)
-			-DWITH_VALGRIND=$(usex valgrind)
-			-DWITH_VIGRANUMPY=$(usex python)
-		)
-		cmake-utils_src_configure
-	}
-
-	if use python; then
-		python_foreach_impl vigra_configure
-	else
-		# required for docdir
-		_cmake_check_build_dir init
-		vigra_configure
-	fi
-}
-
-src_compile() {
-	local VIGRA_BUILD_DIR
-	vigra_compile() {
-		cmake-utils_src_compile
-		VIGRA_BUILD_DIR="${BUILD_DIR}"
-	}
-	if use python; then
-		python_foreach_impl vigra_compile
-	else
-		vigra_compile
-	fi
-
-	if use doc; then
-		einfo "Generating Documentation"
-		# use build dir from last compile command
-		VARTEXFONTS="${T}/fonts" BUILD_DIR="${VIGRA_BUILD_DIR}" cmake-utils_src_make doc
-	fi
-}
-
-src_install() {
-	if use python; then
-		python_foreach_impl cmake-utils_src_install
-		python_optimize
-	else
-		cmake-utils_src_install
-	fi
-}
-
-src_test() {
-	# perhaps disable tests (see #390447)
-	vigra_test() {
-		PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake-utils_src_test
-	}
-	if use python; then
-		python_foreach_impl vigra_test
-	else
-		vigra_test
-	fi
-}
diff --git a/media-libs/vigra/vigra-1.11.1-r3.ebuild b/media-libs/vigra/vigra-1.11.1-r3.ebuild
index d38b643763a9..bfb94af9b87d 100644
--- a/media-libs/vigra/vigra-1.11.1-r3.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="amd64 arm64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 42a088adb108..3551f485d415 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,7 +1,7 @@
 DIST vulkan-layers-1.1.106.tar.gz 1151285 BLAKE2B 763654d76c0c9d139ab922b2319df8becef5357c140ade3ba5d99cdbf6c7440b156048970202c2735bed4cb7de213d6647e492fa608023c91cf94a4b0353b4b9 SHA512 caf2c54c89aee2760747fc03f6d3e7742687f86aed5f05e1e8beffac35b114fd61af761bf95593f7cbdb3f9dbc92f570916af1225c7cdce3c16ba81024dc2027
 DIST vulkan-layers-1.1.125.tar.gz 1763589 BLAKE2B e6db1c8b2469afcc9565a55e3977443952cf8a176b6b2b2f5747fbfdb887074e014138b4626f58ddb5c24f87260af32c0c589aef237366aee5acfd3b31ad06ee SHA512 07fcfa9737711671a1a537285f69b63b1a14cf9201dcc169fbe99e19febe612ba8a1e7b448d18bfd01a35d90fb99a261ada0ae9b8facb36d04079bcf3c5c72e0
-EBUILD vulkan-layers-1.1.106.ebuild 1408 BLAKE2B deba604fcd8171d7ea1b27f496bab561659073d3405e655561570ff11d74a92b091a8eb78b19eb8335b5a32cb2466f609b0750c873ed981afac71245aa866a82 SHA512 ffb87f7a8a1843b60b28218ad413d51e9673a5d659ce9e6eb5c1b197d7a395b991561d109ba62413b9188b902e61503080095c0251b749289d02aaece92abd7e
-EBUILD vulkan-layers-1.1.125-r1.ebuild 1424 BLAKE2B c3e78366c44853e84d6347a5f5d89b8e28eecbcbeb0d34caf1776e21a0577d1ab0c7c5126240de22915d3ca60cba5d607d5835078bfbe324af7979f1e1e79a2f SHA512 9148b3e286138839528ef63a13b29c5390a0c614065686e074698d70c138dd80400947b2c92a3368655e659417598afdd990aaa09b0757accc84786cfcab34a3
-EBUILD vulkan-layers-1.1.125-r2.ebuild 1459 BLAKE2B 44c26bbbcfb7a3c1181ad3f32286a4d02b770e3d65dee7d95e70591f968b61faa75331181d05ed25c05cc6dad1291debca44715d3626d407cb72ec322074da64 SHA512 a42fa2ca984c93f4b1bfd872168e450e4043f008d8fbb854136985aac9550f237b4290b288678d2aa86d707e8baccac1eb0db2821b5e3dc06b4a0628fd147b56
-EBUILD vulkan-layers-9999.ebuild 1441 BLAKE2B cc94694493a6160c74d28641a78595bf88864ad76b2796160f34bd7d4666b4242dc5ce7da5cdad2f2896ff6ed74c466d21aa49a74a7fca250e563bc8573e07ab SHA512 4a03e5d2018273581f43f622d8fa8a6a0d598eac97e1a8c4023ff55f106c1a671a805ed0e264be6208545d3bc9b81b58c7ab21ef10b99be2b967683fb42146e9
+EBUILD vulkan-layers-1.1.106.ebuild 1404 BLAKE2B 8bb9a4535efab8535e92918e7e494b60f4cfbb5f4e411747005e3a4f137c996f9b40883094a35c12bf01da82bc0ffec78bfd96c561093edc61e08d2ded11592a SHA512 2f3188bf2cfbeb3e9b43e022cc1c2b41d1cebb602af1a85ad6f986d3ca6609240786daf38061ddfa8e529e926f23c070e71cf7c0ee3a2abbc0a6dd180ddc4b06
+EBUILD vulkan-layers-1.1.125-r1.ebuild 1422 BLAKE2B b334aea89721e4b043be76720ed53ba32672d3e411dfc67238cdc6fae84942130c76dfc8d38cea0a31f042bb752650f41fe5495b806bd5673c37e93f135c6de5 SHA512 ad2a877cb94d5ba161e8612dde6f5d4996c9af8c3a7e68c1e2135e9166258bdbbd3d22a00bce732880c949d48ad010f2766e54ab6b374e9c724818b658c203d9
+EBUILD vulkan-layers-1.1.125-r2.ebuild 1455 BLAKE2B fdf77002ac28e64c367df7104626b7e37fbf76179230976ccb41acc118d9e0ad513c1ade8635a5d47649b1d511ad85d93b6be3533168101a71c474cd8f86bee1 SHA512 ca3e73d8061da3e2ea86b494500566f7525040b907edfda0245824d6f36899337860202b2466f83d78c4246d11bfd9cfd54d8cbcad18eca05594920ece4c425f
+EBUILD vulkan-layers-9999.ebuild 1439 BLAKE2B e5233489dd2e520e8fb97e06a1604d84c678479a46d0378c911642b8e42f7029b330a19e85aa3e5b776aa0fd725346eb5bba473323205bd4660aba87b33a7f7b SHA512 8ea1a54dbac14d56ec58b76aa335ee0ebac6058213bacb9935d863d7134167c51fa6acf615f6155c152524b28e191825f1d51d6091bcb26c9d3c506308b79176
 MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.106.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.106.ebuild
index 6aced6feec5a..bbadb5f80b40 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.1.106.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.1.106.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers.git"
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.125-r1.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.125-r1.ebuild
index 9814252061d4..b61178bd1e34 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.1.125-r1.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.1.125-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers.git"
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.125-r2.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.125-r2.ebuild
index 90400f07498b..9a3f1dd75c31 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.1.125-r2.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.1.125-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers.git"
@@ -10,7 +10,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	EGIT_COMMIT="237d818e81fbffa073d29d94f53a2cbac4f25b9f"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}"
 fi
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index 2b59cfc6220e..8b38bc5df9e4 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers.git"
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index d77a29a68a98..329b97ca7a25 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,6 +1,6 @@
 DIST vulkan-loader-1.1.114.tar.gz 1343624 BLAKE2B 1212c837d86f29160b19bbc14a82564d57722d0d8b540e9360af0a470db59d8c5ad76a1f9f5f892a09b7f43ae62792262b1713c8cabace087c37c2cbb103215b SHA512 90fe8fa7b0a0028faaf8e3aea0724799eb57989a0297e416b3b651a81e0de99b0506eb6b17f84bfc1a6ed33edcc806a5b6c1b187d0d49ea0c8d99ae9dcb5338c
 DIST vulkan-loader-1.1.125.tar.gz 1398802 BLAKE2B 7cf1f99f60b4b37bfad12580fc8809012a0540d928366b465a532fbf90e7d87bf42eeeff70b1a46efeadef9c599cad6009b122ed9c5c7298973207f05acc1032 SHA512 40e1e5c16491f0549eae3efc065c375c258b475d81e1c781a756c71ec329f390e2aba55ced5ed2005e938f9d074dffc1692e7e1e330a35f55460cae1606fdf2e
-EBUILD vulkan-loader-1.1.114.ebuild 1544 BLAKE2B 54d59237e53fc6da87c6c1f4acee474354b382cfc3416cb702514d34ea7db1df59329e18fed9f954137610db2b64dff25ea901c3754d83f5e49de266661554b1 SHA512 b3b3dca31fe3b43d1a09312f0590679d026126f3e34d01659ee144d2bad4bcef651ff15b6be824cb731e1c740cc716ec97195094693a2c5e7c927174850449e6
-EBUILD vulkan-loader-1.1.125.ebuild 1787 BLAKE2B 3859eeb424f8240a057c8630e172f07152bedc2df69b0282a0fb5521f92dece37e95ba6b3ccc8d99261442bf51f4065071eb09ed478b0a677de4d83cc69f7e3b SHA512 54e9105d0d3c7f09c28e366a3eb05a8ba97b99e03be6f920dfb6e9de94285d849eedb4b210bf0ac265f6a0e98d5b854e0a8816308a5081a57abdfd74c42c3afe
-EBUILD vulkan-loader-9999.ebuild 1787 BLAKE2B 3859eeb424f8240a057c8630e172f07152bedc2df69b0282a0fb5521f92dece37e95ba6b3ccc8d99261442bf51f4065071eb09ed478b0a677de4d83cc69f7e3b SHA512 54e9105d0d3c7f09c28e366a3eb05a8ba97b99e03be6f920dfb6e9de94285d849eedb4b210bf0ac265f6a0e98d5b854e0a8816308a5081a57abdfd74c42c3afe
+EBUILD vulkan-loader-1.1.114.ebuild 1540 BLAKE2B fdec6f95df828705af5333a453370f57522a89043d146973c15ac7c936161e57a24423eec6da5b63835766b44ce7ab7ed22f80da5d3953bc1133511231611781 SHA512 489e33754fb559969b6b9bb0a6aee0ab43e1c74f073dcadc7c13439630a948d15d3cd35af2d2bfce6839d2cf067a5929390308af67052fd78cca55f0a7621c41
+EBUILD vulkan-loader-1.1.125.ebuild 1783 BLAKE2B ea4bce58c924c9e7ae3f0c15edd0a29c05bdae3b356527909ee4d235670f2654a51e6527f319d26f235a733b8ee53fc828cb54ff88539b0997580c29098b2ac2 SHA512 a3be26b8c6b28e2ea281540dc10048ad47fe041c5cac3ad0191e784042a6f24b5598626f93120f533de085ff55bbcf174e7e18234a240c2d6ebb39d1dcd83e6d
+EBUILD vulkan-loader-9999.ebuild 1785 BLAKE2B f5d326b8d33f44d87dad4434d4979aa0d550cb4a9b5f5abf1622f6ed23742549766b6b11fd757d54eed2550b7ba41ca6eaa286be86f6dbcbb2468c6effb8a8e8 SHA512 3ded4d4ab634eca8e083ecff8725097e6c7ceb50f7c85f9bd542155a27994c4c00136deb906910f60e129390fc0da09c22ae7050e4f141e67395b2cb7a3d774e
 MISC metadata.xml 414 BLAKE2B 53100d7021d8350e960e2b087bba612ee99f6ce960b63964aa2ba50b1172f5b9fe13fb9addb069ae74cc03292b92fc88838b41eac1083c8779dcb8e0e480d1dc SHA512 6328c52f607ed4ea3ba31430f63df84e942ea3e6726b5107c8840e3869725bd7407b446d4f905765a0c6d6dd04fda643bd2b5e06681f6ac771bbb4fbc8d4c417
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.114.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.114.ebuild
index 85fca3d94db2..9e3ff63960bf 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.1.114.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.1.114.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Loader.git"
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.125.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.125.ebuild
index 2d672fe1761d..57567e265b71 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.1.125.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.1.125.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Loader.git"
@@ -16,7 +16,7 @@ else
 		MY_PV=${SNAPSHOT_COMMIT}
 		MY_P=Vulkan-Loader-${SNAPSHOT_COMMIT}
 	fi
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/${MY_P}
 fi
diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index 2d672fe1761d..7e0ba7770fcd 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Loader.git"
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index 64a1d52f1c4b..72f05d923315 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -2,5 +2,5 @@ DIST x264-snapshot-20190214-2245.tar.bz2 770462 BLAKE2B d90a3bafb88febe12526b225
 DIST x264-snapshot-20190903-2245.tar.bz2 774515 BLAKE2B 0b19fc1d3cedea32bfac9c5247bce7b3c04dead35458d61f3b5c0694040dc852b0110b620faf4118ed265a5605aafce3c49d468d38fb91e4c515b2860c486920 SHA512 c357c9025ffdf653c974eb7ccc2e9a4de86c02881372a6a8270ae59ce948c284da48a2aba37763bd29359d2a6dfc76ea56a52fed6082f8483912c8f948488a2d
 EBUILD x264-0.0.20190214.ebuild 1793 BLAKE2B 2a4fb700986dcf17215eca221d61390dba0b66cd60c3ec5a059d8770bcca98515fa8eec147032787f2e2ae175ec7ff3954d1c352cecd04d8dbf64e23f835a659 SHA512 97f3301b4d30b68fbdd7e6d53dfa6565e130767fe71d0461c07c3b04a3a841456402def3646f6ec9e2026ff4935bb8928beb8b3bca4d147172379921b8a9d1f3
 EBUILD x264-0.0.20190903.ebuild 1802 BLAKE2B 153c3d6f00bcb4f56d5993daaa030b8203bef2cdf3b93aed258d8a86a80609b7aefdfbd732e2b1eab432a259d312c2862a99f4f5845230002274761b9f82c5fc SHA512 134d54a9cef4ab21f3a73b3063a8110680048499867051b9a24a981d1919ff261f0459d9be61c4a333ffd2971f0436919802f12b23c239841075567d6da21e2a
-EBUILD x264-9999.ebuild 1802 BLAKE2B a490e72a524f8d3197c7c6a883ed3b0558c72af8eec39d6462003edc9da92d8320480da10d3239e1d181c3d0c58e8d998f255ae86befc1308ec96a678eea24d3 SHA512 e79cbb081cb364f34ff1dfc932dc9a601cc73b6eac7a2497a7216458e638a1e5dc5f3c0be8d30a48b562a266829326e83ced19a07faa4b1b544a647877f26843
+EBUILD x264-9999.ebuild 1802 BLAKE2B 4c6f2e562abd8e9fafe18875972998456f8dfd8dc1d8cb896c60594df3e6ae163d07886ca08d2dddcc4cc735c00d92370ef879bc601f853bc841fa14720f8ae9 SHA512 80d05ceb92256f7c33f8838defcbed7295853c5e5f5970deadaba72c087fbfe463fa3e5ba6123ac19e87f29f3d8ab747e7bfcdb652611383e00a75802b70027e
 MISC metadata.xml 488 BLAKE2B 3e6982e1bbd45194bb664ddb4b34e307ef4030f4fba9905d0a292c8a5ce73e27bc1c687758cc4fb18d38cc2c93ed21b64dfa35b2aaa63dc6fbd1110b9e1daf1f SHA512 2dc9d360de31770d2e8eebc3bab9662a00ad328ba41380052c3e7502a4da85c7b0ce29cf229670d917c93d7b508282dd9f1694a718da65f1110c785a2bc68394
diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild
index 4cdfe6a9bba3..5478a141f758 100644
--- a/media-libs/x264/x264-9999.ebuild
+++ b/media-libs/x264/x264-9999.ebuild
@@ -17,7 +17,7 @@ else
 	S="${WORKDIR}/${MY_P}"
 fi
 
-SLOT="0/158" # SONAME
+SLOT="0/159" # SONAME
 
 LICENSE="GPL-2"
 IUSE="altivec +interlaced opencl pic static-libs cpu_flags_x86_sse +threads"
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index f62dc2d55409..931b1bd092c6 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -15,5 +15,5 @@ EBUILD x265-3.0.ebuild 5684 BLAKE2B 5ac5d28a1de72646b53a556398f42f849c77d7df72dc
 EBUILD x265-3.1.2.ebuild 5685 BLAKE2B 6cfac74e85e8b5637b480974c5dfa9be45614b31e720ae0e637309b4d4f0ad5e8b48965fad88b95a071d98f02bd2da8f63f35f71c22c6878cfb26c6c9156cbfe SHA512 900ef8019a7c894bc104ab7a7ef0476ff091e191309af89042a1804a4cae61877bfcd5172a1ba89aedda700d42454d68a92bf4a98fb1fcebc6711680af6871e3
 EBUILD x265-3.1.ebuild 5685 BLAKE2B 6cfac74e85e8b5637b480974c5dfa9be45614b31e720ae0e637309b4d4f0ad5e8b48965fad88b95a071d98f02bd2da8f63f35f71c22c6878cfb26c6c9156cbfe SHA512 900ef8019a7c894bc104ab7a7ef0476ff091e191309af89042a1804a4cae61877bfcd5172a1ba89aedda700d42454d68a92bf4a98fb1fcebc6711680af6871e3
 EBUILD x265-3.2.ebuild 5685 BLAKE2B 03a54678214d214fe79b8c4cd5c6bca412f57c87399d0231b30ea7b276ee4bdcaa6438623f6ca6b73e1fdb91349b7b298ff3eae89afc3ecddd704ae3dde7588a SHA512 9bd96418e104f5f3675551aa40bfef52291b22a33e1560133f678feb9cd5b50d75ff10608d54728318e2f1c629b30272717dd9353c080b174c7dd80369c7f365
-EBUILD x265-9999.ebuild 5685 BLAKE2B 106b19966e868c8c2476cc33196a1ca757dddb988ef732e80a6a823b850cee8832e6a53c5ce1efc957cf00763185f9d20cf462948cb23d90c2346c11dcb78cc7 SHA512 c2c6ce7b575f2f27a685d36867d4813999fc26fed8e5aca0912d925d2fc9e424168bcc9372922fd48d66fdc4b368f5785efb3ace35759daa1b53212f1d979467
+EBUILD x265-9999.ebuild 5685 BLAKE2B 650e0506ab41a7e2573866adc8af101c00d7dfbbe9f778c0f971303462044aef6afb5d481a755bd7d115c2b6276b2d04234b9d3ec611ae97243aac46e458c74b SHA512 c07a92b909137490ed16a7fce8fe24f3e272021abe9f01c62a90adb6fbb9f750238f4c8f9ac4062dc59307fac8f6a9f594a0bf6453a522e4b63b183a4f42e75a
 MISC metadata.xml 703 BLAKE2B c71ecd74be6e4fcdf70dcdc197e6830875f6cae0b1ee4e96b0edc4b16db4e512b2b8e8962fa75c7f4f380d74ff713158fd6124d4a22229b3c213c197124a59c6 SHA512 b9f2ac6ed88fce31fa7459321cc7cc2114caee48066b0ae1773a8711f2d652370d154a6167d8c8eb0dc47f55ca211812b99d11c4a1941a3a2553c62a6f21abf6
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index d5d064525690..aaf2a4fe9a00 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://x265.org/"
 
 LICENSE="GPL-2"
 # subslot = libx265 soname
-SLOT="0/180"
+SLOT="0/184"
 IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/zimg/Manifest b/media-libs/zimg/Manifest
index ad28a2c8411d..d2f4db735d4f 100644
--- a/media-libs/zimg/Manifest
+++ b/media-libs/zimg/Manifest
@@ -1,6 +1,6 @@
 DIST zimg-2.8.tar.gz 265363 BLAKE2B a8982c64325e0089617136fcd5d6ee429ab861e3b9445b9cc0292bd3bbd3abb5783e94983e3e802fd9e59c2c7089eeea176d1eda4f3a850379cfc4fb36cbc408 SHA512 1e89087a756798a7ae3bfae3bc8244b29ae8ae7f04f53bdf6c4d4de3cb11412dc1eecd95a4a121bb9077437e633f8fbb665522ff8112ade806d9191ea4b5f7bf
 DIST zimg-2.9.2.tar.gz 266049 BLAKE2B 214a6afec061dc7cc7c751f2a57e56951e44b78fea6a0c0dc71235d3dd286fb811303b0a5198ab82165ee78d993caabaf39d7ec17db4c4e5ffca9a3475b49781 SHA512 b688f8e93a2e4549f2c844cd58c6e0714e6494d6fc8c800dc1b0cdf2278fb9925a646fc332350c1b5d77cef2134bf35e18a873c24ea1979c1adce57bfef68ebe
 EBUILD zimg-2.8.ebuild 777 BLAKE2B 4d602fb564c63ce60390c22b32fd528fb15b8bb1da34ba59dab12bde8ce5bed22af81013caa7cf91da5f9de461bb9f5c61b5b9ca2da8f47771a568103873e01b SHA512 3eb6b7514c5c93b611fb7992b0c174e705492a26366bf18b1adf2484ba3580d4fd3515956f51426dcac93e7ceb6bac18b587532c7ae7efa731aff2d610bb76a3
-EBUILD zimg-2.9.2.ebuild 845 BLAKE2B 7610be50c9ae4d842cbed4ba71371bad69a83875f6649d0fabb9ab72affab557a0e078e784096622777101d149bc4771e2ccd9ee7318bd25e31792e96b68809f SHA512 80806f48183a73c0c01c84baeef298f676d00beb03ed1e16ddbb7ec41bbf8ea3bbbd7c57bb52d0a6bdfec725758652c77775a7e84b3b87c58564f53951c019ee
+EBUILD zimg-2.9.2.ebuild 835 BLAKE2B 91df42ee57c4b3e4d017d669525ec265b42f9555ac51ce1c1e27291ca55b6b6ba81eae0f049103f0d18db16f4335dc5088af331debc83b7d672283d5f2ed3b91 SHA512 e723804c12387baf927520c7aa46c2384541b8f813421db087e765c5129db2621c98345d89da160f755914bfd6437ace96d343939bc029b5a814d854a7fc1322
 EBUILD zimg-9999.ebuild 845 BLAKE2B 7610be50c9ae4d842cbed4ba71371bad69a83875f6649d0fabb9ab72affab557a0e078e784096622777101d149bc4771e2ccd9ee7318bd25e31792e96b68809f SHA512 80806f48183a73c0c01c84baeef298f676d00beb03ed1e16ddbb7ec41bbf8ea3bbbd7c57bb52d0a6bdfec725758652c77775a7e84b3b87c58564f53951c019ee
 MISC metadata.xml 311 BLAKE2B 35db707f7a5c1e20c662525b306a018a6cc2a5cfec6e6f316c5d532566e85710d8223f9a7478569e78c476dce30f357986a66ffde04112113c389b6198de59f3 SHA512 a46022cde358c89be1d423501630b15ea56d2012e022ba8e91800d834bae267bff5a79c115e0fcfd632da6b9031d3c68948f1cd83e3f27699895b7de548f95b2
diff --git a/media-libs/zimg/zimg-2.9.2.ebuild b/media-libs/zimg/zimg-2.9.2.ebuild
index 4e92e0eec814..4d0105daf146 100644
--- a/media-libs/zimg/zimg-2.9.2.ebuild
+++ b/media-libs/zimg/zimg-2.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
 	S="${WORKDIR}/${PN}-release-${PV}/"
 fi
 inherit autotools multilib-minimal
diff --git a/media-libs/zita-alsa-pcmi/Manifest b/media-libs/zita-alsa-pcmi/Manifest
index bed5c35d31c2..b1764469a911 100644
--- a/media-libs/zita-alsa-pcmi/Manifest
+++ b/media-libs/zita-alsa-pcmi/Manifest
@@ -1,7 +1,4 @@
-AUX makefile.patch 2530 BLAKE2B 8c8821fd585e856e4264a77dda509c3fd608d69fe7ac92d1cbd6816341f34c3fcafc38e54d11d31328205aedf9d67b3b87e045378c7d12b1fc4ee9b81a422b92 SHA512 b17ef2a498889ebbc3c26c2e515f9cb596d35445e5499ec0f8fa2cb3ecf437a991cc9e29379a47d1de66584ba311f34d862d79a5455a5160765ce47264a6fa39
 AUX zita-alsa-pcmi-0.3.2-Makefile.patch 787 BLAKE2B d2658d2d051c10a37909c54aa03f45ef7e51c574036a2e116c12071d73ba78751c7f48e40749e1dcc8d30e2317a4603d5020e1b447e1694b20733a2d6ccf7c5f SHA512 52e55cb02f9cf60a71b601665263c3943e58dca1691959b52c223e2ac995ed3de43261786d70a63c267e6aa7ef9b42fbf0f8e92603a57515f56295c5d31b29e0
-DIST zita-alsa-pcmi-0.2.0.tar.bz2 21278 BLAKE2B 60fb731ec37a13472c79a21bbe56ddf83bed9067f7a0665c56f4a8accbe3dc41070b0a0111a2717837904bb30b40865f70bfddb9c5018848059eeb375e11d2ff SHA512 6b521dc8bef96a6ee73bc2accd3c7d0641e9a4f3d955868cd3fe04ae46f15a1b1ffaa45d56518f54f4fdf9f68f629e3036dca294936015205c20f01d55338e96
 DIST zita-alsa-pcmi-0.3.2.tar.bz2 21480 BLAKE2B dfd37f3cee647b7100ff1cb9f696ba7968bec4e6f11165955de67f38f48838f17c2efc0936780ce30ca0e2d7438b78ddd8a27960f6c54e7a8a5e87b1f9b50044 SHA512 9d6040d0ec636ebcf02a033cdc017105bbed8e0ddb99584890d8e027402a85791e0983a1a9cd677dc6f1da0ced530afb5e65a8e863329a5e785ef09e0b7124f0
-EBUILD zita-alsa-pcmi-0.2.0.ebuild 990 BLAKE2B 228fec4deef42701c346fd4b0cad5fccb5fb0e6c2ee11ab8d90654dc26a49424135ac57f334766a397bbbe805158c3c73062db6a28f9419ebaba92c1f2386532 SHA512 adff03ab865cbcf696e0f0d2cc545ede173b2aaa146aebc7a79eeacdb234a5ddaf4aabbda28dc73db1323ab8aeff05d2361aa34fbb3f80df88faae4bf50218de
-EBUILD zita-alsa-pcmi-0.3.2.ebuild 884 BLAKE2B 9cb753d9da62c62279fa37cab2785cc0765b572c9ce09e5f4233f924c422210d411daee03d772783895fcb9493f01ba19ee327b816fc1448ca467cb83adde29f SHA512 a18e27eed2355296d4e2d1373e78eb34db00a029f74069102ecb266811bc0d4fd42a84de02de4a40a201e5e4d1ff71c3b616127346c95b195b6bdf5006bcb2d0
+EBUILD zita-alsa-pcmi-0.3.2.ebuild 882 BLAKE2B 1dabedf1df2e0f5e13a13c26bf396c0f05d4239b13561cb411b1277ce407d6384d50bbda99a13d519983d8e721c79d030955edb26b06b330d4d39a9ba9618f4c SHA512 6a65e7c7fe4fc3641168cbf5b77b0d3951aa35c0d8b3d86fa479305f383e4fab5096ff61e2c26d0aa550ed61db21b4e1c8a39d9e2334d3639860e8e56276c252
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/zita-alsa-pcmi/files/makefile.patch b/media-libs/zita-alsa-pcmi/files/makefile.patch
deleted file mode 100644
index d5e86d6c68f5..000000000000
--- a/media-libs/zita-alsa-pcmi/files/makefile.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Index: zita-alsa-pcmi-0.2.0/libs/Makefile
-===================================================================
---- zita-alsa-pcmi-0.2.0.orig/libs/Makefile
-+++ zita-alsa-pcmi-0.2.0/libs/Makefile
-@@ -31,7 +31,7 @@ VERSION = $(MAJVERS).$(MINVERS)
- 
- 
- CPPFLAGS += -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
--CXXFLAGS += -O2 -Wall -I. -fPIC
-+CXXFLAGS += -Wall -I. -fPIC
- LDLFAGS +=
- LDLIBS +=
- 
-@@ -45,14 +45,14 @@ ZITA-ALSA-PCMI_H = zita-alsa-pcmi.h
- 
- 
- $(ZITA-ALSA-PCMI_MIN): $(ZITA-ALSA-PCMI_O)
--	g++ -shared $(LDFLAGS) -Wl,-soname,$(ZITA-ALSA-PCMI_MAJ) -o $(ZITA-ALSA-PCMI_MIN) $(ZITA-ALSA-PCMI_O) $(ZITA-ALSA-PCMI_DEP)
-+	$(CXX) -shared $(LDFLAGS) -Wl,-soname,$(ZITA-ALSA-PCMI_MAJ) -o $(ZITA-ALSA-PCMI_MIN) $(ZITA-ALSA-PCMI_O) $(ZITA-ALSA-PCMI_DEP)
- 
- 
- install:	$(ZITA-ALSA-PCMI_MIN)
- 	install -Dm 644 $(ZITA-ALSA-PCMI_H)   $(DESTDIR)$(PREFIX)/include/$(ZITA-ALSA-PCMI_H)
- 	install -Dm 644 $(ZITA-ALSA-PCMI_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-ALSA-PCMI_MIN)
- 	ln -sf $(ZITA-ALSA-PCMI_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-ALSA-PCMI_SO)
--	ldconfig
-+	ln -sf $(ZITA-ALSA-PCMI_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-ALSA-PCMI_MAJ)
- 
- uninstall:
- 	rm -rf $(DESTDIR)$(PREFIX)/include/zita-alsa-pcmi.h
-Index: zita-alsa-pcmi-0.2.0/apps/Makefile
-===================================================================
---- zita-alsa-pcmi-0.2.0.orig/apps/Makefile
-+++ zita-alsa-pcmi-0.2.0/apps/Makefile
-@@ -23,9 +23,9 @@ PREFIX = /usr/local
- SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
- LIBDIR = lib$(SUFFIX)
- VERSION = "0.1.0"
--LDFLAGS += -L$(PREFIX)/$(LIBDIR)
--CPPFLAGS += -DVERSION=\"$(VERSION)\"
--CXXFLAGS += -O2 -Wall -MMD -MP
-+LDFLAGS += -L$(PREFIX)/$(LIBDIR) -L../libs/
-+CPPFLAGS += -DVERSION=\"$(VERSION)\" -I../libs/
-+CXXFLAGS += -Wall -MMD -MP
- 
- 
- all:	alsa_loopback alsa_delay
-@@ -34,7 +34,7 @@ all:	alsa_loopback alsa_delay
- ALSA_LOOPBACK_O =	alsa_loopback.o pxthread.o
- alsa_loopback:	LDLIBS += -lzita-alsa-pcmi -lasound -lpthread -lrt
- alsa_loopback:	$(ALSA_LOOPBACK_O)
--	g++ $(LDFLAGS) -o $@ $(ALSA_LOOPBACK_O) $(LDLIBS)
-+	$(CXX) $(LDFLAGS) -o $@ $(ALSA_LOOPBACK_O) $(LDLIBS)
- $(ALSA_LOOPBACK_O):
- -include $(_ALSA_LOOPBACK_O:%.o=%.d)
- 
-@@ -42,7 +42,7 @@ $(ALSA_LOOPBACK_O):
- ALSA_DELAY_O =	alsa_delay.o mtdm.o pxthread.o
- alsa_delay:	LDLIBS += -lzita-alsa-pcmi -lasound -lpthread -lrt
- alsa_delay:	$(ALSA_DELAY_O)
--	g++ $(LDFLAGS) -o $@ $(ALSA_DELAY_O) $(LDLIBS)
-+	$(CXX) $(LDFLAGS) -o $@ $(ALSA_DELAY_O) $(LDLIBS)
- $(ALSA_DELAY_O):
- -include $(ALSA_DELAY_O:%.o=%.d)
- 
diff --git a/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.2.0.ebuild b/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.2.0.ebuild
deleted file mode 100644
index bc254d1853fb..000000000000
--- a/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="Provides easy access to ALSA PCM devices"
-HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/"
-SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-DEPEND="media-libs/alsa-lib"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/makefile.patch"
-}
-
-src_compile() {
-	tc-export CC CXX
-	cd "${S}/libs"
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)"
-	ln -s libzita-alsa-pcmi.so.0.2.0 libzita-alsa-pcmi.so
-	cd "${S}/apps"
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)"
-}
-
-src_install() {
-	cd "${S}/libs"
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)" DESTDIR="${D}" install
-	cd "${S}/apps"
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)" DESTDIR="${D}" install
-	cd "${S}"
-	dodoc AUTHORS README
-}
diff --git a/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.3.2.ebuild b/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.3.2.ebuild
index 033dc4432202..ba25be31b16d 100644
--- a/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.3.2.ebuild
+++ b/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 
 CDEPEND="media-libs/alsa-lib"
diff --git a/media-libs/zita-convolver/Manifest b/media-libs/zita-convolver/Manifest
index 79d3f2876f7a..71abafd89c37 100644
--- a/media-libs/zita-convolver/Manifest
+++ b/media-libs/zita-convolver/Manifest
@@ -1,10 +1,4 @@
-AUX zita-convolver-2.0.0-makefile.patch 1174 BLAKE2B 1206c7bd9ee592fc8110bf0fbcb8cedc377de3ff6c772d2d698c3dbf3a5561cc8f3bf389b8d2d312b80789a033d5009b81a772f88d24befada9833d9cefcd0a2 SHA512 6ee1d8520a570c159a61f3d1204168c79fac9506bb88090baa8dc1b2e8a1c935b1f983ecf8166e517fa82f7bdf01a9587ec66fa3bc2767d45ba9e989c48381a7
-AUX zita-convolver-3.1.0-makefile.patch 1283 BLAKE2B 14b6b799ff67218b482317ed64ba303437c53a6eae1d7d04f0bbd18d45f944cc2631fee6d59accff5cb990b923f2337e472ec713a1f087419600e73f2a94773a SHA512 732ec568f9f9daf67909be724690a681611e41d3e5ad84735ab1fb9a94e0540c48765d32bdffecc8548321e5dd1f9ae7155d9920654eabfc72158254662180f4
 AUX zita-convolver-4.0.3-makefile.patch 907 BLAKE2B ab142d1f19bf104cb0bb02d615f1611138859dd001062b675a7f1e716763749f464534e8b64a0793211e6a816ac35d4fad0af4fa8896b55e7024c3dd9910f462 SHA512 4f6ea8c861d8444e259a1dcd5d0ddb5980a36a396a6362bb2cd7e498dff2b368cd7b1458a54360255645b32561872cbbc59a8bfbd1ff71659f24329df51be702
-DIST zita-convolver-2.0.0.tar.bz2 12858 BLAKE2B 1801681e799a85cd9a5b6d724ea3928e379bcd4cde1e01a39dc714e9480bdc0dfbf777aa4230c42190fc9e98ee3f842f34bf5c65a53744ff6b977c231194bb51 SHA512 5e12e8785e3b3161e42bb3a65e63ec4d4d2d6fa5c11960e0843f3985d76d4f24d7a1d979d0a092dd0c5407b817b66e799da211fa0f7eb96f581ffc56950135ce
-DIST zita-convolver-3.1.0.tar.bz2 21485 BLAKE2B 7976bac136bef04091b76b55fd4afd5a18c7f269c1dbce8875bc7c8a50b652f3c2ddd3c5e71ae26896d906a17b78f2bcfab129c078c1d60f8871c9509bb173d7 SHA512 0003d4fffcc07b3e67d54996a63db35d537d97b26003e06afbeed19fba551d552d4d5a808a86b5c600f5254816c6b26db49f48e13bfa3c77d93d61956c479eb9
 DIST zita-convolver-4.0.3.tar.bz2 19591 BLAKE2B 3bd77cbc46d93c2200329451634dc48b94183aaa17034aa4b3dd03c33ad7982e9bed85e164f5c0e34666a1a6443199afe24222d41477368c4b366335e9767b91 SHA512 62d7841757f10c094e43ed755e187f947c5743f302ed2a1ee6064a850c18921466f4505d8a2a7b3ad23619db7f1ad7307e1dfb2e8a1e7685e60ece2ffff4f6ca
-EBUILD zita-convolver-2.0.0-r1.ebuild 958 BLAKE2B 29d71ecce58a60f5ccd52484fdaa6908a7bd0c65f5bb6e6c4b817f713fc49238847e43483e9e614141795626f8d64c0903e22e8cb1934e0cbab299d580cb8d00 SHA512 9a5d86ff5ebac7b440541e5d314c7ee0a87bc17c3a9b2f9c5b454203064cf15d0b4bedac91b1d50211285536391c866bf648f2f4f753557c5aa91ec49b74cbb4
-EBUILD zita-convolver-3.1.0.ebuild 1004 BLAKE2B 323f97cf35298f0803d54ca880f1ea9579d7ecd5bc5ce691f211188d0ce6405490f24a900c2038f4e6b1a1678e4c592c70965270f7678c2dd739f52331f6c8bf SHA512 8a56f6073c521e046299cb73b9fb6a91e8f4588e7f2b2d55160be83c4f55a09733c86ab847e111d794bc4d960e89e2dc608f206619b972bd9115f0ff72e0e525
 EBUILD zita-convolver-4.0.3.ebuild 740 BLAKE2B f4d6f1d4c70924dc799d3d7891b95bf8c2aa7330b7a998f57997140b0e172ba863a34a9a98c3be6c7761d975457fec35c0186f24635d2b333cf0dcfedb7e18b5 SHA512 b6788a671a26e322dd205996fb0d211e4e9e139167d93008224dd8c4291641dfca490983c45610b94119a0f4bc9c446ae607d42c23456e7954a977676c4a5bf0
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/zita-convolver/files/zita-convolver-2.0.0-makefile.patch b/media-libs/zita-convolver/files/zita-convolver-2.0.0-makefile.patch
deleted file mode 100644
index 46c44173e8ac..000000000000
--- a/media-libs/zita-convolver/files/zita-convolver-2.0.0-makefile.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- libs/Makefile.orig	2015-10-16 16:00:45.639918246 +0100
-+++ libs/Makefile	2015-10-28 15:52:17.539967709 +0000
-@@ -28,9 +28,8 @@
- DISTDIR = zita-convolver-$(VERSION)
- 
- 
--CPPFLAGS += -Wall -I. -fPIC -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O3
--CPPFLAGS += -mmmx -msse -mfpmath=sse -ffast-math -funroll-loops -fpermissive
--CPPFLAGS += -march=i686
-+CPPFLAGS += -Wall -I. -fPIC -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
-+CXXFLAGS += -ffast-math
- #CPPFLAGS += -DVECTORIZE 
- 
- LDLFAGS += 
-@@ -46,7 +45,7 @@
- 
- 
- $(ZITA-CONVOLVER_MIN):	$(ZITA-CONVOLVER_O)
--	g++ -shared $(LDFLAGS) -Wl,-soname,$(ZITA-CONVOLVER_MAJ) -o $(ZITA-CONVOLVER_MIN) $(ZITA-CONVOLVER_O) $(ZITA-CONVOLVER_DEP)
-+	$(CXX) -shared $(LDFLAGS) -Wl,-soname,$(ZITA-CONVOLVER_MAJ) -o $(ZITA-CONVOLVER_MIN) $(ZITA-CONVOLVER_O) $(ZITA-CONVOLVER_DEP)
- 
- 
- install:	$(ZITA-CONVOLVER_MIN)
-@@ -54,8 +53,8 @@
- 	install -d $(PREFIX)/$(LIBDIR)
- 	install -m 644 $(ZITA-CONVOLVER_H) $(PREFIX)/include
- 	install -m 755 $(ZITA-CONVOLVER_MIN) $(PREFIX)/$(LIBDIR)
--	ldconfig
- 	ln -sf $(ZITA-CONVOLVER_MIN) $(PREFIX)/$(LIBDIR)/$(ZITA-CONVOLVER_SO)
-+	ln -sf $(ZITA-CONVOLVER_MIN) $(PREFIX)/$(LIBDIR)/$(ZITA-CONVOLVER_MAJ)
- 
- 
- clean:
diff --git a/media-libs/zita-convolver/files/zita-convolver-3.1.0-makefile.patch b/media-libs/zita-convolver/files/zita-convolver-3.1.0-makefile.patch
deleted file mode 100644
index d8f5af24fcdd..000000000000
--- a/media-libs/zita-convolver/files/zita-convolver-3.1.0-makefile.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: zita-convolver-3.1.0/libs/Makefile
-===================================================================
---- zita-convolver-3.1.0.orig/libs/Makefile
-+++ zita-convolver-3.1.0/libs/Makefile
-@@ -32,8 +32,7 @@ VERSION = $(MAJVERS).$(MINVERS)
- 
- CPPFLAGS += -I. -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DENABLE_VECTOR_MODE 
- CXXFLAGS += -fPIC -Wall
--CXXFLAGS += -ffast-math -funroll-loops -O3
--CXXFLAGS += -march=native
-+CXXFLAGS += -ffast-math -funroll-loops
- LDLFAGS += 
- LDLIBS +=
- 
-@@ -47,7 +46,7 @@ ZITA-CONVOLVER_H = zita-convolver.h
- 
- 
- $(ZITA-CONVOLVER_MIN):	$(ZITA-CONVOLVER_O)
--	g++ -shared $(LDFLAGS) -Wl,-soname,$(ZITA-CONVOLVER_MAJ) -o $(ZITA-CONVOLVER_MIN) $(ZITA-CONVOLVER_O) $(ZITA-CONVOLVER_DEP)
-+	$(CXX) -shared $(LDFLAGS) -Wl,-soname,$(ZITA-CONVOLVER_MAJ) -o $(ZITA-CONVOLVER_MIN) $(ZITA-CONVOLVER_O) $(ZITA-CONVOLVER_DEP)
- 
- 
- install:	$(ZITA-CONVOLVER_MIN)
-@@ -56,7 +55,7 @@ install:	$(ZITA-CONVOLVER_MIN)
- 	install -m 644 $(ZITA-CONVOLVER_H) $(DESTDIR)$(PREFIX)/include
- 	install -m 755 $(ZITA-CONVOLVER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)
- 	ln -sf $(ZITA-CONVOLVER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-CONVOLVER_SO)
--	ldconfig
-+	ln -sf $(ZITA-CONVOLVER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-CONVOLVER_MAJ)
- 
- clean:
- 	/bin/rm -f *~ *.o *.a *.d *.so.*
diff --git a/media-libs/zita-convolver/zita-convolver-2.0.0-r1.ebuild b/media-libs/zita-convolver/zita-convolver-2.0.0-r1.ebuild
deleted file mode 100644
index 4bea16d309c3..000000000000
--- a/media-libs/zita-convolver/zita-convolver-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="C++ library implementing a real-time convolution matrix"
-HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"
-SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="cpu_flags_x86_sse"
-
-RDEPEND="sci-libs/fftw:3.0="
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P}/libs
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
-	# upstream defaults to this on x86 but patched out of the Makefile
-	# try to reenable optimisation for x86 and allow building on other arch's
-	use cpu_flags_x86_sse && append-flags "-msse" "-mfpmath=sse"
-
-	emake CXX="$(tc-getCXX)"
-}
-
-src_install() {
-	emake PREFIX="${ED}/usr" LIBDIR="$(get_libdir)" install
-	dodoc "${WORKDIR}/${P}/AUTHORS"
-}
diff --git a/media-libs/zita-convolver/zita-convolver-3.1.0.ebuild b/media-libs/zita-convolver/zita-convolver-3.1.0.ebuild
deleted file mode 100644
index 22c6eb0b7048..000000000000
--- a/media-libs/zita-convolver/zita-convolver-3.1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="C++ library implementing a real-time convolution matrix"
-HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"
-SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="cpu_flags_x86_sse"
-
-RDEPEND="sci-libs/fftw:3.0="
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P}/libs
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
-	# upstream defaults to this on x86 but patched out of the Makefile
-	# try to reenable optimisation for x86 and allow building on other arch's
-	use cpu_flags_x86_sse && append-flags "-msse" "-mfpmath=sse"
-
-	emake CXX="$(tc-getCXX)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)" install
-	dodoc "${WORKDIR}/${P}/AUTHORS" "${WORKDIR}/${P}/README"
-}
diff --git a/media-libs/zita-resampler/Manifest b/media-libs/zita-resampler/Manifest
index dac695688c08..b8b179d0db8f 100644
--- a/media-libs/zita-resampler/Manifest
+++ b/media-libs/zita-resampler/Manifest
@@ -1,4 +1,4 @@
 AUX zita-resampler-1.6.2-makefile.patch 3036 BLAKE2B 595ebbae53d4c0ec344d02f4602eec599e9d301a308384f3a4d3c99a9e64111f7b183ccee92c9f7e069a00275f3304712b9644409bbe23030961aeeadf9c8b52 SHA512 a7bb5621c761ab36502303053872782cf275e55b248f0387765c1251ab43c58577862c5fc2b321f6746fd7ec0a8e7c7766bcac290cb204f2e94947aa27cb1992
 DIST zita-resampler-1.6.2.tar.bz2 125539 BLAKE2B d2e04fb5e0efbde3432ce973df59a11d2a184146d124b662712a5de2d9c243f6564899f190f7a7b68a9e01bcaab05c92b91ebcbf942473134a12a85e4e08c603 SHA512 d547419dd222c8a399d8f196efa1ec88a3f781275b696ae2fe1bb6e2fc329285affb8aace85972c304ad256becc4a155534dd5ef4ce3c57cbc9dcca0122b670c
-EBUILD zita-resampler-1.6.2.ebuild 864 BLAKE2B f4e3d81cec30c0b8c93aa7e7d878e06e5b854aee3dcfde141ef648b220a734f576c6086badff147b5532c39942ffe7ab788fceb174a5f647c3284961970d40b8 SHA512 b6189ad721dec36e6d6dcb5254762d6ce0e6ef6c88bd833784487ceae3994504d6e182a529156af42a53f00c1bdb65216ac7cd8311c67b7b182a261dca83567e
+EBUILD zita-resampler-1.6.2.ebuild 863 BLAKE2B 41a5b1b4e8be9edaf741a212c53d5b3f005ae481f79cdae4676fe53c1df1a15b7ffca160e3787d7b21a92ff49c33b4ea62c902083e85f462e37e01d8b35840d8 SHA512 9490dd14cfe852bf23e2feec038119b44b08751176bbaf069e8b68dde3fe592b3bce0a4d809d12d7cdf0d8e253476e4a7b3ff67251c146a8e06f790598fa1b4c
 MISC metadata.xml 692 BLAKE2B fad59853ee366f99db8e9c0dfa932c564eb0d8194808b809182ce64f286d39de2a363eb86f192d124adbbc92b1e7801a9fa5be0752fad1725f147d468484f589 SHA512 be926699e99357b49f5fe90a78c60b0fd701229fd603dca5988b40611ae5bb0c271a6a346469e0ebaff62bdc718c400954491ccc2557e5799a4fba08c67207cf
diff --git a/media-libs/zita-resampler/zita-resampler-1.6.2.ebuild b/media-libs/zita-resampler/zita-resampler-1.6.2.ebuild
index 754fa1dfdde9..8632095fbd83 100644
--- a/media-libs/zita-resampler/zita-resampler-1.6.2.ebuild
+++ b/media-libs/zita-resampler/zita-resampler-1.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0/1"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="tools"
 
 RDEPEND="tools? ( media-libs/libsndfile )"
diff --git a/media-libs/zxing-cpp/Manifest b/media-libs/zxing-cpp/Manifest
index 857b343a08ea..7eafc590eab2 100644
--- a/media-libs/zxing-cpp/Manifest
+++ b/media-libs/zxing-cpp/Manifest
@@ -1,3 +1,3 @@
 DIST zxing-cpp-1.0.7.tar.gz 128659323 BLAKE2B 3b5d27136fe0d25ff27ed7aa8ca7d15e91a2f4c99c145143789b5795bb4af1f0a501697201307779b315af4417008123f076debb6178f51542ac3495405fed01 SHA512 e6597157099e478c2afad413e8dc3347369aef6e1a76cff331c4d71f178be97dde23e8fe89c7147eab034e2aecf1660a66e2a951f60c32d2fb67635033c1a0c8
-EBUILD zxing-cpp-1.0.7.ebuild 409 BLAKE2B 9174914d08de504cef67076d05fd5234e7c3d2ad2cf07de073aa9de23dade2883a8f071e550530c7baaab4b2201e3af58276243f2bafbf430b5ba3d705dc209d SHA512 0359092f0ea1fbc386e1eed066dddf6dad40e7e27402d7bc5c85247e3faf75e5525f1ceacf7c5efbd909ebf244f3df2333c1c2f7224c190ed39ef3a4b7e872e8
+EBUILD zxing-cpp-1.0.7.ebuild 403 BLAKE2B 1c905c23819cebaaea528d47f1ab0312eca3cb2546687cb70e20be2508c6c74134c7d83624f886f2e1d72608b9e18f178c3124df0dd3c7391768418b74197ddf SHA512 fa0153ea2effae8115c0d58c7283153b1ba7ba1ea270b29ef32ae72dd711252d99ed241a2f53fd5a91d1a29ec5771b1f83ec1819425127a20d2748b2322cbcb7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/zxing-cpp/zxing-cpp-1.0.7.ebuild b/media-libs/zxing-cpp/zxing-cpp-1.0.7.ebuild
index 1632e5bcc706..8a437d07071c 100644
--- a/media-libs/zxing-cpp/zxing-cpp-1.0.7.ebuild
+++ b/media-libs/zxing-cpp/zxing-cpp-1.0.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="C++ Multi-format 1D/2D barcode image processing library"
 HOMEPAGE="https://github.com/nu-book/zxing-cpp"
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
commit	21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree	e1810a4b135afce04b34862ef0fab2bfaeb8aeca /media-libs
parent	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)