gentoo resync : 15.12.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
commit: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree: 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /media-libs
parent: b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
421 files changed, 4123 insertions, 5368 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index cb539baafa58..565adb1bd75e 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index 89b1a601fc06..c0e45cf4bf28 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -7,9 +7,7 @@ AUX allegro-4.4.2-shared.patch 247 BLAKE2B d5bada972b4c2555f9ad9da18b30b224f5aa7
 AUX allegro-4.4.2-static-func.patch 416 BLAKE2B 3f7436cf87dd66c6ac336a3d8be8901a4679ae3054c1fe8ecb1012b5da883d3bfffc41c7421af6d95171e24e5ed864c8a6b029a9b387ad76c082437b406a8891 SHA512 ad1cd77c66f75192ccf5048f0742b9f420e611b7790576c3915721d104299b9e91619451d615d3653737bb2333b1cb170acb3202f0293be92b8be3371445ac19
 AUX allegro-4.4.2-underlink.patch 456 BLAKE2B ede5f9e5195b1c54460f584924afd9daa64c795a0e083499084c7377f1989bc0df621339ff3988bc2a997447050ebf3fe0f5055fbcef8ee21dd66dfdf1ca003a SHA512 0e873aa6d1b6e72e2e4b46276f0a2a4ffe816c8d0b6a10dd9462cfed826b40d7b3461ebe51e595e9f2e7a5d2f19fd261b1ad0e05f60b77717224911e59a537d0
 DIST allegro-4.4.2.tar.gz 4674902 BLAKE2B 9f43fad416348425692481524f6c15808ee03946d93df4a072a46557817ccd5f6ae7eede908ca4a02a0a9e49f9a7c42909c48c14923b2155d3999ff370401006 SHA512 ad4bc1c15fc83bc8a019031fed82f37a793664bb6683cf023ec05fd9cd945f00f43764f3126892426036249c63afa5678fb4906407bb325ce5827b36aee0fa86
-DIST allegro-5.2.4.0.tar.gz 7822903 BLAKE2B 50538e27276fbe1572a660b3f1396bdb9b542dc2aafaa819a4108e0e2771731cb6924cf1d0b7a7bfea1ff5c12b4772ff58dc571c81bb6a601d31a2083f5f9bea SHA512 c5f80191005165331635464ffd345369943d37dcb55345176a7171614e12826b25d9d74ab656333302d6682d404f1b46a5d94c0dd23d7873151e6e488d62c776
 DIST allegro-5.2.5.0.tar.gz 7849326 BLAKE2B 8d8995b9ad252b81c534099ffd91d81bbdcf4a34f7ca7c4fb7dd97e5c075869c212fa68445a5fe479a675d755ad0414976c11cbc112ecdd61f1fa09704957b21 SHA512 c6341396ad7340233c1297ed122095e5c2d129a32da2350b4bb39c4b74f8d56d57ec4e608defec471d63fff51d786f0a9f3844be82f81cdb3d48d5bc49908b12
-EBUILD allegro-4.4.2-r2.ebuild 2710 BLAKE2B e3355fae46eaeed67fd426adaffd704db607e2d5d3e0b5f158c131ea5034f7003e41e52772525d0e29d859c5a7788bcbc253a60208e6632d0cc9c0e236b2fe92 SHA512 2bb250aabb2a1d048ac2a0bb2fd9dfa3774a23539488ef9d79187bfb33e67c6aedcec6386b052d41047b625d0f06bd0328e8e3426cf7e8eeb742845ce25bacd4
-EBUILD allegro-5.2.4.0.ebuild 2704 BLAKE2B 00be6767ea9561888a856b5645d62b50b35d52881cfa39e0914e60bffb55409db6eb9c81280deb14307140527830428eb638221dee672eb545912946b04479a4 SHA512 6ed0efe4520dada386b2bf29b660696606afe69a723f64f699980a103e5a4b3206724dee9f4c6c77e43009146747973880ad96610cf410b6f5c698904d6a61e6
-EBUILD allegro-5.2.5.0.ebuild 2792 BLAKE2B c68cd10374a280e4e230954b1843c3e0c5d5c3854da9c7309bb7ffeaffeae8d8c69938aefb4dd3cec619f3de54da34b3d4b5aeb5a49da9696827cd395591bddd SHA512 d9771f255e1ce41b34c0c880bbcc8fed5ad81101b0beb57b2fa0d27dc648f73450de07376b08e9ccfb1bb2c28e278bfdd2889c1fe815995898b465b693c36d75
+EBUILD allegro-4.4.2-r2.ebuild 2737 BLAKE2B 53d1da512860d07ae86685094c73795eff384dccac3bfdcaa14e766300043289163cf721ff53abcc826070182eb14bef098fcadb2cda4730cd6042ed76116d4c SHA512 947594d6b3dcc1df3cb7359d41ddac48b8095933aa82dc5e064c92534e94d380ff0b65896a5558b82c11b7149c5f4dd552017b247c35b233318a6e5b010cff0c
+EBUILD allegro-5.2.5.0.ebuild 2815 BLAKE2B f9e0fa04cef9144f57076184248d86aa7a2db28e2c3bb31c34abb7f3a06d1f6130bfc45e041293378b42854fbefdf0cf9718d709b7b1e73b79365d76ddfebf11 SHA512 09fd35132056411a1e45080ecf97563f52df1bcfadc2557d72dc954fbebe27f352cb7d11c54824063a8335fcf6a3f3866b00d52f43123c2b1eacec6373b981f0
 MISC metadata.xml 1034 BLAKE2B c1cdd935feae4561903bde181428ef0d71743f85e7756f507087528641471b4af3d1339758c3d829f8244b5cec7cc74bb7563699b9e5b05146ae4c6abe8dd5af SHA512 21301cc66fe94a4d728900cd5856d3e0d27507b1d340e36246c183b13232cb7f9c9da9f8b20428bd387c7216a892dce169c2bc885caabacb08a32892faffc994
diff --git a/media-libs/allegro/allegro-4.4.2-r2.ebuild b/media-libs/allegro/allegro-4.4.2-r2.ebuild
index 08dd7f1068c6..0387f700f4a8 100644
--- a/media-libs/allegro/allegro-4.4.2-r2.ebuild
+++ b/media-libs/allegro/allegro-4.4.2-r2.ebuild
@@ -14,6 +14,7 @@ LICENSE="Allegro MIT GPL-2+ ZLIB"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ~mips ppc ppc64 x86"
 IUSE="alsa fbcon jack jpeg opengl oss png svga test vga vorbis X"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	alsa? ( media-libs/alsa-lib )
diff --git a/media-libs/allegro/allegro-5.2.4.0.ebuild b/media-libs/allegro/allegro-5.2.4.0.ebuild
deleted file mode 100644
index ec269bd77e84..000000000000
--- a/media-libs/allegro/allegro-5.2.4.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="Cross-platform library aimed at video game and multimedia programming"
-HOMEPAGE="https://liballeg.org/"
-SRC_URI="https://github.com/liballeg/allegro5/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD ZLIB"
-SLOT="5"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="alsa dumb flac gtk jpeg openal opengl opus oss physfs png pulseaudio test truetype vorbis webp X xinerama"
-
-REQUIRED_USE="X? ( opengl ) xinerama? ( X )"
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	dumb? ( >=media-libs/dumb-0.9.3-r2[${MULTILIB_USEDEP}] )
-	flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
-	gtk? ( >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}] )
-	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
-	opengl? (
-		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	)
-	opus? ( media-libs/opus[${MULTILIB_USEDEP}] )
-	physfs? ( >=dev-games/physfs-2.0.3-r1[${MULTILIB_USEDEP}] )
-	png? ( >=media-libs/libpng-1.5.18:0=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
-	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
-	webp? ( media-libs/libwebp:0=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-	)
-	xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	x11-base/xorg-proto
-"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/allegro5/allegro_native_dialog.h )
-
-src_configure() {
-	local mycmakeargs=(
-		-DWANT_ALSA=$(usex alsa)
-		-DWANT_DEMO=OFF
-		-DWANT_EXAMPLES=OFF
-		-DWANT_FLAC=$(usex flac)
-		-DWANT_IMAGE_JPG=$(usex jpeg)
-		-DWANT_IMAGE_PNG=$(usex png)
-		-DWANT_MODAUDIO=$(usex dumb)
-		-DWANT_NATIVE_DIALOG=$(usex gtk)
-		-DWANT_OPENAL=$(usex openal)
-		-DWANT_OPENGL=$(usex opengl)
-		-DWANT_OPUS=$(usex opus)
-		-DWANT_OSS=$(usex oss)
-		-DWANT_PHYSFS=$(usex physfs)
-		-DWANT_PULSEAUDIO=$(usex pulseaudio)
-		-DWANT_TESTS=$(usex test)
-		-DWANT_TTF=$(usex truetype)
-		-DWANT_OGG_VIDEO=$(usex vorbis)
-		-DWANT_VORBIS=$(usex vorbis)
-		-DWANT_IMAGE_WEBP=$(usex webp)
-		-DWANT_X11=$(usex X)
-		-DWANT_X11_XINERAMA=$(usex xinerama)
-	)
-
-	cmake-multilib_src_configure
-}
-
-src_install() {
-	local HTML_DOCS=( docs/html/refman/. )
-	cmake-multilib_src_install
-
-	dodoc CHANGES-5.0.txt
-	doman docs/man/*.3
-}
diff --git a/media-libs/allegro/allegro-5.2.5.0.ebuild b/media-libs/allegro/allegro-5.2.5.0.ebuild
index 355077dbfb22..be007eeb7fb5 100644
--- a/media-libs/allegro/allegro-5.2.5.0.ebuild
+++ b/media-libs/allegro/allegro-5.2.5.0.ebuild
@@ -11,8 +11,9 @@ SRC_URI="https://github.com/liballeg/allegro5/releases/download/${PV}/${P}.tar.g
 
 LICENSE="BSD ZLIB"
 SLOT="5"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="alsa dumb flac gtk jpeg openal opengl opus oss physfs png pulseaudio test truetype vorbis webp X xinerama"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="X? ( opengl )
 	xinerama? ( X )
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index dff695f7b004..046610e6a836 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,10 +1,13 @@
 AUX alsa-lib-1.1.6-missing_files.patch 5349 BLAKE2B 9ce6d529b78aa90dd5c507173f6a4b55f7b45a1e5e005760c07b3b000aef62c17ccd4f5815135c511006565e182619d2535c4eebe07d7825e4d871b6d9365d1d SHA512 879d11cf369a1aab2cc86c72ba90ad3dfeced2395c4cafda064a89a8f7790f032d4bc1c9065a86be28a3f7656bf91b4148df4e59d962ba4470221dc13a4fec90
+AUX alsa-lib-1.2.1.1-ucm_add_asoundlib_h.patch 720 BLAKE2B 9f160f4e4976b71ed69f8dac448978c3707e8cfcbbe4818d713ba0f7ab4eb15f5c1ecf4043abd821d613a1aa72e1f966fa6a179dde68b480b58cd5bffc507e57 SHA512 bbfa90c089bfd1a85cbeb4bb4200ae89795116bfda13e3ef7c47d7807d8c5236b7bbc5864878b00ad6243e34b06f9cf400b15dd5c1faa903d3e1544d47104028
 DIST alsa-lib-1.1.2.tar.bz2 947423 BLAKE2B 09cd6a625d8f681c5515fd925191fb5468158ed77cc3878c076f4344e4d8f7b15e9872d3d6635710049ca14199851f2343246e94810fe2a0bb0d1e02915c941e SHA512 a6c6675b1fd86955ef5072b9e6090795fc6b0b16f32481bece049e5f100e689be48b6416ff7cf36abfc67e0b94f420e08c15ff13a9701987d6bb69a8fa567e8a
 DIST alsa-lib-1.1.8.tar.bz2 1002562 BLAKE2B a531ab501943924d007f7ae0e4489deea805ccbc8f2f02d3ee392aa2dbe54ffe31f58ee1744308f851a68f693c83125088708e901d0d83e4a7a5f644ef448aa3 SHA512 50ae107c6efe8200b4c41e0463e099d16e149332f1d3a22c3e81d3e7d980b7f93f3610fc9711ef62067caeb1054e7ea612ba3903bf8a91ebeffa48687cf80eed
 DIST alsa-lib-1.1.9.tar.bz2 1058187 BLAKE2B 60454be162a0f36334602586762f8ce657d2883636bcb65ae91dedce62297bd40f3dbdc6213ef773542708b367f8796e143b1fc987c40de6d5d5a69a648f6b18 SHA512 402e39cca82d17555e3e52ef06b8ed9dcf58531da393809a7b5cf18658299fa90ee8a60bfc5213482d7a02b13140c441f1333b144556f44ab4adb786a2fb3c49
-DIST alsa-lib-1.2.1.tar.bz2 1003711 BLAKE2B 6aa34238a07c9da2c1fe86e51111018541a647779e0ab4a5ecbfc4a8dcfdc168d5d921ec1c5ae4822227a31ea317cccc41a5c23f19d0e92a6302bba81bfa1423 SHA512 a5bd60ed0cfca3911db534364554412c479d2cb6ded6c8e7011d2510797a6cbd10613d6e1d42cb589afec8e7408c8fd5465360ddd14df8701af7dc414961c19e
+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 2071 BLAKE2B 529064b0608b135c5514f802ac6eae8184980d809c59082f71e4ae44c5853e8d29b48cdb6c489498dbd9ed4a8ef6b44546d47c1ba182cb1eecaa3a70480fabaf SHA512 93ffab825893c1ea5189021d4d7e8df6e267694d4628b2d700c34fbde0bda026d6268e754f5af853a2c3b9f3477eef0a4d8a153923712fe446ea806c8d7b3b55
+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.ebuild 2095 BLAKE2B 13615b3dd4e6971800d51678e4cec2026261a25f92ebbf88d8f3e2bed76ccc3adf3c96a724c61b803ca698661676b53bce5a51f2b37a2a76d7d3f3393e25a055 SHA512 b1499113fdbb948563df08095a8b81a5e761b2a0663314fd4b4e475e08d6b140c9aaded17fc5bc4879c3db2079759b5d4408113e164d3314a509d9710239723c
+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
 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 6bd44f7bd1e4..57d9380777de 100644
--- a/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc elibc_uclibc python +thread-safety"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.1.1-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.1.1-r1.ebuild
new file mode 100644
index 000000000000..704317dcf5a9
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.2.1.1-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit autotools multilib multilib-minimal python-single-r1
+
+DESCRIPTION="Advanced Linux Sound Architecture Library"
+HOMEPAGE="https://alsa-project.org/"
+SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="alisp debug doc elibc_uclibc python +thread-safety"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	doc? ( >=app-doc/doxygen-1.2.6 )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" #652422
+	"${FILESDIR}/${P}-ucm_add_asoundlib_h.patch" #700870
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
+	# https://bugs.gentoo.org/509886
+	if use elibc_uclibc ; then
+		sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die
+	fi
+	# https://bugs.gentoo.org/545950
+	sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-maintainer-mode
+		--disable-resmgr
+		--enable-aload
+		--enable-rawmidi
+		--enable-seq
+		--enable-shared
+		# enable Python only on final ABI
+		$(multilib_native_use_enable python)
+		$(use_enable alisp)
+		$(use_enable thread-safety)
+		$(use_with debug)
+		$(usex elibc_uclibc --without-versioned '')
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake
+
+	if multilib_is_native_abi && use doc; then
+		emake doc
+		grep -FZrl "${S}" doc/doxygen/html | \
+			xargs -0 sed -i -e "s:${S}::"
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	if multilib_is_native_abi && use doc; then
+		docinto html
+		dodoc -r doc/doxygen/html/.
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f \( -name '*.a' -o -name '*.la' \) -delete || die
+	dodoc ChangeLog doc/asoundrc.txt NOTES TODO
+}
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild
index ba7e99bdece2..ba7e99bdece2 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.1.1-ucm_add_asoundlib_h.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.1.1-ucm_add_asoundlib_h.patch
new file mode 100644
index 000000000000..3c6072b8c3dc
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.2.1.1-ucm_add_asoundlib_h.patch
@@ -0,0 +1,25 @@
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Sat, 23 Nov 2019 14:38:35 +0000 (+0100)
+Subject: ucm: use-case.h - add <alsa/asoundlib.h> include
+X-Git-Url: https://git.alsa-project.org/?p=alsa-lib.git;a=commitdiff_plain;h=1a4b362115b5e1bb4f5b888919ffd11736adbf0c
+
+ucm: use-case.h - add <alsa/asoundlib.h> include
+
+It is required for snd_ctl_elem_id_t and snd_mixer_selem_id_t.
+
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+
+diff --git a/include/use-case.h b/include/use-case.h
+index 8a37121..80073ef 100644
+--- a/include/use-case.h
++++ b/include/use-case.h
+@@ -42,6 +42,8 @@
+ extern "C" {
+ #endif
+ 
++#include <alsa/asoundlib.h>
++
+ /**
+  *  \defgroup ucm Use Case Interface
+  *  The ALSA Use Case manager interface.
diff --git a/media-libs/alsa-oss/Manifest b/media-libs/alsa-oss/Manifest
index 24eee5b5fe71..83dff860641d 100644
--- a/media-libs/alsa-oss/Manifest
+++ b/media-libs/alsa-oss/Manifest
@@ -4,5 +4,5 @@ DIST alsa-oss-1.1.6.tar.bz2 291588 BLAKE2B 2db4b6d80a17518aeadff8a8f12a40eb4f9e5
 DIST alsa-oss-1.1.8.tar.bz2 291800 BLAKE2B 47124c4edd14878b202e6ff6866b5441ffa0991ac3011a3db1efcd1dd2a0c27c9f2b8b38c2a51e8b46cb5714a97393a462154cdfaf89f1238244f7b2635a7740 SHA512 42966af0ca1be33b4ab1e20b2e3320056ad6caf6ecc5ecde3ae19571809a2fa924dd91d9b2a5d5b6f345b29d937b079400d2a165dbe2b8a33b857cd406c4ac7c
 EBUILD alsa-oss-1.0.28.ebuild 894 BLAKE2B 6e0b285df68d4521a637b974fd733a2b69a543ffc8a6421ac3d0044470b254f900118bf1a31dbba9601fe1ded18de55c8733e4a86865cc8278b4d9fed536ddee SHA512 4512d2e7d062e878be3fd9bfd4aee8d741cb07050e6a09398f64a6e41d2fda8ee35aa7ad52b68458f41744fc4376382da00e880558f3dcd96e58e19d1c6ffe2d
 EBUILD alsa-oss-1.1.6.ebuild 932 BLAKE2B e1387fb2b563da837866cefb6c602c5812caf7fc37038cca43cfe5a2879155531c519db72ff0c79b0b93c3829b89c5cc578ef192ef7db46f9813f829a2efa489 SHA512 8cd3d6fda6985870eab8fa0129d2ce125a8467fcd0875a28515f5e3fe2a4985865539d7b384538a7b1d65c0a938b55394290b5e8195950c7c3118764830ccb49
-EBUILD alsa-oss-1.1.8.ebuild 1034 BLAKE2B cc3843326253f600b76c3d035d6a4a34454e3f49d09a127a848766e386cf7f89e9f678a78220e29c9ecb79eec245c78eb0c2d934aacd6490f87d850f61272183 SHA512 efd41162c78313402f8cfee0d6bd041047d0e26250ac0d735b83c034aa65bdd9e662f213b25d2b8dfe99add028c75dde81082421b049c9ab5ed794cbcae867c0
+EBUILD alsa-oss-1.1.8.ebuild 1033 BLAKE2B aaca1b6e905e433b6537d8cc562b0cb35d88798bd886ec478299fa46cca25e412180580c7d4d581226bf7179c032c0311dea01f1e5aa2c4b0ddfdd275883d4a6 SHA512 a4579b5cb196c120bcd0b721c271491fb7ae973efd6e2bd20d172426988fc16f4b95b6e6865e7f5cb9aab6af5bd142a7d7bbde6c38ee6b31598a7519c158ec51
 MISC metadata.xml 217 BLAKE2B ee5131ede673a41d69ab787db1d05f6d64afc4d625294c8314d0db362124dddca5b31ff6d29cc41ebb3f464f4665e2bc9bccfac84f69231ebe819d262e8ed7c7 SHA512 783364e33af22e28ba41661e2380968c95f6464ae9ebb300d542ca159a54c4e53cf5e8b1053a72e75902f433e90fa26f6456fa127fca6daa44542bda57779e5a
diff --git a/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild b/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
index 865ec9ed9ab5..3f5ffeb98e28 100644
--- a/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
+++ b/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/oss-lib/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 RDEPEND=">=media-libs/alsa-lib-${PV}[${MULTILIB_USEDEP}]"
diff --git a/media-libs/alsa-topology-conf/Manifest b/media-libs/alsa-topology-conf/Manifest
index 7832a0505fb5..f0ca33bf583b 100644
--- a/media-libs/alsa-topology-conf/Manifest
+++ b/media-libs/alsa-topology-conf/Manifest
@@ -1,3 +1,3 @@
 DIST alsa-topology-conf-1.2.1.tar.bz2 5377 BLAKE2B 95cd1074068ba85e6c6b74d65f7ddc40e182426cff69c7765689edcaca3609a249638c70e5f92c889b3c76ea662e7e43e355af4573acb3fc293026392f614522 SHA512 ed86e7372f887a2e13596ca7456da1db84ff05d01f98d80c403263673d2c0f247834bdc9edbeb62231ca1dc6b9792dade87672d905303a8e0fa462c1fac1b7fd
-EBUILD alsa-topology-conf-1.2.1.ebuild 455 BLAKE2B 57e3fa474bfb485fa2271f7af2da51ea7f943e49cbb35f5087dd9bf7f74da196b5a81539c6e5f8140a14641f7a11ee8b225a6a4abea7988f03eebeb84bfee00c SHA512 b414934678e0b3592dc28199250334242ae999a31e46fcad05517ec5d34cb4918e246606e4ab8d8bb18c767b290b0c1b715498076cfb5cd1e5213f03f51858d2
+EBUILD alsa-topology-conf-1.2.1.ebuild 460 BLAKE2B 738edf3066973365edcc139985115de6ce5c1f3c13b16b0a9f4eea75fda285eba209cdb4ef9640388861f38e84463b79c19764bef5560ab92843219f2fad1f1b SHA512 4d143b345e5181e23bd4f2e39e7451c7705fc500fa503a8503071dc6f78a20011b52ccd382e16d4c8cbfc722f8ea42f10c791447fe22dd2e182db78b0b75685c
 MISC metadata.xml 329 BLAKE2B 05575ce410f512de7fb1849f45c1bf4825ddcd8185e4c8a37c0dae08428baec9e909e4c7891558acec9a49397d5322444853d1382b8e5a5e3d849c56553efd78 SHA512 2ae6177fd9279fbf5167b90741750f4b2ad83f762dc385eef8af6c009d69d6a775a2d56c0767100187a6d64b5eee7df4495cc4d218b510e530507fc8bcb83611
diff --git a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.1.ebuild b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.1.ebuild
index e2abfdd3e339..54245fb4c1ef 100644
--- a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.1.ebuild
+++ b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-DESCRIPTION="ALSA ucm configuration files"
+DESCRIPTION="ALSA topology configuration files"
 HOMEPAGE="https://www.alsa-project.org"
 SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 LICENSE="BSD"
diff --git a/media-libs/alsa-ucm-conf/Manifest b/media-libs/alsa-ucm-conf/Manifest
index 9714f3cea14f..e1619743f2be 100644
--- a/media-libs/alsa-ucm-conf/Manifest
+++ b/media-libs/alsa-ucm-conf/Manifest
@@ -1,3 +1,5 @@
+DIST alsa-ucm-conf-1.2.1.2.tar.bz2 14660 BLAKE2B dec3e11d2aef17344eb1a11987eb9b6b53606fe278bf84523cf6a829799b264b6a0bfd0e6af46c7ce834f34584078fbd8e1a78c667c64f51e0ef67e448264705 SHA512 e498c4355a765eb6ecd03f03611c8904f757bf73619a3c8159c044f80a4c3ab5cbd343692c227e13c6da307fc2e35259b4726902d3ab8e03eff11aa1c74027d5
 DIST alsa-ucm-conf-1.2.1.tar.bz2 14593 BLAKE2B 544d513dc578e8d5a684fe953421880684c7b0472a05b0f6a5b3994e2cbf6af7a319856f032557cbd1215fcb6565a31cbbeb577f211773757c55b29ba65ceb08 SHA512 af1f462199fb30438c7b85e34d9dc74d283843e67e52ef138346e5d83098e4752156d746b107de92390e82eb2a78b87dc3920362b9dbd5e1153f6f8a39683534
+EBUILD alsa-ucm-conf-1.2.1.2.ebuild 454 BLAKE2B 81ac047a6e226f13d293634a595acdf50e64df6871b83f849f01693091caad84d44d1a0df010447400797e98dc2801a2306139a539a4b0bdb6f9c91f8a078a59 SHA512 fe3f0c7b94dac038d70c26485ff14e6e21098a406f3478ddfa9ad55f8df8d56f4e455374895c1c6e2b7850a68b3b81f8f8bf992b5855f8c0730c965860f8babf
 EBUILD alsa-ucm-conf-1.2.1.ebuild 454 BLAKE2B 81ac047a6e226f13d293634a595acdf50e64df6871b83f849f01693091caad84d44d1a0df010447400797e98dc2801a2306139a539a4b0bdb6f9c91f8a078a59 SHA512 fe3f0c7b94dac038d70c26485ff14e6e21098a406f3478ddfa9ad55f8df8d56f4e455374895c1c6e2b7850a68b3b81f8f8bf992b5855f8c0730c965860f8babf
 MISC metadata.xml 324 BLAKE2B 8c9dd8aec6c9ed94966ecbce2a5db369f6d9c76751a77c70ca425d2a8d5cf54f15c6a211c553b9159d798e812e59b6f98505951290edc75ce92fe9e48aeae50d SHA512 84d140218362decc45a6474ac04c5e461730718051b8b0c608165a1ba2263cc91bd700fb25f98f76015949fcd5917822876dce13c17d89410ee7f5a648456c4b
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.1.2.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.1.2.ebuild
new file mode 100644
index 000000000000..3daa74fc1922
--- /dev/null
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.1.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="ALSA ucm configuration files"
+HOMEPAGE="https://www.alsa-project.org"
+SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!<media-libs/alsa-lib-1.2.1"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/alsa
+	doins -r ucm{,2}
+}
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index 013edda01da5..b8b9398af158 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -3,10 +3,15 @@ AUX assimp-4.0.1-qt-5.11.0.patch 2230 BLAKE2B e99a1e8dcd5f3c5d8f2b5f116ccd2b5f9a
 AUX assimp-4.1.0-disabletest.patch 298 BLAKE2B 49444fb1fdd3cb2aafd9b29de7a454ce8720707bb6f569d9697cd82303df7edf08d909ef8d8926b17203ad1126f13a6445080191649a96af837d1d7e02fa7667 SHA512 320f2f76ffbebf3a5d3064faa3bc16e0cb597ad994c35b1344aa3a60a07839e67a9d68b80f8723b663d491c6a37b6c95510e987acd04dd519d489a82e3d7e729
 AUX assimp-4.1.0-findassimp.patch 744 BLAKE2B b78cbd88d16d58defbe2970d4969cc9296956c70469521dac7fbb90d2e8e478e077c401224739f6a5f343a2f4579c212cedf939dab482c9235e1065fbf37ed6a SHA512 7523363a5fe387cdfe3f927ede667718ae42223ebb615234f1b3c0cd80d17cd3590ac7af27279748685a263522029784b089f34765c9f5a7e98873a3ad62bd2a
 AUX assimp-4.1.0-unzip-of.patch 242 BLAKE2B c977c94d4ef44d9e185738e7f3c2e5bda59ea52e11c5900387f9e590201f4ffff3aa6dc9a60452f8f782ce37a510cb85cecd1f8df8b23b331688b75f69ea3890 SHA512 e8908f0c44afc4969b9fe670de418ae9df592cab47b0c9a67958c37414740c527a7ee1ef6d61de19c926f08bf20663be66dc54fc6e3d9164e6ecf34360dff37b
+AUX assimp-5.0.0-disabletest.patch 392 BLAKE2B 1654fb964c738aaa343abd1905616648c85ab0793d3450d4a05358c9463d00655f0a1b7aa5f1444d90e12ce51341b9a52e75fd81090a65607c3a21efcd374360 SHA512 25856886bae9cef071317880d8d677a3241c74c0cf288a5677f3be492d640d6db3ba5de3d53cf3f41f78e12ee9f544bf37de7ba82e98d9f4e3f699e38f053bd4
+AUX assimp-5.0.0-findassimp.patch 744 BLAKE2B b78cbd88d16d58defbe2970d4969cc9296956c70469521dac7fbb90d2e8e478e077c401224739f6a5f343a2f4579c212cedf939dab482c9235e1065fbf37ed6a SHA512 7523363a5fe387cdfe3f927ede667718ae42223ebb615234f1b3c0cd80d17cd3590ac7af27279748685a263522029784b089f34765c9f5a7e98873a3ad62bd2a
+AUX assimp-5.0.0-unzip-of.patch 242 BLAKE2B c977c94d4ef44d9e185738e7f3c2e5bda59ea52e11c5900387f9e590201f4ffff3aa6dc9a60452f8f782ce37a510cb85cecd1f8df8b23b331688b75f69ea3890 SHA512 e8908f0c44afc4969b9fe670de418ae9df592cab47b0c9a67958c37414740c527a7ee1ef6d61de19c926f08bf20663be66dc54fc6e3d9164e6ecf34360dff37b
 AUX findassimp-3.3.1.patch 624 BLAKE2B 6e1df31dc55739e01807eacf90558be6af791c4054b438f765cd733639c5c6fb34046871577ddbc7194284f81228000e48218a5a890d21390976778928362d94 SHA512 5f8f7e061da89e7fb4705148b171e631e16a3b7ba7156b1cd3a4b8987adc066f0b4a36f7d70a9b174f3bb27ebe13353435d81cbe85a1166c75148e8419311be1
 DIST assimp-4.0.1.tar.gz 44625148 BLAKE2B 50cbb6096e89fa311a67cf4f526be57a19f41fe48d59bcdd8d6fd309a988cb19c0f1a4c175301e4c299cb644882a6e8042b0d9281319424faf7504688764e97e SHA512 260b4c7e738f857d8364c4878ea4e789ca676180821943f6d9bff8f56e5f9377ea29660dca4e130c681a8aa12fc32f155adb1d78ca260ba242e68b8afa6cc1bb
 DIST assimp-4.1.0.tar.gz 45417293 BLAKE2B 74170ab48b64ab357ddd9da58f1218d0c3c0a4039345dcd7ae396aca3bb47c2f5ea2ee8b61b7d81c68c2e1237cd3ba516b816038400e9960b6c0cfe031a41e54 SHA512 5f1292de873ae16c9921d1d44f2871474d74c0ddfd76cc928a7d9b3e03aa6eca4cc72af0513da20a86d09c55d48646e610fd4a4f2b05364f08ad09cf27cbc67a
-EBUILD assimp-4.0.1-r1.ebuild 1385 BLAKE2B c658a4892def26404509ced1538aa9635da5b5dda3ba00b53d5bfcc14efce0803e045aa687bb116dcdda93ad933fdaeea655dbb6f9c25160ded30d90638338db SHA512 8e003f3e6bb196f1085a7903add296153119d1fbb948f87c00332f3c970853f429406d037eed52449126fdc5566cc19b6650a518ba8fc9a6129735dda0ecfede
-EBUILD assimp-4.0.1.ebuild 1334 BLAKE2B 69cba811c5f5b0957c36b257c1bc52c30b15c58ade44c5cff8a1e3697eeda607d8ed5885362a5ad8e1b8ba1c982dd8155f325ae3798a982a39a8d0132e68cd4d SHA512 c47fddb39ed30f9c8cdd9fcdf5b43703c07134a8e7dd187518eaec8392792614716252d39f19262278b8cfe832cf92df602b08855d1d0724b74796f851068d7a
-EBUILD assimp-4.1.0.ebuild 1335 BLAKE2B 32beb38eb69125088c91f83c06261c4009010293b983334cd52244909eac316e4e8df042fa9a4450a0e53a67994240a0de3b55f7174b1e5d2703e62854ea9d10 SHA512 eac34e7a57c085d9b51d9415f9a4a09eeee0da8d88bc0b8e119208ef6f49f5262bfc2729275f2a2689efc5dfdd66641190b343113365a3a7968d217f2591027b
+DIST assimp-5.0.0.tar.gz 46604597 BLAKE2B 850c84cce6c24c01c2db00d76337797f3e4a4e819e133cf194cac0a7344fa58cb4805e0d5eb29b434f651c0b977e2c0fc5dbe083557f19bb9fe7ccb6977428d1 SHA512 0f73b6e961cd8455d6b6c8c10ed8b99485d846c96377b5d4fcc3b83f737647207c1306aa3dd51dad9654fbfa61bfe1119b34646f90288ae7ecab45efa6fa418a
+EBUILD assimp-4.0.1-r1.ebuild 1412 BLAKE2B 6887461a143ac6864da211607bfb4ca8c98cbf092150c8f67c61806680faa414a29c8da199a0da434a1ab0a094f5a524730289d5d2091d1b8a64d7c21ffc5710 SHA512 a218a38b0c6c4b4b2d97a5f6260381c33beb0c3d46e32f7ee08e7c6651ddbabe0d729410673aa0f9027fa653e7207397b9957e7e3841140b098f40d15180e1de
+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
diff --git a/media-libs/assimp/assimp-4.0.1-r1.ebuild b/media-libs/assimp/assimp-4.0.1-r1.ebuild
index 0e4e53c35722..2454b233cb62 100644
--- a/media-libs/assimp/assimp-4.0.1-r1.ebuild
+++ b/media-libs/assimp/assimp-4.0.1-r1.ebuild
@@ -13,6 +13,7 @@ LICENSE="BSD"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="samples static test tools"
 SLOT="0"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/boost:=
diff --git a/media-libs/assimp/assimp-4.0.1.ebuild b/media-libs/assimp/assimp-4.0.1.ebuild
index 954e9f5f3a09..5ad3d5d68370 100644
--- a/media-libs/assimp/assimp-4.0.1.ebuild
+++ b/media-libs/assimp/assimp-4.0.1.ebuild
@@ -13,6 +13,7 @@ LICENSE="BSD"
 KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="samples static test tools"
 SLOT="0"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/boost:=
diff --git a/media-libs/assimp/assimp-4.1.0.ebuild b/media-libs/assimp/assimp-4.1.0.ebuild
index 00b042528bb6..f52e8180a882 100644
--- a/media-libs/assimp/assimp-4.1.0.ebuild
+++ b/media-libs/assimp/assimp-4.1.0.ebuild
@@ -13,6 +13,7 @@ LICENSE="BSD"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="samples static test tools"
 SLOT="0"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/boost:=
diff --git a/media-libs/assimp/assimp-5.0.0.ebuild b/media-libs/assimp/assimp-5.0.0.ebuild
new file mode 100644
index 000000000000..f52e8180a882
--- /dev/null
+++ b/media-libs/assimp/assimp-5.0.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Importer library to import assets from 3D files"
+HOMEPAGE="https://github.com/assimp/assimp"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="samples static test tools"
+SLOT="0"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/boost:=
+	sys-libs/zlib:=[minizip]
+	samples? (
+		media-libs/freeglut
+		virtual/opengl
+		x11-libs/libX11
+	)
+	tools? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+		media-libs/devil
+		virtual/opengl
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-disabletest.patch" # bug 659122
+	"${FILESDIR}/${P}-unzip-of.patch"
+	"${FILESDIR}/${P}-findassimp.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DASSIMP_BUILD_SAMPLES=$(usex samples)
+		-DASSIMP_BUILD_STATIC_LIB=$(usex static)
+		-DASSIMP_BUILD_TESTS=$(usex test)
+		-DASSIMP_BUILD_ASSIMP_TOOLS=$(usex tools)
+		-DCMAKE_DEBUG_POSTFIX=""
+		-DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	insinto /usr/share/cmake/Modules
+	doins cmake-modules/Findassimp.cmake
+}
+
+src_test() {
+	"${BUILD_DIR}/test/unit" || die
+}
diff --git a/media-libs/assimp/files/assimp-5.0.0-disabletest.patch b/media-libs/assimp/files/assimp-5.0.0-disabletest.patch
new file mode 100644
index 000000000000..d5343c113668
--- /dev/null
+++ b/media-libs/assimp/files/assimp-5.0.0-disabletest.patch
@@ -0,0 +1,13 @@
+--- a/test/unit/utVersion.cpp	2019-11-18 11:39:09.655298634 +0100
++++ b/test/unit/utVersion.cpp	2019-11-18 11:39:25.823299035 +0100
+@@ -66,10 +66,6 @@
+     EXPECT_NE( aiGetCompileFlags(), 0U );
+ }
+ 
+-TEST_F( utVersion, aiGetVersionRevisionTest ) {
+-    EXPECT_NE( aiGetVersionRevision(), 0U );
+-}
+-
+ TEST_F( utVersion, aiGetBranchNameTest ) {
+     EXPECT_NE( nullptr, aiGetBranchName() );
+ }
diff --git a/media-libs/assimp/files/assimp-5.0.0-findassimp.patch b/media-libs/assimp/files/assimp-5.0.0-findassimp.patch
new file mode 100644
index 000000000000..6056f4973c55
--- /dev/null
+++ b/media-libs/assimp/files/assimp-5.0.0-findassimp.patch
@@ -0,0 +1,28 @@
+--- a/cmake-modules/Findassimp.cmake	2019-10-08 08:08:29.025321121 +0200
++++ b/cmake-modules/Findassimp.cmake	2019-10-08 08:09:47.976323079 +0200
+@@ -54,14 +54,17 @@
+ 
+ 	find_path(
+ 	  assimp_INCLUDE_DIRS
+-	  NAMES postprocess.h scene.h version.h config.h cimport.h
++	  NAMES assimp/postprocess.h assimp/scene.h assimp/version.h assimp/config.h assimp/cimport.h
+ 	  PATHS /usr/local/include/
++	  PATHS /usr/include/
+ 	)
+ 
+ 	find_library(
+ 	  assimp_LIBRARIES
+ 	  NAMES assimp
+ 	  PATHS /usr/local/lib/
++	  PATHS /usr/lib/
++	  PATHS /usr/lib64/
+ 	)
+ 
+ 	if (assimp_INCLUDE_DIRS AND assimp_LIBRARIES)
+@@ -78,4 +81,4 @@
+ 	  endif (assimp_FIND_REQUIRED)
+ 	endif (assimp_FOUND)
+ 	
+-endif(WIN32)
+\ Brak znaku nowej linii na końcu pliku
++endif(WIN32)
diff --git a/media-libs/assimp/files/assimp-5.0.0-unzip-of.patch b/media-libs/assimp/files/assimp-5.0.0-unzip-of.patch
new file mode 100644
index 000000000000..e75b47a1af4b
--- /dev/null
+++ b/media-libs/assimp/files/assimp-5.0.0-unzip-of.patch
@@ -0,0 +1,11 @@
+--- a/contrib/unzip/unzip.h	2019-08-21 21:38:10.991542891 +0200
++++ b/contrib/unzip/unzip.h	2019-08-21 21:38:24.507543226 +0200
+@@ -45,6 +45,8 @@
+ #ifndef _unz_H
+ #define _unz_H
+ 
++#define OF _Z_OF
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
diff --git a/media-libs/aubio/Manifest b/media-libs/aubio/Manifest
index 5d5689a8cbe5..b0f04a3d0fb2 100644
--- a/media-libs/aubio/Manifest
+++ b/media-libs/aubio/Manifest
@@ -3,7 +3,7 @@ AUX aubio-0.4.9-docdir.patch 1192 BLAKE2B 617f5a63d51440eba157687b752822b3e14316
 DIST aubio-0.4.7.tar.bz2 372173 BLAKE2B 544239b215dd87d4cf4a6ed6b5dd856411d0a3f1c3242e3e1077fa0780160785a9934884a1f0d0dc80fe21b1d417bc3800db59842ec300a4c29d75b7942cba05 SHA512 30c614f2b502b993df28d4746a99421fe0aada33c98c42ea19c271554b29b360cb4d4f6650c1b1da508da4bc341348c5944cb452f69b2bf354ca6348f84de260
 DIST aubio-0.4.8.tar.bz2 387933 BLAKE2B e30d0ce97360376edf8eba895dc3040157a139c843ef9d6bf0483ffb750916eaccf9e28b8d80dcc0034572cca4f08479e4db44468c96206ce7b60a2fa9600634 SHA512 e58b32beda36865a5243ec7ed4647cf96e3652a25fd319fc697c08f93487f895070dc66b830700b40b879220c2e3a53b8cdc255ce2e34770ba5e34b36a4f51b4
 DIST aubio-0.4.9.tar.bz2 397604 BLAKE2B b849d92678ea8fb20e17921b1a61fdc85a84d4a528acfefa3278169ab5f7fe935217ec37dd9f931202f0f0a1fd3a9518372afbce34cc2dd3ca30c6b4e5d9a301 SHA512 0cb81bb4b15051db3f3f4d160d500af56fdfb237e0a74e3f366f53c2870030aa0a7cee8469a611a9694c36b8866d3d42ffb48241c999de08f3fee43e6d903130
-EBUILD aubio-0.4.7.ebuild 2450 BLAKE2B 975c2121ba3b505134e3b079e8654f77d16902e2fe6c31b158577922e3a2332909ff78f3eb04e16eef14039e1fdb4ead67a949eecc6f166f5efaf69a17bfc5c9 SHA512 7f26d97bf9de42e2429f797c3af73079a3105822ded2550fcf2852c5e6807fc4b60e9dd1688ef97aed1389161bde2544c94360f9fb82dfd92ba23d072ff90f8d
-EBUILD aubio-0.4.8.ebuild 2519 BLAKE2B fa2d62ac5ae0cc31ae18f72dce097e8a007f7c8662f75463583c924b01ff9fbc739dad525deb69d4d2e3e839019e9be7bb472325e652848e51bb94a85071f5e8 SHA512 e95141cfd5e2532ba9ac3e5fd7b7590c0f985790472c859b9c6e36a181e7d6ac3cd1e4dc5c177eaf2c8dc3662ae77330bca5453fad21104d36de547891ea601b
-EBUILD aubio-0.4.9.ebuild 2544 BLAKE2B 030de5ee0318b5413d24f828b0e57c154115b49f62dcf1ab30b46b04638117332a5aa05ae8385abbcb18a5e4adb21ec829c3dd3e06829eb08ac09ea132051815 SHA512 0252af4b21719ed23efe0f29f7042a42ac1edb3aa6ae506e2caa7f892ce39a0b2d88a3128295dc0f8e4307b3905007c7c77e8626b18f60f43478b5542fe3a503
+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
 MISC metadata.xml 346 BLAKE2B 00429033f506bf3818f26f13062d21d0d04d8fc84185244615a09d008c5da6e350df5f32bdcba2c07103039ed64f802cc563a0ca8cd79e117741b947e421142d SHA512 ff3830c2d2322fabdb34458fd27c3e05ad825b1d707eee6150417e4c21480bdffbe4e639ff33a9914cc28189b91e970719326f065746f4241e186f7b27b168d1
diff --git a/media-libs/aubio/aubio-0.4.7.ebuild b/media-libs/aubio/aubio-0.4.7.ebuild
index 8b392873a277..25b51776eced 100644
--- a/media-libs/aubio/aubio-0.4.7.ebuild
+++ b/media-libs/aubio/aubio-0.4.7.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
@@ -16,6 +16,7 @@ LICENSE="GPL-3"
 SLOT="0/5"
 KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 IUSE="doc double-precision examples ffmpeg fftw jack libav libsamplerate sndfile python test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	ffmpeg? (
diff --git a/media-libs/aubio/aubio-0.4.8.ebuild b/media-libs/aubio/aubio-0.4.8.ebuild
index 3a1b634cdba2..e9f738ddd156 100644
--- a/media-libs/aubio/aubio-0.4.8.ebuild
+++ b/media-libs/aubio/aubio-0.4.8.ebuild
@@ -16,6 +16,7 @@ LICENSE="GPL-3"
 SLOT="0/5"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc double-precision examples ffmpeg fftw jack libav libsamplerate sndfile python test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	ffmpeg? (
diff --git a/media-libs/aubio/aubio-0.4.9.ebuild b/media-libs/aubio/aubio-0.4.9.ebuild
index 1a8f50444b57..4ef488dd5591 100644
--- a/media-libs/aubio/aubio-0.4.9.ebuild
+++ b/media-libs/aubio/aubio-0.4.9.ebuild
@@ -16,6 +16,7 @@ LICENSE="GPL-3"
 SLOT="0/5"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc double-precision examples ffmpeg fftw jack libav libsamplerate sndfile python test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	ffmpeg? (
diff --git a/media-libs/audiofile/Manifest b/media-libs/audiofile/Manifest
index 285335a8ae72..102c65af2da3 100644
--- a/media-libs/audiofile/Manifest
+++ b/media-libs/audiofile/Manifest
@@ -3,5 +3,5 @@ AUX audiofile-0.3.6-gcc6-build-fixes.patch 3785 BLAKE2B 7f016bfa9af8a440e31bcc39
 AUX audiofile-0.3.6-mingw32.patch 687 BLAKE2B dec0680a401890f64a659a7303b089d03a40001d2b73da66c174663f818e5e72b7b8985e8fa220c15685b4cd857ba24cefb341c95059a4d9e10ae81a580a8f50 SHA512 b568b189f7316a41c724b02ee881adcdcb0e01fe22d4d6adc82fefef3296c34822943ec1cb299169dfd8fcdac9c260e1dd69fc9b5b6b4058382cc2f246c382f8
 AUX audiofile-0.3.6-system-gtest.patch 5209 BLAKE2B fa4a40165b37a6d33b929efbd79e20a1a7b953ee6d826dfbe88907255f217dcad1f9f4b14b910abe0d60a5c6b3956c92b3a7d6df76d1a47b7e5853bd7bc1d3a9 SHA512 ae821f7e4ea1684651e430007b2b52b369769d8b60cc7180aee3c80c55c7d01ad9e97792099d2d6694eec2f090552355688e2ee3cc527d7a8989e717d3de5b5d
 DIST audiofile-0.3.6.tar.xz 530760 BLAKE2B 5263e66b92471c8b7e8ad73a5065966fc93fd92d70481df804451353bafe44d670ec48b183bc19a7ac60025ea73b234d6aef1017fb220c16d14c68a27db027e4 SHA512 f3b58210a4ef3ac8e08a368a78e0f4b8345456d084bdebfd20d1631fa75e562aa58d31863a502b6ff18178327aa5b87403566bd34566fa52bdfc8e01de400bcb
-EBUILD audiofile-0.3.6-r3.ebuild 1234 BLAKE2B 84d6d52e18c90176da0fa3b5bde83f132c2e7e64a2b29bbe57a6fa295fb45933006b6149848aa39419b04150939e2113814515254ae0a7ef4dbf74ea797fda5e SHA512 77c0f99ebb21062ef3ac4d818d9b6516fd90b8464c6e93bdb8d383d4e1f40cffd8b19901f2a80cefc1c0b12faf4c692d78e680d21e826bde4cf2911ec6f08da4
+EBUILD audiofile-0.3.6-r3.ebuild 1261 BLAKE2B c9951ed13a47d53e8f92a3a7047da9cf9646ac6ae336dd41f43913b07969afeff9b6ec4254a68046ccbfefa11c4c5be0e84cddaeda32109761a1ec22717c0c40 SHA512 73c9804e675a1de443c9f77080b9d9e4d00bde8997c10349a6ad344bbf89beb699dff6263050242053da1f4db54f565a139b745ce20251e32b7bde7256ad1204
 MISC metadata.xml 359 BLAKE2B 3a6913b1f6e97d45f7d1c415879d82fec86642dc2a187907d1893ff9b81cf7781a5485e5140a901482913713ab4f7a5a8ce62df872fc75bf2f34f80d0dbeef9c SHA512 2f2ae33ca88cb3246c8419b88a800ba405123263a6cf2f94c9478d8303bf036ece9a6781a1fe83d8b1f329071623e76f6e909c0207289d6dad8166b163c3b897
diff --git a/media-libs/audiofile/audiofile-0.3.6-r3.ebuild b/media-libs/audiofile/audiofile-0.3.6-r3.ebuild
index 3c1b316b64a6..d424a7db8a4a 100644
--- a/media-libs/audiofile/audiofile-0.3.6-r3.ebuild
+++ b/media-libs/audiofile/audiofile-0.3.6-r3.ebuild
@@ -12,6 +12,7 @@ LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1" # subslot = soname major version
 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="flac static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="flac? ( >=media-libs/flac-1.2.1[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index eadeb1510564..a7d2d86f00d0 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -8,7 +8,7 @@ EBUILD babl-0.1.12.ebuild 1328 BLAKE2B 800e1330f71eaffac72e111a35fa226b478051694
 EBUILD babl-0.1.38.ebuild 1451 BLAKE2B 9813a49605fae9ca6e5ff3a57205511a3e82ab6091e147a108398aff74ef260193df9306f7b67ccd67442d88f8811870a85ff512635e9cc6e6dcdcf4f3374a0c SHA512 b971cb3d4f1a1bf6d18482a1244eee5d566d02da0f9e683b8ce9420a9f0ca3446239ff7fee20900994efc2e515a02cc3fa0e3b2cc307d823e53efdcfe0b60a98
 EBUILD babl-0.1.62.ebuild 1524 BLAKE2B 534897c0657474eb7bc11e7936beae3b70885ee9f424bf87337b8a1f69c51112a564e45515036031e3f44d612de3558e81ad4990c0bb008a49d02013eefee359 SHA512 7d2b17d83e5b67602444ac9872756d91b17051747eb689b0bd0c32875d166cfb96f90ba084100aeed0085b95e2c2dbe4f76c359bce193ec9d009a732972a42b6
 EBUILD babl-0.1.64.ebuild 1533 BLAKE2B 04b78ca906fc77ca656bc43e246abb57e8f7643c703006ec013e9fca06084a0569b94f8f426b9d0923001f16bc8eb6058b6877cf055a302ec5c3d41994c2ef52 SHA512 0ba6b80c0d0540734a7789520794f3ebf6dbfab1f8ba992fbe921ad5d65ac9be201ebcab0e7bea145ab7d85b00d26ca0ab04ffe77b873ef1628c5eb61097f380
-EBUILD babl-0.1.66.ebuild 1533 BLAKE2B 04b78ca906fc77ca656bc43e246abb57e8f7643c703006ec013e9fca06084a0569b94f8f426b9d0923001f16bc8eb6058b6877cf055a302ec5c3d41994c2ef52 SHA512 0ba6b80c0d0540734a7789520794f3ebf6dbfab1f8ba992fbe921ad5d65ac9be201ebcab0e7bea145ab7d85b00d26ca0ab04ffe77b873ef1628c5eb61097f380
+EBUILD babl-0.1.66.ebuild 1524 BLAKE2B 534897c0657474eb7bc11e7936beae3b70885ee9f424bf87337b8a1f69c51112a564e45515036031e3f44d612de3558e81ad4990c0bb008a49d02013eefee359 SHA512 7d2b17d83e5b67602444ac9872756d91b17051747eb689b0bd0c32875d166cfb96f90ba084100aeed0085b95e2c2dbe4f76c359bce193ec9d009a732972a42b6
 EBUILD babl-0.1.72.ebuild 1527 BLAKE2B 65dd29d72fcc54fa330811d76371ff74c185d0a82b942ee2fc6166ca4e2cd910bb4f8bbbf8e9df70e255514f7381e49d2cfc2a4e8bec5c7ece5583d58e31f8a3 SHA512 fced31549369fd47471f87147e24b9c27730d1afdc0f093fdd092213d969cb3d4b372e17dc4f2bcf9824ea3efa43a5e2d06e4e8f2a761248e4e23d7fafc46ca0
 EBUILD babl-9999.ebuild 1527 BLAKE2B 65dd29d72fcc54fa330811d76371ff74c185d0a82b942ee2fc6166ca4e2cd910bb4f8bbbf8e9df70e255514f7381e49d2cfc2a4e8bec5c7ece5583d58e31f8a3 SHA512 fced31549369fd47471f87147e24b9c27730d1afdc0f093fdd092213d969cb3d4b372e17dc4f2bcf9824ea3efa43a5e2d06e4e8f2a761248e4e23d7fafc46ca0
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-libs/babl/babl-0.1.66.ebuild b/media-libs/babl/babl-0.1.66.ebuild
index 634e2a1ade64..61dffd8b9f21 100644
--- a/media-libs/babl/babl-0.1.66.ebuild
+++ b/media-libs/babl/babl-0.1.66.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"
diff --git a/media-libs/bcg729/Manifest b/media-libs/bcg729/Manifest
index afeabf438516..d11b901985e6 100644
--- a/media-libs/bcg729/Manifest
+++ b/media-libs/bcg729/Manifest
@@ -1,4 +1,7 @@
+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
-EBUILD bcg729-1.0.4.ebuild 623 BLAKE2B e5933d4aa23c3898a13d050cd61bd2ca0452692bc029f9ade00abb8c70767e0e25a9f72d8ab8ea5df3867d0670272952263419de25c5f81ab8c8540920635651 SHA512 950ea02042115a4654841cb217d0615fb05d2d272f518d5ce6f0af6ad7874d30a1caa286516e02e13fc3b78a236fd170ec3b15cf7c2abcf700d55b2f04a0efad
-EBUILD bcg729-999999.ebuild 532 BLAKE2B 5c5477ece2be46fd1c9460317253f40be5898b7d736e722a4b9298c1e0c440c8ec5736ec136135e8a959ede7f9b5a042f5b0fa48b44fc910f7031c88747f4ec1 SHA512 87d0caa1f5a310d7eb22400437ce527fefce9893ee8c31c3d92b650e0dbb19eb3ff5e2d663e0c214199dc27f2419c3fee59e3a76e9073ff407d10d8b6e2fe910
+DIST bcg729-4.3.0_alpha.tar.gz 121783 BLAKE2B 10d34fcea3eae131cefc8133f092e4e74f5c8df244bc343fe5d73a49167c6d6ec506845d6cb29cac1fb111c1a68bcc1b60d011aa635923138fea6bec5d342594 SHA512 326a76ff32086c1cb70c0327153f04bfcb82f5fb6767668a713f2517cf4b130f23563db3c6c9b4cd33b1514ce829356120d2ebd9208291da277a9a09263764fe
+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-1.0.4.ebuild b/media-libs/bcg729/bcg729-1.0.4.ebuild
index 6d177a36f30e..4701c38eafb3 100644
--- a/media-libs/bcg729/bcg729-1.0.4.ebuild
+++ b/media-libs/bcg729/bcg729-1.0.4.ebuild
@@ -6,7 +6,8 @@ inherit autotools ltprune
 
 DESCRIPTION="encoder and decoder of the ITU G729 Annex A/B speech codec"
 HOMEPAGE="https://github.com/BelledonneCommunications/bcg729"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/BelledonneCommunications/bcg729/archive/${PV}.tar.gz \
+		-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-libs/bcg729/bcg729-4.3.0_alpha.ebuild b/media-libs/bcg729/bcg729-4.3.0_alpha.ebuild
new file mode 100644
index 000000000000..0af9054bbb8e
--- /dev/null
+++ b/media-libs/bcg729/bcg729-4.3.0_alpha.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 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"
+HOMEPAGE="https://github.com/BelledonneCommunications/bcg729"
+SRC_URI="https://github.com/BelledonneCommunications/bcg729/archive/${PV/_/-}.tar.gz \
+		-> ${P}.tar.gz"
+
+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
+)
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_STATIC=$(usex static-libs)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/bcg729/bcg729-999999.ebuild b/media-libs/bcg729/bcg729-999999.ebuild
index 961164ae6e95..4155676ac3c2 100644
--- a/media-libs/bcg729/bcg729-999999.ebuild
+++ b/media-libs/bcg729/bcg729-999999.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit git-r3 cmake-multilib
+inherit cmake-utils git-r3
 
 DESCRIPTION="encoder and decoder of the ITU G729 Annex A/B speech codec"
 HOMEPAGE="https://github.com/BelledonneCommunications/bcg729"
-EGIT_REPO_URI="${HOMEPAGE}"
+EGIT_REPO_URI="https://github.com/BelledonneCommunications/bcg729"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -15,10 +15,19 @@ IUSE="static-libs"
 RDEPEND="
 	!media-plugins/mediastreamer-bcg729
 "
+S=${WORKDIR}/${P/_/-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.0_beta-cmake-build.patch
+)
 
-multilib_src_configure() {
-	local mycmakeargs+=(
+src_configure() {
+	mycmakeargs=(
 		-DENABLE_STATIC=$(usex static-libs)
 	)
 	cmake-utils_src_configure
 }
+
+src_install() {
+	cmake-utils_src_install
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/bcg729/files/bcg729-4.3.0_beta-cmake-build.patch b/media-libs/bcg729/files/bcg729-4.3.0_beta-cmake-build.patch
new file mode 100644
index 000000000000..9efcf0fabe8c
--- /dev/null
+++ b/media-libs/bcg729/files/bcg729-4.3.0_beta-cmake-build.patch
@@ -0,0 +1,8 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -119,5 +119,3 @@
+ 	DESTINATION ${CONFIG_PACKAGE_LOCATION}
+ )
+ 
+-add_subdirectory(build)
+-
diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index 8fa22e638677..f364f5f7a217 100644
--- a/media-libs/chromaprint/Manifest
+++ b/media-libs/chromaprint/Manifest
@@ -1,7 +1,6 @@
+AUX chromaprint-1.4.3-cmake.patch 1787 BLAKE2B 596a2ec2e684c3f2a03180fd5420029cca56c07bf3362e2158a99f40c2d4a117b7d17ce6a8afc20647654643ee31569849e8413962168799963acb043bf869fa SHA512 b53dfd1c26f34aedae6964d9e87725872f5b3b4d7f6d5f8162490579f05d863bc27d5bc4f6f2303f95346ace2cd751e6f3a0ee15c34d15eb3088123f472c5338
 AUX chromaprint-1.4.3-test-bigendian.patch 1944 BLAKE2B e8441359f3d830451398c492e0711e6eeb290be75e336099b307e61d327158fbc2e188ffa96201e16fa5d2c1588ab763b79d9881b6f3ba276c6dcdee7de5e4ea SHA512 a6df0cd861c3d9d2c5ae28f50459c6930ddac262e2126e2f3ca4ec05a5e4d790df8cb0d7fc90eb0f4269ea4289958e9777d7d39cf588fea99e4c1d1f9f63bb59
-DIST chromaprint-1.4.2.tar.gz 613367 BLAKE2B ffec54c952a35f8f5bf6bc74b5d58339af3f0ffc0a0c0e88ee5e864e9112ad96cced629dcb8422f5e74aca3c48f93f7fa153cc6aabf0659a4e90416c34f34e43 SHA512 69449adf1c95c1395a5545d36877afe95b409d045357cc675e9ac58aee2955b3a9a245f37805192804a9b7fddc792b9e9289bf6448fa3393131048d28e06d7e2
 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.2.ebuild 1343 BLAKE2B 24428f0e9a39a15c1ab425325e1e860eca45a0d0a2a2e8f2086f1491663acb5510e726d17fc318689a98d83871258573d0e59d1b12fd07807d9a4f4e1f6bd1c9 SHA512 cd209880b290e50a80d52a6c64d34f72ed49c60da6b1b16bc661dd4ef8c889ba3d7d650cb0f668a56e3520a5b313ffde0bdf824c975f03b709ea063c5b1b12b0
-EBUILD chromaprint-1.4.3.ebuild 1443 BLAKE2B 01c52ce3b90ca5c691cd64c196989365c872a20b3b8db6986f05ce5b8addbf1e9e0142d54fb37e6b0b7f652dd15870c334c6a99e60cf96795f72adfa6ee6ac47 SHA512 82291e77365fe71b0a6dae7f46c14ec54ce31d3a427d27602e5d261a358cc1ffc13de6c9af6d7cc2829cf76036297be0b586e70061c786409547d95443188d18
+EBUILD chromaprint-1.4.3.ebuild 1438 BLAKE2B 7b2b41732d8637bdef586a438371e7b8a8ee2e87562ad20462964e5ef72285bda89a5c9001b0adf4756ecbc57188004fcf48c5832e78d39c1cbc2d7e13f4c807 SHA512 71c13d57d5110f9a60c867d1736296e35a41a55520bbcf2e9eadf96c545546da6559f911b178b1493888ce4b65aad703840d819c25efb68a1c086023a3ffcccc
 MISC metadata.xml 502 BLAKE2B b4f7420ba8b5e4004b6f8fa9cc70c0eddea04a0e1759c9724b94198e3df99c2505893706cb5232c643a43208822d7ef5bb56660c76029cadb52b9a0562fd8021 SHA512 229e807429496e637ba289f269af83eca274c53eb2fc2d9dc5f304c39118eaf1d0ae9a5cca01ffa1958d110c55537f1792e26343bf3309ad72b1f0411af9dafe
diff --git a/media-libs/chromaprint/chromaprint-1.4.2.ebuild b/media-libs/chromaprint/chromaprint-1.4.2.ebuild
deleted file mode 100644
index 9ff16c48df08..000000000000
--- a/media-libs/chromaprint/chromaprint-1.4.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-multilib
-
-GTEST_VERSION="1.8.0"
-
-DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints"
-HOMEPAGE="https://acoustid.org/chromaprint"
-SRC_URI="https://bitbucket.org/acoustid/${PN}/downloads/${P}.tar.gz
-	test? (	https://github.com/google/googletest/archive/release-${GTEST_VERSION}.tar.gz -> gtest-${GTEST_VERSION}.tar.gz )
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0/1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86"
-IUSE="libav test tools"
-
-# note: use ffmpeg or libav instead of fftw because it's recommended and required for tools
-RDEPEND="
-	libav? ( >=media-video/libav-11:0=[${MULTILIB_USEDEP}] )
-	!libav? ( >=media-video/ffmpeg-2.6:0=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest[${MULTILIB_USEDEP}]
-		dev-libs/boost[${MULTILIB_USEDEP}]
-	)"
-
-DOCS="NEWS.txt README.md"
-
-multilib_src_configure() {
-	export GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VERSION}/googletest/"
-	local mycmakeargs=(
-		"-DBUILD_TOOLS=$(multilib_native_usex tools ON OFF)"
-		"-DBUILD_TESTS=$(usex test ON OFF)"
-		-DFFT_LIB=avfft
-		-DAUDIO_PROCESSOR_LIB=$(usex libav avresample swresample)
-		)
-	cmake-utils_src_configure
-}
-
-multilib_src_test() {
-	emake check
-}
diff --git a/media-libs/chromaprint/chromaprint-1.4.3.ebuild b/media-libs/chromaprint/chromaprint-1.4.3.ebuild
index 169011a15e18..943c2de4042b 100644
--- a/media-libs/chromaprint/chromaprint-1.4.3.ebuild
+++ b/media-libs/chromaprint/chromaprint-1.4.3.ebuild
@@ -1,21 +1,22 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit cmake-multilib
+EAPI=7
 
 GTEST_VERSION="1.8.0"
+inherit cmake-multilib
 
-DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints"
+DESCRIPTION="Library implementing a custom algorithm for extracting audio fingerprints"
 HOMEPAGE="https://acoustid.org/chromaprint"
 SRC_URI="https://github.com/acoustid/${PN}/releases/download/v${PV}/${P}.tar.gz
-	test? (	https://github.com/google/googletest/archive/release-${GTEST_VERSION}.tar.gz -> gtest-${GTEST_VERSION}.tar.gz )
+	test? ( https://github.com/google/googletest/archive/release-${GTEST_VERSION}.tar.gz -> gtest-${GTEST_VERSION}.tar.gz )
 "
 
 LICENSE="LGPL-2.1"
 SLOT="0/1"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="libav test tools"
+RESTRICT="!test? ( test )"
 
 # note: use ffmpeg or libav instead of fftw because it's recommended and required for tools
 RDEPEND="
@@ -23,25 +24,25 @@ RDEPEND="
 	!libav? ( >=media-video/ffmpeg-2.6:0=[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest[${MULTILIB_USEDEP}]
-		dev-libs/boost[${MULTILIB_USEDEP}]
-	)"
+	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
 
-PATCHES=( "${FILESDIR}"/chromaprint-1.4.3-test-bigendian.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-test-bigendian.patch
+	"${FILESDIR}"/${P}-cmake.patch
+)
 
-DOCS="NEWS.txt README.md"
+DOCS=( NEWS.txt README.md )
 
-S=${WORKDIR}/${PN}-v${PV}
+S="${WORKDIR}/${PN}-v${PV}"
 
 multilib_src_configure() {
 	export GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VERSION}/googletest/"
 	local mycmakeargs=(
-		"-DBUILD_TOOLS=$(multilib_native_usex tools ON OFF)"
-		"-DBUILD_TESTS=$(usex test ON OFF)"
+		-DBUILD_TOOLS=$(multilib_native_usex tools ON OFF)
+		-DBUILD_TESTS=$(usex test ON OFF)
 		-DFFT_LIB=avfft
 		-DAUDIO_PROCESSOR_LIB=$(usex libav avresample swresample)
-		)
+	)
 	cmake-utils_src_configure
 }
 
diff --git a/media-libs/chromaprint/files/chromaprint-1.4.3-cmake.patch b/media-libs/chromaprint/files/chromaprint-1.4.3-cmake.patch
new file mode 100644
index 000000000000..60fe548cf29c
--- /dev/null
+++ b/media-libs/chromaprint/files/chromaprint-1.4.3-cmake.patch
@@ -0,0 +1,58 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3991219..f9e172b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,21 +1,11 @@
+-cmake_minimum_required(VERSION 2.8.12)
+-
+-if(POLICY CMP0042)
+-	cmake_policy(SET CMP0042 NEW)
+-endif()
+-
+-if(POLICY CMP0048)
+-    cmake_policy(SET CMP0048 OLD)
+-endif()
+-
+-project(chromaprint C CXX)
++cmake_minimum_required(VERSION 3.3)
+ 
+ set(chromaprint_VERSION_MAJOR 1)
+ set(chromaprint_VERSION_MINOR 4)
+ set(chromaprint_VERSION_PATCH 3)
+ set(chromaprint_VERSION "${chromaprint_VERSION_MAJOR}.${chromaprint_VERSION_MINOR}.${chromaprint_VERSION_PATCH}")
+ 
+-set(PROJECT_VERSION "${chromaprint_VERSION}")
++project(chromaprint LANGUAGES C CXX VERSION "${chromaprint_VERSION}")
+ 
+ set(chromaprint_SOVERSION 1)
+ 
+@@ -31,14 +21,14 @@ include(CheckCXXCompilerFlag)
+ 
+ find_package(Threads)
+ 
+-check_cxx_compiler_flag("-std=c++11" COMPILER_SUPPORTS_CXX11)
+-if(COMPILER_SUPPORTS_CXX11)
+-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+-endif()
++option(BUILD_SHARED_LIBS "Build shared libraries" ON)
+ 
+-if(CMAKE_COMPILER_IS_GNUCXX AND BUILD_SHARED_LIBS)
+-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
+-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
++set(CMAKE_CXX_STANDARD 11)
++
++if(BUILD_SHARED_LIBS)
++	set(CMAKE_C_VISIBILITY_PRESET hidden)
++	set(CMAKE_CXX_VISIBILITY_PRESET hidden)
++	set(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
+ endif()
+ 
+ if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_BUILD_TYPE STREQUAL "Debug")
+@@ -70,7 +60,6 @@ if(APPLE)
+ 	set(FRAMEWORK_INSTALL_DIR "/Library/Frameworks" CACHE STRING "Directory to install frameworks to")
+ endif()
+ 
+-option(BUILD_SHARED_LIBS "Build shared libraries" ON)
+ option(BUILD_TOOLS "Build command line tools" OFF)
+ option(BUILD_TESTS "Build test suite" OFF)
+ 
diff --git a/media-libs/clutter/Manifest b/media-libs/clutter/Manifest
index c90b1099f169..41ae0c81fc4e 100644
--- a/media-libs/clutter/Manifest
+++ b/media-libs/clutter/Manifest
@@ -1,3 +1,3 @@
 DIST clutter-1.26.2.tar.xz 5353736 BLAKE2B ac30cee3c5a8ed786c38820b7afb86e80929c2a797b737b35650ae6dd856576d72cc7f5407a984f418e255d6ab43c8d3ca9d7efd6f50650b2e0c733ecca19114 SHA512 c8008a1a1f111313d9abaff8d4415f112ddc32a02e08845f3735d33bb25b72b082f133daba06749bb9595eaf1ba83b308d30a413fbbe8dcdc1afdd7077a30937
-EBUILD clutter-1.26.2-r1.ebuild 2891 BLAKE2B 5e6885b83331bb942c1af62ef1faa9d0f916105c11d9135122da4701d29b731b0ba689546bce08883c2d1e7587ec0cfa9e32ac61eef30b3dd4f97631a94b0f04 SHA512 a903e737aa572dc376c4b7009d8424c1fb6eb11e45afe85fd15b237a1c7a0ad5893b13679bb2d60f572c7f0aeb1f9787f6c1f4cb6fe1339d6aa7530bfce9d340
+EBUILD clutter-1.26.2-r1.ebuild 2918 BLAKE2B b70aedd42169b93ad7ca2bb32ff886c1018cde9c0677defe443d8a38014bac597a58bfbbacb8a4496473b0e919d506c338c9b3049c481700f219764fdd8aabc5 SHA512 557aa003b559eb8c99c529cd4c92b275d8e57932aa2ebda4ae040c78807eacb6064da5433799d12113cfc19398d0f75c831a01c19fc0170f0baf12cea764ad90
 MISC metadata.xml 404 BLAKE2B 45f5b28d9e612464ad5f56c016adae7466e549403a3939fddc433f9f428476db7b4e5a2436a436b0f9c46176bf849938c4c8895ae8f464115ea6ffeedac0f19d SHA512 c6e268f9e2fd4400fd0e7c265b6c64b738a22005ea9af7d792c45a8bd1de8fe81ac1d534cbfc2988cf55bd810aa84bdddf45d3ce33c3bf60e5030fc48d467db6
diff --git a/media-libs/clutter/clutter-1.26.2-r1.ebuild b/media-libs/clutter/clutter-1.26.2-r1.ebuild
index 6727c1dea6c1..f29567c85508 100644
--- a/media-libs/clutter/clutter-1.26.2-r1.ebuild
+++ b/media-libs/clutter/clutter-1.26.2-r1.ebuild
@@ -13,6 +13,7 @@ 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 )
diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest
index e6b5ebb048dc..1c48c5cd786a 100644
--- a/media-libs/cogl/Manifest
+++ b/media-libs/cogl/Manifest
@@ -1,5 +1,6 @@
+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 3296 BLAKE2B 4d54e1b23836eabe6481d04a0e5f72a4b5a4b254b0b20a3a2bcdaaca1f07ba5a5f3ac166450cad816a5f8f39dc24b60b2376cb35baef2fd76b52969a3b8797b3 SHA512 0d4233f5255bc121afcc88911f3ccde053781c5e7af11991b1b0203c634a6ee3f6d11ece85961354fb2c60ff9ed70f9ff65c5f7d5c6058094e2786403a4bcf2c
-EBUILD cogl-1.22.4.ebuild 3301 BLAKE2B 554e34ce7e632da913dde9f6348a4466d7d048fc0278e472bbe35c63409a79116ae67ca44b04049e1865a2b5729b335a774e81a57961b4b304e1831bc9d9b50a SHA512 db77352038331a943628dba9d9ff6d5d83c2d3d48962405d4a8dd3205bbd4a8b6440fb3d1819528aef856c689d9d31a96792c124676ecd707efe2f88ba226daf
+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
index c3702f70decd..eae9521a25cd 100644
--- a/media-libs/cogl/cogl-1.22.2.ebuild
+++ b/media-libs/cogl/cogl-1.22.2.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 
+GNOME2_EAUTORECONF="yes"
 inherit gnome2 multilib
 
 DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
@@ -58,6 +59,10 @@ DEPEND="${COMMON_DEPEND}
 # 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/" \
diff --git a/media-libs/cogl/cogl-1.22.4.ebuild b/media-libs/cogl/cogl-1.22.4.ebuild
index 12bd445b80ff..05c334364057 100644
--- a/media-libs/cogl/cogl-1.22.4.ebuild
+++ b/media-libs/cogl/cogl-1.22.4.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 
+GNOME2_EAUTORECONF="yes"
 inherit gnome2 multilib
 
 DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
@@ -17,7 +18,7 @@ REQUIRED_USE="
 	wayland? ( gles2 )
 	|| ( gles2 opengl )
 "
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.32:2
@@ -58,6 +59,10 @@ DEPEND="${COMMON_DEPEND}
 # 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/" \
@@ -114,5 +119,5 @@ src_install() {
 	gnome2_src_install
 
 	# Remove silly examples-data directory
-	rm -rv "${ED}/usr/share/cogl/examples-data/" || die
+	rm -rvf "${ED}/usr/share/cogl/examples-data/" || die
 }
diff --git a/media-libs/cogl/files/cogl-eglmesaext-include.patch b/media-libs/cogl/files/cogl-eglmesaext-include.patch
new file mode 100644
index 000000000000..eff5c6841e1b
--- /dev/null
+++ b/media-libs/cogl/files/cogl-eglmesaext-include.patch
@@ -0,0 +1,60 @@
+From 9c4764224aded552fb855b1c2b85b26d2b894adf Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+Date: Tue, 29 Oct 2019 18:17:51 +0300
+Subject: [PATCH] Fix building against libglvnd-provided EGL headers
+
+Add missing EGL/eglmesaext.h include. When building against mesa-provided
+headers, this header is included indirectly via EGL/eglext.h.
+
+Also fix typo COGL_EGL_INCLUDE -> COGL_EGL_INCLUDES
+---
+ configure.ac | 16 ++++++++++++++--
+ 1 file changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index da188edd..b0b0c94d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -670,10 +670,15 @@ AS_IF([test "x$enable_gles1" = "xyes"],
+             AC_SUBST([COGL_EGL_INCLUDES])
+ 
+             AC_CHECK_HEADERS([EGL/eglext.h],
+-                             [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDE
++                             [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES
+ #include <EGL/eglext.h>"],
+                              [],
+                              [$COGL_EGL_INCLUDES])
++            AC_CHECK_HEADERS([EGL/eglmesaext.h],
++                             [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES
++#include <EGL/eglmesaext.h>"],
++                             [],
++                             [$COGL_EGL_INCLUDES])
+ 
+             # Check for a GLES 1.x Common Profile library with/without EGL.
+             #
+@@ -1178,6 +1183,12 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"],
+               [],
+               [AC_MSG_ERROR([Unable to locate required EGL headers])],
+               [#include <EGL/egl.h>])
++            AC_CHECK_HEADERS(
++              [EGL/eglmesaext.h],
++              [],
++              [AC_MSG_ERROR([Unable to locate required EGL headers])],
++              [#include <EGL/egl.h>
++#include <EGL/eglext.h>])
+ 
+             AC_CHECK_LIB(EGL, [eglInitialize],
+               [COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -lEGL"],
+@@ -1188,7 +1199,8 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"],
+           )
+ 
+         COGL_EGL_INCLUDES="#include <EGL/egl.h>
+-#include <EGL/eglext.h>"
++#include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>"
+         AC_SUBST([COGL_EGL_INCLUDES])
+       ])
+ 
+-- 
+2.22.0
+
diff --git a/media-libs/coin/Manifest b/media-libs/coin/Manifest
index 10ffbfd077b0..9d4172ff1326 100644
--- a/media-libs/coin/Manifest
+++ b/media-libs/coin/Manifest
@@ -4,9 +4,9 @@ AUX coin-3.1.3-gcc-4.7.patch 347 BLAKE2B 4129b651164fd35e18469143c0728e67456ecdc
 AUX coin-3.1.3-gcc-7.patch 575 BLAKE2B 5bdb1d8c2b6c63cba4224506199e26bb91d47feda853903a8461929e12ef32b13395cb78926ddac86bf25ca740ab67ac66f37a085e041272a8e520916c21b8da SHA512 c4ea88ce111dd7dba1d8b1dd30cf325e91d5617540c5cbcdbe2be95e892641015071dc61830307188cfc16ecbdf58e89129b93621e0dd43ae05f7ad754df7b53
 AUX coin-3.1.3-memhandler-initialization.patch 906 BLAKE2B 421dea48d77870d324fa333bac19c6e00ad7ca576929bf029bd9b0be193462adb23cbadaf71d96fd30025db3780408a294db2d9ae3a52232798b677dd8e62c46 SHA512 f67c7179b1a023a938a55d82cfb1c18ffabc7586211e8e89a4fb4f8a4925f9c98240fffaa9c8dc46febd528e0d0b91607a417f290c0e0c06adbafb171ba1bf6b
 AUX coin-3.1.3-pkgconfig-partial.patch 431 BLAKE2B af57c0a4ec1985351db67f8f8f1d978c9ec3765e5d0d6e304e479314be3cc5cd48212094f87d8126ce84143a671fc7e000081cd0b38d149633515f121ce5f16d SHA512 6747ed14dca25017b6126ee2e542bec8cdf36cc634a8f0df059715f022a5f6c6f7126b9ea3c01e099a5564c634921fdc829c7561754df8c2dbf915659c7edb53
-AUX coin-4.0.0a-gcc-7.patch 581 BLAKE2B 2ee051f14c8c4e264cc887f51e49d817c7b08be735dcc4c3be8574fb1f4b5db2b41ad46d22c7adfd2283986a0ff87948b9f03783bb80a2b423c8040872fa9933 SHA512 6ebfca69557c867218526cbe9937a37a6a4936448353410586b24f60efbc19000003c67cb04e1b9dfa5cfe950fde3e9c9aec1762292b5c26169c963682630480
+AUX coin-4.0.0a-cmake.patch 2747 BLAKE2B c120bc01ccaffe28d6bacc9135349cd532c708b4d5bca8219768188c86384c9431ad036b42106c03418744b941d6944472e0b134aae564fe4553428f534bbaab SHA512 f4f9246ceb853c9cf63bdb851b354195c2fddef7fc914ceb7b693f36cfb0ce9e6230cf6284fb987185f26f2f46076bc44ea2bb6bb8c40053fa2992cf85831553
 DIST Coin-3.1.3.tar.gz 5981534 BLAKE2B 33f88149cf0bf7daeb32226e2deb29f9f36f2a29ca9fcf025f39bb50d3eb0bfc85113a1e96cf980c97d037419c3a263bcf6eccaeb2f289517304c59d4c9de919 SHA512 d6fd47ecc74e96fc4de46e3a683f038f1907b96db2bbe935fb49f2d59190bd18f3f439dc0e4cb435360e74e1d65994a32b21f670d5a76394692616625cb14394
-DIST Coin3D-coin-8d1ca1a6ea23.tar.bz2 4925310 BLAKE2B 3c9aab5e68b79db4878e5d27773537acb7d658580a8deea059565dfa78ee791cb7ee23f159e077408c3307e2647e628357daaa4f2f5a4fc4a125c8d1663ee718 SHA512 f0c4d39a89b1dc3e183c2c8cffad6be30f9d27e50b3735c1b261addc55376aceb8f81c916fbdfeb42b852071692febaf6e3839373095bcf2b7046c773fcc809c
+DIST Coin3D-coin-a4ce638f43bd.tar.bz2 4942450 BLAKE2B b974b8a39d8ef07a2b3465e131bb5ca08d249a99a9ccdd7f9a87bd26c8c901c7042211edf7acf097e56afc0ba80bf156c6864a831fbed4cac18c7ac7495601ff SHA512 90b7697649e18af77805d9aae918ba77958952839375812272d796c4cda4d887465fb9bb94f215509ae969cddf54fb92f38deb961cdd24e24c67b20ffc0f1adf
 EBUILD coin-3.1.3-r2.ebuild 2534 BLAKE2B 38f1000733493542aff3953b7b7265d0622c66b49bbab780e23e090378c6c048ac901c6a8d48c1a1edcf87fa08f4fbd9111b0de7718fd6083c39d8739fe4a74d SHA512 44dc45645ca3b834be9c88063346f1931e6cd67fec999c6515ce0610910d6359d6415ceaef5486de26cf5a231edf69828b01bf5940b98da6693c2f89cd189902
-EBUILD coin-4.0.0a_pre20180416.ebuild 1948 BLAKE2B c9ef483cc14628bc324ce598dad1d3863d4c60b10d757da16496c3d056e3079dbf5eb1ff271071e0af12f17adf8494f27ac2efb22804b5bc39631eaa53a9cac1 SHA512 d77ec8ac2d0c7f71371b9360d1a07293dd306ee35fe5b869f2956a76a0d93671da8c6d97ec3235b66413ebbd22ee3522a3768b7d2167f5dd1c299e4adea9f7a1
-MISC metadata.xml 483 BLAKE2B 4b4e0a4e69a83b8cfa2be1298873b2ca28cde6dbc431a967c9c37839d17647c052cf8a465894451c23a75fea7be3cadd5954e3cff69de2b3f0bd5ef333251ba2 SHA512 e4419aa5e2ed7e0637f0c971b3b6d0937d4b7e0238b567ecef8bff4c8512ad88e6e04ca3f539f09b7c1f6fe6e2727b555b291e7ed5029776a7efef078bb88a1b
+EBUILD coin-4.0.0a_pre20191109.ebuild 2446 BLAKE2B 303703fe72bb2d0244784894f077af1ce849868b323eceef27c6347c0d8f20f03e21974a5ba02a7b8d5c2cdb39710018ed069b25a6be0bbb946a05ef08bcd26b SHA512 5ab3137cd754272d4323c967b7f25d281f3f2ee3e75b7ab24ca7056553644b1d5042993ac417d0f067c825c9d095b2ea9a2937c8acf7e42c64f024b125b7f781
+MISC metadata.xml 602 BLAKE2B e4f425e15a7cf6879fc709f5cf27abddcc195b824e1158297e529a2fdb2080ff555a90832b5b287c43d73aa038d0d89c62c9f8df2a3e0ebce3c2024f2e5c3126 SHA512 d551b68c2b3f192475ee7fa187e9ab6f6bca52ec3b8c1b58901ea49a61d51ef5680d3b29d784e4c43a8b5fabeb904bdd8582ce32a0055b2420aa9c994299c142
diff --git a/media-libs/coin/coin-4.0.0a_pre20180416.ebuild b/media-libs/coin/coin-4.0.0a_pre20191109.ebuild
index 815c8aa67e80..0397a3a736d5 100644
--- a/media-libs/coin/coin-4.0.0a_pre20180416.ebuild
+++ b/media-libs/coin/coin-4.0.0a_pre20191109.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils flag-o-matic
 
-MY_P=Coin3D-coin-8d1ca1a6ea23
+MY_P=Coin3D-coin-a4ce638f43bd
 
 DESCRIPTION="A high-level 3D graphics toolkit, fully compatible with SGI Open Inventor 2.1"
 HOMEPAGE="https://bitbucket.org/Coin3D/coin/wiki/Home"
@@ -14,13 +14,20 @@ SRC_URI="https://dev.gentoo.org/~reavertm/${MY_P}.tar.bz2"
 LICENSE="|| ( GPL-2 PEL )"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
-IUSE="debug doc javascript openal qthelp simage test threads"
+IUSE="debug doc +exceptions javascript man openal qthelp test threads"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	man? ( doc )
+	qthelp? ( doc )
+"
 
 RDEPEND="
 	app-arch/bzip2
 	dev-libs/expat
 	media-libs/fontconfig
 	media-libs/freetype:2
+	media-libs/simage
 	sys-libs/zlib
 	virtual/opengl
 	virtual/glu
@@ -28,25 +35,26 @@ RDEPEND="
 	x11-libs/libSM
 	x11-libs/libX11
 	x11-libs/libXext
-	javascript? ( dev-lang/spidermonkey:0 )
+	javascript? ( dev-lang/spidermonkey:60 )
 	openal? ( media-libs/openal )
-	simage? ( media-libs/simage )
 "
 DEPEND="${RDEPEND}
+	dev-libs/boost:0
 	x11-base/xorg-proto
 	doc? (
 		app-doc/doxygen
 		qthelp? ( dev-qt/qthelp:5 )
 	)
 "
+
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.0a-gcc-7.patch
+	"${FILESDIR}"/${PN}-4.0.0a-cmake.patch
 )
 
 DOCS=(
-	AUTHORS FAQ FAQ.legal NEWS README RELNOTES THANKS docs/HACKING
+	AUTHORS FAQ FAQ.legal NEWS THANKS docs/HACKING
 )
 
 src_configure() {
@@ -54,31 +62,48 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DCOIN_BUILD_DOCUMENTATION=$(usex doc)
+
 		-DCOIN_BUILD_SHARED_LIBS=ON
-		-DCOIN_BUILD_SINGLE_LIB=ON
 		-DCOIN_BUILD_TESTS=$(usex test)
-		-DCOIN_HAVE_JAVASCRIPT=$(usex javascript)
-		-DCOIN_MULTIPLE_VERSION=OFF
-		-DCOIN_QT_HELP=$(usex doc)
+		-DCOIN_BUILD_DOCUMENTATION=$(usex doc)
+
+		-DCOIN_BUILD_INTERNAL_DOCUMENTATION=OFF
+		-DCOIN_BUILD_DOCUMENTATION_MAN=$(usex man)
+		-DCOIN_BUILD_DOCUMENTATION_QTHELP=$(usex qthelp)
+		-DCOIN_BUILD_DOCUMENTATION_CHM=OFF
+
 		-DCOIN_THREADSAFE=$(usex threads)
-		-DCOIN_VERBOSE=$(usex debug)
-		-DHAVE_3DS_IMPORT_CAPABILITIES=ON
+		-DHAVE_VRML97=ON
+		-DCOIN_HAVE_JAVASCRIPT=$(usex javascript)
+		-DHAVE_NODEKITS=ON
 		-DHAVE_DRAGGERS=ON
-		-DHAVE_MAN=OFF
 		-DHAVE_MANIPULATORS=ON
-		-DHAVE_NODEKITS=ON
 		-DHAVE_SOUND=$(usex openal)
-		-DHAVE_VRML97=ON
-		-DSIMAGE_RUNTIME_LINKING=OFF
+		-DHAVE_3DS_IMPORT_CAPABILITIES=ON
 		-DUSE_EXTERNAL_EXPAT=ON
+		-DUSE_EXCEPTIONS=$(usex exceptions)
+		-DUSE_SUPERGLU=OFF
+
+		-DFONTCONFIG_RUNTIME_LINKING=OFF
+		-DFREETYPE_RUNTIME_LINKING=OFF
+		-DLIBBZIP2_RUNTIME_LINKING=OFF
+		-DOPENAL_RUNTIME_LINKING=OFF
+		-DSIMAGE_RUNTIME_LINKING=OFF
+		-DZLIB_RUNTIME_LINKING=OFF
+		-DGLU_RUNTIME_LINKING=OFF
+		-DSPIDERMONKEY_RUNTIME_LINKING=ON
+
+		-DCOIN_VERBOSE=$(usex debug)
+		-DHAVE_MULTIPLE_VERSION=ON
+
+		-DCOIN_BUILD_SINGLE_LIB=ON
 	)
 
 	cmake-utils_src_configure
 }
 
 src_test() {
-	pushd "${BUILD_DIR}/testsuite" > /dev/null || die
-	./CoinTests || die "Tests failed."
+	pushd "${BUILD_DIR}/bin" > /dev/null || die
+	./CoinTests -r detailed || die "Tests failed."
 	popd > /dev/null || die
 }
diff --git a/media-libs/coin/files/coin-4.0.0a-cmake.patch b/media-libs/coin/files/coin-4.0.0a-cmake.patch
new file mode 100644
index 000000000000..f47bf9bfb844
--- /dev/null
+++ b/media-libs/coin/files/coin-4.0.0a-cmake.patch
@@ -0,0 +1,96 @@
+diff -ruN Coin3D-coin-a4ce638f43bd/CMakeLists.txt my/CMakeLists.txt
+--- Coin3D-coin-a4ce638f43bd/CMakeLists.txt	2019-11-09 14:39:34.000000000 +0100
++++ my/CMakeLists.txt	2019-11-21 00:19:43.563521948 +0100
+@@ -97,8 +97,8 @@
+ 
+ report_prepare(
+   COIN_BUILD_SHARED_LIBS
+-  COIN_BUILD_TESTS 
+-  COIN_BUILD_DOCUMENTATION 
++  COIN_BUILD_TESTS
++  COIN_BUILD_DOCUMENTATION
+   COIN_BUILD_INTERNAL_DOCUMENTATION
+   COIN_BUILD_DOCUMENTATION_MAN
+   COIN_BUILD_DOCUMENTATION_QTHELP
+@@ -107,29 +107,29 @@
+   HAVE_VRML97
+   COIN_HAVE_JAVASCRIPT
+   HAVE_NODEKITS
+-  HAVE_DRAGGERS 
+-  HAVE_MANIPULATORS 
+-  HAVE_SOUND 
++  HAVE_DRAGGERS
++  HAVE_MANIPULATORS
++  HAVE_SOUND
+   HAVE_3DS_IMPORT_CAPABILITIES
+   USE_EXTERNAL_EXPAT
+-  USE_EXCEPTIONS 
+-  USE_SUPERGLU 
+-  FONTCONFIG_RUNTIME_LINKING   
+-  FREETYPE_RUNTIME_LINKING     
+-  LIBBZIP2_RUNTIME_LINKING     
+-  OPENAL_RUNTIME_LINKING       
+-  SIMAGE_RUNTIME_LINKING       
+-  ZLIB_RUNTIME_LINKING         
+-  GLU_RUNTIME_LINKING          
+-  SPIDERMONKEY_RUNTIME_LINKING 
+-  HAVE_MULTIPLE_VERSION 
++  USE_EXCEPTIONS
++  USE_SUPERGLU
++  FONTCONFIG_RUNTIME_LINKING
++  FREETYPE_RUNTIME_LINKING
++  LIBBZIP2_RUNTIME_LINKING
++  OPENAL_RUNTIME_LINKING
++  SIMAGE_RUNTIME_LINKING
++  ZLIB_RUNTIME_LINKING
++  GLU_RUNTIME_LINKING
++  SPIDERMONKEY_RUNTIME_LINKING
++  HAVE_MULTIPLE_VERSION
+   IF_APPLE
+-    COIN_BUILD_MAC_FRAMEWORK 
+-    COIN_BUILD_MAC_X11 
+-    COIN_BUILD_MAC_AGL 
++    COIN_BUILD_MAC_FRAMEWORK
++    COIN_BUILD_MAC_X11
++    COIN_BUILD_MAC_AGL
+   IF_MSVC
+     COIN_BUILD_MSVC_STATIC_RUNTIME
+-    COIN_BUILD_SINGLE_LIB 
++    COIN_BUILD_SINGLE_LIB
+     MSVC_VERSION
+     COIN_BUILD_MSVC_MP
+ )
+@@ -141,8 +141,8 @@
+     CMAKE_INSTALL_DATADIR
+     CMAKE_INSTALL_FULL_DATADIR
+     CMAKE_INSTALL_INCLUDEDIR
+-    CMAKE_INSTALL_FULL_INCLUDEDIR 
+-    CMAKE_INSTALL_DOCDIR 
++    CMAKE_INSTALL_FULL_INCLUDEDIR
++    CMAKE_INSTALL_DOCDIR
+     CMAKE_INSTALL_FULL_DOCDIR
+   )
+ else()
+@@ -165,7 +165,7 @@
+   list(APPEND COIN_TARGET_LINK_LIBRARIES Boost::boost)
+ endif()
+ 
+-if(COIN_BUILD_MAC_X11)
++if(COIN_BUILD_MAC_X11 OR UNIX)
+   find_package(X11 REQUIRED)
+   # On Mac OS X, GLX is provided as a separate OpenGL implementation, different
+   # from the standard OpenGL framework which provides support for GLUT and native
+@@ -530,6 +530,7 @@
+   endif()
+   check_library_exists(dl dlopen "" HAVE_DL_LIB)
+   if(HAVE_DL_LIB)
++    list(APPEND COIN_TARGET_LINK_LIBRARIES dl)
+     check_include_file(dlfcn.h HAVE_DLFCN_H)
+   endif()
+   check_library_exists(dld shl_load "" HAVE_DLD_LIB)
+@@ -815,4 +816,4 @@
+ 
+ # ############################################################################
+ # New CPACK section, please see the README file inside cpack.d directory.
+-add_subdirectory(cpack.d)
++# not needed add_subdirectory(cpack.d)
diff --git a/media-libs/coin/files/coin-4.0.0a-gcc-7.patch b/media-libs/coin/files/coin-4.0.0a-gcc-7.patch
deleted file mode 100644
index 89829b59b27d..000000000000
--- a/media-libs/coin/files/coin-4.0.0a-gcc-7.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ruN Coin3D-coin-8d1ca1a6ea23/src/3ds/SoStream.cpp my/src/3ds/SoStream.cpp
---- Coin3D-coin-8d1ca1a6ea23/src/3ds/SoStream.cpp	2018-04-16 23:14:36.000000000 +0200
-+++ my/src/3ds/SoStream.cpp	2018-05-06 06:56:42.104728484 +0200
-@@ -185,7 +185,7 @@
-   if (!gotNum) { setBadBit(); return FALSE; } \
-  \
-   char *ce; \
--  *s = '\0'; \
-+  *s = NULL; \
-   _convertType_ tempVal = _convertFunc_(buf, &ce, 0); \
-  \
-   if (ce != s) \
-@@ -282,7 +282,7 @@
- gotAll: \
-   \
-   char *ce; \
--  *s = '\0'; \
-+  *s = NULL; \
-   double tempVal = _convertFunc_(buf, &ce); \
-  \
-   if (ce != s) \
diff --git a/media-libs/coin/metadata.xml b/media-libs/coin/metadata.xml
index aa4affdefe9d..11c05aeb8175 100644
--- a/media-libs/coin/metadata.xml
+++ b/media-libs/coin/metadata.xml
@@ -5,6 +5,8 @@
     <email>reavertm@gentoo.org</email>
   </maintainer>
   <use>
+    <flag name="exceptions">Compile with C++ exceptions</flag>
+    <flag name="man">Build and install man pages</flag>
     <flag name="qthelp">Build API documentation in QtHelp format</flag>
     <flag name="simage">Texture loading via <pkg>media-libs/simage</pkg> library</flag>
   </use>
diff --git a/media-libs/compface/Manifest b/media-libs/compface/Manifest
index e9a9861dbfd0..17e0772be4b6 100644
--- a/media-libs/compface/Manifest
+++ b/media-libs/compface/Manifest
@@ -1,4 +1,4 @@
-AUX compface-1.5.2-destdir.diff 408 BLAKE2B 83798a6d80b57f29b06edc1ce931d5fe52357344693fb890cbbc1de81a7fd87a399c585de370b396d5ca180c41b7ff049a1d007c0e575306462df1a428510de0 SHA512 d9137aab3623907ee48d72f61593480f5a952dcecf794e69404b15a3b0be0b5098abd9aaff8966f82f14f797fb243e00d2b4b4a7f7951f1aef233fe24bfa543a
+AUX compface-1.5.2-fix-build-system.patch 899 BLAKE2B e9bc5c7e6194ff77967ba5ff700771015f8a29612f2c28f32853de06871e30e4f8f4211ae035efbc739326a0b0460aedf0cd859644741cfcf8920f71c485d0ee SHA512 b42ce74af078598f58bca042d820a3d40077447091de111a5d15eddf83ed6c409c330ef79398304998b7e9057b753398b1d84e6318d42a8acb1556eb030c190c
 DIST compface-1.5.2.tar.gz 46970 BLAKE2B d26c25a35b3a2e63ddfb50feace61930fa3be9f4150ad8f8c96a3820ccebf1422fda5703628d58ad646f1d1eeaccc5f2f08ed5f2e74b845f5d7328f2829e63d6 SHA512 0da9ee4c5fb2b5c712466d9fa6170e5687b23c038e6304baa42d7ede6d9bd50a1b84da416eb853a420c01a6b9eccd5e7d92a4ebc26295714b85254c05c9e3360
-EBUILD compface-1.5.2.ebuild 631 BLAKE2B e9c3eb589b9dc6ed3ebcd7305adf7de21ba4815c39386da99bc50f73fcc9d71f0c492724013951808091eb73087fb25cd883023716d24b0a96e1bff8ee68eca0 SHA512 571fbef11ddff7bd26c76e5eddf8fa76057b9b04c749553f772d8101e334087c5b3e5bce314f28a3f1dd8835288154eac23b3fce8e10b9487c62c222465e9043
+EBUILD compface-1.5.2.ebuild 550 BLAKE2B ad91b7fba3479466cb611c80528e22f4d749cf34cf1c4d830a72cea425e517de3b42e7c30fbb5fffdfcdeb8971581806c460bac4b1e7c5afedd25c62aba2e3a9 SHA512 f5ce1b99d312bb2ecd26b3d132e4fc9ce4e1c4c00b24bdf3ca6e96e117e599de4531d8285d35df295d48dc7305fc1281e208084e5080e8ef578f1911e98a3699
 MISC metadata.xml 221 BLAKE2B 6fb71e3c82061054a0c2d88c1ce8e591d5742628fe53032c9efd2c371ce1e8b0135b00ac91fa1905df39a507d5faa5871fb3a30d167dd46cec581682ba17c8ff SHA512 a11e9bbbabc9ac96985c5dc247e601b065fa762f12bce74224896c27aee34eb908187622bfc849c39c6c722a8ef8ee72b248afc84da1b0eb72f1ff5eeb13bbf0
diff --git a/media-libs/compface/compface-1.5.2.ebuild b/media-libs/compface/compface-1.5.2.ebuild
index af03c528e505..db1dd3858f06 100644
--- a/media-libs/compface/compface-1.5.2.ebuild
+++ b/media-libs/compface/compface-1.5.2.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Utilities and library to convert to/from X-Face format"
 HOMEPAGE="http://www.xemacs.org/Download/optLibs.html"
@@ -12,15 +10,12 @@ SRC_URI="http://ftp.xemacs.org/pub/xemacs/aux/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-destdir.diff
-	sed -i "/strip/d" Makefile.in
-}
+RDEPEND="dev-lang/perl"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog README
+	default
 	newbin xbm2xface{.pl,}
 }
diff --git a/media-libs/compface/files/compface-1.5.2-destdir.diff b/media-libs/compface/files/compface-1.5.2-destdir.diff
deleted file mode 100644
index 18ecfd1b4e5f..000000000000
--- a/media-libs/compface/files/compface-1.5.2-destdir.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- compface-1.5.2.orig/Makefile.in
-+++ compface-1.5.2/Makefile.in
-@@ -1,10 +1,10 @@
- prefix          = @prefix@
- exec_prefix     = @exec_prefix@
- srcdir          = @srcdir@
--BINDIR		= @bindir@
--LIBDIR		= @libdir@
--MANDIR		= @mandir@
--INCLUDEDIR	= @includedir@
-+BINDIR		= $(DESTDIR)/@bindir@
-+LIBDIR		= $(DESTDIR)/@libdir@
-+MANDIR		= $(DESTDIR)/@mandir@
-+INCLUDEDIR	= $(DESTDIR)/@includedir@
- 
- @SET_MAKE@
- 
diff --git a/media-libs/compface/files/compface-1.5.2-fix-build-system.patch b/media-libs/compface/files/compface-1.5.2-fix-build-system.patch
new file mode 100644
index 000000000000..2cfea742c981
--- /dev/null
+++ b/media-libs/compface/files/compface-1.5.2-fix-build-system.patch
@@ -0,0 +1,28 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1,10 +1,10 @@
+ prefix          = @prefix@
+ exec_prefix     = @exec_prefix@
+ srcdir          = @srcdir@
+-BINDIR		= @bindir@
+-LIBDIR		= @libdir@
+-MANDIR		= @mandir@
+-INCLUDEDIR	= @includedir@
++BINDIR		= $(DESTDIR)/@bindir@
++LIBDIR		= $(DESTDIR)/@libdir@
++MANDIR		= $(DESTDIR)/@mandir@
++INCLUDEDIR	= $(DESTDIR)/@includedir@
+ 
+ @SET_MAKE@
+ 
+@@ -77,10 +77,8 @@
+ 		$(INSTALL_PROGRAM) -d $(BINDIR) $(LIBDIR) $(MAN1DIR) $(MAN3DIR) $(INCLUDEDIR)
+ 		$(INSTALL_PROGRAM) $(srcdir)/$(NAMEEXE) $(EXECUTABLE) 
+ 		-chmod 0755 $(EXECUTABLE)
+-		-strip $(EXECUTABLE)
+ 		$(INSTALL_PROGRAM) $(srcdir)/$(UNNAMEEXE) $(UNEXECUTABLE)
+ 		-chmod 0755 $(UNEXECUTABLE)
+-		-strip $(UNEXECUTABLE)
+ 		$(INSTALL_DATA) $(srcdir)/$(NAME).1 $(MAN1DIR)/$(NAME).1
+ 		cd $(MAN1DIR) && $(RM) ./$(UNNAME).1 && $(LN_S) $(NAME).1 $(UNNAME).1
+ 		$(INSTALL_DATA) $(srcdir)/$(NAME).3 $(MAN3DIR)/$(NAME).3
diff --git a/media-libs/dav1d/Manifest b/media-libs/dav1d/Manifest
index d5be30b4f675..8c53cde6336f 100644
--- a/media-libs/dav1d/Manifest
+++ b/media-libs/dav1d/Manifest
@@ -5,12 +5,14 @@ DIST dav1d-0.3.0.tar.bz2 435690 BLAKE2B 57124b2a5bcde8a2de8e4ee8155ec736d2f4c13d
 DIST dav1d-0.3.1.tar.bz2 438676 BLAKE2B f51c997fb95abc5b2721d67feb2023daf6bdab8d725b2b52b6c25440dcfab637b8543b8622c18da678eff20bbed155e86da9c9040a98160e5b9381ba7ab5ecf8 SHA512 b810c993a2a262f75ea0d4404428bc5660ac0d4c4d41aa311bc2180abecc40b36e73858f436b27372f4a1a0b7c700df4f8cc535130c663d6bfba2206d549e0f2
 DIST dav1d-0.4.0.tar.bz2 493854 BLAKE2B 8ae022054ab9827306f6e8501e0bfbc03a04e280a3e155c12ae2dfef474eab976097ce3ed990bd5cdbc3ac79018138a156f0701973ac40357224feb75149332a SHA512 7d2ad9959649321e86f9d0dcf44b274251c103fce9f02964d898b6d9da69e38e93bbed86a7ea217c93e0ee89e1ad43bc31dc217535c4b1cc37761191a6585fc1
 DIST dav1d-0.5.1.tar.bz2 548584 BLAKE2B 407188a57c469124db4863bc78dbca8b31879ed8836503ba584d4781e5f956c9f0a4661a4f47729bde74f1dd393c08db98a4cb49103f99c0f76720bc148b53a9 SHA512 2d1e7888fa9c138903b4209647e907803d2444fc2afb219b9a45dcc4c75098128b299950750bd68970004ea413ad88933d4d651a3e4e0e1557506598a15cee3b
+DIST dav1d-0.5.2.tar.bz2 554192 BLAKE2B 29305d0bb20a3de0048d102789fe1fdb1a030596213a1e2f025918ac6bb37c92c8c5f8078320487702ed66b16d4d63234823b5475d84bdea853b92e76be4c70e SHA512 37da9138a1dba68b9e723ba48b23eab567f839308132fc5a28727c131280f2eca3e160b074982f5265c914dcad0e4029af9ce23909b32bb9ec60f235c623e384
 EBUILD dav1d-0.1.0.ebuild 1128 BLAKE2B 20202e1f79289bf576003933bfae0e417974df92f810c2a6ed873e1143af297c2af37918fed3ead030206a4d96fe22722a943b11f2b66a8e1dce210256f7f2c1 SHA512 d25a735d98e03391640d290669a69fe225d28ec3a8a3a1137919d4cd47e97e11f03e1c30f0f2123153b4c0a34f6e8539da94b100a05c0c42e98247b1aabb2d38
 EBUILD dav1d-0.2.0-r1.ebuild 1135 BLAKE2B 081253071832f93fd96b216169ea0a1f29a2608ec058eebb41c1eb47922ae64134c3c027005abb56549d7b8e66d0831defc07eb95d963c37de07e730384c42d6 SHA512 35a638950d61cb3a79391f959fc8da3240dbf191f6db0ec55b8d80f08287a8ec1eefc9a611196e70449a89b0ec87aca4f304cd4ed46d6911d72e9343ec612ed4
 EBUILD dav1d-0.2.1.ebuild 1135 BLAKE2B 081253071832f93fd96b216169ea0a1f29a2608ec058eebb41c1eb47922ae64134c3c027005abb56549d7b8e66d0831defc07eb95d963c37de07e730384c42d6 SHA512 35a638950d61cb3a79391f959fc8da3240dbf191f6db0ec55b8d80f08287a8ec1eefc9a611196e70449a89b0ec87aca4f304cd4ed46d6911d72e9343ec612ed4
 EBUILD dav1d-0.3.0.ebuild 1147 BLAKE2B fbceacf787e296094352daa0382eba35447e6c09aa5fa087cc25102a846537f08852fb86f1592fb06aa23a36acfab93ac6b40fd0af86f305663322076d4b1016 SHA512 50524008230f23b520ae3401af3ce65822b238c3300a4a3715034ac5f584bf76a3f1fd4e1591a539ca07f4f3005564b22bcbe07c30b4ce809ef928bfa00d6a82
 EBUILD dav1d-0.3.1.ebuild 1161 BLAKE2B 102cd9d3e438f66ad960b9542650acf2f1171d47c9c321d16dec7a6ffee4662820ced2732087a50b2faf706e891e7c707f8c3f4d163442bddb94db45848faa05 SHA512 610cfdd81df7f852c5fcbe0691e0274a11e1fabd37d51eea85c875ae36905eb54991b8bcf930378b2c640f93e6c175543d8d68ab3ed4e866ddac8cd6331dd05a
-EBUILD dav1d-0.4.0.ebuild 1166 BLAKE2B 69a6f25017ffe6e5869ba5faa36b5da6dcb291030979ac12229f475eabfaa7897aa54aed926958b728a16097155ccaf4d7d9b11d1932715dedc42e8e78f18369 SHA512 4e2187506d4db679a03663ef28f10cff9e671ac196e40d5804f63e960e71ff79a1906f85528c0bffe2062da2e50f92469064c428fd72811e156dbb421589d920
-EBUILD dav1d-0.5.1.ebuild 1157 BLAKE2B 3ccc5357cef3f4dfe37f3b9229f0eee9bcc12c5acee48adafc8d1e1ad136b1093a422fe1005c03bb63f8b5f1b34dfe0a690cc0ba8692a967c1af62372327ce07 SHA512 7de035cbb7469d57847afb1c49a27d247a06eabed6e86b265698a6b83844c7b33f28b530b3ac8bbc30336ee73ef1acd0cdc89b1d51e709d883d63aa083681645
-EBUILD dav1d-9999.ebuild 1157 BLAKE2B 3ccc5357cef3f4dfe37f3b9229f0eee9bcc12c5acee48adafc8d1e1ad136b1093a422fe1005c03bb63f8b5f1b34dfe0a690cc0ba8692a967c1af62372327ce07 SHA512 7de035cbb7469d57847afb1c49a27d247a06eabed6e86b265698a6b83844c7b33f28b530b3ac8bbc30336ee73ef1acd0cdc89b1d51e709d883d63aa083681645
+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
 MISC metadata.xml 536 BLAKE2B 40ec2224aed078ad4748d3182defb6813cdd34a614d40db2fbbbeb8b63e24a59ba1cbe9d458fec17516c328a89f77927d9fbeb9a1e4a2b8c296b7de7235b1af4 SHA512 74e6595ce441bb313364f375a8afa9b2a0179f350e30d075ecf99e058874450e15f4005a0712e20a4feb047d57799dffacb3903af00a3c5a8d059f7025e49de6
diff --git a/media-libs/dav1d/dav1d-0.4.0.ebuild b/media-libs/dav1d/dav1d-0.4.0.ebuild
index c344ddc2e4e4..1bfd1838576c 100644
--- a/media-libs/dav1d/dav1d-0.4.0.ebuild
+++ b/media-libs/dav1d/dav1d-0.4.0.ebuild
@@ -36,15 +36,16 @@ multilib_src_configure() {
 	use 8bit  && bits+=( 8 )
 	use 10bit && bits+=( 16 )
 
+	local enable_asm
 	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_x32 ]]; then
-		build_asm=false
+		enable_asm=false
 	else
-		build_asm=$(usex asm true false)
+		enable_asm=$(usex asm true false)
 	fi
 
 	local emesonargs=(
 		-D bitdepths=$(IFS=,; echo "${bits[*]}")
-		-D build_asm=$build_asm
+		-D enable_asm=${enable_asm}
 	)
 	meson_src_configure
 }
diff --git a/media-libs/dav1d/dav1d-0.5.1.ebuild b/media-libs/dav1d/dav1d-0.5.1.ebuild
index 69a1a98df066..2d5b991ec5d9 100644
--- a/media-libs/dav1d/dav1d-0.5.1.ebuild
+++ b/media-libs/dav1d/dav1d-0.5.1.ebuild
@@ -34,15 +34,16 @@ multilib_src_configure() {
 	use 8bit  && bits+=( 8 )
 	use 10bit && bits+=( 16 )
 
+	local enable_asm
 	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_x32 ]]; then
-		build_asm=false
+		enable_asm=false
 	else
-		build_asm=$(usex asm true false)
+		enable_asm=$(usex asm true false)
 	fi
 
 	local emesonargs=(
 		-D bitdepths=$(IFS=,; echo "${bits[*]}")
-		-D build_asm=$build_asm
+		-D enable_asm=${enable_asm}
 	)
 	meson_src_configure
 }
diff --git a/media-libs/dav1d/dav1d-0.5.2.ebuild b/media-libs/dav1d/dav1d-0.5.2.ebuild
new file mode 100644
index 000000000000..2d5b991ec5d9
--- /dev/null
+++ b/media-libs/dav1d/dav1d-0.5.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SCM=""
+if [[ "${PV}" == "9999" ]]; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
+fi
+
+inherit ${SCM} meson ninja-utils multilib-minimal
+
+DESCRIPTION="dav1d is an AV1 Decoder :)"
+HOMEPAGE="https://code.videolan.org/videolan/dav1d"
+
+LICENSE="BSD-2"
+SLOT="0/3"
+IUSE="+8bit +10bit +asm"
+
+ASM_DEPEND=">=dev-lang/nasm-2.13.02"
+BDEPEND="asm? (
+		abi_x86_32? ( ${ASM_DEPEND} )
+		abi_x86_64? ( ${ASM_DEPEND} )
+	)"
+
+DOCS=( README.md doc/PATENTS THANKS.md )
+
+multilib_src_configure() {
+	local -a bits=()
+	use 8bit  && bits+=( 8 )
+	use 10bit && bits+=( 16 )
+
+	local enable_asm
+	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_x32 ]]; then
+		enable_asm=false
+	else
+		enable_asm=$(usex asm true false)
+	fi
+
+	local emesonargs=(
+		-D bitdepths=$(IFS=,; echo "${bits[*]}")
+		-D enable_asm=${enable_asm}
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
diff --git a/media-libs/dav1d/dav1d-9999.ebuild b/media-libs/dav1d/dav1d-9999.ebuild
index 69a1a98df066..2d5b991ec5d9 100644
--- a/media-libs/dav1d/dav1d-9999.ebuild
+++ b/media-libs/dav1d/dav1d-9999.ebuild
@@ -34,15 +34,16 @@ multilib_src_configure() {
 	use 8bit  && bits+=( 8 )
 	use 10bit && bits+=( 16 )
 
+	local enable_asm
 	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_x32 ]]; then
-		build_asm=false
+		enable_asm=false
 	else
-		build_asm=$(usex asm true false)
+		enable_asm=$(usex asm true false)
 	fi
 
 	local emesonargs=(
 		-D bitdepths=$(IFS=,; echo "${bits[*]}")
-		-D build_asm=$build_asm
+		-D enable_asm=${enable_asm}
 	)
 	meson_src_configure
 }
diff --git a/media-libs/exempi/Manifest b/media-libs/exempi/Manifest
index 975a5b008f57..f3270f3e9c73 100644
--- a/media-libs/exempi/Manifest
+++ b/media-libs/exempi/Manifest
@@ -1,5 +1,5 @@
 AUX exempi-2.4.2-iconv.patch 1440 BLAKE2B a3fccd3c268c28f1fe0b9e13544ba7b33d433a9a92ad9319301996c162766dac9d3fc14f97c3a3c795d787d0b7b9048dec830e1ce5d809b1a14ffa82097e2ff5 SHA512 09cc5ba46c8e0a0b0c1c3b0c86d9c49c21e64a64ca35a90053bf98ed81652b8d1c91bc29a321b5b3bf032b65af220129860f7d3f8c6e12ce608db19c01841736
 AUX exempi-2.4.5-CVE-2018-12648.patch 1556 BLAKE2B 154787079e9a1b3c747275aadd5fd2e47efd6079508b1f2db12ca5d0a83c1efb31ac87f869703e28e1b638a26d693fec6b6875d762c85c2ea63ff3adba70b036 SHA512 12594e62110d5d0e457102db94822c0920196420ca2321193b79736ed05dde6859723d66bba0177d55b0390c0716debfcf0e074ca27eaa12ef3e29e799d3913e
 DIST exempi-2.4.5.tar.gz 3901474 BLAKE2B 7db80266847a18464ee5d75e2ffa38a05b2b23a30fb02a16c0a4a512f853a625f00db3ee0de3f177af584e12d65c8ecd2acc96cae96ef02d7b39129ab4b5274a SHA512 2b3dd8b2d1763fbbfed1995635f625a8e909a4c3119147385737f349002b2fa038cfaca72b2b877db8f28b9022230e49264b58766a68060b0b7c322cad99b22c
-EBUILD exempi-2.4.5-r1.ebuild 1212 BLAKE2B d2ed38a7ecf09f2132bdb0e10cb0bf4687ff2cf94cfb84a9f8b78b71442563187eb026baf3218a77ba0b0e56438987e0e8301dc0df2415c1af93141c8cf2ac72 SHA512 1950515248dc22c248cba2740dd3bf12674cc4021eb8e1beb4603877c241b0e85630940f06716e1c686f9316e3cac2025fbf42e93ce9aea5f216ca1523229870
+EBUILD exempi-2.4.5-r1.ebuild 1239 BLAKE2B 57e4a1c40b9abf1d2f5d7718c8de54792cfcd5ea542fb1ea533855b20ed64d6aac4fbde7fbfe85a37e4b20ef8368485f4f16c5110de7ddd67cab06d0312a115e SHA512 bc6d991cb0a1ad2486ca1648159a4d4373df35020e3cb791cd9c1d8685669a500fe0124b7510bb70e53ff11a40c65ec8460e45ce6109772e84394027a3f2d465
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/media-libs/exempi/exempi-2.4.5-r1.ebuild b/media-libs/exempi/exempi-2.4.5-r1.ebuild
index d5d4a561bd1a..b83321ccd228 100644
--- a/media-libs/exempi/exempi-2.4.5-r1.ebuild
+++ b/media-libs/exempi/exempi-2.4.5-r1.ebuild
@@ -13,6 +13,7 @@ LICENSE="BSD"
 SLOT="2/3"
 KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~sh sparc x86"
 IUSE="examples static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/expat-2:=
diff --git a/media-libs/fidlib/Manifest b/media-libs/fidlib/Manifest
index 5cb646096cfe..88814d7041f7 100644
--- a/media-libs/fidlib/Manifest
+++ b/media-libs/fidlib/Manifest
@@ -1,6 +1,4 @@
-AUX fidlib-0.9.10-cpp-extern.patch 456 BLAKE2B 62e4465fa85f52cbe3855fd16b538a142c4f6b8cf9a83d98bb7f34b58b709a9d265dac605972d30d6109886eaa2d7d7932dc057ef6502a15ce54f7515c49ffb6 SHA512 3134dd872d6ca6bf518eb5b72337a8ff8476acc1c65f1c7b3a7b65aad7373f38c8e7a3f92e5e1bfbddb2ead3b4348677891750b2258986c827c70fee885f406b
 AUX fidlib-0.9.10-extern.patch 525 BLAKE2B 6a018a1e1c58d4c0457546955c88152a3d6e72aa0379d4787c0c3dcc85c409e8cef2e3f9d493bf4121521119eaf70cefa5c1d35ca03d01d060dc2246e8414e4c SHA512 e47f4814b181047d998d533ace997977ea32c7c1fbcce25c41cf775eacba8abb4360bc0a63335355453300e17fd314e5c5da59897afd68345ab97c7d53eeb14c
 DIST fidlib-0.9.10.tgz 87082 BLAKE2B 1a8c2c9abaf1d8d0855466af2c3243a4253f505b488822852d49c702f0904beb599bfa7a023d4be925d1d245b8357ebef05dd6c4051bdc9c9c3eeae96bbf0b46 SHA512 77600acd665407b4d786b406a4f20b2f6c30c74775f5777d5054420b80c74e5bfa316bf7bd90df1669c09cef0ff9b552a0338cd138bf7d9bcf1df7cbff9fea4b
-EBUILD fidlib-0.9.10-r1.ebuild 1112 BLAKE2B 8ce38e8658eba5c4a1e8f13e26f8d124080a104d7865d3b0d399c43f9e4ec3f544f91847b197ee743031ea1c6aaa584bcbd111edcf6f6fbbd4d2a07a10bed7ee SHA512 e20854ab0377b9a05350903950b9d96fa2ed85916aba61e69a652e36f4c5dee2c4d42ee1baaacdab05ccfebf78a06ebfa6fb294f6447df75eb9144a340ee1194
-EBUILD fidlib-0.9.10.ebuild 1122 BLAKE2B 28ad3b24850ef30bc2ea1f39cf13bb3bee81eb3bd2ef6f603829c21820d5f9e4363acfb2646ef5bdb81d16f557cc18da8ec8cc946214ba8a6eeabfe6bdeef766 SHA512 17bd54f6cf95a7fb39fedd8c5752aca884682515163453f54f13017c8130083218fbd01afb9d9bcd7765efe562b4f0021c079f33bc1c6dcc103fc914828c0598
+EBUILD fidlib-0.9.10-r1.ebuild 1107 BLAKE2B 514896ac94d4ec18fef4a801aabd02f48217c921f702ee10bd8d51fcdf61b52848f6ab8b3a5c137bd45ac1845e75e38fd7aa49aa5cd02a838053d5deeb1a8b1c SHA512 016d8decb9df92fc632dda85ed6a56369f3ada565179813eb4bdee53f9aa058c9a71dabd9716ff535718fbaf337f9a7f7deb2559c69e07235a55f25ded593a1b
 MISC metadata.xml 265 BLAKE2B e3dedcada43b8145986c6c9f3ed1d374d3e93d2a1f6bdf5d83af1a43e24d01ee0ea4b6efd67ffee46d585e6d37272cbacec69e66e21b22af6a5e01878003e44a SHA512 5b875b5d0a59914316df520eee72ee3c5f931b8513424120281657bbc266c777214a924e4c6c867cdd7a61cb66037c7b9b501225cc06d890abb8ca04c13f5fba
diff --git a/media-libs/fidlib/fidlib-0.9.10-r1.ebuild b/media-libs/fidlib/fidlib-0.9.10-r1.ebuild
index 9782a86864d2..939921d2acf6 100644
--- a/media-libs/fidlib/fidlib-0.9.10-r1.ebuild
+++ b/media-libs/fidlib/fidlib-0.9.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://uazu.net/fidlib/${P}.tgz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 doecho() {
 	echo "$@"
diff --git a/media-libs/fidlib/fidlib-0.9.10.ebuild b/media-libs/fidlib/fidlib-0.9.10.ebuild
deleted file mode 100644
index eb2c394daffb..000000000000
--- a/media-libs/fidlib/fidlib-0.9.10.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit toolchain-funcs flag-o-matic eutils multilib
-
-DESCRIPTION="Run-time filter design and execution library"
-HOMEPAGE="http://uazu.net/fidlib/"
-SRC_URI="http://uazu.net/fidlib/${P}.tgz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-doecho() {
-	echo "$@"
-	"$@" || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cpp-extern.patch
-
-	# Avoid ICE under gcc-4.6, fixed in 4.6.3
-	if [[ $(gcc-version) == "4.6" && $(gcc-micro-version) -le 2 ]] ; then
-		replace-flags -O? -O0
-	fi
-}
-
-src_compile() {
-	# build library
-	doecho $(tc-getCC) ${CFLAGS} -DT_LINUX ${LDFLAGS} -Wl,-soname,libfidlib.so.${PV:0:1} \
-		-fPIC -shared fidlib.c -lm -o libfidlib.so.${PV:0:1}
-
-	# build command-line tool
-	doecho $(tc-getCC) ${CFLAGS} ${LDFLAGS} firun.c -lm ./libfidlib.so.${PV:0:1} -o firun
-}
-
-src_install() {
-	dobin firun
-	dolib.so libfidlib.so.${PV:0:1}
-	dosym libfidlib.so.${PV:0:1} /usr/$(get_libdir)/libfidlib.so
-
-	insinto /usr/include/fidlib
-	doins fidlib.h
-
-	dodoc NEWS README fidlib.txt firun.txt
-}
diff --git a/media-libs/fidlib/files/fidlib-0.9.10-cpp-extern.patch b/media-libs/fidlib/files/fidlib-0.9.10-cpp-extern.patch
deleted file mode 100644
index 221ec825f174..000000000000
--- a/media-libs/fidlib/files/fidlib-0.9.10-cpp-extern.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- fidlib-0.9.10/fidlib.h
-+++ fidlib-0.9.10/fidlib.h
-@@ -2,6 +2,10 @@
- //	fidlib include file
- //
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
- typedef struct FidFilter FidFilter;
- struct FidFilter {
-    short typ;		// Type of filter element 'I' IIR, 'F' FIR, or 0 for end of list
-@@ -66,3 +70,7 @@
- extern void fid_run_zapbuf(void *buf);
- extern void fid_run_freebuf(void *runbuf);
- extern void fid_run_free(void *run);
-+
-+#ifdef __cplusplus
-+}
-+#endif
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index 2881483b1ea8..cbd6a7795f23 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -7,5 +7,5 @@ AUX flac-1.3.2-honor-htmldir.patch 2088 BLAKE2B 7dd5f79de44f5c2453bfe5137d22d8cf
 DIST flac-1.3.2.tar.xz 776192 BLAKE2B ff09df3fc4f985a00fcf6d497be675ceeda85cc57ea73b4f8ad6679cd40a33640f8502adc80c0a571d01fa0a17b8fcb6bfd8df7474620099d4f34bbc073bc7a3 SHA512 63910e8ebbe508316d446ffc9eb6d02efbd5f47d29d2ea7864da9371843c8e671854db6e89ba043fe08aef1845b8ece70db80f1cce853f591ca30d56ef7c3a15
 DIST flac-1.3.3.tar.xz 1044472 BLAKE2B 14acf10e5bce54767a8e3c9bfd0b80c388011e35c7e6a814672f8048d5350b4e6f54c6df4f704e611fa4a796fcfcb6aca1ed798f542cd6abe181210f9f6e33f6 SHA512 d6417e14fab0c41b2df369e5e39ce62a5f588e491af4d465b0162f74e171e5549b2f061867f344bfbf8aaccd246bf5f2acd697e532a2c7901c920c69429b1a28
 EBUILD flac-1.3.2-r1.ebuild 1825 BLAKE2B 5c64304c1ccce92a9b77e188fa7f9a1e6be16dc8091449c335cff961701029caccc9cb2315f6df4db62903b3ed1a485e79c39c82cebbc2f7c3340088a37c4fae SHA512 837c11ef4176b2a643de7c5f2e1975d58ce67093341a1334735dc01cef7b86862de07445fef14d7a58de14c0b9cc58a1f8a8999704b8a66c0be51e87ba83ea4c
-EBUILD flac-1.3.3.ebuild 1511 BLAKE2B 12c473a76720d8d8c31c7e9a69a01f27f7d5b25e6fc2a6eb39bac827f89dca8aeb9ede96b490128b9916f483d73a422a868ace361aa12ccac313f7e00a7c9ae7 SHA512 276dbf4955b907a1f7f74560c0cee4561d45606e5297c461580ed0abcff7fd63c90004207578b79068c8883cd634fd63d9aa0fc7ce3ca3286f135f393d896478
+EBUILD flac-1.3.3.ebuild 1505 BLAKE2B ab342407e57dc684eceae7417aa9cdda07e15eac306d9453f3d5ef49d6524b75550a6c67c47979038c8e0bf880b053f65eb35c40f96e716eaaf878360f617e57 SHA512 451b61b64be108b435ecbbdc993c8debd94b07e062618ec2495c0197971c7a8f744d9cad00e8532de9f00abce5df717b51da8ed726c53c3a2cbc9ec65fb3fc92
 MISC metadata.xml 327 BLAKE2B dee4aea4020b899879f83487d34853963264b68e7a7e8c509571bc353a5b20fde4d7f78899b900bf4214f5d488f088523090d4f41e8542f069e9a4eb7791c2ad SHA512 a4e6ad50d3089ff980a07a6ea6f7fcc22e3efc4da4c5721492aae001861fa185f12d68fc5effb55ccce8d67042b7a605c28096f4bca88f2ba9d5b4eb2593d14c
diff --git a/media-libs/flac/flac-1.3.3.ebuild b/media-libs/flac/flac-1.3.3.ebuild
index 39de528194b4..cb7d541ecd0c 100644
--- a/media-libs/flac/flac-1.3.3.ebuild
+++ b/media-libs/flac/flac-1.3.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/${PN}/${P}.tar.xz"
 
 LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
 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 ~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="altivec +cxx debug ogg cpu_flags_x86_sse static-libs"
 
 RDEPEND="ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest
index 17f9a1f0474e..eb3acd83e13c 100644
--- a/media-libs/freeglut/Manifest
+++ b/media-libs/freeglut/Manifest
@@ -1,7 +1,3 @@
-AUX freeglut-3.0.0-bsd-usb-joystick.patch 23398 BLAKE2B a55c99083262409976a3074bdafbaf42e19ea980f7d8e3641cb65cd6d502668f1f8ec653eb7d23852276a0634ba5841e7b989f32b8a50036b6b26a69d6630988 SHA512 fe527efb2be40a87c6767e65315795efd632627503f6e43b6ba50d81b7a7d59608f4bf4387001ef1443f47dfb739d972259eb406e6f32996dd710a78a10976cf
-AUX freeglut-3.0.0-drop-unnecessary-x11-libs.patch 1158 BLAKE2B 85f025a23d1fb0e4866ffdeafcd563e6d752d5d56a5f4d0648a376e8a6b9dbc54f80f5ab6d35d4a6bd71f469e9fd7225df2f93eecd49916bd86cbca580d369aa SHA512 414ace62ec3b6db139e4667648d0af8c4ad1beb6a91ea86218aa4ef6e27bab1eb1d3749ad08bc55a028ed1d9020840763f20fe4c5a317cdf374fc8494eb8c2bf
-DIST freeglut-3.0.0.tar.gz 419095 BLAKE2B 6065044fb2816ddfebd363189cdb897e00fa433d79c09f5a705b80ff730e1312158ed5db8d7a2cbfc2ddac0d0a9400300c5c245d967c33c937da11303fc316de SHA512 9c45d5b203b26a7ff92331b3e080a48e806c92fbbe7c65d9262dd18c39cd6efdad8a795a80f499a2d23df84b4909dbd7c1bab20d7dd3555d3d88782ce9dd15b0
 DIST freeglut-3.2.1.tar.gz 440228 BLAKE2B ed8a4b2361416cfee5540350ee50c32a56e5ea75d6834c677c5cec676967a04e13b2adf3da1cc9a3a2c73fbc6147b3b0bc91953a6edf1e35ce8c933eeff6f97a SHA512 aced4bbcd36269ce6f4ee1982e0f9e3fffbf18c94f785d3215ac9f4809b992e166c7ada496ed6174e13d77c0f7ef3ca4c57d8a282e96cbbe6ff086339ade3b08
-EBUILD freeglut-3.0.0.ebuild 1322 BLAKE2B 40ee9faa939ac5e56c0f4c55607a47b2e1d88ce6c2968f2007ec4f8cc9966091fecf33b6069d5aeb54a6a3fe333602cf47d275290c7f04712f2ec47516fb428e SHA512 c503d74959f04442423e2b60b6f81fd3ba778bbfa1c2d59478aa75556de75c961354db2040f4c9934e690cb253f4460579196f11344a7fc71fc14791e0036005
-EBUILD freeglut-3.2.1.ebuild 1382 BLAKE2B 451d265b6a3fb046fb8dd4e85e59f3255ba00a9bb571f02ee4f6a8adb1549a475962869469630dc1db398bf38ba7144f499fad3b373ee7232d445543c979ec22 SHA512 3e7ab2f42252a77bd947d1b5a4eccb0c5d398570b19d7c246b327a9c20c13bde40da8234a66513216ee435e13671dcb7e834aa3090a5ed794a640eb0c8dfee97
+EBUILD freeglut-3.2.1.ebuild 1372 BLAKE2B 1fd05d9c15bf80088e15465eca5771e5c779449fc52cb27fddaf151a32f9cec66368f426ebeaac6cd742c3dee4df80c5b52a7df6bc1f005c1b423362784cb947 SHA512 1f163d591f7cba5eae5e5d46ac42d74fe2983890857a957a2758cec420c2023e0680520310227c28775bd1923f28b394426c2bf8ab5a13a259b0c7b39815de00
 MISC metadata.xml 528 BLAKE2B ee8c09e46677ec77c1d6771b31ac1b28e75464d7e0e4405c41831e19446c5a442c782dbd32a79d0fe5e7ed85ecbd2404764f2121f5f4bff5483db4571fd89212 SHA512 94dc412f8f049bb88723fdba9f9b89645eb792547a768ea524a711ad9302c5cac38a7292ab09726154fc6829a05f41af05220f91d9f6eaed056e4cff8324370e
diff --git a/media-libs/freeglut/files/freeglut-3.0.0-bsd-usb-joystick.patch b/media-libs/freeglut/files/freeglut-3.0.0-bsd-usb-joystick.patch
deleted file mode 100644
index 505b3467ec46..000000000000
--- a/media-libs/freeglut/files/freeglut-3.0.0-bsd-usb-joystick.patch
+++ /dev/null
@@ -1,753 +0,0 @@
-From 5908c36a4a3964cdc8db5c7bfdfd4381ec0996df Mon Sep 17 00:00:00 2001
-From: dcnieho <dcnieho@7f0cb862-5218-0410-a997-914c9d46530a>
-Date: Wed, 12 Jul 2017 20:44:35 +0000
-Subject: [PATCH] Fix build on NetBSD.
-
-(cherry picked from commit 06e1d815cf9abda49b845754ff420734446eb95b)
-
-(cherry picked from commit c4294ad59093c27159ea6028d33e3c9581df5354)
-
-git-svn-id: http://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1829 7f0cb862-5218-0410-a997-914c9d46530a
----
- src/fg_joystick.c         |  5 ++---
- src/x11/fg_joystick_x11.c | 10 +++++-----
- 2 files changed, 7 insertions(+), 8 deletions(-)
-
-diff --git a/src/fg_joystick.c b/src/fg_joystick.c
-index 6f6771c..b73d7e7 100644
---- a/src/fg_joystick.c
-+++ b/src/fg_joystick.c
-@@ -46,21 +46,20 @@
- 
- #    ifdef HAVE_USB_JS
- #        if defined(__NetBSD__)
--/* XXX The below hack is done until freeglut's autoconf is updated. */
--#            define HAVE_USBHID_H 1
- #            ifdef HAVE_USBHID_H
- #                include <usbhid.h>
- #            else
- #                include <usb.h>
- #            endif
-+#            include <dev/usb/usb.h>
- #        elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- #            ifdef HAVE_USBHID_H
- #                include <usbhid.h>
- #            else
- #                include <libusbhid.h>
- #            endif
-+#            include <legacy/dev/usb/usb.h>
- #        endif
--#        include <legacy/dev/usb/usb.h>
- #        include <dev/usb/usbhid.h>
- 
- /* Compatibility with older usb.h revisions */
-diff --git a/src/x11/fg_joystick_x11.c b/src/x11/fg_joystick_x11.c
-index a37388b..04bc373 100644
---- a/src/x11/fg_joystick_x11.c
-+++ b/src/x11/fg_joystick_x11.c
-@@ -50,7 +50,7 @@ void fgPlatformJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
- {
-     int status;
- 
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-     int len;
- 
-     if ( joy->pJoystick.os->is_analog )
-@@ -215,7 +215,7 @@ void fgPlatformJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
- 
- void fgPlatformJoystickOpen( SFG_Joystick* joy )
- {
--#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
-+#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__)
- 	int i = 0;
-        char *cp;
- #endif
-@@ -229,7 +229,7 @@ void fgPlatformJoystickOpen( SFG_Joystick* joy )
- #  endif
- #endif
- 
--#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
-+#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__)
-     for( i = 0; i < _JS_MAX_AXES; i++ )
-         joy->pJoystick.os->cache_axes[ i ] = 0.0f;
- 
-@@ -409,7 +409,7 @@ void fgPlatformJoystickOpen( SFG_Joystick* joy )
- 
- void fgPlatformJoystickInit( SFG_Joystick *fgJoystick[], int ident )
- {
--#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
-+#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__)
-     fgJoystick[ ident ]->id = ident;
-     fgJoystick[ ident ]->error = GL_FALSE;
- 
-@@ -436,7 +436,7 @@ void fgPlatformJoystickInit( SFG_Joystick *fgJoystick[], int ident )
- 
- void fgPlatformJoystickClose ( int ident )
- {
--#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
-+#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__)
-     if( fgJoystick[ident]->pJoystick.os )
-     {
-         if( ! fgJoystick[ ident ]->error )
--- 
-2.19.2
-
-From c0f0f1e0903a5dd848825db0fe1f01d5db37c4e1 Mon Sep 17 00:00:00 2001
-From: dcnieho <dcnieho@7f0cb862-5218-0410-a997-914c9d46530a>
-Date: Wed, 12 Jul 2017 20:44:47 +0000
-Subject: [PATCH] some whitespace cleanup
-
-(cherry picked from commit 2dd5aa4aa1b5c19392f9abd00e0f6893907df205)
-
-git-svn-id: http://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1830 7f0cb862-5218-0410-a997-914c9d46530a
----
- src/fg_init.c                 |  32 ++--
- src/fg_joystick.c             |   8 +-
- src/fg_main.c                 |  14 +-
- src/freeglutdll.def.in        | 312 +++++++++++++++++-----------------
- src/mswin/fg_joystick_mswin.c |   2 +-
- src/mswin/fg_main_mswin.c     | 160 ++++++++---------
- 6 files changed, 264 insertions(+), 264 deletions(-)
-
-diff --git a/src/fg_joystick.c b/src/fg_joystick.c
-index b73d7e7..2f4f6ed 100644
---- a/src/fg_joystick.c
-+++ b/src/fg_joystick.c
-@@ -581,7 +581,7 @@ void fgPlatformJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
- 
- void fgPlatformJoystickOpen( SFG_Joystick* joy )
- {
--	int i = 0;
-+    int i = 0;
-     OSStatus err;
- 
-     /* XXX FIXME: get joystick name in Mac */
-@@ -856,7 +856,7 @@ static void fghJoystickOpen( SFG_Joystick* joy )
-     joy->num_axes = joy->num_buttons = 0;
-     joy->name[ 0 ] = '\0';
- 
--	fgPlatformJoystickOpen ( joy );
-+    fgPlatformJoystickOpen ( joy );
- 
- }
- 
-@@ -878,7 +878,7 @@ static void fghJoystickInit( int ident )
-     fgJoystick[ ident ]->num_axes = fgJoystick[ ident ]->num_buttons = 0;
-     fgJoystick[ ident ]->error = GL_TRUE;
- 
--	fgPlatformJoystickInit( fgJoystick, ident );
-+    fgPlatformJoystickInit( fgJoystick, ident );
- 
-     fghJoystickOpen( fgJoystick[ ident  ] );
- }
-@@ -906,7 +906,7 @@ void fgJoystickClose( void )
-     {
-         if( fgJoystick[ ident ] )
-         {
--			fgPlatformJoystickClose ( ident );
-+            fgPlatformJoystickClose ( ident );
- 
-             free( fgJoystick[ ident ] );
-             fgJoystick[ ident ] = NULL;
--- 
-2.19.2
-
-From 6096caf2468ad4557968b9156ea9fcab2efb3fd1 Mon Sep 17 00:00:00 2001
-From: dcnieho <dcnieho@7f0cb862-5218-0410-a997-914c9d46530a>
-Date: Wed, 12 Jul 2017 20:45:07 +0000
-Subject: [PATCH] moved static variables and functions that should not have
- stuck behind in fg_joystick.c, but should have been in fg_joystick_x11.c
-
-(cherry picked from commit 0d98472817921dc95d070f13bba59b72d792a7b2)
-
-git-svn-id: http://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1832 7f0cb862-5218-0410-a997-914c9d46530a
----
- src/fg_joystick.c         | 173 ----------------------------------
- src/x11/fg_joystick_x11.c | 190 +++++++++++++++++++++++++++++++++++++-
- 2 files changed, 185 insertions(+), 178 deletions(-)
-
-diff --git a/src/fg_joystick.c b/src/fg_joystick.c
-index 2f4f6ed..e548c04 100644
---- a/src/fg_joystick.c
-+++ b/src/fg_joystick.c
-@@ -68,8 +68,6 @@
- #        endif
- #    endif
- 
--static int hatmap_x[9] = { 0, 0, 1, 1, 1, 0, -1, -1, -1 };
--static int hatmap_y[9] = { 0, 1, 1, 0, -1, -1, -1, 0, 1 };
- struct os_specific_s {
-   char             fname [128 ];
-   int              fd;
-@@ -98,178 +96,7 @@ struct os_specific_s {
- #    define UHIDDEV "/dev/uhid"
- #    define AJSDEV "/dev/joy"
- 
--#    ifdef HAVE_USB_JS
--/*
-- * fghJoystickFindUSBdev (and its helper, fghJoystickWalkUSBdev) try to locate
-- * the full name of a USB device. If /dev/usbN isn't readable, we punt and
-- * return the uhidN device name. We warn the user of this situation once.
-- */
--static char *fghJoystickWalkUSBdev(int f, char *dev, char *out, int outlen)
--{
--  struct usb_device_info di;
--  int i, a;
--  char *cp;
--
--  for (a = 1; a < USB_MAX_DEVICES; a++) {
--    di.udi_addr = a;
--    if (ioctl(f, USB_DEVICEINFO, &di) != 0)
--      return NULL;
--    for (i = 0; i < USB_MAX_DEVNAMES; i++)
--      if (di.udi_devnames[i][0] &&
--          strcmp(di.udi_devnames[i], dev) == 0) {
--        cp =  calloc( 1, strlen(di.udi_vendor) + strlen(di.udi_product) + 2);
--        strcpy(cp, di.udi_vendor);
--        strcat(cp, " ");
--        strcat(cp, di.udi_product);
--        strncpy(out, cp, outlen - 1);
--        out[outlen - 1] = 0;
--        free( cp );
--        return out;
--      }
--  }
--  return NULL;
--}
--
--static int fghJoystickFindUSBdev(char *name, char *out, int outlen)
--{
--  int i, f;
--  char buf[50];
--  char *cp;
--  static int protection_warned = 0;
--
--  for (i = 0; i < 16; i++) {
--    snprintf(buf, sizeof(buf), "%s%d", USBDEV, i);
--    f = open(buf, O_RDONLY);
--    if (f >= 0) {
--      cp = fghJoystickWalkUSBdev(f, name, out, outlen);
--      close(f);
--      if (cp)
--        return 1;
--    }
--    else if (errno == EACCES) {
--      if (!protection_warned) {
--        fgWarning ( "Can't open %s for read!", buf );
--        protection_warned = 1;
--      }
--    }
--  }
--  return 0;
--}
- 
--static int fghJoystickInitializeHID(struct os_specific_s *os,
--       int *num_axes, int *num_buttons)
--{
--    int size, is_joystick;
--#   ifdef HAVE_USBHID_H
--        int report_id = 0;
--#   endif
--    struct hid_data *d;
--    struct hid_item h;
--    report_desc_t rd;
--
--    if ( ( rd = hid_get_report_desc( os->fd ) ) == 0 )
--    {
--        fgWarning ( "error: %s: %s", os->fname, strerror( errno ) );
--        return FALSE;
--    }
--
--    os->hids = NULL;
--
--#   ifdef HAVE_USBHID_H
--        if( ioctl( os->fd, USB_GET_REPORT_ID, &report_id ) < 0)
--        {
--            /*** XXX {report_id} may not be the right variable? ***/
--            fgWarning ( "error: %s%d: %s", UHIDDEV, report_id, strerror( errno ) );
--            return FALSE;
--        }
--
--        size = hid_report_size( rd, hid_input, report_id );
--#   else
--        size = hid_report_size( rd, 0, hid_input );
--#   endif
--    os->hid_data_buf = calloc( 1, size );
--    os->hid_dlen = size;
--
--    is_joystick = 0;
--#   ifdef HAVE_USBHID_H
--        d = hid_start_parse( rd, 1 << hid_input, report_id );
--#   else
--        d = hid_start_parse( rd, 1 << hid_input );
--#   endif
--        while( hid_get_item( d, &h ) )
--        {
--            int usage, page, interesting_hid;
--
--            page = HID_PAGE( h.usage );
--            usage = HID_USAGE( h.usage );
--
--            /* This test is somewhat too simplistic, but this is how MicroSoft
--             * does, so I guess it works for all joysticks/game pads. */
--            is_joystick = is_joystick ||
--                ( h.kind == hid_collection &&
--                  page == HUP_GENERIC_DESKTOP &&
--                  ( usage == HUG_JOYSTICK || usage == HUG_GAME_PAD ) );
--
--            if( h.kind != hid_input )
--                continue;
--
--            if( !is_joystick )
--                continue;
--
--            interesting_hid = TRUE;
--            if( page == HUP_GENERIC_DESKTOP )
--            {
--                switch( usage )
--                {
--                case HUG_X:
--                case HUG_RX:
--                case HUG_Y:
--                case HUG_RY:
--                case HUG_Z:
--                case HUG_RZ:
--                case HUG_SLIDER:
--                    if( *num_axes < _JS_MAX_AXES )
--                    {
--                        os->axes_usage[ *num_axes ] = usage;
--                        ( *num_axes )++;
--                    }
--                    break;
--                case HUG_HAT_SWITCH:
--                    /* Allocate two axes for a hat */
--                    if( *num_axes + 1 < _JS_MAX_AXES )
--                    {
--                        os->axes_usage[ *num_axes ] = usage;
--                        (*num_axes)++;
--                        os->axes_usage[ *num_axes ] = usage;
--                        (*num_axes)++;
--                    }
--                    break;
--                default:
--                    interesting_hid = FALSE;
--                    break;
--                }
--            }
--            else if( page == HUP_BUTTON )
--            {
--                interesting_hid = ( usage > 0 ) &&
--                    ( usage <= _JS_MAX_BUTTONS );
--
--                if( interesting_hid && usage - 1 > *num_buttons )
--                    *num_buttons = usage - 1;
--            }
--
--            if( interesting_hid )
--            {
--                h.next = os->hids;
--                os->hids = calloc( 1, sizeof ( struct hid_item ) );
--                *os->hids = h;
--            }
--        }
--        hid_end_parse( d );
--
--        return os->hids != NULL;
--}
--#    endif
- #endif
- 
- /*
-diff --git a/src/x11/fg_joystick_x11.c b/src/x11/fg_joystick_x11.c
-index 04bc373..30ad4b5 100644
---- a/src/x11/fg_joystick_x11.c
-+++ b/src/x11/fg_joystick_x11.c
-@@ -42,8 +42,188 @@
- #include <fcntl.h>
- 
- 
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+
-+static int hatmap_x[9] = {0, 0, 1, 1, 1, 0, -1, -1, -1};
-+static int hatmap_y[9] = {0, 1, 1, 0, -1, -1, -1, 0, 1};
-+
-+#    ifdef HAVE_USB_JS
-+/*
-+* fghJoystickFindUSBdev (and its helper, fghJoystickWalkUSBdev) try to locate
-+* the full name of a USB device. If /dev/usbN isn't readable, we punt and
-+* return the uhidN device name. We warn the user of this situation once.
-+*/
-+static char *fghJoystickWalkUSBdev(int f, char *dev, char *out, int outlen)
-+{
-+    struct usb_device_info di;
-+    int i, a;
-+    char *cp;
-+
-+    for (a = 1; a < USB_MAX_DEVICES; a++) {
-+        di.udi_addr = a;
-+        if (ioctl(f, USB_DEVICEINFO, &di) != 0)
-+            return NULL;
-+        for (i = 0; i < USB_MAX_DEVNAMES; i++)
-+            if (di.udi_devnames[i][0] &&
-+                strcmp(di.udi_devnames[i], dev) == 0) {
-+                cp = calloc(1, strlen(di.udi_vendor) + strlen(di.udi_product) + 2);
-+                strcpy(cp, di.udi_vendor);
-+                strcat(cp, " ");
-+                strcat(cp, di.udi_product);
-+                strncpy(out, cp, outlen - 1);
-+                out[outlen - 1] = 0;
-+                free(cp);
-+                return out;
-+            }
-+    }
-+    return NULL;
-+}
-+
-+static int fghJoystickFindUSBdev(char *name, char *out, int outlen)
-+{
-+    int i, f;
-+    char buf[50];
-+    char *cp;
-+    static int protection_warned = 0;
-+
-+    for (i = 0; i < 16; i++) {
-+        snprintf(buf, sizeof(buf), "%s%d", USBDEV, i);
-+        f = open(buf, O_RDONLY);
-+        if (f >= 0) {
-+            cp = fghJoystickWalkUSBdev(f, name, out, outlen);
-+            close(f);
-+            if (cp)
-+                return 1;
-+        }
-+        else if (errno == EACCES) {
-+            if (!protection_warned) {
-+                fgWarning("Can't open %s for read!", buf);
-+                protection_warned = 1;
-+            }
-+        }
-+    }
-+    return 0;
-+}
-+
-+static int fghJoystickInitializeHID(struct os_specific_s *os,
-+                                    int *num_axes, int *num_buttons)
-+{
-+    int size, is_joystick;
-+#   ifdef HAVE_USBHID_H
-+    int report_id = 0;
-+#   endif
-+    struct hid_data *d;
-+    struct hid_item h;
-+    report_desc_t rd;
-+
-+    if ((rd = hid_get_report_desc(os->fd)) == 0)
-+    {
-+        fgWarning("error: %s: %s", os->fname, strerror(errno));
-+        return FALSE;
-+    }
-+
-+    os->hids = NULL;
-+
-+#   ifdef HAVE_USBHID_H
-+    if (ioctl(os->fd, USB_GET_REPORT_ID, &report_id) < 0)
-+    {
-+        /*** XXX {report_id} may not be the right variable? ***/
-+        fgWarning("error: %s%d: %s", UHIDDEV, report_id, strerror(errno));
-+        return FALSE;
-+    }
-+
-+    size = hid_report_size(rd, hid_input, report_id);
-+#   else
-+    size = hid_report_size(rd, 0, hid_input);
-+#   endif
-+    os->hid_data_buf = calloc(1, size);
-+    os->hid_dlen = size;
-+
-+    is_joystick = 0;
-+#   ifdef HAVE_USBHID_H
-+    d = hid_start_parse(rd, 1 << hid_input, report_id);
-+#   else
-+    d = hid_start_parse(rd, 1 << hid_input);
-+#   endif
-+    while (hid_get_item(d, &h))
-+    {
-+        int usage, page, interesting_hid;
-+
-+        page = HID_PAGE(h.usage);
-+        usage = HID_USAGE(h.usage);
-+
-+        /* This test is somewhat too simplistic, but this is how MicroSoft
-+        * does, so I guess it works for all joysticks/game pads. */
-+        is_joystick = is_joystick ||
-+            (h.kind == hid_collection &&
-+             page == HUP_GENERIC_DESKTOP &&
-+             (usage == HUG_JOYSTICK || usage == HUG_GAME_PAD));
-+
-+        if (h.kind != hid_input)
-+            continue;
-+
-+        if (!is_joystick)
-+            continue;
-+
-+        interesting_hid = TRUE;
-+        if (page == HUP_GENERIC_DESKTOP)
-+        {
-+            switch (usage)
-+            {
-+                case HUG_X:
-+                case HUG_RX:
-+                case HUG_Y:
-+                case HUG_RY:
-+                case HUG_Z:
-+                case HUG_RZ:
-+                case HUG_SLIDER:
-+                    if (*num_axes < _JS_MAX_AXES)
-+                    {
-+                        os->axes_usage[*num_axes] = usage;
-+                        (*num_axes)++;
-+                    }
-+                    break;
-+                case HUG_HAT_SWITCH:
-+                    /* Allocate two axes for a hat */
-+                    if (*num_axes + 1 < _JS_MAX_AXES)
-+                    {
-+                        os->axes_usage[*num_axes] = usage;
-+                        (*num_axes)++;
-+                        os->axes_usage[*num_axes] = usage;
-+                        (*num_axes)++;
-+                    }
-+                    break;
-+                default:
-+                    interesting_hid = FALSE;
-+                    break;
-+            }
-+        }
-+        else if (page == HUP_BUTTON)
-+        {
-+            interesting_hid = (usage > 0) &&
-+                (usage <= _JS_MAX_BUTTONS);
-+
-+            if (interesting_hid && usage - 1 > *num_buttons)
-+                *num_buttons = usage - 1;
-+        }
-+
-+        if (interesting_hid)
-+        {
-+            h.next = os->hids;
-+            os->hids = calloc(1, sizeof(struct hid_item));
-+            *os->hids = h;
-+        }
-+    }
-+    hid_end_parse(d);
-+
-+    return os->hids != NULL;
-+}
-+#    endif
-+#endif
-+
-+
- /*this should be defined in a header file */
--#define MAX_NUM_JOYSTICKS  2   
-+#define MAX_NUM_JOYSTICKS  2
- extern SFG_Joystick *fgJoystick [ MAX_NUM_JOYSTICKS ];
- 
- void fgPlatformJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
-@@ -216,15 +396,15 @@ void fgPlatformJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
- void fgPlatformJoystickOpen( SFG_Joystick* joy )
- {
- #if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__)
--	int i = 0;
-+    int i = 0;
-        char *cp;
- #endif
- #ifdef JS_NEW
-        unsigned char u;
--	int i=0;
-+    int i=0;
- #else
- #  if defined( __linux__ ) || TARGET_HOST_SOLARIS
--	int i = 0;
-+    int i = 0;
-     int counter = 0;
- #  endif
- #endif
-@@ -448,7 +628,7 @@ void fgPlatformJoystickClose ( int ident )
-             free( fgJoystick[ ident ]->pJoystick.os->hid_data_buf );
- #endif
-         free( fgJoystick[ident]->pJoystick.os );
--	}
-+    }
- #endif
- 
-     if( ! fgJoystick[ident]->error )
--- 
-2.19.2
-
-From f310b56bb6f93e255cf880c8970c794e0f2efc8d Mon Sep 17 00:00:00 2001
-From: dcnieho <dcnieho@7f0cb862-5218-0410-a997-914c9d46530a>
-Date: Mon, 31 Jul 2017 20:49:26 +0000
-Subject: [PATCH] Fix build on NetBSD.
-
-(cherry picked from commit 1236c7644508227b616e97e29e123b34257e36d1)
-
-git-svn-id: http://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1835 7f0cb862-5218-0410-a997-914c9d46530a
----
- src/fg_joystick.c         | 59 -------------------------------------
- src/x11/fg_joystick_x11.c | 61 +++++++++++++++++++++++++++++++++++++++
- 2 files changed, 61 insertions(+), 59 deletions(-)
-
-diff --git a/src/fg_joystick.c b/src/fg_joystick.c
-index e548c04..b24476a 100644
---- a/src/fg_joystick.c
-+++ b/src/fg_joystick.c
-@@ -40,65 +40,6 @@
- #define JS_TRUE  1
- #define JS_FALSE 0
- 
--/* BSD defines from "jsBSD.cxx" around lines 42-270 */
--
--#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
--
--#    ifdef HAVE_USB_JS
--#        if defined(__NetBSD__)
--#            ifdef HAVE_USBHID_H
--#                include <usbhid.h>
--#            else
--#                include <usb.h>
--#            endif
--#            include <dev/usb/usb.h>
--#        elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
--#            ifdef HAVE_USBHID_H
--#                include <usbhid.h>
--#            else
--#                include <libusbhid.h>
--#            endif
--#            include <legacy/dev/usb/usb.h>
--#        endif
--#        include <dev/usb/usbhid.h>
--
--/* Compatibility with older usb.h revisions */
--#        if !defined(USB_MAX_DEVNAMES) && defined(MAXDEVNAMES)
--#            define USB_MAX_DEVNAMES MAXDEVNAMES
--#        endif
--#    endif
--
--struct os_specific_s {
--  char             fname [128 ];
--  int              fd;
--  int              is_analog;
--  /* The following structure members are specific to analog joysticks */
--  struct joystick  ajs;
--#    ifdef HAVE_USB_JS
--  /* The following structure members are specific to USB joysticks */
--  struct hid_item *hids;
--  int              hid_dlen;
--  int              hid_offset;
--  char            *hid_data_buf;
--  int              axes_usage [ _JS_MAX_AXES ];
--#    endif
--  /* We keep button and axes state ourselves, as they might not be updated
--   * on every read of a USB device
--   */
--  int              cache_buttons;
--  float            cache_axes [ _JS_MAX_AXES ];
--};
--
--/* Idents lower than USB_IDENT_OFFSET are for analog joysticks. */
--#    define USB_IDENT_OFFSET    2
--
--#    define USBDEV "/dev/usb"
--#    define UHIDDEV "/dev/uhid"
--#    define AJSDEV "/dev/joy"
--
--
--#endif
--
- /*
-  * Functions associated with the "jsJoystick" class in PLIB
-  */
-diff --git a/src/x11/fg_joystick_x11.c b/src/x11/fg_joystick_x11.c
-index 30ad4b5..8c75bbe 100644
---- a/src/x11/fg_joystick_x11.c
-+++ b/src/x11/fg_joystick_x11.c
-@@ -42,8 +42,68 @@
- #include <fcntl.h>
- 
- 
-+/* BSD defines from "jsBSD.cxx" around lines 42-270 */
-+
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+
-+#    ifdef HAVE_USB_JS
-+#        if defined(__NetBSD__)
-+#            ifdef HAVE_USBHID_H
-+#                include <usbhid.h>
-+#            else
-+#                include <usb.h>
-+#            endif
-+#            include <dev/usb/usb.h>
-+#        elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#            ifdef HAVE_USBHID_H
-+#                include <usbhid.h>
-+#            else
-+#                include <libusbhid.h>
-+#            endif
-+#            include <legacy/dev/usb/usb.h>
-+#        endif
-+#        include <dev/usb/usbhid.h>
-+
-+/* Compatibility with older usb.h revisions */
-+#        if !defined(USB_MAX_DEVNAMES) && defined(MAXDEVNAMES)
-+#            define USB_MAX_DEVNAMES MAXDEVNAMES
-+#        endif
-+#    endif
-+
-+struct os_specific_s {
-+  char             fname [128 ];
-+  int              fd;
-+  int              is_analog;
-+  /* The following structure members are specific to analog joysticks */
-+  struct joystick  ajs;
-+#    ifdef HAVE_USB_JS
-+  /* The following structure members are specific to USB joysticks */
-+  struct hid_item *hids;
-+  int              hid_dlen;
-+  int              hid_offset;
-+  char            *hid_data_buf;
-+  int              axes_usage [ _JS_MAX_AXES ];
-+#    endif
-+  /* We keep button and axes state ourselves, as they might not be updated
-+   * on every read of a USB device
-+   */
-+  int              cache_buttons;
-+  float            cache_axes [ _JS_MAX_AXES ];
-+};
-+
-+/* Idents lower than USB_IDENT_OFFSET are for analog joysticks. */
-+#    define USB_IDENT_OFFSET    2
-+
-+#    define USBDEV "/dev/usb"
-+#    define UHIDDEV "/dev/uhid"
-+#    define AJSDEV "/dev/joy"
-+
-+
-+#endif
-+
- #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- 
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- static int hatmap_x[9] = {0, 0, 1, 1, 1, 0, -1, -1, -1};
- static int hatmap_y[9] = {0, 1, 1, 0, -1, -1, -1, 0, 1};
- 
-@@ -104,6 +164,7 @@ static int fghJoystickFindUSBdev(char *name, char *out, int outlen)
-     }
-     return 0;
- }
-+#endif
- 
- static int fghJoystickInitializeHID(struct os_specific_s *os,
-                                     int *num_axes, int *num_buttons)
--- 
-2.19.2
-
diff --git a/media-libs/freeglut/files/freeglut-3.0.0-drop-unnecessary-x11-libs.patch b/media-libs/freeglut/files/freeglut-3.0.0-drop-unnecessary-x11-libs.patch
deleted file mode 100644
index 761a6bfce7c2..000000000000
--- a/media-libs/freeglut/files/freeglut-3.0.0-drop-unnecessary-x11-libs.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From bbdaa724ef363e34bd19fb2308739e59a9e8ddc8 Mon Sep 17 00:00:00 2001
-From: jtsiomb <jtsiomb@7f0cb862-5218-0410-a997-914c9d46530a>
-Date: Tue, 26 Mar 2019 18:55:42 +0000
-Subject: [PATCH] Applied Christian's change to drop unnecessary dependency to
- X11 libraries we don't actually use, by asking cmake to link with X11_X11_LIB
- instead of the catch-all X11_LIBRARIES.
-
-git-svn-id: http://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1845 7f0cb862-5218-0410-a997-914c9d46530a
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d1c20e8..e324a02 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -312,8 +312,8 @@ ENDIF(CMAKE_COMPILER_IS_GNUCC)
- INCLUDE(CheckIncludeFiles)
- IF(UNIX AND NOT(ANDROID OR BLACKBERRY OR FREEGLUT_WAYLAND))
-     FIND_PACKAGE(X11 REQUIRED)
--    INCLUDE_DIRECTORIES(${X11_INCLUDE_DIR})
--    LIST(APPEND LIBS ${X11_LIBRARIES})
-+    INCLUDE_DIRECTORIES(${X11_X11_INCLUDE_PATH})
-+    LIST(APPEND LIBS ${X11_X11_LIB})
-     IF(X11_Xrandr_FOUND)
-         SET(HAVE_X11_EXTENSIONS_XRANDR_H TRUE)
-         LIST(APPEND LIBS ${X11_Xrandr_LIB})
--- 
-2.19.2
-
diff --git a/media-libs/freeglut/freeglut-3.0.0.ebuild b/media-libs/freeglut/freeglut-3.0.0.ebuild
deleted file mode 100644
index 1ac3aea844d6..000000000000
--- a/media-libs/freeglut/freeglut-3.0.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="Completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library"
-HOMEPAGE="http://freeglut.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="debug static-libs"
-
-# enabling GLES support seems to cause build failures
-RDEPEND=">=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]"
-# gles? ( media-libs/mesa[gles1,${MULTILIB_USEDEP}] )
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-HTML_DOCS=( doc/. )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-drop-unnecessary-x11-libs.patch
-	"${FILESDIR}"/${P}-bsd-usb-joystick.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		"-DFREEGLUT_GLES=OFF"
-		"-DFREEGLUT_BUILD_STATIC_LIBS=$(usex static-libs ON OFF)"
-	)
-#	$(cmake-utils_use gles FREEGLUT_GLES)
-	cmake-multilib_src_configure
-}
diff --git a/media-libs/freeglut/freeglut-3.2.1.ebuild b/media-libs/freeglut/freeglut-3.2.1.ebuild
index a696fe8a8fdf..1fdc43ee6236 100644
--- a/media-libs/freeglut/freeglut-3.2.1.ebuild
+++ b/media-libs/freeglut/freeglut-3.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug static-libs"
 
 # enabling GLES support seems to cause build failures
diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest
index 05df3313995f..73c69cb1fa5b 100644
--- a/media-libs/freeimage/Manifest
+++ b/media-libs/freeimage/Manifest
@@ -1,20 +1,10 @@
-AUX freeimage-3.15.4-CVE-2015-0852.patch 6191 BLAKE2B 1b5c66b65ced14f45a9cb87b3e630cf726779e24f2c787e056fdeda9e06009225184949982dadfdc3f929663d11843fefd1c443c28b00e787d9660f53e4539b5 SHA512 bd42281246aeddbea7810ec3037b8d264afe96fe5fb4551ed617784c0b7c6b7ef6af2429c63c941ab7642c30948242050c088677716dcb9b4282776a95957e9f
-AUX freeimage-3.15.4-CVE-2016-5684-1.patch 690 BLAKE2B dc22eefe8b21c960095a4b531cc13762e6042dc2f4d1718e116bb83cf1d1efc6111116c7ed5c4e55fcfeef1c0e9250065205104b83e2ba06adf3a65a8de0db30 SHA512 7c535725fddb0a4f97c2634cf6144c9fea9d5963279265e0f08d9cc2f6a4aaf24a6fa27096dc5a50457db90bb93b895936d5967ae08ea9d93ebea89cd2ff724d
-AUX freeimage-3.15.4-CVE-2016-5684-2.patch 369 BLAKE2B d1c7950cb6839b8782d1c409d3f96ad9da09b6f7bf1728b01e4ce4ece8ce1d37838640fceabbc4357aad5e0f53ba2fbf34b5ffbd53aedb7dd6a4b6a1f981e6de SHA512 275871b569301af72d7db03c390113124b15a16d043bb7c95d10b4fe7a79cd092e2d320efe0ec6038f64f29e07ea443b97c367ff78dbd718ae04393e956be533
-AUX freeimage-3.15.4-libjpeg-turbo.patch 20346 BLAKE2B 38ecea346812c292e697717319db206c658cc30a04de9b7e5dff2bd531c03424982aba7b3206ad69ffb75132779b1e0c07e0a49c7e8e127d59ce0d85afdf8335 SHA512 effe0dd7d47400e57d4754a5d9b4533051aae0410fc9b579dd4af902c39538bf071bcc492a68cb027b0a28bc2f627357f26f4cb4f1d0ba93a34d0d5c0dfc524e
-AUX freeimage-3.15.4-libjpeg9.patch 1581 BLAKE2B 717a2e0b757c5d7ca540ec5ef6cfa2a2bc06bfc2de86e7b67bfc6c8010b7b32272456ed67d3297f02477318b3c3af8075df004c432cd1bd795652dab4096f7e5 SHA512 76f05f35118e96405977ebe746b600a3887677c30ce1fe0600d1e8f0c2aa0238f4dd418a0c612021ec8551692c2420190bcfb2f6b305a24c5a4070c77f1b7899
-AUX freeimage-3.15.4-raw.patch 350 BLAKE2B 4f97bc847878eef03c4af249fb20353979aa043fd37840b9cdb3159fa097a8b52455c2a0f4bd6f97140ebcf15739692c270f7ae1e62859da7188b835fb28a9f8 SHA512 2429bec7ec8f4963d3b0bd658093e8c3ff83d8ea5d934beb28526b80e89cb3aee6fe849800d80a81680614fa98e962744ced33ee198e04e32fc4be4d105e528b
-AUX freeimage-3.15.4-unbundling.patch 17258 BLAKE2B 309707fe4b07c3808fb2824a07eeef77a6b424267b5363e7b67c5677f33903962b887d1116e6c8bdd786c244cb80e84b4a2d9b5941a89ed640aabc6fddd1e320 SHA512 96883a598a6386b322e69497760cff606d95e354dd7a197b858060b41402641c9188bf6c77a9a249d04a8c3d59561ccb034581a43e1df3fd0806f3a2a521f3a0
 AUX freeimage-3.18.0-disable-plugin-G3.patch 1553 BLAKE2B d122df83a8889cd599d12c65cee5678b3654266c2e128d1d8d963eed7743b62ba6da7c582acc389f874fd218e2f7857d718a562bd81c52cf23f31284fdc00dc4 SHA512 9a0adeaaa3bf839387dbbccc54e0e32e0af87af4c398edd4cc44f1c6d380228dc7c174a7715ac397c15d48b7b5337543aac05020e25b6680187e179e8738dccd
 AUX freeimage-3.18.0-libjpeg9.patch 520 BLAKE2B 4788a3c4c209568df7176ed7b2699f9c33efb8c2ff2dc51d1e6bc76329ade073bdd296d7e9aa2441a655e46407df31cc5dd84c0d1805ca75418bae9d4ca4ecfa SHA512 75fc7c4d257d4bd67202c5c91af23f3e990342490c4661ab2219b89c40626703d9ceb5f05dc8d2a912153fbe5b9e07f24566570597f84cec15fbe03cb7d4b69e
 AUX freeimage-3.18.0-raw.patch 432 BLAKE2B 96c89d051a849f5909bdb9b3f720d4146651504f972a1661b55caa6344eeac3dc64dda1beb027e43e9b2eb7ce5ac8193db424422e74ce957744d9e6d14086a7a SHA512 01e150205a62ee9eb240890a5c9b92160a74073a1fe43811ed8941aeda824ba3c87bf4a2e631cbe367a7391374e93d309d95a6b5ec31009e4e8f1c2fc6b10da1
 AUX freeimage-3.18.0-remove-jpeg-transform.patch 3392 BLAKE2B d82f5723aaff66a995ec4d748a8bc988a18ef149e525d108b458971dc3ae7278e9f0d65527576b6ebcd54b403d296810e19cc2d808397a8aa3558a13bd296331 SHA512 071b5dc814020db19d41527f2f6fe89f2a3a1340d5825c204ea3fa496d4d1c3075bdd006fa041b0a819892d5b01f1b9b32ed8827e9a180ef9bbe92bf2554a67e
 AUX freeimage-3.18.0-rename-jpeg_read_icc_profile.patch 1278 BLAKE2B b387457b89614c4fe3e7e37891c8ce0cc296b8e05300cd88b789e1a6551cb78761a58446f1a16d0d59af6ea05fcf73defd898fe99e6b12e6cde9de6bd7606edc SHA512 4c18f02f750c47796a718f579ae3bfda91354eba4ba991f4df9d71a09ead04e13087bcd1423374c359a39b98c729a38466e464b46d7cd1af15e9e4aadd72a3b4
 AUX freeimage-3.18.0-unbundling.patch 20960 BLAKE2B 61ee63e7be0d5db7bf4a3bc053bb67f5a6ce6949ed252b1729e7542addd432d1105b7e70d834f05210be3c5c81a5378a2cb00d5b9d8e21590672a1ac6e1135fa SHA512 c56062099e17e8a16447fccc4bdf3089e7992273f1a09a2ff7f591b3bd68a8d1e80842400aaffdc8394ed64273e26a4f01e12fc8c55bb40d346db96eb5dcbe30
-DIST FreeImage3154.pdf 1007480 BLAKE2B 801d39c4b7eeab833c7225c2d53a3a0e8e9d2a91ea3f7173047705c8b750706f3a4a9ac60f7ba9d5e8150b548bd5add242e9e40f498c57ad9e5a623972bbb239 SHA512 cebde5e2609c9a0c06b4e07e1c595d7d6714895095cd9935f59c8b2ff9b34116248f5453b41f469f6242d87cae79be82d59f6a9ec0f75b1ea3df61ac1f651b28
-DIST FreeImage3154.zip 5513923 BLAKE2B 376b00faaae2c10c9eb36f89726a022734e109ca7ca11951c9e6525f21d2a7ee305ec195be29a272ecb7935ba5d0b61f3d84f26a6aec5f7a9229d5e47cd665bb SHA512 0db9eb7d0ed8e08e10ff4fa274c4484541ca119c3d437a85fdc3b2d9232bf14a7877c79b1e62c8c99278d7020a9f623c161f2342475f3ee526233404138112cc
 DIST FreeImage3180.pdf 1665541 BLAKE2B 5d40ee6fa0a1e73df0cc961edbd70a2835ef88fb540f123fd81f2bb826d4c949d2a60dfe3fc02406ce632a389935abac0d471c963c9803b8c2aece2b48afb003 SHA512 632f68b14f7a5916a1b95bbf86c268d0afe786a2537472301bb002254aa3195f046efb41f073133633211e985e90edbb99285ab6f42bc55501c756292a3c4c03
 DIST FreeImage3180.zip 7415716 BLAKE2B b695271f4e80eb304eccde66e38b5095eceae51fbe0dd97df69c55f364f8440d8c97139b8edc2f01c400f5c53a7336fdfab1e28aa3ea04f485901d5def443d25 SHA512 9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818
-EBUILD freeimage-3.15.4-r1.ebuild 3004 BLAKE2B b67721500490eab75a294efa32d508eed33e909e0acea8ed5b49dfd79ab7cbcb074ab0e571a0106a606fd996a2afb4c7eafe10b9d3ec31b97f4b3e50da8f8f36 SHA512 c2fe03d952891e8be4709f7819d5326f18d1755cee625f0bdc7e0a6e05e3dde2093b82780183fdf36f639397ffeb511a653b3caadd0b4b26d1f7fe8cf0529275
-EBUILD freeimage-3.18.0-r1.ebuild 2976 BLAKE2B f701f466ef86c26db8a731da62f5686e1b2e17076cb88f8cf750969dab3e27eeaed659c36e60dd7386a73e4c98a73425b91866b51c3e1a75991ac3533f870618 SHA512 7717ee6cd9685b1866133a046a74ae486679ba4362cb66a1f78a5c47169e05a7985131e519ce2d64fe7dde5eb466e5c6b37f6d966d3307369abaf3fa44a60b96
+EBUILD freeimage-3.18.0-r1.ebuild 2974 BLAKE2B 2dc58bd65dfaf7742fa79f30e3f21ad04cacd113640aa366ee6aa952daee2600a5fb4241ba5a45d9b90a71e745ffe169775765c114eaa1eac698a68aca399c78 SHA512 66bc093e1baa9fd8e4ee95131ad0b1a4d09bb4e1045c636ac384d350be9fe271c2410dfe02e30d5c4ff248f7a3923cebbb577310da53fa5ffa70a361d2fb7a2d
 MISC metadata.xml 403 BLAKE2B e4d54e3da3203c09e5b281d7d9a5ee1c42f98d081751195edb3754809e9cfc9037b79f70da579f01485b4cda65fe4ddaa70f5522d6138af5b214cdbcbd412928 SHA512 08dffea02b8771a4728338c3cdfa0fd7f312d4570838bdfea4ec395c007cc36f3ef87432db5da44468c7b3834855e2de8ae13ddf9447cba9c88da4367c6cc10c
diff --git a/media-libs/freeimage/files/freeimage-3.15.4-CVE-2015-0852.patch b/media-libs/freeimage/files/freeimage-3.15.4-CVE-2015-0852.patch
deleted file mode 100644
index e0c4b0cf19c4..000000000000
--- a/media-libs/freeimage/files/freeimage-3.15.4-CVE-2015-0852.patch
+++ /dev/null
@@ -1,214 +0,0 @@
---- a/Source/FreeImage/PluginPCX.cpp
-+++ b/Source/FreeImage/PluginPCX.cpp
-@@ -30,7 +30,7 @@
- //   Constants + headers
- // ----------------------------------------------------------
- 
--#define IO_BUF_SIZE	2048
-+#define PCX_IO_BUF_SIZE	2048
- 
- // ----------------------------------------------------------
- 
-@@ -120,17 +120,17 @@
- 
- 		while (length--) {
- 			if (count == 0) {
--				if (*ReadPos >= IO_BUF_SIZE - 1 ) {
--					if (*ReadPos == IO_BUF_SIZE - 1) {
-+				if (*ReadPos >= PCX_IO_BUF_SIZE - 1 ) {
-+					if (*ReadPos == PCX_IO_BUF_SIZE - 1) {
- 						// we still have one BYTE, copy it to the start pos
- 
--						*ReadBuf = ReadBuf[IO_BUF_SIZE - 1];
-+						*ReadBuf = ReadBuf[PCX_IO_BUF_SIZE - 1];
- 
--						io.read_proc(ReadBuf + 1, 1, IO_BUF_SIZE - 1, handle);
-+						io.read_proc(ReadBuf + 1, 1, PCX_IO_BUF_SIZE - 1, handle);
- 					} else {
- 						// read the complete buffer
- 
--						io.read_proc(ReadBuf, 1, IO_BUF_SIZE, handle);
-+						io.read_proc(ReadBuf, 1, PCX_IO_BUF_SIZE, handle);
- 					}
- 
- 					*ReadPos = 0;
-@@ -346,19 +346,9 @@
- 	BOOL header_only = (flags & FIF_LOAD_NOPIXELS) == FIF_LOAD_NOPIXELS;
- 
- 	try {
--		// check PCX identifier
--
--		long start_pos = io->tell_proc(handle);
--		BOOL validated = pcx_validate(io, handle);		
--		io->seek_proc(handle, start_pos, SEEK_SET);
--		if(!validated) {
--			throw FI_MSG_ERROR_MAGIC_NUMBER;
--		}
--
--		// process the header
--
- 		PCXHEADER header;
- 
-+		// process the header
- 		if(io->read_proc(&header, sizeof(PCXHEADER), 1, handle) != 1) {
- 			throw FI_MSG_ERROR_PARSING;
- 		}
-@@ -366,20 +356,38 @@
- 		SwapHeader(&header);
- #endif
- 
--		// allocate a new DIB
-+		// process the window
-+		const WORD *window = header.window;	// left, upper, right,lower pixel coord.
-+		const int left		= window[0];
-+		const int top		= window[1];
-+		const int right		= window[2];
-+		const int bottom	= window[3];
- 
--		unsigned width = header.window[2] - header.window[0] + 1;
--		unsigned height = header.window[3] - header.window[1] + 1;
--		unsigned bitcount = header.bpp * header.planes;
-+		// check image size
-+		if((left >= right) || (top >= bottom)) {
-+			throw FI_MSG_ERROR_PARSING;
-+		}
- 
--		if (bitcount == 24) {
--			dib = FreeImage_AllocateHeader(header_only, width, height, bitcount, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
--		} else {
--			dib = FreeImage_AllocateHeader(header_only, width, height, bitcount);			
-+		const unsigned width = right - left + 1;
-+		const unsigned height = bottom - top + 1;
-+		const unsigned bitcount = header.bpp * header.planes;
-+
-+		// allocate a new dib
-+		switch(bitcount) {
-+			case 1:
-+			case 4:
-+			case 8:
-+				dib = FreeImage_AllocateHeader(header_only, width, height, bitcount);
-+				break;
-+			case 24:
-+				dib = FreeImage_AllocateHeader(header_only, width, height, bitcount, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
-+				break;
-+			default:
-+				throw FI_MSG_ERROR_DIB_MEMORY;
-+				break;
- 		}
- 
- 		// if the dib couldn't be allocated, throw an error
--
- 		if (!dib) {
- 			throw FI_MSG_ERROR_DIB_MEMORY;
- 		}
-@@ -426,19 +434,23 @@
- 
- 				if (palette_id == 0x0C) {
- 					BYTE *cmap = (BYTE*)malloc(768 * sizeof(BYTE));
--					io->read_proc(cmap, 768, 1, handle);
- 
--					pal = FreeImage_GetPalette(dib);
--					BYTE *pColormap = &cmap[0];
-+					if(cmap) {
-+						io->read_proc(cmap, 768, 1, handle);
- 
--					for(int i = 0; i < 256; i++) {
--						pal[i].rgbRed   = pColormap[0];
--						pal[i].rgbGreen = pColormap[1];
--						pal[i].rgbBlue  = pColormap[2];
--						pColormap += 3;
-+						pal = FreeImage_GetPalette(dib);
-+						BYTE *pColormap = &cmap[0];
-+
-+						for(int i = 0; i < 256; i++) {
-+							pal[i].rgbRed   = pColormap[0];
-+							pal[i].rgbGreen = pColormap[1];
-+							pal[i].rgbBlue  = pColormap[2];
-+							pColormap += 3;
-+						}
-+
-+						free(cmap);
- 					}
- 
--					free(cmap);
- 				}
- 
- 				// wrong palette ID, perhaps a gray scale is needed ?
-@@ -463,12 +475,12 @@
- 			return dib;
- 		}
- 
--		// calculate the line length for the PCX and the DIB
-+		// calculate the line length for the PCX and the dib
- 
- 		// length of raster line in bytes
--		unsigned linelength = header.bytes_per_line * header.planes;
--		// length of DIB line (rounded to DWORD) in bytes
--		unsigned pitch = FreeImage_GetPitch(dib);
-+		const unsigned linelength = header.bytes_per_line * header.planes;
-+		// length of dib line (rounded to DWORD) in bytes
-+		const unsigned pitch = FreeImage_GetPitch(dib);
- 
- 		// run-length encoding ?
- 
-@@ -478,14 +490,18 @@
- 		// ---------------
- 
- 		line = (BYTE*)malloc(linelength * sizeof(BYTE));
--		if(!line) throw FI_MSG_ERROR_MEMORY;
-+		if(!line) {
-+			throw FI_MSG_ERROR_MEMORY;
-+		}
- 		
--		ReadBuf = (BYTE*)malloc(IO_BUF_SIZE * sizeof(BYTE));
--		if(!ReadBuf) throw FI_MSG_ERROR_MEMORY;
-+		ReadBuf = (BYTE*)malloc(PCX_IO_BUF_SIZE * sizeof(BYTE));
-+		if(!ReadBuf) {
-+			throw FI_MSG_ERROR_MEMORY;
-+		}
- 		
- 		bits = FreeImage_GetScanLine(dib, height - 1);
- 
--		int ReadPos = IO_BUF_SIZE;
-+		int ReadPos = PCX_IO_BUF_SIZE;
- 
- 		if ((header.planes == 1) && ((header.bpp == 1) || (header.bpp == 8))) {
- 			BYTE skip;
-@@ -497,7 +513,7 @@
- 				// skip trailing garbage at the end of the scanline
- 
- 				for (unsigned count = written; count < linelength; count++) {
--					if (ReadPos < IO_BUF_SIZE) {
-+					if (ReadPos < PCX_IO_BUF_SIZE) {
- 						ReadPos++;
- 					} else {
- 						io->read_proc(&skip, sizeof(BYTE), 1, handle);
-@@ -513,7 +529,9 @@
- 			unsigned x, y, written;
- 
- 			buffer = (BYTE*)malloc(width * sizeof(BYTE));
--			if(!buffer) throw FI_MSG_ERROR_MEMORY;
-+			if(!buffer) {
-+				throw FI_MSG_ERROR_MEMORY;
-+			}
- 
- 			for (y = 0; y < height; y++) {
- 				written = readline(*io, handle, line, linelength, bIsRLE, ReadBuf, &ReadPos);
-@@ -532,7 +550,7 @@
- 					}
- 				}
- 
--				// then write the DIB row
-+				// then write the dib row
- 
- 				for (x = 0; x < width / 2; x++) {
- 					bits[x] = (buffer[2*x] << 4) | buffer[2*x+1];
-@@ -541,7 +559,7 @@
- 				// skip trailing garbage at the end of the scanline
- 
- 				for (unsigned count = written; count < linelength; count++) {
--					if (ReadPos < IO_BUF_SIZE) {
-+					if (ReadPos < PCX_IO_BUF_SIZE) {
- 						ReadPos++;
- 					} else {
- 						io->read_proc(&skip, sizeof(BYTE), 1, handle);
diff --git a/media-libs/freeimage/files/freeimage-3.15.4-CVE-2016-5684-1.patch b/media-libs/freeimage/files/freeimage-3.15.4-CVE-2016-5684-1.patch
deleted file mode 100644
index 1e94602e0e5e..000000000000
--- a/media-libs/freeimage/files/freeimage-3.15.4-CVE-2016-5684-1.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/Source/FreeImage/PluginXPM.cpp
-+++ b/Source/FreeImage/PluginXPM.cpp
-@@ -181,6 +181,11 @@
- 		}
- 		free(str);
- 
-+		// check info string
-+		if((width <= 0) || (height <= 0) || (colors <= 0) || (cpp <= 0)) {
-+			throw "Improperly formed info string";
-+		}
-+
-         if (colors > 256) {
- 			dib = FreeImage_AllocateHeader(header_only, width, height, 24, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
- 		} else {
-@@ -193,7 +198,7 @@
- 			FILE_RGBA rgba;
- 
- 			str = ReadString(io, handle);
--			if(!str)
-+			if(!str || (strlen(str) < cpp))
- 				throw "Error reading color strings";
- 
- 			std::string chrs(str,cpp); //create a string for the color chars using the first cpp chars
diff --git a/media-libs/freeimage/files/freeimage-3.15.4-CVE-2016-5684-2.patch b/media-libs/freeimage/files/freeimage-3.15.4-CVE-2016-5684-2.patch
deleted file mode 100644
index 542a9aeab094..000000000000
--- a/media-libs/freeimage/files/freeimage-3.15.4-CVE-2016-5684-2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Source/FreeImage/PluginXPM.cpp
-+++ b/Source/FreeImage/PluginXPM.cpp
-@@ -198,7 +198,7 @@
- 			FILE_RGBA rgba;
- 
- 			str = ReadString(io, handle);
--			if(!str || (strlen(str) < cpp))
-+			if(!str || (strlen(str) < (size_t)cpp))
- 				throw "Error reading color strings";
- 
- 			std::string chrs(str,cpp); //create a string for the color chars using the first cpp chars
diff --git a/media-libs/freeimage/files/freeimage-3.15.4-libjpeg-turbo.patch b/media-libs/freeimage/files/freeimage-3.15.4-libjpeg-turbo.patch
deleted file mode 100644
index 62037c59deb2..000000000000
--- a/media-libs/freeimage/files/freeimage-3.15.4-libjpeg-turbo.patch
+++ /dev/null
@@ -1,531 +0,0 @@
---- /dev/null
-+++ b/LibJPEG/jpegcomp.h
-@@ -0,0 +1,26 @@
-+/*
-+ * jpegcomp.h
-+ *
-+ * Copyright (C) 2010, D. R. Commander
-+ * For conditions of distribution and use, see the accompanying README file.
-+ *
-+ * JPEG compatibility macros
-+ * These declarations are considered internal to the JPEG library; most
-+ * applications using the library shouldn't need to include this file.
-+ */
-+
-+#if JPEG_LIB_VERSION >= 70
-+#define _DCT_scaled_size DCT_h_scaled_size
-+#define _min_DCT_scaled_size min_DCT_h_scaled_size
-+#define _min_DCT_h_scaled_size min_DCT_h_scaled_size
-+#define _min_DCT_v_scaled_size min_DCT_v_scaled_size
-+#define _jpeg_width jpeg_width
-+#define _jpeg_height jpeg_height
-+#else
-+#define _DCT_scaled_size DCT_scaled_size
-+#define _min_DCT_scaled_size min_DCT_scaled_size
-+#define _min_DCT_h_scaled_size min_DCT_scaled_size
-+#define _min_DCT_v_scaled_size min_DCT_scaled_size
-+#define _jpeg_width image_width
-+#define _jpeg_height image_height
-+#endif
---- a/LibJPEG/jpegint.h
-+++ b/LibJPEG/jpegint.h
-@@ -2,7 +2,7 @@
-  * jpegint.h
-  *
-  * Copyright (C) 1991-1997, Thomas G. Lane.
-- * Modified 1997-2011 by Guido Vollbeding.
-+ * Modified 1997-2009 by Guido Vollbeding.
-  * This file is part of the Independent JPEG Group's software.
-  * For conditions of distribution and use, see the accompanying README file.
-  *
-@@ -100,16 +100,14 @@
- };
- 
- /* Forward DCT (also controls coefficient quantization) */
--typedef JMETHOD(void, forward_DCT_ptr,
--		(j_compress_ptr cinfo, jpeg_component_info * compptr,
--		 JSAMPARRAY sample_data, JBLOCKROW coef_blocks,
--		 JDIMENSION start_row, JDIMENSION start_col,
--		 JDIMENSION num_blocks));
--
- struct jpeg_forward_dct {
-   JMETHOD(void, start_pass, (j_compress_ptr cinfo));
--  /* It is useful to allow each component to have a separate FDCT method. */
--  forward_DCT_ptr forward_DCT[MAX_COMPONENTS];
-+  /* perhaps this should be an array??? */
-+  JMETHOD(void, forward_DCT, (j_compress_ptr cinfo,
-+			      jpeg_component_info * compptr,
-+			      JSAMPARRAY sample_data, JBLOCKROW coef_blocks,
-+			      JDIMENSION start_row, JDIMENSION start_col,
-+			      JDIMENSION num_blocks));
- };
- 
- /* Entropy encoding */
-@@ -213,6 +211,10 @@
-   JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-   JMETHOD(boolean, decode_mcu, (j_decompress_ptr cinfo,
- 				JBLOCKROW *MCU_data));
-+
-+  /* This is here to share code between baseline and progressive decoders; */
-+  /* other modules probably should not use it */
-+  boolean insufficient_data;	/* set TRUE after emitting warning */
- };
- 
- /* Inverse DCT (also performs dequantization) */
-@@ -302,6 +304,7 @@
- #define jinit_downsampler	jIDownsampler
- #define jinit_forward_dct	jIFDCT
- #define jinit_huff_encoder	jIHEncoder
-+#define jinit_phuff_encoder	jIPHEncoder
- #define jinit_arith_encoder	jIAEncoder
- #define jinit_marker_writer	jIMWriter
- #define jinit_master_decompress	jIDMaster
-@@ -311,6 +314,7 @@
- #define jinit_input_controller	jIInCtlr
- #define jinit_marker_reader	jIMReader
- #define jinit_huff_decoder	jIHDecoder
-+#define jinit_phuff_decoder	jIPHDecoder
- #define jinit_arith_decoder	jIADecoder
- #define jinit_inverse_dct	jIIDCT
- #define jinit_upsampler		jIUpsampler
-@@ -321,41 +325,15 @@
- #define jinit_memory_mgr	jIMemMgr
- #define jdiv_round_up		jDivRound
- #define jround_up		jRound
--#define jzero_far		jZeroFar
- #define jcopy_sample_rows	jCopySamples
- #define jcopy_block_row		jCopyBlocks
-+#define jzero_far		jZeroFar
- #define jpeg_zigzag_order	jZIGTable
- #define jpeg_natural_order	jZAGTable
--#define jpeg_natural_order7	jZAG7Table
--#define jpeg_natural_order6	jZAG6Table
--#define jpeg_natural_order5	jZAG5Table
--#define jpeg_natural_order4	jZAG4Table
--#define jpeg_natural_order3	jZAG3Table
--#define jpeg_natural_order2	jZAG2Table
- #define jpeg_aritab		jAriTab
- #endif /* NEED_SHORT_EXTERNAL_NAMES */
- 
- 
--/* On normal machines we can apply MEMCOPY() and MEMZERO() to sample arrays
-- * and coefficient-block arrays.  This won't work on 80x86 because the arrays
-- * are FAR and we're assuming a small-pointer memory model.  However, some
-- * DOS compilers provide far-pointer versions of memcpy() and memset() even
-- * in the small-model libraries.  These will be used if USE_FMEM is defined.
-- * Otherwise, the routines in jutils.c do it the hard way.
-- */
--
--#ifndef NEED_FAR_POINTERS	/* normal case, same as regular macro */
--#define FMEMZERO(target,size)	MEMZERO(target,size)
--#else				/* 80x86 case */
--#ifdef USE_FMEM
--#define FMEMZERO(target,size)	_fmemset((void FAR *)(target), 0, (size_t)(size))
--#else
--EXTERN(void) jzero_far JPP((void FAR * target, size_t bytestozero));
--#define FMEMZERO(target,size)	jzero_far(target, size)
--#endif
--#endif
--
--
- /* Compression module initialization routines */
- EXTERN(void) jinit_compress_master JPP((j_compress_ptr cinfo));
- EXTERN(void) jinit_c_master_control JPP((j_compress_ptr cinfo,
-@@ -370,6 +348,7 @@
- EXTERN(void) jinit_downsampler JPP((j_compress_ptr cinfo));
- EXTERN(void) jinit_forward_dct JPP((j_compress_ptr cinfo));
- EXTERN(void) jinit_huff_encoder JPP((j_compress_ptr cinfo));
-+EXTERN(void) jinit_phuff_encoder JPP((j_compress_ptr cinfo));
- EXTERN(void) jinit_arith_encoder JPP((j_compress_ptr cinfo));
- EXTERN(void) jinit_marker_writer JPP((j_compress_ptr cinfo));
- /* Decompression module initialization routines */
-@@ -383,6 +362,7 @@
- EXTERN(void) jinit_input_controller JPP((j_decompress_ptr cinfo));
- EXTERN(void) jinit_marker_reader JPP((j_decompress_ptr cinfo));
- EXTERN(void) jinit_huff_decoder JPP((j_decompress_ptr cinfo));
-+EXTERN(void) jinit_phuff_decoder JPP((j_decompress_ptr cinfo));
- EXTERN(void) jinit_arith_decoder JPP((j_decompress_ptr cinfo));
- EXTERN(void) jinit_inverse_dct JPP((j_decompress_ptr cinfo));
- EXTERN(void) jinit_upsampler JPP((j_decompress_ptr cinfo));
-@@ -401,17 +381,12 @@
- 				    int num_rows, JDIMENSION num_cols));
- EXTERN(void) jcopy_block_row JPP((JBLOCKROW input_row, JBLOCKROW output_row,
- 				  JDIMENSION num_blocks));
-+EXTERN(void) jzero_far JPP((void FAR * target, size_t bytestozero));
- /* Constant tables in jutils.c */
- #if 0				/* This table is not actually needed in v6a */
- extern const int jpeg_zigzag_order[]; /* natural coef order to zigzag order */
- #endif
- extern const int jpeg_natural_order[]; /* zigzag coef order to natural order */
--extern const int jpeg_natural_order7[]; /* zz to natural order for 7x7 block */
--extern const int jpeg_natural_order6[]; /* zz to natural order for 6x6 block */
--extern const int jpeg_natural_order5[]; /* zz to natural order for 5x5 block */
--extern const int jpeg_natural_order4[]; /* zz to natural order for 4x4 block */
--extern const int jpeg_natural_order3[]; /* zz to natural order for 3x3 block */
--extern const int jpeg_natural_order2[]; /* zz to natural order for 2x2 block */
- 
- /* Arithmetic coding probability estimation tables in jaricom.c */
- extern const INT32 jpeg_aritab[];
---- a/LibJPEG/transupp.h
-+++ b/LibJPEG/transupp.h
-@@ -1,7 +1,7 @@
- /*
-  * transupp.h
-  *
-- * Copyright (C) 1997-2011, Thomas G. Lane, Guido Vollbeding.
-+ * Copyright (C) 1997-2009, Thomas G. Lane, Guido Vollbeding.
-  * This file is part of the Independent JPEG Group's software.
-  * For conditions of distribution and use, see the accompanying README file.
-  *
-@@ -57,7 +57,6 @@
-  * corner up and/or left to make it so, simultaneously increasing the region
-  * dimensions to keep the lower right crop corner unchanged.  (Thus, the
-  * output image covers at least the requested region, but may cover more.)
-- * The adjustment of the region dimensions may be optionally disabled.
-  *
-  * We also provide a lossless-resize option, which is kind of a lossless-crop
-  * operation in the DCT coefficient block domain - it discards higher-order
-@@ -107,15 +106,13 @@
- 
- /*
-  * Codes for crop parameters, which can individually be unspecified,
-- * positive or negative for xoffset or yoffset,
-- * positive or forced for width or height.
-+ * positive, or negative.  (Negative width or height makes no sense, though.)
-  */
- 
- typedef enum {
--        JCROP_UNSET,
--        JCROP_POS,
--        JCROP_NEG,
--        JCROP_FORCE
-+	JCROP_UNSET,
-+	JCROP_POS,
-+	JCROP_NEG
- } JCROP_CODE;
- 
- /*
-@@ -131,14 +128,21 @@
-   boolean trim;			/* if TRUE, trim partial MCUs as needed */
-   boolean force_grayscale;	/* if TRUE, convert color image to grayscale */
-   boolean crop;			/* if TRUE, crop source image */
-+  boolean slow_hflip;  /* For best performance, the JXFORM_FLIP_H transform
-+                          normally modifies the source coefficients in place.
-+                          Setting this to TRUE will instead use a slower,
-+                          double-buffered algorithm, which leaves the source
-+                          coefficients in tact (necessary if other transformed
-+                          images must be generated from the same set of
-+                          coefficients. */
- 
-   /* Crop parameters: application need not set these unless crop is TRUE.
-    * These can be filled in by jtransform_parse_crop_spec().
-    */
-   JDIMENSION crop_width;	/* Width of selected region */
--  JCROP_CODE crop_width_set;	/* (forced disables adjustment) */
-+  JCROP_CODE crop_width_set;
-   JDIMENSION crop_height;	/* Height of selected region */
--  JCROP_CODE crop_height_set;	/* (forced disables adjustment) */
-+  JCROP_CODE crop_height_set;
-   JDIMENSION crop_xoffset;	/* X offset of selected region */
-   JCROP_CODE crop_xoffset_set;	/* (negative measures from right edge) */
-   JDIMENSION crop_yoffset;	/* Y offset of selected region */
---- a/LibJPEG/transupp.c
-+++ b/LibJPEG/transupp.c
-@@ -1,7 +1,8 @@
- /*
-  * transupp.c
-  *
-- * Copyright (C) 1997-2011, Thomas G. Lane, Guido Vollbeding.
-+ * Copyright (C) 1997-2009, Thomas G. Lane, Guido Vollbeding.
-+ * Copyright (C) 2010, D. R. Commander.
-  * This file is part of the Independent JPEG Group's software.
-  * For conditions of distribution and use, see the accompanying README file.
-  *
-@@ -20,9 +21,19 @@
- #include "jinclude.h"
- #include "jpeglib.h"
- #include "transupp.h"		/* My own external interface */
-+#include "jpegcomp.h"
- #include <ctype.h>		/* to declare isdigit() */
- 
- 
-+#if JPEG_LIB_VERSION >= 70
-+#define dstinfo_min_DCT_h_scaled_size dstinfo->min_DCT_h_scaled_size
-+#define dstinfo_min_DCT_v_scaled_size dstinfo->min_DCT_v_scaled_size
-+#else
-+#define dstinfo_min_DCT_h_scaled_size DCTSIZE
-+#define dstinfo_min_DCT_v_scaled_size DCTSIZE
-+#endif
-+
-+
- #if TRANSFORMS_SUPPORTED
- 
- /*
-@@ -134,7 +145,7 @@
-    * Partial iMCUs at the right edge are left untouched.
-    */
-   MCU_cols = srcinfo->output_width /
--    (dstinfo->max_h_samp_factor * dstinfo->min_DCT_h_scaled_size);
-+    (dstinfo->max_h_samp_factor * dstinfo_min_DCT_h_scaled_size);
- 
-   for (ci = 0; ci < dstinfo->num_components; ci++) {
-     compptr = dstinfo->comp_info + ci;
-@@ -200,7 +211,7 @@
-    * this is essentially the same as the routine above.
-    */
-   MCU_cols = srcinfo->output_width /
--    (dstinfo->max_h_samp_factor * dstinfo->min_DCT_h_scaled_size);
-+    (dstinfo->max_h_samp_factor * dstinfo_min_DCT_h_scaled_size);
- 
-   for (ci = 0; ci < dstinfo->num_components; ci++) {
-     compptr = dstinfo->comp_info + ci;
-@@ -265,7 +276,7 @@
-    * Partial iMCUs at the bottom edge are copied verbatim.
-    */
-   MCU_rows = srcinfo->output_height /
--    (dstinfo->max_v_samp_factor * dstinfo->min_DCT_v_scaled_size);
-+    (dstinfo->max_v_samp_factor * dstinfo_min_DCT_v_scaled_size);
- 
-   for (ci = 0; ci < dstinfo->num_components; ci++) {
-     compptr = dstinfo->comp_info + ci;
-@@ -393,7 +404,7 @@
-    * not mirrored.
-    */
-   MCU_cols = srcinfo->output_height /
--    (dstinfo->max_h_samp_factor * dstinfo->min_DCT_h_scaled_size);
-+    (dstinfo->max_h_samp_factor * dstinfo_min_DCT_h_scaled_size);
- 
-   for (ci = 0; ci < dstinfo->num_components; ci++) {
-     compptr = dstinfo->comp_info + ci;
-@@ -474,7 +485,7 @@
-    * not mirrored.
-    */
-   MCU_rows = srcinfo->output_width /
--    (dstinfo->max_v_samp_factor * dstinfo->min_DCT_v_scaled_size);
-+    (dstinfo->max_v_samp_factor * dstinfo_min_DCT_v_scaled_size);
- 
-   for (ci = 0; ci < dstinfo->num_components; ci++) {
-     compptr = dstinfo->comp_info + ci;
-@@ -542,9 +553,9 @@
-   jpeg_component_info *compptr;
- 
-   MCU_cols = srcinfo->output_width /
--    (dstinfo->max_h_samp_factor * dstinfo->min_DCT_h_scaled_size);
-+    (dstinfo->max_h_samp_factor * dstinfo_min_DCT_h_scaled_size);
-   MCU_rows = srcinfo->output_height /
--    (dstinfo->max_v_samp_factor * dstinfo->min_DCT_v_scaled_size);
-+    (dstinfo->max_v_samp_factor * dstinfo_min_DCT_v_scaled_size);
- 
-   for (ci = 0; ci < dstinfo->num_components; ci++) {
-     compptr = dstinfo->comp_info + ci;
-@@ -653,9 +664,9 @@
-   jpeg_component_info *compptr;
- 
-   MCU_cols = srcinfo->output_height /
--    (dstinfo->max_h_samp_factor * dstinfo->min_DCT_h_scaled_size);
-+    (dstinfo->max_h_samp_factor * dstinfo_min_DCT_h_scaled_size);
-   MCU_rows = srcinfo->output_width /
--    (dstinfo->max_v_samp_factor * dstinfo->min_DCT_v_scaled_size);
-+    (dstinfo->max_v_samp_factor * dstinfo_min_DCT_v_scaled_size);
- 
-   for (ci = 0; ci < dstinfo->num_components; ci++) {
-     compptr = dstinfo->comp_info + ci;
-@@ -771,7 +782,7 @@
-  * The routine returns TRUE if the spec string is valid, FALSE if not.
-  *
-  * The crop spec string should have the format
-- *	<width>[f]x<height>[f]{+-}<xoffset>{+-}<yoffset>
-+ *	<width>x<height>{+-}<xoffset>{+-}<yoffset>
-  * where width, height, xoffset, and yoffset are unsigned integers.
-  * Each of the elements can be omitted to indicate a default value.
-  * (A weakness of this style is that it is not possible to omit xoffset
-@@ -793,22 +804,14 @@
-     /* fetch width */
-     if (! jt_read_integer(&spec, &info->crop_width))
-       return FALSE;
--    if (*spec == 'f' || *spec == 'F') {
--      spec++;
--      info->crop_width_set = JCROP_FORCE;
--    } else
--      info->crop_width_set = JCROP_POS;
-+    info->crop_width_set = JCROP_POS;
-   }
--  if (*spec == 'x' || *spec == 'X') {
-+  if (*spec == 'x' || *spec == 'X') {	
-     /* fetch height */
-     spec++;
-     if (! jt_read_integer(&spec, &info->crop_height))
-       return FALSE;
--    if (*spec == 'f' || *spec == 'F') {
--      spec++;
--      info->crop_height_set = JCROP_FORCE;
--    } else
--      info->crop_height_set = JCROP_POS;
-+    info->crop_height_set = JCROP_POS;
-   }
-   if (*spec == '+' || *spec == '-') {
-     /* fetch xoffset */
-@@ -897,7 +900,12 @@
-     info->num_components = srcinfo->num_components;
- 
-   /* Compute output image dimensions and related values. */
-+#if JPEG_LIB_VERSION >= 80
-   jpeg_core_output_dimensions(srcinfo);
-+#else
-+  srcinfo->output_width = srcinfo->image_width;
-+  srcinfo->output_height = srcinfo->image_height;
-+#endif
- 
-   /* Return right away if -perfect is given and transformation is not perfect.
-    */
-@@ -905,15 +913,15 @@
-     if (info->num_components == 1) {
-       if (!jtransform_perfect_transform(srcinfo->output_width,
- 	  srcinfo->output_height,
--	  srcinfo->min_DCT_h_scaled_size,
--	  srcinfo->min_DCT_v_scaled_size,
-+	  srcinfo->_min_DCT_h_scaled_size,
-+	  srcinfo->_min_DCT_v_scaled_size,
- 	  info->transform))
- 	return FALSE;
-     } else {
-       if (!jtransform_perfect_transform(srcinfo->output_width,
- 	  srcinfo->output_height,
--	  srcinfo->max_h_samp_factor * srcinfo->min_DCT_h_scaled_size,
--	  srcinfo->max_v_samp_factor * srcinfo->min_DCT_v_scaled_size,
-+	  srcinfo->max_h_samp_factor * srcinfo->_min_DCT_h_scaled_size,
-+	  srcinfo->max_v_samp_factor * srcinfo->_min_DCT_v_scaled_size,
- 	  info->transform))
- 	return FALSE;
-     }
-@@ -932,26 +940,26 @@
-     info->output_width = srcinfo->output_height;
-     info->output_height = srcinfo->output_width;
-     if (info->num_components == 1) {
--      info->iMCU_sample_width = srcinfo->min_DCT_v_scaled_size;
--      info->iMCU_sample_height = srcinfo->min_DCT_h_scaled_size;
-+      info->iMCU_sample_width = srcinfo->_min_DCT_v_scaled_size;
-+      info->iMCU_sample_height = srcinfo->_min_DCT_h_scaled_size;
-     } else {
-       info->iMCU_sample_width =
--	srcinfo->max_v_samp_factor * srcinfo->min_DCT_v_scaled_size;
-+	srcinfo->max_v_samp_factor * srcinfo->_min_DCT_v_scaled_size;
-       info->iMCU_sample_height =
--	srcinfo->max_h_samp_factor * srcinfo->min_DCT_h_scaled_size;
-+	srcinfo->max_h_samp_factor * srcinfo->_min_DCT_h_scaled_size;
-     }
-     break;
-   default:
-     info->output_width = srcinfo->output_width;
-     info->output_height = srcinfo->output_height;
-     if (info->num_components == 1) {
--      info->iMCU_sample_width = srcinfo->min_DCT_h_scaled_size;
--      info->iMCU_sample_height = srcinfo->min_DCT_v_scaled_size;
-+      info->iMCU_sample_width = srcinfo->_min_DCT_h_scaled_size;
-+      info->iMCU_sample_height = srcinfo->_min_DCT_v_scaled_size;
-     } else {
-       info->iMCU_sample_width =
--	srcinfo->max_h_samp_factor * srcinfo->min_DCT_h_scaled_size;
-+	srcinfo->max_h_samp_factor * srcinfo->_min_DCT_h_scaled_size;
-       info->iMCU_sample_height =
--	srcinfo->max_v_samp_factor * srcinfo->min_DCT_v_scaled_size;
-+	srcinfo->max_v_samp_factor * srcinfo->_min_DCT_v_scaled_size;
-     }
-     break;
-   }
-@@ -988,16 +996,10 @@
-     else
-       yoffset = info->crop_yoffset;
-     /* Now adjust so that upper left corner falls at an iMCU boundary */
--    if (info->crop_width_set == JCROP_FORCE)
--      info->output_width = info->crop_width;
--    else
--      info->output_width =
--        info->crop_width + (xoffset % info->iMCU_sample_width);
--    if (info->crop_height_set == JCROP_FORCE)
--      info->output_height = info->crop_height;
--    else
--      info->output_height =
--        info->crop_height + (yoffset % info->iMCU_sample_height);
-+    info->output_width =
-+      info->crop_width + (xoffset % info->iMCU_sample_width);
-+    info->output_height =
-+      info->crop_height + (yoffset % info->iMCU_sample_height);
-     /* Save x/y offsets measured in iMCUs */
-     info->x_crop_offset = xoffset / info->iMCU_sample_width;
-     info->y_crop_offset = yoffset / info->iMCU_sample_height;
-@@ -1020,7 +1022,7 @@
-   case JXFORM_FLIP_H:
-     if (info->trim)
-       trim_right_edge(info, srcinfo->output_width);
--    if (info->y_crop_offset != 0)
-+    if (info->y_crop_offset != 0 || info->slow_hflip)
-       need_workspace = TRUE;
-     /* do_flip_h_no_crop doesn't need a workspace array */
-     break;
-@@ -1124,9 +1126,11 @@
-   jtemp = dstinfo->image_width;
-   dstinfo->image_width = dstinfo->image_height;
-   dstinfo->image_height = jtemp;
-+#if JPEG_LIB_VERSION >= 70
-   itemp = dstinfo->min_DCT_h_scaled_size;
-   dstinfo->min_DCT_h_scaled_size = dstinfo->min_DCT_v_scaled_size;
-   dstinfo->min_DCT_v_scaled_size = itemp;
-+#endif
- 
-   /* Transpose sampling factors */
-   for (ci = 0; ci < dstinfo->num_components; ci++) {
-@@ -1362,8 +1366,10 @@
-   /* Correct the destination's image dimensions as necessary
-    * for rotate/flip, resize, and crop operations.
-    */
-+#if JPEG_LIB_VERSION >= 70
-   dstinfo->jpeg_width = info->output_width;
-   dstinfo->jpeg_height = info->output_height;
-+#endif
- 
-   /* Transpose destination image parameters */
-   switch (info->transform) {
-@@ -1371,9 +1377,17 @@
-   case JXFORM_TRANSVERSE:
-   case JXFORM_ROT_90:
-   case JXFORM_ROT_270:
-+#if JPEG_LIB_VERSION < 70
-+    dstinfo->image_width = info->output_height;
-+    dstinfo->image_height = info->output_width;
-+#endif
-     transpose_critical_parameters(dstinfo);
-     break;
-   default:
-+#if JPEG_LIB_VERSION < 70
-+    dstinfo->image_width = info->output_width;
-+    dstinfo->image_height = info->output_height;
-+#endif
-     break;
-   }
- 
-@@ -1389,6 +1403,7 @@
-       GETJOCTET(srcinfo->marker_list->data[5]) == 0) {
-     /* Suppress output of JFIF marker */
-     dstinfo->write_JFIF_header = FALSE;
-+#if JPEG_LIB_VERSION >= 70
-     /* Adjust Exif image parameters */
-     if (dstinfo->jpeg_width != srcinfo->image_width ||
- 	dstinfo->jpeg_height != srcinfo->image_height)
-@@ -1396,6 +1411,7 @@
-       adjust_exif_parameters(srcinfo->marker_list->data + 6,
- 	srcinfo->marker_list->data_length - 6,
- 	dstinfo->jpeg_width, dstinfo->jpeg_height);
-+#endif
-   }
- 
-   /* Return the appropriate output data set */
-@@ -1432,7 +1448,7 @@
- 	      src_coef_arrays, dst_coef_arrays);
-     break;
-   case JXFORM_FLIP_H:
--    if (info->y_crop_offset != 0)
-+    if (info->y_crop_offset != 0 || info->slow_hflip)
-       do_flip_h(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,
- 		src_coef_arrays, dst_coef_arrays);
-     else
diff --git a/media-libs/freeimage/files/freeimage-3.15.4-libjpeg9.patch b/media-libs/freeimage/files/freeimage-3.15.4-libjpeg9.patch
deleted file mode 100644
index 24eb9e010fca..000000000000
--- a/media-libs/freeimage/files/freeimage-3.15.4-libjpeg9.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Bug: https://bugs.gentoo.org/647422
-Upstream Patch: https://sourceforge.net/p/freeimage/patches/130/
-
-diff -Naur a/Source/FreeImage/PluginJPEG.cpp b/Source/FreeImage/PluginJPEG.cpp
---- a/Source/FreeImage/PluginJPEG.cpp	2018-03-24 23:24:11.062695375 -0400
-+++ b/Source/FreeImage/PluginJPEG.cpp	2018-03-24 23:25:39.451124161 -0400
-@@ -1586,14 +1586,14 @@
- 
- 			// thumbnail support (JFIF 1.02 extension markers)
- 			if(FreeImage_GetThumbnail(dib) != NULL) {
--				cinfo.write_JFIF_header = 1; //<### force it, though when color is CMYK it will be incorrect
-+				cinfo.write_JFIF_header = static_cast<boolean>(1); //<### force it, though when color is CMYK it will be incorrect
- 				cinfo.JFIF_minor_version = 2;
- 			}
- 
- 			// baseline JPEG support
- 			if ((flags & JPEG_BASELINE) ==  JPEG_BASELINE) {
--				cinfo.write_JFIF_header = 0;	// No marker for non-JFIF colorspaces
--				cinfo.write_Adobe_marker = 0;	// write no Adobe marker by default				
-+				cinfo.write_JFIF_header = static_cast<boolean>(0);	// No marker for non-JFIF colorspaces
-+				cinfo.write_Adobe_marker = static_cast<boolean>(0);	// write no Adobe marker by default
- 			}
- 
- 			// set subsampling options if required
-diff -Naur a/Source/FreeImage.h b/Source/FreeImage.h
---- a/Source/FreeImage.h	2018-03-24 23:24:11.066695395 -0400
-+++ b/Source/FreeImage.h	2018-03-24 23:26:35.945391182 -0400
-@@ -117,12 +117,17 @@
- #ifndef _WINDOWS_
- #define _WINDOWS_
- 
-+#if JPEG_LIB_VERSION < 90
-+
- #ifndef FALSE
- #define FALSE 0
- #endif
- #ifndef TRUE
- #define TRUE 1
- #endif
-+
-+#endif
-+
- #ifndef NULL
- #define NULL 0
- #endif
diff --git a/media-libs/freeimage/files/freeimage-3.15.4-raw.patch b/media-libs/freeimage/files/freeimage-3.15.4-raw.patch
deleted file mode 100644
index 44f566627e2f..000000000000
--- a/media-libs/freeimage/files/freeimage-3.15.4-raw.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=458516
-
---- FreeImage/Source/FreeImage.h
-+++ FreeImage/Source/FreeImage.h
-@@ -141,8 +141,10 @@
- typedef uint16_t WORD;
- typedef uint32_t DWORD;
- typedef int32_t LONG;
-+#ifndef _LIBRAW_TYPES_H
- typedef int64_t INT64;
- typedef uint64_t UINT64;
-+#endif
- #else
- // MS is not C99 ISO compliant
- typedef long BOOL;
-
diff --git a/media-libs/freeimage/files/freeimage-3.15.4-unbundling.patch b/media-libs/freeimage/files/freeimage-3.15.4-unbundling.patch
deleted file mode 100644
index ac2ac54ce5cf..000000000000
--- a/media-libs/freeimage/files/freeimage-3.15.4-unbundling.patch
+++ /dev/null
@@ -1,639 +0,0 @@
-lots of fixes here:
-	- use system graphics libraries
-	- make all of them optional
-	- drop root users from install (fix user installs)
-	- make static lib build optional
-	- link with CXX and CXXFLAGS (since this is C++ code)
-
---- a/Makefile.gnu
-+++ b/Makefile.gnu
-@@ -11,7 +11,24 @@
- # Converts cr/lf to just lf
- DOS2UNIX = dos2unix
- 
--LIBRARIES = -lstdc++
-+PKG_CONFIG ?= pkg-config
-+
-+USE_EXR ?= yes
-+USE_JPEG ?= yes
-+USE_JPEG2K ?= yes
-+USE_MNG ?= yes
-+USE_PNG ?= yes
-+USE_TIFF ?= yes
-+USE_RAW ?= yes
-+
-+LIBRARIES-yes = $(shell $(PKG_CONFIG) --libs zlib)
-+LIBRARIES-$(USE_EXR)    += $(shell $(PKG_CONFIG) --libs OpenEXR)
-+LIBRARIES-$(USE_JPEG)   += -ljpeg
-+LIBRARIES-$(USE_JPEG2K) += $(shell $(PKG_CONFIG) --libs libopenjpeg)
-+LIBRARIES-$(USE_MNG)    += -lmng
-+LIBRARIES-$(USE_PNG)    += $(shell $(PKG_CONFIG) --libs libpng)
-+LIBRARIES-$(USE_TIFF)   += $(shell $(PKG_CONFIG) --libs libtiff-4 IlmBase)
-+LIBRARIES-$(USE_RAW)    += $(shell $(PKG_CONFIG) --libs libraw)
- 
- MODULES = $(SRCS:.c=.o)
- MODULES := $(MODULES:.cpp=.o)
-@@ -64,13 +81,15 @@
- 	$(AR) r $@ $(MODULES)
- 
- $(SHAREDLIB): $(MODULES)
--	$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
-+	$(CXX) $(CXXFLAGS) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES-yes)
- 
- install:
- 	install -d $(INCDIR) $(INSTALLDIR)
--	install -m 644 -o root -g root $(HEADER) $(INCDIR)
--	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
--	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
-+	install -m 644 $(HEADER) $(INCDIR)
-+ifneq ($(STATICLIB),)
-+	install -m 644 $(STATICLIB) $(INSTALLDIR)
-+endif
-+	install -m 755 $(SHAREDLIB) $(INSTALLDIR)
- 	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
- 	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)	
- #	ldconfig
---- a/Source/FreeImage/J2KHelper.cpp
-+++ b/Source/FreeImage/J2KHelper.cpp
-@@ -21,7 +21,7 @@
- 
- #include "FreeImage.h"
- #include "Utilities.h"
--#include "../LibOpenJPEG/openjpeg.h"
-+#include <openjpeg.h>
- 
- /**
- Divide an integer by a power of 2 and round upwards
---- a/Source/FreeImage/PluginEXR.cpp
-+++ b/Source/FreeImage/PluginEXR.cpp
-@@ -22,16 +22,16 @@
- 
- #include "FreeImage.h"
- #include "Utilities.h"
--#include "../OpenEXR/IlmImf/ImfIO.h"
--#include "../OpenEXR/Iex/Iex.h"
--#include "../OpenEXR/IlmImf/ImfOutputFile.h"
--#include "../OpenEXR/IlmImf/ImfInputFile.h"
--#include "../OpenEXR/IlmImf/ImfRgbaFile.h"
--#include "../OpenEXR/IlmImf/ImfChannelList.h"
--#include "../OpenEXR/IlmImf/ImfRgba.h"
--#include "../OpenEXR/IlmImf/ImfArray.h"
--#include "../OpenEXR/IlmImf/ImfPreviewImage.h"
--#include "../OpenEXR/Half/half.h"
-+#include <ImfIO.h>
-+#include <Iex.h>
-+#include <ImfOutputFile.h>
-+#include <ImfInputFile.h>
-+#include <ImfRgbaFile.h>
-+#include <ImfChannelList.h>
-+#include <ImfRgba.h>
-+#include <ImfArray.h>
-+#include <ImfPreviewImage.h>
-+#include <half.h>
- 
- 
- // ==========================================================
---- a/Source/FreeImage/PluginJ2K.cpp
-+++ b/Source/FreeImage/PluginJ2K.cpp
-@@ -21,7 +21,7 @@
- 
- #include "FreeImage.h"
- #include "Utilities.h"
--#include "../LibOpenJPEG/openjpeg.h"
-+#include <openjpeg.h>
- 
- // ==========================================================
- // Plugin Interface
---- a/Source/FreeImage/PluginJP2.cpp
-+++ b/Source/FreeImage/PluginJP2.cpp
-@@ -21,7 +21,7 @@
- 
- #include "FreeImage.h"
- #include "Utilities.h"
--#include "../LibOpenJPEG/openjpeg.h"
-+#include <openjpeg.h>
- 
- // ==========================================================
- // Plugin Interface
---- a/Source/FreeImage/PluginPNG.cpp
-+++ b/Source/FreeImage/PluginPNG.cpp
-@@ -37,8 +37,8 @@
- 
- // ----------------------------------------------------------
- 
--#include "../ZLib/zlib.h"
--#include "../LibPNG/png.h"
-+#include <zlib.h>
-+#include <png.h>
- 
- // ----------------------------------------------------------
- 
---- a/Source/transupp.c
-+++ b/Source/transupp.c
-@@ -15,8 +15,7 @@
- /* Although this file really shouldn't have access to the library internals,
-  * it's helpful to let it call jround_up() and jcopy_block_row().
-  */
--#define JPEG_INTERNALS
--
-+#include <jerror.h>
- #include "jinclude.h"
- #include "jpeglib.h"
- #include "transupp.h"		/* My own external interface */
---- a/Source/FreeImage/ZLibInterface.cpp
-+++ b/Source/FreeImage/ZLibInterface.cpp
-@@ -19,10 +19,10 @@
- // Use at your own risk!
- // ==========================================================
- 
--#include "../ZLib/zlib.h"
-+#include <zlib.h>
- #include "FreeImage.h"
- #include "Utilities.h"
--#include "../ZLib/zutil.h"	/* must be the last header because of error C3163 in VS2008 (_vsnprintf defined in stdio.h) */
-+#define OS_CODE 0x03
- 
- /**
- Compresses a source buffer into a target buffer, using the ZLib library. 
---- a/Source/FreeImage/PluginG3.cpp
-+++ b/Source/FreeImage/PluginG3.cpp
-@@ -20,7 +20,7 @@
- // Use at your own risk!
- // ==========================================================
- 
--#include "../LibTIFF4/tiffiop.h"
-+#include "tiffiop.h"
- 
- #include "FreeImage.h"
- #include "Utilities.h"
---- a/Source/FreeImage/PluginJPEG.cpp
-+++ b/Source/FreeImage/PluginJPEG.cpp
-@@ -35,11 +35,15 @@
- #undef FAR
- #include <setjmp.h>
- 
--#include "../LibJPEG/jinclude.h"
--#include "../LibJPEG/jpeglib.h"
--#include "../LibJPEG/jerror.h"
-+#include <string.h>
-+#include <stdio.h>
-+#include <jconfig.h>
-+#include <jpeglib.h>
-+#include <jerror.h>
- }
- 
-+#define SIZEOF(object)        ((size_t) sizeof(object))
-+
- #include "FreeImage.h"
- #include "Utilities.h"
- 
---- a/Source/FreeImageToolkit/JPEGTransform.cpp
-+++ b/Source/FreeImageToolkit/JPEGTransform.cpp
-@@ -25,10 +25,11 @@
- #undef FAR
- #include <setjmp.h>
- 
--#include "../LibJPEG/jinclude.h"
--#include "../LibJPEG/jpeglib.h"
--#include "../LibJPEG/jerror.h"
--#include "../LibJPEG/transupp.h"
-+#include <string.h>
-+#include <stdio.h>
-+#include <jpeglib.h>
-+#include <jerror.h>
-+#include "transupp.h"
- }
- 
- #include "FreeImage.h"
---- a/Makefile.fip
-+++ b/Makefile.fip
-@@ -11,7 +11,24 @@
- # Converts cr/lf to just lf
- DOS2UNIX = dos2unix
- 
--LIBRARIES = -lstdc++
-+PKG_CONFIG ?= pkg-config
-+
-+USE_EXR ?= yes
-+USE_JPEG ?= yes
-+USE_JPEG2K ?= yes
-+USE_MNG ?= yes
-+USE_PNG ?= yes
-+USE_TIFF ?= yes
-+USE_RAW ?= yes
-+
-+LIBRARIES-yes = $(shell $(PKG_CONFIG) --libs zlib)
-+LIBRARIES-$(USE_EXR)    += $(shell $(PKG_CONFIG) --libs OpenEXR)
-+LIBRARIES-$(USE_JPEG)   += -ljpeg
-+LIBRARIES-$(USE_JPEG2K) += $(shell $(PKG_CONFIG) --libs libopenjpeg)
-+LIBRARIES-$(USE_MNG)    += -lmng
-+LIBRARIES-$(USE_PNG)    += $(shell $(PKG_CONFIG) --libs libpng)
-+LIBRARIES-$(USE_TIFF)   += $(shell $(PKG_CONFIG) --libs libtiff-4 IlmBase)
-+LIBRARIES-$(USE_RAW)    += $(shell $(PKG_CONFIG) --libs libraw)
- 
- MODULES = $(SRCS:.c=.o)
- MODULES := $(MODULES:.cpp=.o)
-@@ -65,14 +82,18 @@
- 	$(AR) r $@ $(MODULES)
- 
- $(SHAREDLIB): $(MODULES)
--	$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
-+	$(CXX) $(CXXFLAGS) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES-yes)
- 
- install:
- 	install -d $(INCDIR) $(INSTALLDIR)
--	install -m 644 -o root -g root $(HEADER) $(INCDIR)
--	install -m 644 -o root -g root $(HEADERFIP) $(INCDIR)
--	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
--	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
-+	install -m 644 $(HEADER) $(INCDIR)
-+	install -m 644 $(HEADERFIP) $(INCDIR)
-+ifneq ($(STATICLIB),)
-+	install -m 644 $(STATICLIB) $(INSTALLDIR)
-+endif
-+	install -m 755 $(SHAREDLIB) $(INSTALLDIR)
-+	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
-+	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
- 
- clean:
- 	rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
---- a/Makefile.srcs
-+++ b/Makefile.srcs
-@@ -1,6 +1,14 @@
-+USE_EXR ?= yes
-+USE_JPEG ?= yes
-+USE_JPEG2K ?= yes
-+USE_MNG ?= yes
-+USE_PNG ?= yes
-+USE_TIFF ?= yes
-+USE_RAW ?= yes
-+
- VER_MAJOR = 3
- VER_MINOR = 15.4
--SRCS = \
-+SRCS-yes = \
- 	Source/FreeImage/BitmapAccess.cpp \
- 	Source/FreeImage/ColorLookup.cpp \
- 	Source/FreeImage/FreeImage.cpp \
-@@ -17,36 +25,74 @@ SRCS = \
- 	Source/FreeImage/GetType.cpp \
- 	Source/FreeImage/MemoryIO.cpp \
- 	Source/FreeImage/PixelAccess.cpp \
-+
-+SRCS-$(USE_JPEG2K) += \
- 	Source/FreeImage/J2KHelper.cpp \
-+
-+SRCS-$(USE_MNG) += \
- 	Source/FreeImage/MNGHelper.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/Plugin.cpp \
- 	Source/FreeImage/PluginBMP.cpp \
- 	Source/FreeImage/PluginCUT.cpp \
- 	Source/FreeImage/PluginDDS.cpp \
-+
-+SRCS-$(USE_EXR) += \
- 	Source/FreeImage/PluginEXR.cpp \
-+
-+SRCS-$(USE_TIFF) += \
- 	Source/FreeImage/PluginG3.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginGIF.cpp \
- 	Source/FreeImage/PluginHDR.cpp \
- 	Source/FreeImage/PluginICO.cpp \
- 	Source/FreeImage/PluginIFF.cpp \
-+
-+SRCS-$(USE_JPEG2K) += \
- 	Source/FreeImage/PluginJ2K.cpp \
-+
-+SRCS-$(USE_MNG) += \
- 	Source/FreeImage/PluginJNG.cpp \
-+
-+SRCS-$(USE_JPEG2K) += \
- 	Source/FreeImage/PluginJP2.cpp \
-+
-+SRCS-$(USE_JPEG) += \
- 	Source/FreeImage/PluginJPEG.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginKOALA.cpp \
-+
-+SRCS-$(USE_MNG) += \
- 	Source/FreeImage/PluginMNG.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginPCD.cpp \
- 	Source/FreeImage/PluginPCX.cpp \
- 	Source/FreeImage/PluginPFM.cpp \
- 	Source/FreeImage/PluginPICT.cpp \
-+
-+SRCS-$(USE_PNG) += \
- 	Source/FreeImage/PluginPNG.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginPNM.cpp \
- 	Source/FreeImage/PluginPSD.cpp \
- 	Source/FreeImage/PluginRAS.cpp \
-+
-+SRCS-$(USE_RAW) += \
- 	Source/FreeImage/PluginRAW.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginSGI.cpp \
- 	Source/FreeImage/PluginTARGA.cpp \
-+
-+SRCS-$(USE_TIFF) += \
- 	Source/FreeImage/PluginTIFF.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginWBMP.cpp \
- 	Source/FreeImage/PluginXBM.cpp \
- 	Source/FreeImage/PluginXPM.cpp \
-@@ -83,7 +129,11 @@ SRCS = \
- 	Source/Metadata/IPTC.cpp \
- 	Source/Metadata/TagConversion.cpp \
- 	Source/Metadata/TagLib.cpp \
-+
-+SRCS-$(USE_TIFF) += \
- 	Source/Metadata/XTIFF.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImageToolkit/Background.cpp \
- 	Source/FreeImageToolkit/BSplineRotate.cpp \
- 	Source/FreeImageToolkit/Channels.cpp \
-@@ -92,10 +142,18 @@ SRCS = \
- 	Source/FreeImageToolkit/CopyPaste.cpp \
- 	Source/FreeImageToolkit/Display.cpp \
- 	Source/FreeImageToolkit/Flip.cpp \
-+
-+SRCS-$(USE_JPEG) += \
- 	Source/FreeImageToolkit/JPEGTransform.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImageToolkit/MultigridPoissonSolver.cpp \
- 	Source/FreeImageToolkit/Rescale.cpp \
- 	Source/FreeImageToolkit/Resize.cpp \
-+
-+SRCS-$(USE_JPEG) += \
-+	Source/transupp.c
-+SRCS = $(SRCS-yes)
- INCLS = \
- 	Examples/OpenGL/TextureManager/TextureManager.h \
- 	Examples/Plugin/PluginCradle.h \
-@@ -116,7 +174,17 @@
- 	Wrapper/FreeImagePlus/test/fipTest.h \
- 	TestAPI/TestSuite.h
- 
--INCLUDE = -I. \
-+INCLUDE-yes = -I. \
- 	-ISource \
- 	-ISource/Metadata \
- 	-ISource/FreeImageToolkit \
-+
-+INCLUDE-yes += $(shell $(PKG_CONFIG) --cflags-only-I zlib)
-+INCLUDE-$(USE_EXR)    += -DUSE_EXR    $(shell $(PKG_CONFIG) --cflags-only-I OpenEXR)
-+INCLUDE-$(USE_JPEG)   += -DUSE_JPEG
-+INCLUDE-$(USE_JPEG2K) += -DUSE_JPEG2K $(shell $(PKG_CONFIG) --cflags-only-I libopenjpeg)
-+INCLUDE-$(USE_MNG)    += -DUSE_MNG
-+INCLUDE-$(USE_PNG)    += -DUSE_PNG    $(shell $(PKG_CONFIG) --cflags-only-I libpng)
-+INCLUDE-$(USE_TIFF)   += -DUSE_TIFF   $(shell $(PKG_CONFIG) --cflags-only-I libtiff-4 IlmBase)
-+INCLUDE-$(USE_RAW)    += -DUSE_RAW    $(shell $(PKG_CONFIG) --cflags-only-I libraw)
-+INCLUDE = $(INCLUDE-yes)
---- a/fipMakefile.srcs
-+++ b/fipMakefile.srcs
-@@ -1,6 +1,14 @@
-+USE_EXR ?= yes
-+USE_JPEG ?= yes
-+USE_JPEG2K ?= yes
-+USE_MNG ?= yes
-+USE_PNG ?= yes
-+USE_TIFF ?= yes
-+USE_RAW ?= yes
-+
- VER_MAJOR = 3
- VER_MINOR = 15.4
--SRCS = \
-+SRCS-yes = \
- 	Source/FreeImage/BitmapAccess.cpp \
- 	Source/FreeImage/ColorLookup.cpp \
- 	Source/FreeImage/FreeImage.cpp \
-@@ -9,36 +17,74 @@
- 	Source/FreeImage/GetType.cpp \
- 	Source/FreeImage/MemoryIO.cpp \
- 	Source/FreeImage/PixelAccess.cpp \
-+
-+SRCS-$(USE_JPEG2K) += \
- 	Source/FreeImage/J2KHelper.cpp \
-+
-+SRCS-$(USE_MNG) += \
- 	Source/FreeImage/MNGHelper.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/Plugin.cpp \
- 	Source/FreeImage/PluginBMP.cpp \
- 	Source/FreeImage/PluginCUT.cpp \
- 	Source/FreeImage/PluginDDS.cpp \
-+
-+SRCS-$(USE_EXR) += \
- 	Source/FreeImage/PluginEXR.cpp \
-+
-+SRCS-$(USE_TIFF) += \
- 	Source/FreeImage/PluginG3.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginGIF.cpp \
- 	Source/FreeImage/PluginHDR.cpp \
- 	Source/FreeImage/PluginICO.cpp \
- 	Source/FreeImage/PluginIFF.cpp \
-+
-+SRCS-$(USE_JPEG2K) += \
- 	Source/FreeImage/PluginJ2K.cpp \
-+
-+SRCS-$(USE_MNG) += \
- 	Source/FreeImage/PluginJNG.cpp \
-+
-+SRCS-$(USE_JPEG2K) += \
- 	Source/FreeImage/PluginJP2.cpp \
-+
-+SRCS-$(USE_JPEG) += \
- 	Source/FreeImage/PluginJPEG.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginKOALA.cpp \
-+
-+SRCS-$(USE_MNG) += \
- 	Source/FreeImage/PluginMNG.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginPCD.cpp \
- 	Source/FreeImage/PluginPCX.cpp \
- 	Source/FreeImage/PluginPFM.cpp \
- 	Source/FreeImage/PluginPICT.cpp \
-+
-+SRCS-$(USE_PNG) += \
- 	Source/FreeImage/PluginPNG.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginPNM.cpp \
- 	Source/FreeImage/PluginPSD.cpp \
- 	Source/FreeImage/PluginRAS.cpp \
-+
-+SRCS-$(USE_RAW) += \
- 	Source/FreeImage/PluginRAW.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginSGI.cpp \
- 	Source/FreeImage/PluginTARGA.cpp \
-+
-+SRCS-$(USE_TIFF) += \
- 	Source/FreeImage/PluginTIFF.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginWBMP.cpp \
- 	Source/FreeImage/PluginXBM.cpp \
- 	Source/FreeImage/PluginXPM.cpp \
-@@ -75,7 +121,11 @@
- 	Source/Metadata/IPTC.cpp \
- 	Source/Metadata/TagConversion.cpp \
- 	Source/Metadata/TagLib.cpp \
-+
-+SRCS-$(USE_TIFF) += \
- 	Source/Metadata/XTIFF.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImageToolkit/Background.cpp \
- 	Source/FreeImageToolkit/BSplineRotate.cpp \
- 	Source/FreeImageToolkit/Channels.cpp \
-@@ -84,7 +134,11 @@
- 	Source/FreeImageToolkit/CopyPaste.cpp \
- 	Source/FreeImageToolkit/Display.cpp \
- 	Source/FreeImageToolkit/Flip.cpp \
-+
-+SRCS-$(USE_JPEG) += \
- 	Source/FreeImageToolkit/JPEGTransform.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImageToolkit/MultigridPoissonSolver.cpp \
- 	Source/FreeImageToolkit/Rescale.cpp \
- 	Source/FreeImageToolkit/Resize.cpp \
-@@ -95,6 +149,11 @@
- 	Wrapper/FreeImagePlus/src/fipTag.cpp \
- 	Wrapper/FreeImagePlus/src/fipWinImage.cpp \
- 	Wrapper/FreeImagePlus/src/FreeImagePlus.cpp 
-+
-+SRCS-$(USE_JPEG) += \
-+	Source/transupp.c
-+
-+SRCS = $(SRCS-yes)
- INCLUDE = -I. \
- 	-ISource \
- 	-ISource/Metadata \
---- a/Source/FreeImage/PluginRAW.cpp
-+++ b/Source/FreeImage/PluginRAW.cpp
-@@ -19,7 +19,7 @@
- // Use at your own risk!
- // ==========================================================
- 
--#include "../LibRawLite/libraw/libraw.h"
-+#include <libraw.h>
- 
- #include "FreeImage.h"
- #include "Utilities.h"
---- a/Source/Metadata/XTIFF.cpp
-+++ b/Source/Metadata/XTIFF.cpp
-@@ -29,7 +29,7 @@
- #pragma warning (disable : 4786) // identifier was truncated to 'number' characters
- #endif
- 
--#include "../LibTIFF4/tiffiop.h"
-+#include "tiffiop.h"
- 
- #include "FreeImage.h"
- #include "Utilities.h"
---- a/Source/FreeImage/PluginTIFF.cpp
-+++ b/Source/FreeImage/PluginTIFF.cpp
-@@ -37,9 +37,9 @@
- 
- #include "FreeImage.h"
- #include "Utilities.h"
--#include "../LibTIFF4/tiffiop.h"
-+#include "tiffiop.h"
- #include "../Metadata/FreeImageTag.h"
--#include "../OpenEXR/Half/half.h"
-+#include <half.h>
- 
- #include "FreeImageIO.h"
- #include "PSDParser.h"
---- a/Source/tiffiop.h
-+++ b/Source/tiffiop.h
-@@ -30,7 +30,9 @@
-  * ``Library-private'' definitions.
-  */
- 
--#include "tif_config.h"
-+#include <tiffconf.h>
-+#define HAVE_SEARCH_H
-+#define HAVE_FCNTL_H
- 
- #ifdef HAVE_FCNTL_H
- # include <fcntl.h>
---- a/Source/FreeImage/Plugin.cpp
-+++ b/Source/FreeImage/Plugin.cpp
-@@ -223,23 +223,33 @@
- 			*/
- 			s_plugins->AddNode(InitBMP);
- 			s_plugins->AddNode(InitICO);
-+#ifdef USE_JPEG
- 			s_plugins->AddNode(InitJPEG);
-+#endif
-+#ifdef USE_MNG
- 			s_plugins->AddNode(InitJNG);
-+#endif
- 			s_plugins->AddNode(InitKOALA);
- 			s_plugins->AddNode(InitIFF);
-+#ifdef USE_MNG
- 			s_plugins->AddNode(InitMNG);
-+#endif
- 			s_plugins->AddNode(InitPNM, NULL, "PBM", "Portable Bitmap (ASCII)", "pbm", "^P1");
- 			s_plugins->AddNode(InitPNM, NULL, "PBMRAW", "Portable Bitmap (RAW)", "pbm", "^P4");
- 			s_plugins->AddNode(InitPCD);
- 			s_plugins->AddNode(InitPCX);
- 			s_plugins->AddNode(InitPNM, NULL, "PGM", "Portable Greymap (ASCII)", "pgm", "^P2");
- 			s_plugins->AddNode(InitPNM, NULL, "PGMRAW", "Portable Greymap (RAW)", "pgm", "^P5");
-+#ifdef USE_PNG
- 			s_plugins->AddNode(InitPNG);
-+#endif
- 			s_plugins->AddNode(InitPNM, NULL, "PPM", "Portable Pixelmap (ASCII)", "ppm", "^P3");
- 			s_plugins->AddNode(InitPNM, NULL, "PPMRAW", "Portable Pixelmap (RAW)", "ppm", "^P6");
- 			s_plugins->AddNode(InitRAS);
- 			s_plugins->AddNode(InitTARGA);
-+#ifdef USE_TIFF
- 			s_plugins->AddNode(InitTIFF);
-+#endif
- 			s_plugins->AddNode(InitWBMP);
- 			s_plugins->AddNode(InitPSD);
- 			s_plugins->AddNode(InitCUT);
-@@ -248,14 +258,22 @@
- 			s_plugins->AddNode(InitDDS);
- 	        s_plugins->AddNode(InitGIF);
- 	        s_plugins->AddNode(InitHDR);
-+#ifdef USE_TIFF
- 			s_plugins->AddNode(InitG3);
-+#endif
- 			s_plugins->AddNode(InitSGI);
-+#ifdef USE_EXR
- 			s_plugins->AddNode(InitEXR);
-+#endif
-+#ifdef USE_JPEG2K
- 			s_plugins->AddNode(InitJ2K);
- 			s_plugins->AddNode(InitJP2);
-+#endif
- 			s_plugins->AddNode(InitPFM);
- 			s_plugins->AddNode(InitPICT);
-+#ifdef USE_RAW
- 			s_plugins->AddNode(InitRAW);
-+#endif
- 			
- 			// external plugin initialization
- 
diff --git a/media-libs/freeimage/freeimage-3.15.4-r1.ebuild b/media-libs/freeimage/freeimage-3.15.4-r1.ebuild
deleted file mode 100644
index f79cd6ac5c1a..000000000000
--- a/media-libs/freeimage/freeimage-3.15.4-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-MY_PN=FreeImage
-MY_PV=${PV//.}
-MY_P=${MY_PN}${MY_PV}
-
-DESCRIPTION="Image library supporting many formats"
-HOMEPAGE="http://freeimage.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
-	mirror://sourceforge/${PN}/${MY_P}.pdf"
-
-LICENSE="|| ( GPL-2 FIPL-1.0 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff"
-
-# The tiff/ilmbase isn't a typo.  The TIFF plugin cheats and
-# uses code from it to handle 16bit<->float conversions.
-RDEPEND="
-	sys-libs/zlib
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:0= )
-	mng? ( media-libs/libmng:= )
-	openexr? ( media-libs/openexr:= )
-	png? ( media-libs/libpng:0= )
-	raw? ( media-libs/libraw:= )
-	tiff? (
-		media-libs/ilmbase:=
-		media-libs/tiff:0
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_PN}
-
-DOCS=( "${DISTDIR}"/${MY_P}.pdf README.linux Whatsnew.txt )
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.15.4-{unbundling,raw}.patch
-	"${FILESDIR}"/${PN}-3.15.4-CVE-2016-5684-1.patch
-	"${FILESDIR}"/${PN}-3.15.4-CVE-2016-5684-2.patch
-	"${FILESDIR}"/${PN}-3.15.4-CVE-2015-0852.patch
-	"${FILESDIR}"/${PN}-3.15.4-libjpeg9.patch
-)
-
-src_prepare() {
-	pushd Source >/dev/null || die
-	if has_version ">=media-libs/libjpeg-turbo-1.2.1"; then
-		# Patch from Christian Heimes's fork (thanks)
-		# https://bitbucket.org/tiran/freeimageturbo
-		eapply "${FILESDIR}"/${PN}-3.15.4-libjpeg-turbo.patch
-		cp LibJPEG/{jpegcomp.h,jpegint.h} . || die
-	fi
-	cp LibJPEG/{transupp.c,transupp.h,jinclude.h} . || die
-	cp LibTIFF4/{tiffiop,tif_dir}.h . || die
-	rm -rf LibPNG LibMNG LibOpenJPEG ZLib OpenEXR LibRawLite LibTIFF4 LibJPEG || die
-	popd >/dev/null || die
-
-	edos2unix Makefile.{gnu,fip,srcs} fipMakefile.srcs */*.h */*/*.cpp
-	sed -i \
-		-e "s:/./:/:g" \
-		-e "s: ./: :g" \
-		-e 's: Source: \\\n\tSource:g' \
-		-e 's: Wrapper: \\\n\tWrapper:g' \
-		-e 's: Examples: \\\n\tExamples:g' \
-		-e 's: TestAPI: \\\n\tTestAPI:g' \
-		-e 's: -ISource: \\\n\t-ISource:g' \
-		-e 's: -IWrapper: \\\n\t-IWrapper:g' \
-		Makefile.srcs fipMakefile.srcs || die
-	sed -i \
-		-e "/LibJPEG/d" \
-		-e "/LibPNG/d" \
-		-e "/LibTIFF/d" \
-		-e "/Source\/ZLib/d" \
-		-e "/LibOpenJPEG/d" \
-		-e "/OpenEXR/d" \
-		-e "/LibRawLite/d" \
-		-e "/LibMNG/d" \
-		Makefile.srcs fipMakefile.srcs || die
-
-	default
-}
-
-foreach_make() {
-	local m
-	for m in Makefile.{gnu,fip} ; do
-		emake -f ${m} \
-			USE_EXR=$(usex openexr) \
-			USE_JPEG=$(usex jpeg) \
-			USE_JPEG2K=$(usex jpeg2k) \
-			USE_MNG=$(usex mng) \
-			USE_PNG=$(usex png) \
-			USE_TIFF=$(usex tiff) \
-			USE_RAW=$(usex raw) \
-			$(usex static-libs '' STATICLIB=) \
-			"$@"
-	done
-}
-
-src_compile() {
-	tc-export AR PKG_CONFIG
-	foreach_make \
-		CXX="$(tc-getCXX) -fPIC" \
-		CC="$(tc-getCC) -fPIC" \
-		${MY_PN}
-}
-
-src_install() {
-	foreach_make install DESTDIR="${ED}" INSTALLDIR="${ED%/}"/usr/$(get_libdir)
-	einstalldocs
-}
diff --git a/media-libs/freeimage/freeimage-3.18.0-r1.ebuild b/media-libs/freeimage/freeimage-3.18.0-r1.ebuild
index fa58c6fc2f75..60e82af73945 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r1.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
 
 LICENSE="|| ( GPL-2 FIPL-1.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
 
 # The tiff/ilmbase isn't a typo.  The TIFF plugin cheats and
diff --git a/media-libs/freeverb3/Manifest b/media-libs/freeverb3/Manifest
index d127e3ad1ebf..8adfc5f07800 100644
--- a/media-libs/freeverb3/Manifest
+++ b/media-libs/freeverb3/Manifest
@@ -1,5 +1,3 @@
-DIST freeverb3-3.1.2.tar.xz 6015544 BLAKE2B 7589e7aeb04f2253124c94036b53cb86151ffb9f53ae1caefd932ac4ea2c75063a3697101c481e89b7a978044eb02849541b11a7064ede2aec1cd92beba54ad6 SHA512 d3c0b64f14e98f3641b593f3902017fcb457d7a920082bc31e4fc70aaaa11e9172ecabe56bd93c1722b4860239e5ac127c11da6ced6f708def440018451d86bd
 DIST freeverb3-3.2.1.tar.xz 6031592 BLAKE2B 8fbabde0e1c359048f4dc2595729ba93323c1f41176aedfaef406b10c570fc15913a63383f5dd054163efc1f2924958871a8e23d5d7edd0d5e07d52553bc7e38 SHA512 7cab3b2389c8d0a60d0c5f809b214677221204727a74a2b8622455b579aa8fcbd6952da3a343d0ff4bd06a386bbaed0371ddac99bb8ee85862b62435eaeba21b
-EBUILD freeverb3-3.1.2-r1.ebuild 1813 BLAKE2B 0e2ec279432bcd93970f08593c3bf05f053b511c91b1b38cc927bd91beef751b3dade3ced654098b6e075501e89607819ea55a48b49286ff9e1f1acd18d0e267 SHA512 548450eec1904a8c306deba338890c4fe57ddb7c97549fb6c88d1b6754b3cda4d0139e3cea50d1c98501077d2cdd484193f2e43b97fd1ae78dd645cf9c873f5d
 EBUILD freeverb3-3.2.1-r1.ebuild 1326 BLAKE2B 01a2794cd05d4d316f8fbe2cc1b2eaaea27152437fd93f8f7cb684ad47dd804d90560e1fbefd47c0a6a85a649184e7a03112ed412dd27fdefe3c74e77326df07 SHA512 ee8b5ff70d1e9372da1303cbc2e9b5c7d26a1a6b2b7a67bcf933d20f3c0ed9de10c4f0f9dcd2249fc8cdebd3e222ac25ce3b85fe41b3b46a1ce8353615aed82e
 MISC metadata.xml 659 BLAKE2B a7f87a8f8a936d3b366baa087d928641b6690029a039526b4d10bb66ae65d1017d476ea278482853444e613844ab1a16030a7816fe120ecc26c5ee34f8ecd181 SHA512 160cb0784d386e3afe894c5552de7991ceacf332c78e47ebf4b33f02e8f36c3eb05b355f2156cea4b7146a0f13551c1341e5aed0e47ceee39f43c63885e4cece
diff --git a/media-libs/freeverb3/freeverb3-3.1.2-r1.ebuild b/media-libs/freeverb3/freeverb3-3.1.2-r1.ebuild
deleted file mode 100644
index 7b94b1aaa39e..000000000000
--- a/media-libs/freeverb3/freeverb3-3.1.2-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Reverb and Impulse Response Convolution plug-ins (Audacious/JACK)"
-HOMEPAGE="https://savannah.nongnu.org/projects/freeverb3"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-_IUSE_INSTRUCTION_SETS="cpu_flags_x86_3dnow cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1"
-IUSE="${_IUSE_INSTRUCTION_SETS} audacious forcefpu jack openmp plugdouble threads"
-
-REQUIRED_USE="jack? ( audacious )"
-
-_GTK_DEPEND="
-	>=dev-libs/glib-2.4.7:2
-	x11-libs/cairo
-	x11-libs/gtk+:3
-	x11-libs/pango
-"
-RDEPEND="
-	sci-libs/fftw:3.0=
-	audacious? ( ${_GTK_DEPEND}
-		=media-sound/audacious-3.9*[gtk3(+)]
-		media-libs/libsndfile
-	)
-	jack? ( ${_GTK_DEPEND}
-		virtual/jack
-		media-libs/libsndfile
-	)
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local myeconfargs=(
-		--enable-release
-		--enable-undenormal
-		--disable-autocflags
-		--disable-fma
-		--disable-fma4
-		--disable-force3dnow
-		--disable-pluginit
-		--disable-profile
-		--disable-sample
-		--disable-srcnewcoeffs
-		$(use_enable audacious)
-		$(use_enable cpu_flags_x86_3dnow 3dnow)
-		$(use_enable cpu_flags_x86_avx avx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable cpu_flags_x86_sse3 sse3)
-		$(use_enable cpu_flags_x86_sse4_1 sse4)
-		$(use_enable forcefpu)
-		$(use_enable jack)
-		$(use_enable openmp omp)
-		$(use_enable plugdouble)
-		$(use_enable threads pthread)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	einstalldocs
-
-	if use audacious ; then
-		find "${D}/usr/$(get_libdir)/audacious/" -name '*.la' -print -delete || die
-	fi
-
-	insinto /usr/share/${PN}/samples/IR
-	doins samples/IR/*.wav
-}
diff --git a/media-libs/game-music-emu/Manifest b/media-libs/game-music-emu/Manifest
index 8b2fdc0718ab..39091de5a0e5 100644
--- a/media-libs/game-music-emu/Manifest
+++ b/media-libs/game-music-emu/Manifest
@@ -1,3 +1,3 @@
 DIST game-music-emu-0.6.2.tar.xz 163052 BLAKE2B 8bce2a5c09eef947f02cfc3521aa380564ddaad5f8a8f40ac38b645fc146332ba1cb6755592892dab00200c169a4d1f94978d80c52976c04e120d9d01c8db9dc SHA512 1808d28b54cbbd8dc5e3240eb27d2e546398fb62ab6577e59430a7543cfdaa06482f70b4750656b73a05f1c1bc0c0254db97d0940271ea2144724e1c44f5da10
-EBUILD game-music-emu-0.6.2.ebuild 464 BLAKE2B 952cafd317e24379a76940e5b950f5f88752cfe2516ea1a78e4a8f6691cdf2d5557a06d27d4dbf23d177eeba831dea81d3441fe67812b9c6a582a65b3799326a SHA512 7ab841a283eb26ada8bc6ed8a08f9d1f1b7b35b09d1b8c933c4cb640a1e506ebcf6f777c2b49224814863fdd9ef6bb184137a85638b79817de79b745e093a62d
+EBUILD game-music-emu-0.6.2.ebuild 464 BLAKE2B 8173d450f25c37fd28ed2c4e6727d969f053a8731e5de8ae3b1c5c317cfb00a3c15e8b92bab0c3d00e216b277ee4d866e9d354c688e0e7429f161e319a18cee0 SHA512 a2da2ce7c760ce927a73c59fc657e0f06eac4e94948200e7b57ad483cafb4851a5c10cc57f17df229af9202615c1e6d8209d0c1db4b7a5779536f5b263edc317
 MISC metadata.xml 400 BLAKE2B 1dd7cab3e13a3364222e52dc2e4c3dcbeb12e4169aaaa4196bc8ab325e42e04aa7b8aaa6fccb64db1de7ed6163d3060fdddb6df21c7243c4c0b3a7b7f28bd3ed SHA512 2abd1362876b6019d1538a6cd6a5740c29c1920037db3f3c622fb7c533a64b6d559ef8cdead9e2fdecc9c64c799fd1d2f8fc5887d493354604e4a99ed77cbf1d
diff --git a/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild b/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild
index 198e5fa76271..ebb023b80bfd 100644
--- a/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild
+++ b/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-multilib
 
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 64b7ae9c5123..b13390ddf40b 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -6,5 +6,5 @@ AUX gd-2.2.5-ossfuzz5700.patch 2680 BLAKE2B 55beecdf63e280ab54b83b214d704bccc83a
 DIST libgd-2.2.5-ossfuzz5700.dat 30 BLAKE2B 5ddd3d2be2adf05e1e2eb1852cc689be57d4d77c57b471e8b6021877f2fb137d15b4c73445fbb23a9ed585974a96dd154759a48712c1e7b5bdc5750d534aee4a SHA512 2394e92ff7a42c818e13a1ac9ad15bc81aa401adc917366ec8c440bb7f27a63777ab059aa03c501dafef0ac16b462dd23c7fb9f8086ce558203384a98a235fff
 DIST libgd-2.2.5-php_bug_75571.dat 1731 BLAKE2B 4b5d3f258b73e8089ede1b2c9f538855f410965a9e01e1f3f151ae52f072036172b184bd1a4d07b8355bb974bf088bebb0e812175a277bb67926274272bd80a0 SHA512 b3048640ce7828cca7901fadc989e867cfc6d31b44c0f5a1bda54d7428f317c8c8fc6403fef301e193869a95eb46eb7195d47710ec7f8c507ba049cb6cdcb281
 DIST libgd-2.2.5.tar.xz 2594092 BLAKE2B 222a7e012fbf9924ac391ee96c7cd3dec96afd78c6d43dfb680b33e7143e7df87fe6be75bbfe8fb93e916302d7daf08271214c84da28712e93a36465566cb2bd SHA512 e4598e17a277a75e02255402182cab139cb3f2cffcd68ec05cc10bbeaf6bc7aa39162c3445cd4a7efc1a26b72b9152bbedb187351e3ed099ea51767319997a6b
-EBUILD gd-2.2.5-r2.ebuild 3118 BLAKE2B d11daab50fc5a02bfdb61e50c90e2d2f1edeaa4d263771a157220ae9e6eabcc0842dbb4d201f6eae6f5feed128da5c9addb3d67596cfd6b4e033ac114d856acc SHA512 2d1c7687d4517f126eb151a103460c226a44d3d82eac0f0385e1faf14b7c1565b756b50482fbe9a504d0368fa09fe6af49a88fb4586012e98d65fd6475da62c2
+EBUILD gd-2.2.5-r2.ebuild 3145 BLAKE2B c4fadf658d8bba7de2b87223d6d59baaeae795edbb6c762887bc556bdb492a4799aff15fa167865f7bc61c75d78eeda60baf744b4d695b648093919d892b80c9 SHA512 c715a8c23b195ea881a17bd796095adee4da072aafc280c282e681eddc776626b89167a9dac569bc4bd7a4ac3063787d4be302e713177c8a1936fb9efc3f918c
 MISC metadata.xml 1507 BLAKE2B 34dbcbc70165ebe74ea14e6394e2691bda7523e4c848b13a512de8f0707c194a7da3de41a8fe483d7a8b2aa1af8f0d164ea210605ae76480dbf22b976b53d2f5 SHA512 0ac3c1ca25c190333e7f97dbb05e197e62e76abeaa045966fa3024dbeb22d541d78794df08d450e887591909a25dfb6a4fef861ed62f7f055b129e17b1329919
diff --git a/media-libs/gd/gd-2.2.5-r2.ebuild b/media-libs/gd/gd-2.2.5-r2.ebuild
index 69f41d061c59..d801cd9ce73f 100644
--- a/media-libs/gd/gd-2.2.5-r2.ebuild
+++ b/media-libs/gd/gd-2.2.5-r2.ebuild
@@ -17,6 +17,7 @@ LICENSE="gd IJG HPND BSD"
 SLOT="2/3"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_sse fontconfig jpeg png static-libs test tiff truetype webp xpm zlib"
+RESTRICT="!test? ( test )"
 
 # fontconfig has prefixed font paths, details see bug #518970
 REQUIRED_USE="prefix? ( fontconfig )"
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 3386cd669020..7cd7e7881384 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -22,10 +22,10 @@ DIST gegl-0.4.16.tar.bz2 7304904 BLAKE2B a3f6021ed7b9d8b784b909057fcdc39e73b6b8b
 DIST gegl-0.4.18.tar.xz 4812756 BLAKE2B b8e5902b62c3549f57dd0ce52a0a406974bf8664d5b85389b79f7d698bcf2643d19861add3d8a9bd5c99036aba4da97b70884dcaacf2cb89170b995f1d1497a0 SHA512 e79874cd50e9f0c27c7dc9d9b952545c31d0a48e2b158aa54b92c3e933267877222f86ede7256f2528f18985dc85d6eadbcd809f7a3563efc4449ec7634f15fd
 EBUILD gegl-0.2.0-r2.ebuild 4703 BLAKE2B e9dcbc55e332b3484435f1739b305f672f1af489c2b7bae9801529b765c8f12feabef63d64f828c059bc3510b792a6f5a2561c1517e79c6819860dfd7ec3a87d SHA512 443632d54bb065e465e9ff2b3b693cac33c49d4c6c9d14dbb4c45b1fade07adf79cac3841d1b63120912e6cc863e5f7eae9403c71bac3c973e4fca980fb1bbf9
 EBUILD gegl-0.2.0-r6.ebuild 4965 BLAKE2B 12066b7a2edc729653570a433bad8993d30dc24cd820ae24c6b3bc4f734f79a1206f29f3a1190883f094ed46c5516e6d976005cde91ff6050c90dcb90ede0216 SHA512 72bf6368f6e046a591956f65d249331d539902e6cba90c12e2f8939ec6910c869d1638f918820c68d92bbc8e0d1b7e72543a908cf4dbc6626cf78c7556f69285
-EBUILD gegl-0.3.0.ebuild 5228 BLAKE2B 04a228c189e9fdf2619cfc1467eae37ecd01ef35ad8c9a1a87c0e7a93a9e493c0aad4dbf2a7a8053bb47dbd6965f41c3ab032171c013ebca6405f543abcb0f12 SHA512 7cac050e006f38082e3093b3553774d70837ed632bfed6a5f2f1dd97297e8dc603256ec967e8fd898a0dfd0108ea23773e1f0d516c08f4b371b16b3a02cd427d
-EBUILD gegl-0.3.34.ebuild 5295 BLAKE2B f468df5f492a5cb4079ab021d10833a6d75ab97c28bb03a8091df0bb80f284171fe04476e522632264a795ae4f198d7a69d412eb378d25225b7f345a5bfd013b SHA512 376186430d951aced6ef210eee6f7ff7dc8f7f1fb7087083bb86ee6b12d46170df6293db136acfb3f696348b33e84c2657d0679f968b1dbca79291a232d6e1b0
-EBUILD gegl-0.4.14.ebuild 4963 BLAKE2B 155fd64e71878d62960a1beaf50b8e2b4fec41a8884b916319b498adc6393449d41f6a2fbff128e68eebcf688046bcca540c9e10382f805e8df536d28fa04244 SHA512 ed2796b93ef55352f51a8eace6ccb97e5352a203d6fa33d178307c0f215279d337efabd9aa2c0d41faa6757c5a0f34dda1f1907eced0712979413d03980b9de0
-EBUILD gegl-0.4.16.ebuild 4849 BLAKE2B 0ddc711066dc3430b2dfdd3f97edf9accca4feda969ed3534a9f5ce62e8470780f6cb488582b3d7c18edb9d3888df234ef0aeac218a5be08ed5d1182ca4aa1ba SHA512 2bec113e795760a92f09b481f5220fa3b2db96fb3239fb7d3b7db83e5f06319f9ffd9220d0ef509c5cf4fa77315e9600521a7beb63d069e27b0c6726f3aca967
-EBUILD gegl-0.4.18.ebuild 4428 BLAKE2B 6acdd9873395e682bc94b30743e7353400607aee79376781cb446f09860fecb81e54106ddd44677ac7ee815c33c913cb6d5d37fa80ed61b688ff1084585b358e SHA512 a103fe6457f6876b3e1e33c25596b5d199e598c97a0804e0d939b9852c22715d64a3468b8921d2263036ba5addcded48ca6e9be1fe3c0747d5680812bb972ca1
-EBUILD gegl-9999.ebuild 4377 BLAKE2B 340ec7416904d1273b193b5449ea97b1104121ae0f6c2b11d39f92bc77adfe231b06101307af8948925c952bbb6db67958b54f68dbf25d775019b09ce66e2608 SHA512 0bfed5bf968d6d7bd5b111a8fd7f51ee27a9c500a5fd49ec40242558fe0c98c42387c28f8259ea7b5bede089b08553e5f16e26bbb4ecb69feedaf46c2dc43173
-MISC metadata.xml 347 BLAKE2B 3cf9993960788f9caef109afbc99045affa49f771e4b5c1afc8d7f1ad438eaa3ffaf062e6c3056f8228ea4d745a807517875bc82ae13a8f2dc776f7bee01f465 SHA512 c893f262197b33a5ce7c4df6da4f0b761bae4a12082b1f263ed3878eadb388a4c785a1117033d52854a7bbcc102f505946f6e7bfb7449126634d8730ef7d61b2
+EBUILD gegl-0.3.0.ebuild 5255 BLAKE2B ba5de53a099d96b637bcbcfee75b7b387cb391101c9bee621fa54b60b6911f752e56b452f8019bf19c7ceb3ed08cf373f6bd9a68ac30e0282e57216781e6b514 SHA512 bf0f727d0e64493b267d69cc3021943bfcf25d0c61ab484377eee8631fa9110d9c8277c0520e9a8ea8d201e917bd678ca4140a4652f614869bc0a9219dd0b047
+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
+MISC metadata.xml 550 BLAKE2B 8afb3a5aa69ba6b3139f3183ed013cd0797edad0865b0aebcd2824a31549f4968e938017adb85506fea2e60c18ea1278fd3bce0ce1cf9be0efb74b1f0b020470 SHA512 8c5637454afcab249f671518153067a99cac9d60d8e9108688b4328a19ea653de21948a63c7e680585d208c0b3230fd2fb87c2d8a0a7266d31bc328342a47016
diff --git a/media-libs/gegl/gegl-0.3.0.ebuild b/media-libs/gegl/gegl-0.3.0.ebuild
index a35131dde0e1..02a01d4a9de5 100644
--- a/media-libs/gegl/gegl-0.3.0.ebuild
+++ b/media-libs/gegl/gegl-0.3.0.ebuild
@@ -27,6 +27,7 @@ LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0.3"
 
 IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg lcms lensfun libav openexr png raw sdl svg test umfpack vala v4l webp"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
 
 RDEPEND="
diff --git a/media-libs/gegl/gegl-0.3.34.ebuild b/media-libs/gegl/gegl-0.3.34.ebuild
index 730b532886d1..fead3e3c8ecf 100644
--- a/media-libs/gegl/gegl-0.3.34.ebuild
+++ b/media-libs/gegl/gegl-0.3.34.ebuild
@@ -25,6 +25,7 @@ LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0.3"
 
 IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	svg? ( cairo )
 	vala? ( introspection )
diff --git a/media-libs/gegl/gegl-0.4.14.ebuild b/media-libs/gegl/gegl-0.4.14.ebuild
index b46050046a84..2e18c9d64d78 100644
--- a/media-libs/gegl/gegl-0.4.14.ebuild
+++ b/media-libs/gegl/gegl-0.4.14.ebuild
@@ -25,6 +25,7 @@ LICENSE="|| ( GPL-3+ LGPL-3 )"
 SLOT="0.4"
 
 IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	svg? ( cairo )
 	vala? ( introspection )
diff --git a/media-libs/gegl/gegl-0.4.16.ebuild b/media-libs/gegl/gegl-0.4.16.ebuild
index c76de89fa31b..6db995f70e12 100644
--- a/media-libs/gegl/gegl-0.4.16.ebuild
+++ b/media-libs/gegl/gegl-0.4.16.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
@@ -25,6 +25,7 @@ LICENSE="|| ( GPL-3+ LGPL-3 )"
 SLOT="0.4"
 
 IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	svg? ( cairo )
 	vala? ( introspection )
diff --git a/media-libs/gegl/gegl-0.4.18.ebuild b/media-libs/gegl/gegl-0.4.18.ebuild
index 96f2051b491a..0faafc6c7f59 100644
--- a/media-libs/gegl/gegl-0.4.18.ebuild
+++ b/media-libs/gegl/gegl-0.4.18.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
@@ -27,9 +27,12 @@ SLOT="0.4"
 IUSE="cairo debug ffmpeg introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
 REQUIRED_USE="
 	svg? ( cairo )
+	test? ( introspection )
 	vala? ( introspection )
 "
 
+RESTRICT="!test? ( test )"
+
 # NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
 #       so there is no chance to support libav right now (Gentoo bug #567638)
 #       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
@@ -39,6 +42,7 @@ RDEPEND="
 	>=media-libs/babl-0.1.72[introspection?]
 	media-libs/libnsgif
 	>=media-libs/libpng-1.6.0:0=
+	>=sys-libs/zlib-1.2.0
 	virtual/jpeg:0=
 	>=x11-libs/gdk-pixbuf-2.32:2
 	>=x11-libs/pango-1.38.0
@@ -59,19 +63,19 @@ RDEPEND="
 	umfpack? ( sci-libs/umfpack )
 	v4l? ( >=media-libs/libv4l-1.0.1 )
 	webp? ( >=media-libs/libwebp-0.5.0:= )
-	>=sys-libs/zlib-1.2.0
 "
-DEPEND="${RDEPEND}
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND="
 	dev-lang/perl
 	>=dev-util/gtk-doc-am-1
 	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
 	>=sys-devel/libtool-2.2
-	test? ( ffmpeg? ( media-libs/gexiv2 )
-		introspection? (
-			$(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]')
-		)
-	)
+	virtual/pkgconfig
+	test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') )
 	vala? ( $(vala_depend) )
 "
 
@@ -83,8 +87,12 @@ PATCHES=(
 	"${FILESDIR}"/${P}-meson_cpu_detection.patch
 )
 
+python_check_deps() {
+	has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
+}
+
 pkg_setup() {
-	use test && use introspection && python-any-r1_pkg_setup
+	use test && python-any-r1_pkg_setup
 }
 
 src_prepare() {
@@ -100,6 +108,12 @@ src_prepare() {
 		-e '/composite-transform.xml/d' \
 		-i tests/compositions/meson.build || die
 
+	# fix skipping mipmap tests due to executable not found
+	for item in "invert-crop.sh" "invert.sh" "rotate-crop.sh" "rotate.sh" "unsharp-crop.sh" "unsharp.sh"; do
+		sed -i "s:/bin/gegl:/bin/gegl-0.4:g" "${S}/tests/mipmap/${item}" || die
+		sed -i "s:/tools/gegl-imgcmp:/tools/gegl-imgcmp-0.4:g" "${S}/tests/mipmap/${item}" || die
+	done
+
 	gnome2_environment_reset
 
 	use vala && vala_src_prepare
@@ -107,13 +121,9 @@ src_prepare() {
 
 src_configure() {
 	local emesonargs=(
-		# disable documentation as the generating is bit automagic
+		#  - Disable documentation as the generating is bit automagic
 		#    if anyone wants to work on it just create bug with patch
 		-Ddocs=false
-		#  - Parameter -Dworkshop=false disables any use of Lua, effectivly
-		-Dworkshop=false
-		$(meson_use introspection)
-
 		-Dexiv2=disabled
 		-Dgdk-pixbuf=enabled
 		-Dgexiv2=disabled
@@ -121,32 +131,35 @@ src_configure() {
 		#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
 		-Dgraphviz=disabled
 		-Djasper=disabled
-		$(meson_feature lcms)
-		$(meson_feature lensfun)
-		$(meson_feature ffmpeg libav)
 		-Dlibjpeg=enabled
 		-Dlibpng=enabled
-		$(meson_feature raw libraw)
-		$(meson_feature svg librsvg)
-		# libspiro: not in portage main tree
+		#  - libspiro: not in portage main tree
 		-Dlibspiro=disabled
-		$(meson_feature tiff libtiff)
-		#  - v4l support does not work with our media-libs/libv4l-0.8.9,
-		#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
-		$(meson_feature v4l libv4l)
-		$(meson_feature v4l libv4l2)
 		-Dlua=disabled
 		-Dmrg=disabled
-		$(meson_feature openexr)
-		$(meson_feature cairo)
 		-Dpango=enabled
+		-Dsdl2=disabled
+		#  - Parameter -Dworkshop=false disables any use of Lua, effectivly
+		-Dworkshop=false
+		$(meson_feature cairo)
 		$(meson_feature cairo pangocairo)
-		$(meson_feature introspection pygobject)
+		$(meson_feature ffmpeg libav)
+		$(meson_feature lcms)
+		$(meson_feature lensfun)
+		$(meson_feature openexr)
+		$(meson_feature raw libraw)
 		$(meson_feature sdl sdl1)
-		-Dsdl2=disabled
+		$(meson_feature svg librsvg)
+		$(meson_feature test pygobject)
+		$(meson_feature tiff libtiff)
 		$(meson_feature umfpack)
+		#  - v4l support does not work with our media-libs/libv4l-0.8.9,
+		#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
+		$(meson_feature v4l libv4l)
+		$(meson_feature v4l libv4l2)
 		$(meson_feature vala vapigen)
 		$(meson_feature webp)
+		$(meson_use introspection)
 	)
 	meson_src_configure
 }
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index 015343c90de2..3651bef83e5b 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
@@ -27,9 +27,12 @@ SLOT="0.4"
 IUSE="cairo debug ffmpeg introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
 REQUIRED_USE="
 	svg? ( cairo )
+	test? ( introspection )
 	vala? ( introspection )
 "
 
+RESTRICT="!test? ( test )"
+
 # NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
 #       so there is no chance to support libav right now (Gentoo bug #567638)
 #       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
@@ -39,6 +42,7 @@ RDEPEND="
 	>=media-libs/babl-0.1.72[introspection?]
 	media-libs/libnsgif
 	>=media-libs/libpng-1.6.0:0=
+	>=sys-libs/zlib-1.2.0
 	virtual/jpeg:0=
 	>=x11-libs/gdk-pixbuf-2.32:2
 	>=x11-libs/pango-1.38.0
@@ -59,19 +63,19 @@ RDEPEND="
 	umfpack? ( sci-libs/umfpack )
 	v4l? ( >=media-libs/libv4l-1.0.1 )
 	webp? ( >=media-libs/libwebp-0.5.0:= )
-	>=sys-libs/zlib-1.2.0
 "
-DEPEND="${RDEPEND}
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND="
 	dev-lang/perl
 	>=dev-util/gtk-doc-am-1
 	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
 	>=sys-devel/libtool-2.2
-	test? ( ffmpeg? ( media-libs/gexiv2 )
-		introspection? (
-			$(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]')
-		)
-	)
+	virtual/pkgconfig
+	test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') )
 	vala? ( $(vala_depend) )
 "
 
@@ -82,8 +86,12 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.4.18-program-suffix.patch
 )
 
+python_check_deps() {
+	has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
+}
+
 pkg_setup() {
-	use test && use introspection && python-any-r1_pkg_setup
+	use test && python-any-r1_pkg_setup
 }
 
 src_prepare() {
@@ -106,13 +114,9 @@ src_prepare() {
 
 src_configure() {
 	local emesonargs=(
-		# disable documentation as the generating is bit automagic
+		#  - Disable documentation as the generating is bit automagic
 		#    if anyone wants to work on it just create bug with patch
 		-Ddocs=false
-		#  - Parameter -Dworkshop=false disables any use of Lua, effectivly
-		-Dworkshop=false
-		$(meson_use introspection)
-
 		-Dexiv2=disabled
 		-Dgdk-pixbuf=enabled
 		-Dgexiv2=disabled
@@ -120,32 +124,35 @@ src_configure() {
 		#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
 		-Dgraphviz=disabled
 		-Djasper=disabled
-		$(meson_feature lcms)
-		$(meson_feature lensfun)
-		$(meson_feature ffmpeg libav)
 		-Dlibjpeg=enabled
 		-Dlibpng=enabled
-		$(meson_feature raw libraw)
-		$(meson_feature svg librsvg)
-		# libspiro: not in portage main tree
+		#  - libspiro: not in portage main tree
 		-Dlibspiro=disabled
-		$(meson_feature tiff libtiff)
-		#  - v4l support does not work with our media-libs/libv4l-0.8.9,
-		#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
-		$(meson_feature v4l libv4l)
-		$(meson_feature v4l libv4l2)
 		-Dlua=disabled
 		-Dmrg=disabled
-		$(meson_feature openexr)
-		$(meson_feature cairo)
 		-Dpango=enabled
+		-Dsdl2=disabled
+		#  - Parameter -Dworkshop=false disables any use of Lua, effectivly
+		-Dworkshop=false
+		$(meson_feature cairo)
 		$(meson_feature cairo pangocairo)
-		$(meson_feature introspection pygobject)
+		$(meson_feature ffmpeg libav)
+		$(meson_feature lcms)
+		$(meson_feature lensfun)
+		$(meson_feature openexr)
+		$(meson_feature raw libraw)
 		$(meson_feature sdl sdl1)
-		-Dsdl2=disabled
+		$(meson_feature svg librsvg)
+		$(meson_feature test pygobject)
+		$(meson_feature tiff libtiff)
 		$(meson_feature umfpack)
+		#  - v4l support does not work with our media-libs/libv4l-0.8.9,
+		#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
+		$(meson_feature v4l libv4l)
+		$(meson_feature v4l libv4l2)
 		$(meson_feature vala vapigen)
 		$(meson_feature webp)
+		$(meson_use introspection)
 	)
 	meson_src_configure
 }
diff --git a/media-libs/gegl/metadata.xml b/media-libs/gegl/metadata.xml
index edfb95da5b0c..3aa9cb9ab8d7 100644
--- a/media-libs/gegl/metadata.xml
+++ b/media-libs/gegl/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>torokhov-s-a@yandex.ru</email>
+		<name>Sergey Torokhov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="lensfun">Enable support for <pkg>media-libs/lensfun</pkg>.</flag>
 		<flag name="umfpack">Enable sparse solving via <pkg>sci-libs/umfpack</pkg>.</flag>
diff --git a/media-libs/giblib/Manifest b/media-libs/giblib/Manifest
index 1e394b7f8c45..071a669a682c 100644
--- a/media-libs/giblib/Manifest
+++ b/media-libs/giblib/Manifest
@@ -1,3 +1,4 @@
+AUX giblib-1.2.4-fix-build-system.patch 792 BLAKE2B 4e59d03acceb1ff6ea013660e2c6ce1435c47bfcd040800de7deda37346ec7b5687d4b7809222b2331c6b9f52e54c53524d30ca03fe4096b0134fcd5e1a11a7d SHA512 8dc2de904f9c0082b5be16d21d366e84f6912cf891e80b8c32681e4f589c911775fb5227f0ef3d4790920512b279b02b451f3afcbbada329d004c2eac494fe8f
 DIST giblib-1.2.4.tar.gz 287653 BLAKE2B 0b936fe3b56b933a5038751428ec56a872911d3c4ae972e9670cb1ce2496de6a8e21cb4718e7bab4eb1d547eb67ca71b25d77405ff04ebcb1ca0dc03fafea7ef SHA512 4866df223e6d219a5c9a327874bcd67260c83fba8f99862222df41ef86fb31efa0172a777bf46c853ca380dc2a64bbd41bf4fd658fcb84a924cab4e0f525dcfd
-EBUILD giblib-1.2.4-r1.ebuild 877 BLAKE2B ecad038c51683f25ffeac4a9937425ee23b2aaf8200fb60525864465b71d18d9bf14f69bf2cacfb0d650ca6b66cc239ae61996c8a02568a28540777bcd9fc424 SHA512 53c6002d53293fe19f0532f591109b004f56f028ead71bf2ce011be3725c5ebc286b42173613edb66ca070dcdb9c0f37193b21438307bb21b1a96a88381d5682
+EBUILD giblib-1.2.4-r1.ebuild 804 BLAKE2B 60f195dca2cbbde502f49e7bad05b8cdc8e425cb171a9b329af85bc75d3112dfebcf1824132c867c0f2b27c3847f19c388fa9e190f72d8c59843dfba920d23d9 SHA512 4712fc6ee61d53b33b57ed0cf4b6aa35f43b40f63bd2fc7424853003649d5f29054808bd520e5445bddb44ab5c23e422ef54affed25b9058c37e3e4229c3e723
 MISC metadata.xml 750 BLAKE2B d02c2f96076c9be5a95d8701e935ed802f3b8759d2c1cc220e6235e6a310773a05dcd5e77398ee3f32f7a55822c407c5d18c3cb79b674ba5124043934b04539b SHA512 4827fa23f4b181c3e0a76eb422bd05b1504f6982edd7b8de4ac0464043b9cb8339939629162ec0f2ca1a663940e3a52f8c95ca890ad1eb9aed6d9df4c6580c34
diff --git a/media-libs/giblib/files/giblib-1.2.4-fix-build-system.patch b/media-libs/giblib/files/giblib-1.2.4-fix-build-system.patch
new file mode 100644
index 000000000000..f1c37fbadaed
--- /dev/null
+++ b/media-libs/giblib/files/giblib-1.2.4-fix-build-system.patch
@@ -0,0 +1,33 @@
+--- a/giblib-config.in
++++ b/giblib-config.in
+@@ -46,7 +46,7 @@
+       ;;
+     --libs)
+       libdirs=-L@libdir@
+-      echo $libdirs -lgiblib @LDFLAGS@ @IMLIB_LIBS@
++      echo $libdirs -lgiblib @IMLIB_LIBS@
+       ;;
+     *)
+       echo "${usage}" 1>&2
+--- a/giblib.pc.in
++++ b/giblib.pc.in
+@@ -6,6 +6,6 @@
+ Name: giblib
+ Description: wrapper library for imlib2, and other stuff
+ Version: @VERSION@
+-Libs: -L${libdir} -lgiblib @LDFLAGS@ @IMLIB_LIBS@
++Libs: -L${libdir} -lgiblib @IMLIB_LIBS@
+ Cflags: -I${includedir} -I${includedir}/giblib @IMLIB_CFLAGS@
+ 
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,8 +2,7 @@
+ 
+ SUBDIRS = giblib
+ 
+-docs_DATA = README AUTHORS ChangeLog TODO
+-docsdir = $(prefix)/doc/giblib
++doc_DATA = README AUTHORS ChangeLog TODO
+ 
+ EXTRA_DIST= $(docs_DATA) giblib.pc.in
+ 
diff --git a/media-libs/giblib/giblib-1.2.4-r1.ebuild b/media-libs/giblib/giblib-1.2.4-r1.ebuild
index 8c542462cf43..8eb73843f2be 100644
--- a/media-libs/giblib/giblib-1.2.4-r1.ebuild
+++ b/media-libs/giblib/giblib-1.2.4-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
-inherit epunt-cxx libtool
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="a graphics library built on top of imlib2"
 HOMEPAGE="http://freecode.com/projects/giblib http://www.linuxbrit.co.uk/giblib/"
@@ -11,21 +12,29 @@ SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
 LICENSE="feh"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~sh sparc x86"
-IUSE="static-libs"
 
-RDEPEND=">=media-libs/imlib2-1.0.3[X]
+RDEPEND="
+	media-libs/freetype
+	media-libs/imlib2:=[X]
 	x11-libs/libX11
-	x11-libs/libXext
-	>=media-libs/freetype-2.0"
+	x11-libs/libXext"
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${PN}-1.2.4-fix-build-system.patch )
+
 src_prepare() {
-	sed -i 's:@LDFLAGS@::' giblib-config.in giblib.pc.in || die #430724
-	sed -i "/^docsdir/s:=.*:= @datadir@/doc/${PF}:" Makefile.in || die
-	epunt_cxx
-	elibtoolize # otherwise it doesnt install the .so -> .so.x symlink on fbsd
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
 }
 
 src_configure() {
-	econf $(use_enable static-libs static)
+	econf --disable-static
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 34393ae675b9..77d4844ba35d 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -1,15 +1,10 @@
-AUX gmmlib-19.1.2_so_patch_version.patch 371 BLAKE2B 2a11045d40729e3d5c931a79638b5cefcac9c4f365ac2dea3b38a749a6928f977bb6201db4f0e2a429997cadb36991b241afe636dcf34f58d8045f13d82e8727 SHA512 9b5cf0b90df9b43e22c203e3812689b192af73cd6580976a82744497ff6f3386d8c0782e83b9736ad698a5955b7af61859016794791b13b4152f7c0bcef09169
-DIST intel-gmmlib-18.3.0.tar.gz 620491 BLAKE2B 555a733b42b8e4c40170db9ecabc25bb04779c3aba38b9141f021df1dbe83d74e385a3437d4a87577d9e5ff4df21ce618393909cd98fce4a59ec19aeff4eb44d SHA512 358598873556822be6748a282cd1447ca3e0bcaeb11c2bb8862414bac2ab8e57deee9581fa14bfe22d33d712e567db936332b7fe715dae9816b31121af934dec
-DIST intel-gmmlib-18.4.1.tar.gz 621793 BLAKE2B 41d6f93ec68cf29b8bc2d01c103c69dd4f732ce1aaf72cc959f993af73df9b355f0c4c7c97af4102cc1996e7732597dac4fe0abaf359806e2accbee1bf852d90 SHA512 8dcb5892cfc98822e8173d0a71dfb4883e1ef838de8c936a9b36fb05d61137b7c7d7edf941d3ebd532a1126d8d8b978b95843afb3514ba8cbf3eec54f05c8b8b
-DIST intel-gmmlib-19.1.2.tar.gz 632661 BLAKE2B 4a9995a9e4c8b5c8e081d757193212180fbae3a88040da24be4225149c4c0924b56d5969e125a0c21a5af7b2b3d249277d7e27cb3ce13135c69bb977a976879d SHA512 fcc0beedfc3716b6204627f7daa5e0a5aec720b2a29ab2f8262b613a11d31bfe14dc8476513515d8470cf7d66f58d109ed4d5cf203e041228f53a64cb4a6c243
 DIST intel-gmmlib-19.2.1.tar.gz 633194 BLAKE2B fe6105bd76d18f3c4e0d42550fa91a1cfa75413b7289d4cfd89c6edbd9c2104f11dbb9c549f3331259d3629eba5f3698f8289da5f551f55f9a76cb704680e9fb SHA512 686b47d9de54f96ff1b4b75e595175a08e5a619d1b3f3e71388d851263dcb12315be7834721c88c698d4dbf6f68845d7850ce7a238f4e639ca0896de724c408d
 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
-EBUILD gmmlib-18.3.0.ebuild 807 BLAKE2B 7a58c4ee12ab5d2d970742cf8199f71be6e66a44231b58c3ef618a94c0e07b04e27f0767c02545e5f50d667895c7841cfd97425419d0749c493c15807ed03f59 SHA512 9dbbf041162c336914f0877ad0adc74b91ab695eb9886b46e5efdb4a9635e5f77295d3fec65558993d271e70999ea6144430a3ed9f04a000f62e9ca8c4bc3ca8
-EBUILD gmmlib-18.4.1.ebuild 807 BLAKE2B 2800dcb9e11d3b6958c095a31f53c38e4b1633b36e727d0924c6842b862f307ed198ad0b2b23525f973de5720695fabbebe2f94be1ea4d997e56cfb92faec69c SHA512 9777b3431af111fe2ec7cd211bb29bbc242e5b1b07e2eb9ac2b82722c04f59d48a70f5df2bab5c1d3653d96774cd1336dd7b0d98c9f5b1d9e922f2dec49b046a
-EBUILD gmmlib-19.1.2.ebuild 883 BLAKE2B 5ef30d7f29660cebbb9d6e0d0146714c737108e4ec05c01819858d2ac6daaa3a5e0999daf0a20b648228da1aa54ce7cd8b458cad45ec00d0c8409b4ab7fafabc SHA512 cea321160c7b2b74d4b04e12ddcf86295dd680c3f77d4f4b40090a53f6444e6a81b43478059303f54d5cfad1f971acf4c1166777610141b3a86af9178eb279ed
+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
 MISC metadata.xml 322 BLAKE2B 802cb8da9b68866ac616c175586bc3651330ecbfb1b08fe3fad52ec8817e1994f347ae49815869d50296504d9607fcf6c41d40543d8896fafd8d36c4421604f6 SHA512 52324c98984d04659d8ee327850152e41b6146f45a35b147a1fba2043be7ca91e220dd57fc3712e5154b416d04f8a1b0f614259cd9fde8c66ad7734853bb50ec
diff --git a/media-libs/gmmlib/files/gmmlib-19.1.2_so_patch_version.patch b/media-libs/gmmlib/files/gmmlib-19.1.2_so_patch_version.patch
deleted file mode 100644
index 1fd45de157f2..000000000000
--- a/media-libs/gmmlib/files/gmmlib-19.1.2_so_patch_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Source/GmmLib/CMakeLists.txt
-+++ b/Source/GmmLib/CMakeLists.txt
-@@ -40,7 +40,7 @@
- endif()
- 
- if(NOT DEFINED GMMLIB_API_PATCH_VERSION)
--    set(GMMLIB_API_PATCH_VERSION PATCH_VERSION)
-+    set(GMMLIB_API_PATCH_VERSION "${PATCH_VERSION}")
- endif()
- 
- message(STATUS "API version: ${GMMLIB_API_MAJOR_VERSION}.${GMMLIB_API_MINOR_VERSION}.${GMMLIB_API_PATCH_VERSION}")
diff --git a/media-libs/gmmlib/gmmlib-18.3.0.ebuild b/media-libs/gmmlib/gmmlib-18.3.0.ebuild
deleted file mode 100644
index f0dd8d2cd690..000000000000
--- a/media-libs/gmmlib/gmmlib-18.3.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Intel Graphics Memory Management Library"
-HOMEPAGE="https://github.com/intel/gmmlib"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
-	S="${WORKDIR}/${PN}-intel-${P}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_configure() {
-# once upstream makes this optional
-#	local mycmakeargs=(
-#		-DMEDIA_RUN_TEST_SUITE=OFF
-#	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/gmmlib/gmmlib-19.1.2.ebuild b/media-libs/gmmlib/gmmlib-19.1.2.ebuild
deleted file mode 100644
index dd16c51e2ef0..000000000000
--- a/media-libs/gmmlib/gmmlib-19.1.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Intel Graphics Memory Management Library"
-HOMEPAGE="https://github.com/intel/gmmlib"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
-	S="${WORKDIR}/${PN}-intel-${P}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-19.1.2_so_patch_version.patch
-)
-
-multilib_src_configure() {
-# once upstream makes this optional
-#	local mycmakeargs=(
-#		-DMEDIA_RUN_TEST_SUITE=OFF
-#	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/gmmlib/gmmlib-18.4.1.ebuild b/media-libs/gmmlib/gmmlib-19.3.4.ebuild
index 93070e071d29..aee2550263c0 100644
--- a/media-libs/gmmlib/gmmlib-18.4.1.ebuild
+++ b/media-libs/gmmlib/gmmlib-19.3.4.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 cmake-utils
+inherit cmake-multilib
 
 if [[ ${PV} == *9999 ]] ; then
 	: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
@@ -31,7 +31,7 @@ IUSE=""
 DEPEND=""
 RDEPEND="${DEPEND}"
 
-src_configure() {
+multilib_src_configure() {
 # once upstream makes this optional
 #	local mycmakeargs=(
 #		-DMEDIA_RUN_TEST_SUITE=OFF
diff --git a/media-libs/gnonlin/Manifest b/media-libs/gnonlin/Manifest
index dee49458fd0b..10cb0d2925ce 100644
--- a/media-libs/gnonlin/Manifest
+++ b/media-libs/gnonlin/Manifest
@@ -1,3 +1,3 @@
 DIST gnonlin-1.4.0.tar.xz 404096 BLAKE2B 858f6813470893dfdd9c92d8ea84d11c511e92033588e9de2e849806727b80b9be84f0fa08265f5cd98bd701108c18f3f4fc423cc74aa4426cd2e221222a1443 SHA512 22734a8cbc648811467a3a161fdf86997fff682007b57849b253618663d30996a787734df8caff56f0b4b24e98f8cbd073d4c48557b8d09091ab27b72851b055
-EBUILD gnonlin-1.4.0-r1.ebuild 763 BLAKE2B 56ccbb60d13d9920db600a1c35f869edd019caa84d024714aed1cc32ee7c1290b77f095c22a1fb2cb6396accce64a375f76de3bd2ec819bc86eccb172e20ff57 SHA512 8cbe7f8fac539be428c45f684ccdfc0e2e239339c1f354248e9cc5660549ccf47a3aefc836d5146e085389a94fcf0f6d3d1e929bb17ad9590bcfd736e8daaca2
+EBUILD gnonlin-1.4.0-r1.ebuild 787 BLAKE2B 30cf8fedfbc7a06549586789eb2e4758aa2e406b59a0f1fb0e8acf33638b6b950ad5ed0faf81550cff2c12f767782752c41a0bc437c3e4de1c40c477d855addc SHA512 d13dc0e86dc98479254ed03e40ab239b08bfaf62760b481ce15a86c8ad3b58d854b3fc7f10950ef3a6f890331d52cf3b9b173084e9b8b07e7e9749cd45ef0069
 MISC metadata.xml 343 BLAKE2B e7a78ebbf9982f46574fcfb05d245d073282259fa06d1cf7465c85809adf83aaac6d2a55dd6192afd421e0aed99c0cd02146b86757eb4af5a86033e3aff26d86 SHA512 3cd3d7c9e7c36388ef6b35b3510bcb828975500f4f7aeb113d104b47b644e5c2b902acda6d391ccd51e5452c63a1079a593943455c6f25ae88d1ee240583d5fd
diff --git a/media-libs/gnonlin/gnonlin-1.4.0-r1.ebuild b/media-libs/gnonlin/gnonlin-1.4.0-r1.ebuild
index 2215a4832a52..0b4743a7ada9 100644
--- a/media-libs/gnonlin/gnonlin-1.4.0-r1.ebuild
+++ b/media-libs/gnonlin/gnonlin-1.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,7 @@ LICENSE="LGPL-2"
 SLOT="1.0"
 KEYWORDS="amd64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/glib-2.32:2
diff --git a/media-libs/graphene/Manifest b/media-libs/graphene/Manifest
index abd4fe5c9f51..a53606e56100 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 1814 BLAKE2B f9451e89ebcf359fced81fa8b154e4ca05e29e4384c8d9fd239f026f528d1bdd82d26afb806b7f747b2caad323bafdeb6c5e7f53c40c9569031c39ef5447049b SHA512 9f8c5876827539706ae2553b5f8a3e11eecbb6b3e021fc0ddb502fe00960ad323d226ee2d45832e5a956bb2f610a228e542dd8e112d09fbddc41bd5f685c4f1f
+EBUILD graphene-1.8.6.ebuild 1840 BLAKE2B 365d94651dfd3fcada9752eaea005b608e5b2c4396904baf055882bc2ce2580d9d0b88c1117c5d16d85bbca50d30916d5fdcad81b85a09919f63fbab96c4b4ae SHA512 638b87762911c7390731806116aa3b027c766368a06e964810a3d94fc45ffa6c987e443e62268d41092c26f78022399e7128256aa737308f87872b9ef38e4aec
 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 beadf7de4f46..4e09ce2ddb97 100644
--- a/media-libs/graphene/graphene-1.8.6.ebuild
+++ b/media-libs/graphene/graphene-1.8.6.ebuild
@@ -11,8 +11,9 @@ SRC_URI="https://github.com/ebassi/graphene/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/glib-2.30.0:2[${MULTILIB_USEDEP}]
diff --git a/media-libs/grilo/Manifest b/media-libs/grilo/Manifest
index 1a4488ad1954..d45a2e99c8d2 100644
--- a/media-libs/grilo/Manifest
+++ b/media-libs/grilo/Manifest
@@ -1,5 +1,5 @@
 DIST grilo-0.3.7.tar.xz 232544 BLAKE2B 2d1f7942b09808bb5e09040b4a633a6bd354220ba1369d31ff6160c12ab15c1e2642617ae7f35c8320d7a5842736d8714c6e7dc7f3cb0651d841b6513633f5c9 SHA512 82c41d63edc23c056e189a73b0de87db342bba575d42efeda78ed4bf78fb8994111a2e9457e6f2453045b9b7b2d171b9e89d71c3a107cfa06af24644d9cb71df
 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 2193 BLAKE2B 26b2d5b383080e9068ffff02008fd4df78a2a960abd8fdc63006cd6e3ab01c2942f9fb1a90fd56b737d25d16fee0081671785cb8d7000be4fda6d2ee61b47e57 SHA512 e948ffb4f03d4009a3a8c3a264ce9eeaeb01b27649e53b675ac35949b8bd2e83903492bf330d7c9c3ac8651c0c61127b4eeb378bfbabebb1b162aa91454dd56e
+EBUILD grilo-0.3.9.ebuild 2191 BLAKE2B c332c97093dee6ddf9d3ffebc846293526101df4e53e6708a26b6c5c90066920bf1203c86b3d4410ae8a6e5f568f9f49f96f4faa66ae7e150814af28125ba34d SHA512 27c98791d18cad64deaa447a0cb75e73b97b4bdefb8d7c2e35b67305b8aa85786c05c2371d4e3f8009b16fdbc151ffcd111917c924b5da9ca34c2338e413dc20
 MISC metadata.xml 728 BLAKE2B f552b3317894c70912c17e3e46367198f4451940b5029508f83ba3ce904faea24ed3876195f1b062145582dd268064e0c63636ddd5d6033b7032b392e10abba0 SHA512 bbd75a063a5697c257dd9084961d6519fb71409dcd1375d66ff25218deee87841c822edfa66d440cd5c6bfbad70942f01b30f2b7e1a3cc9727beac23ca717b5f
diff --git a/media-libs/grilo/grilo-0.3.9.ebuild b/media-libs/grilo/grilo-0.3.9.ebuild
index f07a46d3c8d4..8cdfd059b112 100644
--- a/media-libs/grilo/grilo-0.3.9.ebuild
+++ b/media-libs/grilo/grilo-0.3.9.ebuild
@@ -12,7 +12,7 @@ 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 test vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/media-libs/gsound/Manifest b/media-libs/gsound/Manifest
index bf491c6c948f..4202a0d48780 100644
--- a/media-libs/gsound/Manifest
+++ b/media-libs/gsound/Manifest
@@ -1,3 +1,3 @@
 DIST gsound-1.0.2.tar.xz 282068 BLAKE2B b85aa42c82c346b4541b38c971be46a35f0276d6cc34420cfc1a0e0ab0b4e25aa02829c17e8cb1d4258acc32d1d9c70a51dfac576046820f84e9ce9821c203ce SHA512 3525598aade28129d605e745cd6e8ef292220c446d59b34129056fa2aba7b4aa808c3efd29f4916056e20d5e4046b0edf2a6c9b97c272c95e59af7f8ef62e6b0
-EBUILD gsound-1.0.2-r1.ebuild 811 BLAKE2B a58e7beed59c91a372ec145d9612ef0714a8caa69ea6e867c40b65666501be3c0afc438b369b5b3fc36fc2197684f1caf9e4fedc644adf0c48c824a262d407ba SHA512 d1e34ce8716d20e8a627d7e067e074a4aea1853d9a227353410989d6946d659c4b6731476420d5a635c4e1988e912858fd3cd409dcbdace33aa44a5d18a2ccdd
+EBUILD gsound-1.0.2-r1.ebuild 830 BLAKE2B f76cd74dfafdac7207e6c43d825f48c3ded100d6c227dcc9010b78a91549c3fdfc9c377cad1a58d1b4a88004b420b4b5d026592f9cba3485ed754716d34f3b7c SHA512 d21b64cf4387fd5f245f90e46d0e39db973ae0007d35b46ab6857cf35d566e3fe88177fb293058823a0418311920eae2b92f32e8022fac8de91d1ff4833b668f
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/media-libs/gsound/gsound-1.0.2-r1.ebuild b/media-libs/gsound/gsound-1.0.2-r1.ebuild
index d98125f76709..c0a183f7fd52 100644
--- a/media-libs/gsound/gsound-1.0.2-r1.ebuild
+++ b/media-libs/gsound/gsound-1.0.2-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GSound"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 IUSE="+introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index 60de1b4a2072..2dbdf6be1568 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -1,5 +1,5 @@
 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 2612 BLAKE2B 1860fc212d06a15668ef22b1d111ba127c3e54ba52f9444a92e721a5e91d2ab1721c3ebe4dc8230fe3797cee180fc5fe2166bad2a86b54de00aa9d5fceeaf483 SHA512 819468969df1ba5f8c70453fe8fc1eea4837a935be02556dec207b5f43853873af8248c2730aa49aa23a58727e2f1e33624a997d5965c3a709877acee87fc0b0
+EBUILD gst-plugins-bad-1.14.5.ebuild 2606 BLAKE2B d93093a22b47fc6ff44c53de76951c7e2a54862965b73739171811c8d6373f77441ce0a766bc144479151e007b0f9e0c088082820c6a941137b11444ea5b4bdf SHA512 f18632ab69e0bb837c812fc3b4a239f4e0b991ac78a8bd3c0079ca17538fa6e103fc4b47a0613837b60b5bd812d885cb7384cee2eba8e5c7169436f6f43e4d0f
 MISC metadata.xml 439 BLAKE2B 5a4a36ccf4bd485eaf1fa66650eec8fa592d4c5bbf9fa478f1645e1b39649b7115694bf55dee7aeb4a5c53b2ba3c4614591cdf4e7d745938397c304108e0aa7c SHA512 9bd27a1a513fc2d697f7d0f2ceb7fa0701c446fe21b597256afd4c2c1f44145e875323ed1ef6202bf7b85472ab4aab43a4b6db5795bb1d28ff53a2a7e484055e
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 43c5ed8cab99..2cbcd04b92da 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
@@ -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 9cd7127226f4..b4d4c6d4d7cf 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -2,6 +2,6 @@ DIST gst-plugins-base-1.14.4.tar.xz 3703232 BLAKE2B b22c44b857bc4f1972f03752cc1a
 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 5925 BLAKE2B a18cda341f3165e7b07babd24c5da5b79da835577b8df698f0e9e5a63b9356c88040d1c0ab638eb2489a93c9d042062cf3e34c8129f0f450bd2dde763867d804 SHA512 86332c0a762c8c19002245b7df5b2f117696c7f28ce74541d6e11107ef1c006b6e5abdd2022e04f0f97d3247e8a6bbbb397bfa27d32cc0340ae126f273abc900
+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
 MISC metadata.xml 1065 BLAKE2B 9736df3218c6157e5cc0f14e96a15ec6ab6140e8774c7361dd4fe9378efd37d1a3da593527313a81591818ad48a5585bd4395fbeb85d357449b00bf7e51bbb5c SHA512 520802b59fc6575e16edd765dacab4ff0ff6e51dd162f03fe7e4e07eb472aeb78f3974a32ba613939932e123179106a450c503234ed806a08416dc6b8dd534c2
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 9f40a8032600..2959bc0dbc7b 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
@@ -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-good/Manifest b/media-libs/gst-plugins-good/Manifest
index c627636ee802..355563335c81 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -1,5 +1,5 @@
 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 1417 BLAKE2B 4615e5d1bff4205bfbee3ca6876455db2f843b48de71002ab6774a24b8092861990f02805796c0fa814f8e4c1dd099edcf9bd9421804944ba4f754032b90ca28 SHA512 378cfc3e7a37ae34a87ce7fa24ae2dbf03252b71085c0cbe1b20734ad7484c78155bafcc924c55aebdc144c4919f476f1ef7cba5358f53de7341e0c8f24b34ff
+EBUILD gst-plugins-good-1.14.5.ebuild 1411 BLAKE2B bc5feab0c910d35717ab032561180fd884a94c0fa906e1167baf6b613eebfa30646515b54ab36e9436772073fff00e896651d46a819194dd1008b17ad1c79122 SHA512 620bf87a5b67ef03a78efcd5fa3732a603decf0657fe9f723e498cacc0190f5de41265ae20857389f81bbf76b6e21b9dce2e5e4ffa6ece9b2880c427bdbb9aee
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
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 2cba91fdae95..5d13e774f3b5 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
@@ -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 1d0483155880..f41ab4efd89e 100644
--- a/media-libs/gst-rtsp-server/Manifest
+++ b/media-libs/gst-rtsp-server/Manifest
@@ -1,5 +1,5 @@
 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 1983 BLAKE2B 44bbb19d0691a24c72f5dd0237fbfecfc6aaf89d6dbc3d346e4bf828ee0543427da5df4c443bd2c634a56716ebff70c67c8edac30f586cd5ecbf607854749a1e SHA512 9f3e868ca8b2aff1d64ba01a6747268643c2c98304db63a117c18c9250af699dcbf3854390c320d05e8620807ca08bb4994f8822ceb09a0fdfbfb73077cdde8f
-EBUILD gst-rtsp-server-1.14.5.ebuild 1985 BLAKE2B 385b06fef47504a0b5ee5435d09de826b1594bc9ee1371ca440c4bcebb5e16a4d3d7a285bbc7968c500550e55ac2a5e2d54f77467b549ea25e5f76d240d96674 SHA512 c4f3d1be98944daae9b9251f5a48436cc03eefc886b99935dff42ffd121c5217e465d2e9e016790d8318940341db8c9df5ef0045ea6a668483a8aa986d5fab58
+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
index 5c4b7ba892eb..00ad98309663 100644
--- 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
@@ -11,6 +11,7 @@ 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
diff --git a/media-libs/gst-rtsp-server/gst-rtsp-server-1.14.5.ebuild b/media-libs/gst-rtsp-server/gst-rtsp-server-1.14.5.ebuild
index e31415b887ee..00ad98309663 100644
--- a/media-libs/gst-rtsp-server/gst-rtsp-server-1.14.5.ebuild
+++ b/media-libs/gst-rtsp-server/gst-rtsp-server-1.14.5.ebuild
@@ -9,8 +9,9 @@ DESCRIPTION="A GStreamer based RTSP server"
 HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-rtsp-server.html"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
+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
diff --git a/media-libs/gstreamer-editing-services/Manifest b/media-libs/gstreamer-editing-services/Manifest
index 35f06a1c0642..280d2986fec5 100644
--- a/media-libs/gstreamer-editing-services/Manifest
+++ b/media-libs/gstreamer-editing-services/Manifest
@@ -1,5 +1,5 @@
 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 1541 BLAKE2B e620b4f7bacb9b43107a9b48872c8c9d308420fc634b2f4970c67c4fa37bdf563e2276045757b907fecd173a97ff090377a3ebffc210d12e0c797ed3b3fb0e9c SHA512 afd9010114a91001a7113426c6cd36679c46fa59644cc6e6f3095e42c0f08f4b6207c3bea9bcca025b14d2fbfd0002240500c41d85e9c10a0c71ab7abe27f379
+EBUILD gstreamer-editing-services-1.14.5.ebuild 1539 BLAKE2B 6f6a6a961099c57bea9c0a0c4c9b3b91c88ffdc51ae078657edbb2ff956a7faa2eb392db1e9a71758d2229ae3bc54959f6ca9a90291bbf647ad7660f9630bb57 SHA512 6a06f9007b0383ce3fa5fbd04fc78be2e0bb2389e43817855864688a3d807f8e02818859b6c0948a96e9228e5eeb3656adabf7cea76099bc33bddbc4dd37a45f
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
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 5dcedc7b4efe..da0e7bcc5a20 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
@@ -13,7 +13,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="+introspection"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 9f4040ef24ca..5f0f41bf806a 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -1,6 +1,6 @@
 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 3435 BLAKE2B 43d1ef1c96c301a90983299fc2feb5574ea07d00ce4422c28119eb88df89f8c1a69e00a31fca98b34c80389157d099f0ae12f6acd3cc0f944daffd7ccb7d6cc4 SHA512 3bf41367597cf73de9347641edd748d1b1e152ce6a0d6ec5b52fe0d16b81074b588bed58b6a104be5ca6779daae7a6086bfa0bcc43fb2fe8af55198f4bb4b26d
-EBUILD gstreamer-1.14.5.ebuild 3443 BLAKE2B 9639ca96375b542e8b7e0bcd7ea4a94f60abbea41890152568e7f38630e6363583ce39123467202db2a6c68b10d19ead2f7a2df5a5836e22ada85bb7b357ddda SHA512 5603ab199c9cec7ee82a33f074dd9fbd1707d9fae80a5efe410ddbdb54f07eefe2bbacb6df594d4e6bbf10a5bc266d6d04d6ddd48e832cf783a2a691dfdca2e6
+EBUILD gstreamer-1.14.4.ebuild 3462 BLAKE2B db6faeb54f1590f2cc96f7217317542d56809382680c7bfa1613aa16b552cdfe55f3ac0a04c8017c571e9f7a6b5a24d611d3ce8b09f17fc9a54e55abf3668a27 SHA512 6a826229d49896d55a0f3cb959a6bb4cd345011b4dd71f92b666e6dee33ab4f75cb96cf3a6f4fc763f1b5b8648a8f1ed992243ccfff533271370229b74d8ceaa
+EBUILD gstreamer-1.14.5.ebuild 3464 BLAKE2B b8b54e6e2800d22f59526f8a1392ba69627a57eff89874aa3bb7de9d088620933ff2065cae4c8b4e9f7e53f8b56c57be5a589228932a1b59d8b1ed23a427f395 SHA512 7cf7970a7ccffad74c959caca256b2584804bb77d6054ca7c68343177a40dcde31430cf5875bc2f7f0e9cd44cef6e469a8a6794a69d4649455b9d8ceae166c87
 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
index eb241bc65fd9..4bcd587409bc 100644
--- a/media-libs/gstreamer/gstreamer-1.14.4.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.14.4.ebuild
@@ -13,6 +13,7 @@ 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}]
diff --git a/media-libs/gstreamer/gstreamer-1.14.5.ebuild b/media-libs/gstreamer/gstreamer-1.14.5.ebuild
index b9369fd6b6b5..7f59947075bc 100644
--- a/media-libs/gstreamer/gstreamer-1.14.5.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.14.5.ebuild
@@ -11,8 +11,9 @@ 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 )"
 
 RDEPEND="
 	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index 7840c5e48a4a..cd57d3b59829 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,7 +1,7 @@
 DIST hamlib-3.1.tar.gz 2130615 BLAKE2B dbc348d5df04015e1706b6f165496f0b0d9a4f7ce5e5ba6c8589349c1c9c1119ef31e8c3d4ba14666d19f3638bf27ad9b4a566af2fd4054faafc0604b8aeafd0 SHA512 befc5c407379e30711bde2affb9c191add6dbb04a36c1309f8771170cf04156c48609a094775638036282e085de6c78d09ef8d2760d69c595471e16e985e0885
 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 2191 BLAKE2B 14b9108b0ddd6b76bfeea8736c404e85e721b2ec473f14f082f669c23c47f0432aa7f6fb067c1d4f3e456d206d1a0b5d1d7a6832cb2ffc68cf5fcd1b4e005f95 SHA512 d733f693a3d91252b785328a18010aeda739f17ef856f20f199ba75465b15ffccb5538a797826b1b384e9532e930b11a91782b8c7a30ca04fc5e45df0c47a5ee
-EBUILD hamlib-3.2.ebuild 2212 BLAKE2B a6ba2c987ed0600628e36f1de4699d1bee12edc16b8b8c3e247043f6610456ac3ebe6584a1a5e2ebd0e2d7adc22d07d17d0fa2956ce31b7cf7d2b0be242de53e SHA512 52f61bb45597bf6d410b07c546d930d20fd17ed34c1e99130ab5a2b727f444289e84556575e9a8ece0875c1ca282d71b0cc5da4812ed54c19087081de105584e
-EBUILD hamlib-3.3.ebuild 2067 BLAKE2B cbd584cd42d274330046a9fc7b439cc955c9ed41611090a63684d6847b0c0155c796263e113f1ebfc32d2486632931fa3174ee8188d8c0ee6265f924541beaf2 SHA512 cfb0e7199c25f75e1fa66e1cb9bac53c39d206bbc50be4c86a623d94b5105dfb214d61dd9c160fd66fbbea7fec08b2aba3781ea501763f5599ffe0b10a7bc48b
+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
 MISC metadata.xml 325 BLAKE2B c1966def562280393eeb5b575d4e136525dc3cf36ef4e6c00dbeff7e0069a4d10eb16706f4b4e929eda1f046d18a8e25fd0025c74695eba1f9c10d19a9f55598 SHA512 fb6d5d77da29969e9b61921ae59e5d5c71b74cebd331867a546a6b2c568650f89191a39a3a1a73c58e1244fa5d13a090b45b866c21b3a3dd71cff0a812c149e5
diff --git a/media-libs/hamlib/hamlib-3.1.ebuild b/media-libs/hamlib/hamlib-3.1.ebuild
index 5cf4c9fed288..a7bc3b024dcb 100644
--- a/media-libs/hamlib/hamlib-3.1.ebuild
+++ b/media-libs/hamlib/hamlib-3.1.ebuild
@@ -81,8 +81,8 @@ src_install() {
 	autotools-utils_src_install
 
 	insinto /usr/$(get_libdir)/pkgconfig
-	doins "${AUTOTOOLS_BUILD_DIR}"/hamlib.pc || die "doins failed"
+	doins "${AUTOTOOLS_BUILD_DIR}"/hamlib.pc
 
 	echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib
-	doenvd "${T}"/73hamlib || die "doenvd failed"
+	doenvd "${T}"/73hamlib
 }
diff --git a/media-libs/hamlib/hamlib-3.2.ebuild b/media-libs/hamlib/hamlib-3.2.ebuild
index e5eb1f9a6b1b..16773a38a259 100644
--- a/media-libs/hamlib/hamlib-3.2.ebuild
+++ b/media-libs/hamlib/hamlib-3.2.ebuild
@@ -81,8 +81,8 @@ src_install() {
 	autotools-utils_src_install
 
 	insinto /usr/$(get_libdir)/pkgconfig
-	doins "${AUTOTOOLS_BUILD_DIR}"/hamlib.pc || die "doins failed"
+	doins "${AUTOTOOLS_BUILD_DIR}"/hamlib.pc
 
 	echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib
-	doenvd "${T}"/73hamlib || die "doenvd failed"
+	doenvd "${T}"/73hamlib
 }
diff --git a/media-libs/hamlib/hamlib-3.3.ebuild b/media-libs/hamlib/hamlib-3.3.ebuild
index f8782dee5719..e263b96f43f7 100644
--- a/media-libs/hamlib/hamlib-3.3.ebuild
+++ b/media-libs/hamlib/hamlib-3.3.ebuild
@@ -82,8 +82,8 @@ src_install() {
 	einstalldocs
 
 	insinto /usr/$(get_libdir)/pkgconfig
-	doins hamlib.pc || die "doins failed"
+	doins hamlib.pc
 
 	echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib
-	doenvd "${T}"/73hamlib || die "doenvd failed"
+	doenvd "${T}"/73hamlib
 }
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 9d6597872ce3..8b620b913fa1 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,11 +1,7 @@
 AUX harfbuzz-2.6.1-gcc-9.patch 468 BLAKE2B 5f0b42d7a834f5b59c79adcbc2fb67e9aa1fa97fb6e6e135c7c88d20780d0a75ad8784c5ed3473cad8a1bb5f1c6f3c8475e7984e555eef1720ac9de387f95b83 SHA512 8dec55d5cb97c3aae2e6885cddc06db9629e6e5336ffc1b3cc263c8ad88e499833570210868dfb6e42c0dbf0326f239d1ac4ee1914f6f84712d1f93350da1912
 DIST harfbuzz-2.6.1.tar.xz 5741372 BLAKE2B bb763eba23a37bd20d0ddb39824d5a0c655d6e098aea2e44b6943e7bd5cb1f9a5cd94e3de5520d962e3c476defac43af58f98d0a5b80e5c1506d00bc716ec876 SHA512 cea531ab9db0ae1b188ac56c3ea6e0344192c4321b97d4425f4a53e6bb34c88463a7453fd69fcadccb8574506c1fb5505422019e41a7938a04e7823e3f484c06
-DIST harfbuzz-2.6.2.tar.xz 5769792 BLAKE2B 8ab4f76e858cb6d120b59c62fcda783fb331ec750ed9e4a74ceea448cafab9aff814d8599442d8939d41d0b5cc176724753b16c7cd42d6d314a08ce27d6856f5 SHA512 0a98c2b49650d66cf11f3395504cba3b18aaca43482924d9b58babd2ccb986b74ed7478bef5c4c1937d7782b7b278504854eaa04a62b329df08d91d30fc879d5
-DIST harfbuzz-2.6.3.tar.xz 5811320 BLAKE2B 84f6f8346574c881b41c47561b983d0714d2754a40955cbb8fb9687cfa0cd2dea965aad1eac417ad1cb5270cd5ced27225c710f0743a408f367902e7c326b24e SHA512 ed387c551c01305d419dab186e3760959ac31abec761dde407142ad3619db918a5b79cc1e0737004f5da3437f7eabb8d796f770f0e7eba60d3a4496995453444
 DIST harfbuzz-2.6.4.tar.xz 5967468 BLAKE2B 24d215324a408a724f47a901c4a56605144d15373518bd52643ece83705d0c63582a80635ecef6a6d8d2f5f39c750076d553fb39aaa8c0dd41702ee910c32f24 SHA512 d8664bb64fda11ff7646693070637e3827f8b3d1de50e11ecf108ce4d19c878b26b2ba4cff278da6e6cc0cb431e1630d9eaa7c32a9bebb9655a7aa8dabf7114f
-EBUILD harfbuzz-2.6.1.ebuild 3045 BLAKE2B 2ed39b3268d0112bb3414581793d12bce4b0aba5c310ce97a03b3405c59b4c159eef2ab3912d477fd5db845befbc02578df2b1fa9d2f071e1108f099eb51bc69 SHA512 c38051a305c7a3a9a955424a78482c31941dea63224f26068ae22b55fe72fa71917c997ec1a82d96c0a80429994551e24393555104521b8f1e83b4305df1a070
-EBUILD harfbuzz-2.6.2.ebuild 3011 BLAKE2B 34b919439695f4fd803de3d5cb5dd0e359243458ff371406b3e893fc096c6bbba41de9b040a970a1b03e94eea26aa4b98075f0043c261a4bab18bbf8c1bd469e SHA512 aaff2444906f005c5a5203614c63ea186ea7d9d432d1c8a3fe5756a9f4ed045469f3671c05008b7158aca8a7f97b0f7a1d8ca4b5b9e06ec2af1b0c26e7ae08a5
-EBUILD harfbuzz-2.6.3.ebuild 3011 BLAKE2B 34b919439695f4fd803de3d5cb5dd0e359243458ff371406b3e893fc096c6bbba41de9b040a970a1b03e94eea26aa4b98075f0043c261a4bab18bbf8c1bd469e SHA512 aaff2444906f005c5a5203614c63ea186ea7d9d432d1c8a3fe5756a9f4ed045469f3671c05008b7158aca8a7f97b0f7a1d8ca4b5b9e06ec2af1b0c26e7ae08a5
-EBUILD harfbuzz-2.6.4.ebuild 3002 BLAKE2B 12a9a2a34411a5cfbf1f17f7e0303e6dd5c23d8f24a63c8c387135804e2cc541652877eeb2a0fe276d47f6772867fa08855d057695050a309c23b9ca9be47b5a SHA512 7f84df933b7a1ff13be9d4fd14616fe9ef771a28220b8b5541628b4ec09aa6a117c2f4c0c5db4c103ca5dc3814f4706a547c6d236effaa0d7bc511453f187aae
-EBUILD harfbuzz-9999.ebuild 3011 BLAKE2B 34b919439695f4fd803de3d5cb5dd0e359243458ff371406b3e893fc096c6bbba41de9b040a970a1b03e94eea26aa4b98075f0043c261a4bab18bbf8c1bd469e SHA512 aaff2444906f005c5a5203614c63ea186ea7d9d432d1c8a3fe5756a9f4ed045469f3671c05008b7158aca8a7f97b0f7a1d8ca4b5b9e06ec2af1b0c26e7ae08a5
+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
 MISC metadata.xml 739 BLAKE2B df7724d5cef26b569f76d41c808f99a1ecf44631f0bae96fbc2a9b4f5981061b55c60d69b1b64d966897f223a3d3b5cc4325a3ac780599ed76591fc2044b4988 SHA512 192f7abc191044f267bddb4db7d91f9b78926f4a361802f607bfe4635d7cf63398c289bc52009ad4d3bc6f92684cafd8b40e48f1e0f8cdaef9a4e27f538e7dbd
diff --git a/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild
index 87e7095493c9..37fe958e75fb 100644
--- a/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild
@@ -22,6 +22,7 @@ LICENSE="Old-MIT ISC icu"
 SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
 
 IUSE="+cairo debug +glib +graphite icu +introspection static-libs test +truetype"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="introspection? ( glib )"
 
 RDEPEND="
diff --git a/media-libs/harfbuzz/harfbuzz-2.6.2.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.2.ebuild
deleted file mode 100644
index 8f3d354b0b08..000000000000
--- a/media-libs/harfbuzz/harfbuzz-2.6.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
-
-if [[ ${PV} = 9999 ]] ; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.xz"
-	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"
-fi
-
-LICENSE="Old-MIT ISC icu"
-SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
-
-IUSE="+cairo debug +glib +graphite icu +introspection static-libs test +truetype"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:= )
-	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
-	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	test? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-"
-# eautoreconf requires gobject-introspection-common
-# ragel needed if regenerating *.hh files from *.rl
-if [[ ${PV} = 9999 ]] ; then
-	DEPEND+="
-		>=dev-libs/gobject-introspection-common-1.34
-		dev-util/ragel
-	"
-fi
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-	if ! use debug ; then
-		append-cppflags -DHB_NDEBUG
-	fi
-}
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
-		# on Darwin/Solaris we need to link with g++, like automake defaults
-		# to, but overridden by upstream because on Linux this is not
-		# necessary, bug #449126
-		sed -i \
-			-e 's/\<LINK\>/CXXLINK/' \
-			src/Makefile.am || die
-		sed -i \
-			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
-			src/Makefile.in || die
-		sed -i \
-			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
-			test/api/Makefile.in || die
-	fi
-
-	[[ ${PV} == 9999 ]] && eautoreconf
-	elibtoolize # for Solaris
-
-	# bug 618772
-	append-cxxflags -std=c++14
-}
-
-multilib_src_configure() {
-	# harfbuzz-gobject only used for instrospection, bug #535852
-	local myeconfargs=(
-		--without-coretext
-		--without-fontconfig #609300
-		--without-uniscribe
-		$(use_enable static-libs static)
-		$(multilib_native_use_with cairo)
-		$(use_with glib)
-		$(use_with introspection gobject)
-		$(use_with graphite graphite2)
-		$(use_with icu)
-		$(multilib_native_use_enable introspection)
-		$(use_with truetype freetype)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/html docs/html || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/media-libs/harfbuzz/harfbuzz-2.6.3.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.3.ebuild
deleted file mode 100644
index 8f3d354b0b08..000000000000
--- a/media-libs/harfbuzz/harfbuzz-2.6.3.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
-
-if [[ ${PV} = 9999 ]] ; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.xz"
-	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"
-fi
-
-LICENSE="Old-MIT ISC icu"
-SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
-
-IUSE="+cairo debug +glib +graphite icu +introspection static-libs test +truetype"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:= )
-	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
-	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	test? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-"
-# eautoreconf requires gobject-introspection-common
-# ragel needed if regenerating *.hh files from *.rl
-if [[ ${PV} = 9999 ]] ; then
-	DEPEND+="
-		>=dev-libs/gobject-introspection-common-1.34
-		dev-util/ragel
-	"
-fi
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-	if ! use debug ; then
-		append-cppflags -DHB_NDEBUG
-	fi
-}
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
-		# on Darwin/Solaris we need to link with g++, like automake defaults
-		# to, but overridden by upstream because on Linux this is not
-		# necessary, bug #449126
-		sed -i \
-			-e 's/\<LINK\>/CXXLINK/' \
-			src/Makefile.am || die
-		sed -i \
-			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
-			src/Makefile.in || die
-		sed -i \
-			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
-			test/api/Makefile.in || die
-	fi
-
-	[[ ${PV} == 9999 ]] && eautoreconf
-	elibtoolize # for Solaris
-
-	# bug 618772
-	append-cxxflags -std=c++14
-}
-
-multilib_src_configure() {
-	# harfbuzz-gobject only used for instrospection, bug #535852
-	local myeconfargs=(
-		--without-coretext
-		--without-fontconfig #609300
-		--without-uniscribe
-		$(use_enable static-libs static)
-		$(multilib_native_use_with cairo)
-		$(use_with glib)
-		$(use_with introspection gobject)
-		$(use_with graphite graphite2)
-		$(use_with icu)
-		$(multilib_native_use_enable introspection)
-		$(use_with truetype freetype)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/html docs/html || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild
index 8217af33d9f3..37dcf3fee8ac 100644
--- a/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild
@@ -15,13 +15,14 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.xz"
-	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"
 fi
 
 LICENSE="Old-MIT ISC icu"
 SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
 
 IUSE="+cairo debug +glib +graphite icu +introspection static-libs test +truetype"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="introspection? ( glib )"
 
 RDEPEND="
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 8f3d354b0b08..6a4bfdfcd95a 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -22,6 +22,7 @@ LICENSE="Old-MIT ISC icu"
 SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
 
 IUSE="+cairo debug +glib +graphite icu +introspection static-libs test +truetype"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="introspection? ( glib )"
 
 RDEPEND="
diff --git a/media-libs/icclib/Manifest b/media-libs/icclib/Manifest
index 1e225322b1e5..8308e7971349 100644
--- a/media-libs/icclib/Manifest
+++ b/media-libs/icclib/Manifest
@@ -1,4 +1,4 @@
 AUX icclib-2.14-make.patch 3074 BLAKE2B 9f45af8c8c0041525e98352b9aa4b2743607d76b79dee02b17cf67e3410f9d45caf433f7e6490bb761c2b19616acf19275356f21a9b9a582f3f30a0e15997e70 SHA512 e2245b6f7aa24fcb135e8ce7a4332b6a689822c6429cf48cab5cd61285e80c72ff50adb6d8e691b948e45b9dd5d3df42935b810e1a25aba4f2d9d51ac9b9a1eb
 DIST icclib_V2.14.zip 158606 BLAKE2B a42a16a00d540f3e0036f86a4934ed8ac3c67bfea135df5fc893cef939b451f0298c576aa4067360597912fff1afe3315588af64e4edc9605ea5944ff9e42cf6 SHA512 ed038c8655968c794491f30c295ef115900bfcc2e8bfd8607f12f73d6f2236fc339c1ed53a364524478273097ab9065a372bb26f38231bfc6dc02773a11546a3
-EBUILD icclib-2.14.ebuild 842 BLAKE2B d76df477830e7e0fc7410de59258da5ace092d66c8eecff7d521bb8f3ec7f1b2809331f242c980837aed71eb4ce3103017014c316962760eb159862d47443691 SHA512 6a755ecd016fc3cd7716fba06ce7819e76f40beb5a2900c44f42618a9e0db2f190c9e8606529acac2bc1807a16c81febc4163fe943a0ac8f26fc3bf01afbac59
+EBUILD icclib-2.14.ebuild 805 BLAKE2B db0ef3c262563d5593fae5c59c534a0834c9d765b0b9f3cccd1853cccf748e3a1c485750c51d816f96f3cb5d1841eaec64295dc415053bdd40342e6ab98a151a SHA512 4ccf44eb5347c97c9e96a3640040095af3e5c20e210ece9f508ba0b6adae7e8a50801c7ba4886f3fb4be928310dc6bad99caabb56fcce1d78835a0d30cf0dc58
 MISC metadata.xml 452 BLAKE2B 6c283d428da4dff860b53d17c0c3a64a63dae0fe9736acdd44045d0be9b9a8a9b2fcc8ab97ded5252bf59d4cf85f55a67aa68de15c1831553aa1103b492d53d1 SHA512 a95f4b878cfad5719ea1a161f0cda34b81982fd000f04da81a8dfcdd77c7592c6621d612eb6faf854deb78902ae31e36cc0b0b8e6e37b559ddbbd2b34e19b23b
diff --git a/media-libs/icclib/icclib-2.14.ebuild b/media-libs/icclib/icclib-2.14.ebuild
index 0c032a1773c1..c1c849efebaf 100644
--- a/media-libs/icclib/icclib-2.14.ebuild
+++ b/media-libs/icclib/icclib-2.14.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit base multilib toolchain-funcs
+inherit toolchain-funcs
 
 MY_P="${PN}_V${PV}"
+
 DESCRIPTION="Library for reading and writing ICC color profile files"
 HOMEPAGE="http://freecode.com/projects/icclib"
 SRC_URI="http://www.argyllcms.com/${MY_P}.zip"
@@ -13,29 +14,26 @@ SRC_URI="http://www.argyllcms.com/${MY_P}.zip"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
 
-S=${WORKDIR}
+BDEPEND="app-arch/unzip"
 
-ICCLIB_SOVERSION="0"
+S="${WORKDIR}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-make.patch"
-)
+PATCHES=( "${FILESDIR}"/${P}-make.patch )
 
 src_compile() {
-	emake CC="$(tc-getCC)" ICCLIB_SOVERSION=${ICCLIB_SOVERSION}
+	ICCLIB_SOVERSION="0"
+	emake CC="$(tc-getCC)" ICCLIB_SOVERSION="${ICCLIB_SOVERSION}"
 }
 
 src_install() {
+	dobin iccdump
+
 	mv libicc.so libicc.so.${ICCLIB_SOVERSION} || die
 	dolib.so libicc.so.${ICCLIB_SOVERSION}
 	dosym libicc.so.${ICCLIB_SOVERSION} /usr/$(get_libdir)/libicc.so
-	dobin iccdump
-	dodoc Readme.txt todo.txt log.txt
 
-	insinto /usr/include
-	doins icc*.h
+	doheader icc*.h
+
+	dodoc Readme.txt todo.txt log.txt
 }
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 77a9162b88a3..68770383b3f3 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,3 +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
-MISC metadata.xml 2448 BLAKE2B ca27be2f23b000d1121343dfe8d21c93062ca12cf358860b30be062744e54df49a0ba108c991f090de5f84945189e02fa1e936df081e564c777a880421e36045 SHA512 659e2887be742527de8386577bbcb0c0544b1526089e67d5bf99745b0c63eb9634f6daa4b09d31bad81bae12ec9d7c227b687ebcec2c34d052e60b9e65bd05c3
+EBUILD imlib2-1.6.1.ebuild 2288 BLAKE2B fccd874d9c0173df5ae448439cffe6f564a21e8b9a0c6bf368a85e45afb62b042048eac5db3177577e625611608ec1ffb3c4eaa7ab027d4c2544811d939e9370 SHA512 bd9dbfc1cce343fe57d26449f3b94f0f453114ee317cfe12d6ce97bbb4460e2d31216a7caba6b063010d9544ae3f730212c1b3dc57de9be13393cabde87db01e
+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
new file mode 100644
index 000000000000..bb6d29fdb685
--- /dev/null
+++ b/media-libs/imlib2/imlib2-1.6.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
+HOMEPAGE="https://www.enlightenment.org/
+	https://sourceforge.net/projects/enlightenment/files/imlib2-src/"
+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"
+IUSE="+X bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 doc +gif +jpeg mp3 +png +shm
+	static-libs +tiff +webp zlib"
+
+REQUIRED_USE="shm? ( X )"
+
+RDEPEND="
+	media-libs/freetype:2[${MULTILIB_USEDEP}]
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	gif? ( media-libs/giflib[${MULTILIB_USEDEP}] )
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	mp3? ( media-libs/libid3tag[${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-4.0.4:0[${MULTILIB_USEDEP}] )
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	!<media-plugins/imlib2_loaders-1.6.0
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+BDEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_with X x)
+		$(use_with bzip2)
+		$(use_with gif)
+		$(use_with jpeg)
+		$(use_with mp3 id3)
+		$(use_with png)
+		$(use_with shm x-shm-fd)
+		$(use_enable static-libs static)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with zlib)
+	)
+
+	# imlib2 has different configure options for x86/amd64 assembly
+	if [[ $(tc-arch) == amd64 ]]; then
+		myeconfargs+=( $(use_enable cpu_flags_x86_sse2 amd64) --disable-mmx )
+	else
+		myeconfargs+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) )
+	fi
+
+	ECONF_SOURCE="${S}" \
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	V=1 emake install DESTDIR="${D}"
+	find "${D}" -name '*.la' -delete || die
+}
+
+multilib_src_install_all() {
+	if use doc; then
+		local HTML_DOCS=( "${S}"/doc/. )
+		rm "${S}"/doc/Makefile.{am,in} || die
+	fi
+	einstalldocs
+}
diff --git a/media-libs/imlib2/metadata.xml b/media-libs/imlib2/metadata.xml
index 7f1dafcefc66..043e8ff987f4 100644
--- a/media-libs/imlib2/metadata.xml
+++ b/media-libs/imlib2/metadata.xml
@@ -6,50 +6,63 @@
 		<name>Joonas Niilola</name>
 	</maintainer>
 	<use>
-		<flag name="shm">Use MIT shared memory support for X image transfer.</flag>
+		<flag name="X">Use the X window system</flag>
+		<flag name="bzip2">Bzip2 loader support</flag>
+		<flag name="gif">Gif image loader support</flag>
+		<flag name="jpeg">Jpeg image loader support</flag>
+		<flag name="mp3">ID3 loader support</flag>
+		<flag name="png">PNG image loader support</flag>
+		<flag name="shm">Use MIT shared memory support for X image transfer</flag>
+		<flag name="tiff">TIFF image loader support</flag>
+		<flag name="webp">WEBP image loader support</flag>
+		<flag name="zlib">Zlib loader support</flag>
 	</use>
 	<longdescription>
-Imlib 2 is the successor to Imlib. It is not just a newer version - it is a
-completely new library. Imlib2 can be installed alongside Imlib 1.x without any
-problems since they are effectively different libraries - but they Have very
-similar functionality.
+		Imlib 2 is the successor to Imlib. It is not just a newer version - it
+		is a completely new library. Imlib2 can be installed alongside Imlib
+		1.x without any problems since they are effectively different libraries
+		- but they Have very similar functionality.
 
-Imlib2 can do the following:
-* Load image files from disk in one of many formats
-* Save images to disk in one of many formats
-* Render image data onto other images
-* Render images to an X-Windows drawable
-* Produce pixmaps and pixmap masks of Images
-* Apply filters to images
-* Rotate images
-* Accept RGBA Data for images
-* Scale images
-* Alpha blend Images on other images or drawables
-* Apply color correction and modification tables and factors to images
-* Render images onto images with color correction and modification tables
-* Render truetype anti-aliased text
-* Render truetype anti-aliased text at any angle
-* Render anti-aliased lines
-* Render rectangles
-* Render linear multi-colored gradients
-* Cache data intelligently for maximum performance
-* Allocate colors automatically
-* Allow full control over caching and color allocation
-* Provide highly optimized MMX assembly for core routines
-* Provide plug-in filter interface
-* Provide on-the-fly runtime plug-in image loading and saving interface
-* Fastest image compositing, rendering and manipulation library for X
+		Imlib2 can do the following:
+		* Load image files from disk in one of many formats,
+		* Save images to disk in one of many formats,
+		* Render image data onto other images,
+		* Render images to an X-Windows drawable,
+		* Produce pixmaps and pixmap masks of Images,
+		* Apply filters to images,
+		* Rotate images,
+		* Accept RGBA Data for images,
+		* Scale images,
+		* Alpha blend Images on other images or drawables,
+		* Apply color correction and modification tables and factors to
+		images,
+		* Render images onto images with color correction and modification
+		tables,
+		* Render truetype anti-aliased text,
+		* Render truetype anti-aliased text at any angle,
+		* Render anti-aliased lines,
+		* Render rectangles,
+		* Render linear multi-colored gradients,
+		* Cache data intelligently for maximum performance,
+		* Allocate colors automatically,
+		* Allow full control over caching and color allocation,
+		* Provide highly optimized MMX assembly for core routines,
+		* Provide plug-in filter interface,
+		* Provide on-the-fly runtime plug-in image loading and saving
+		interface,
+		* Fastest image compositing, rendering and manipulation library for X.
 
-If what you want isn't in the list above somewhere then likely Imlib 2 does not
-do it. If it does it it likely does it faster than any other library you can find
-(this includes gdk-pixbuf, gdkrgb, etc.) primarily because of highly optimized
-code and a smart subsystem that does the dirty work for you and picks up the
-pieces for you so you can be lazy and let all the optimizations for you.
+		If what you want isn't in the list above somewhere then likely Imlib 2
+		does not do it. If it does it it likely does it faster than any other
+		library you can find (this includes gdk-pixbuf, gdkrgb, etc.) primarily
+		because of highly optimized code and a smart subsystem that does the
+		dirty work for you and picks up the pieces for you so you can be lazy
+		and let all the optimizations for you.
 
-Imlib 2 can run without a display, so it can be easily used for background image
-processing for web sites or servers - it only requires the X libraries to be
-installed - that is all - it does not require an XServer to run unless you wish
-to display images.
+		Imlib 2 can run without a display, so it can be easily used for
+		background image processing for web sites or servers - it only requires
+		the X libraries to be installed - that is all - it does not require an
+		XServer to run unless you wish to display images.
 	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">enlightenment</remote-id>
diff --git a/media-libs/jbig2dec/Manifest b/media-libs/jbig2dec/Manifest
index 98361536770a..a5c153e1720d 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 1602 BLAKE2B 4ab60982a2643cbc5b8bc41969b6dbd66768e504b036c30eacd7a71690279b6b676f6688f3a8cf7339a7744a0636675ad6fb3286033deeea42bc55ac216bc393 SHA512 1dc371fb4ec2e0245e55fbef34a47a35ff8d4d98433b6577468df60dcc6e3bf319c6d506b1afe2f778b764778d3ac352ac95bed9cdf952f4113e6f42ab076b77
+EBUILD jbig2dec-0.17-r1.ebuild 1629 BLAKE2B db5efe7f4fb51c215ade1ad52e0f90c090327d932a8ee87bc0203d1d8a3649fda7e74a4e885ce2b0921a88b2cb11358990c06c73887a45afda76c8f4faed596c SHA512 b91126c9ecc40323d0eb5c9b607a02d72de726c29d75434af4d787619c3e666bcec9c0df9afcfe8a4fb6cd2807f2cc2b941454f671a9d3c46aeeecc8a303b06c
 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 287042a3e8c9..29f5067a4060 100644
--- a/media-libs/jbig2dec/jbig2dec-0.17-r1.ebuild
+++ b/media-libs/jbig2dec/jbig2dec-0.17-r1.ebuild
@@ -16,6 +16,7 @@ LICENSE="AGPL-3"
 SLOT="0/$(ver_cut 1-2)" #698428
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="png static-libs test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	test? (
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index ac7c52a3d9fd..0b7b85320d04 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,4 +1,4 @@
 AUX lcms-2.9-BE-test.patch 1367 BLAKE2B 5888ef7f7466c8a76c0b9ba1c87383e274fcfc0570ccc45f2a04c3409421415e7b466b93d9f3acb358ec16481c15cf2d466d0b5d9986f37f48d6fddf0e0be616 SHA512 17d4e612f4aeb6e62ac918aa5438e6ada16f456e4c740b4a13f4560956ff8ee7b6223360420c41de1d7284524460ebb1ba89784782671e258df19fc5a768f1e1
 DIST lcms2-2.9.tar.gz 10953949 BLAKE2B 6f22a0a8901562e8a84a82c077f31b0155bf81d2b5023211059fa157061e78ebe170bd4744f6d15ab76c96ff9dae521a7560e9665a230337d149e1f0c9018788 SHA512 d91e320a97ef9d64cce31585b7df7c85accb52a0c46a10ed0f45a0ba46cc2ad6687de5151e59ac62170ea878ab48595c1493125f4afb1872824afe1c3f3c459b
-EBUILD lcms-2.9.ebuild 1227 BLAKE2B dd8a9599515eafb8be4840c48e09957c68edfe44162ecd36c402ab5067a315c592decc99d1f7419e244ee0f1be9cfb48e36dd249c13932e5bab5968cefaca4e8 SHA512 2c72abc28a802e3cb738c1feb2d17341ed1969de579974628d41ff8aea90e45707732b1e38163e18f9b43fdb6dd8b801f16757ea16862333c569949f3972e461
+EBUILD lcms-2.9.ebuild 1254 BLAKE2B 4575b41cbe45bc6a62a223d0c70811b484829069a534680c5dc4a7bc0b7eb4571f8c312a14e80cbf16639c392262ffe73065178e9e30593dd88dde48e4361d96 SHA512 7bbd67b9a71114b6bcfc8d95e5062eda1458d479e954298f033aeabda6a4b37152b3bf9f77deb58ad0bb498f8667fa0bc1a7a7720c7648593cac4264bf4be89f
 MISC metadata.xml 410 BLAKE2B 9349e230ddeb0fe27ff503a24fcfecb247c3f314b0a68b31c3ae998aca9707a2b513228a98f92dcadc15fc9b91e2d8fdb4b6153b35d9eb9ba5492e1b7d929b7c SHA512 d010ff15cb753002aa9a0f9c6c246e3b633cd4ea4bd75521a4c3c6c5b336852e108dafd0835c7533bf07e30dec8c1237e53218b672a01bf0d838cd48f0033d43
diff --git a/media-libs/lcms/lcms-2.9.ebuild b/media-libs/lcms/lcms-2.9.ebuild
index 3efc857b69ff..2e5a364daa0a 100644
--- a/media-libs/lcms/lcms-2.9.ebuild
+++ b/media-libs/lcms/lcms-2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="2"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc jpeg static-libs test +threads tiff"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest
index 978816ef1380..58ce96936356 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 1409 BLAKE2B 6d72d015d7f329e5b3d287ae0dc4d0bf8fce29c220c8e4d0a4a5a32d3db1c7cbcbcee127378e7b5b0d3fcbb486e40f02c2d9d8a225eabbf84e8f1e162a3e8e4e SHA512 d6784868b552962d714ae422617975829cb1a1c8a0b14066e0d9d27d982cbf40643e96d0b29e1551c74fc2b67b43e0c961f8b4f5a6c8c1707e085618909e0a79
+EBUILD lensfun-0.3.2-r1.ebuild 1436 BLAKE2B 25613e83cbbfa2a348f7bb35aa62402b42547987784a7f05fe88111761c1fc5b0400456f3d5aed6afd80a81d468902ebb2596282f3937fbfe49bbec174500423 SHA512 83c360c014974ded32f24346e40eaea5258179e1ee9014e4a14645f91b99f651db812d5a255f7f2f38679b4f35a47655cf7e59e1653f8e6891ea264a1fd77598
 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 320f15307eb8..cc1d5dc2542c 100644
--- a/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
+++ b/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
@@ -15,6 +15,7 @@ LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning.
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc cpu_flags_x86_sse cpu_flags_x86_sse2 test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="${PYTHON_DEPS}
 	>=dev-libs/glib-2.40
diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 2e0078759731..2dd61ead35c2 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -4,7 +4,7 @@ AUX baseline_reg.patch 847 BLAKE2B d45b93ba00abffca157438b6140e329de2cafe95be97f
 DIST leptonica-1.74.4.tar.gz 12349877 BLAKE2B 5c4a71c1c4f44b617f16b1b1029455badee268dc1ac459f1c7ffe6af5b8dbe702bdbaa6e5564af6e41d0881c59e1aa43dc40d5164f618f13ca2a563b2aa3bd0e SHA512 e74732c10218430463ca01f15e19d329dceb938e315586ed100c634c4d50809824f1d9bf7eeaf91654caf42ed78a5ae5de7c08e7a1d8884c580c536121627891
 DIST leptonica-1.77.0.tar.gz 12888756 BLAKE2B a1de6ff8d886c4e302faa362ad5c18ece727771e5cdbe62b33c34c950d1af9e0e97418e59485568a6386eb2a7e51fd42ffb2fd01f16591c5bc668961640f1f4d SHA512 3cf764c76d5acb6d5982c44e78c02d7a7c3b5e79937c41df193e71dd8a02dbbf965d34a2ecdf0444e907cb73c06bdb8bcae4ceafbf5ee1483c022659e897015b
 DIST leptonica-1.78.0.tar.gz 12905925 BLAKE2B 6a7b74e8aa78a3e4fa6429bbf180001e7d362ebd37d4fd179ba90df7a41993e52d708813ea5a2b30dc90516b7bec83e5386735025993d73f279ab595c39f6c9c SHA512 f059ccc8e7b5ff2c796aeb4ab18bd25e133ec4f38c36b9e2ee203db35a1e68cf45b8baf78ebc4acba4e3607328d1374ea0e8425f35cbe06c6c5728a1ec8c3f50
-EBUILD leptonica-1.74.4.ebuild 1710 BLAKE2B ad7befb5fab551d8278b6fec3a4b7c9e6f71cbfb24c4bbdaf3d1a018f05b19bd7d80e657dab4b77554bb0cefe151c8522e99610f8676af9c1f8e5460873d0f80 SHA512 b66fa2435ce6b070c6d3c0a444ab95fe048bf647ba630abe4b9b04dc41ff2cb69b5ce24cb89d3ebd770ffb80ec56f026dadc50b77c0339ff841b7c5b9d387b77
-EBUILD leptonica-1.77.0.ebuild 1995 BLAKE2B bc14325f908d06c6cb9d6002849d68b1a7b6844238c88103c16551bf661b45230491d50d1572d05508c1c974c0392a87412fa17100208cbf8b021731ff228fde SHA512 71f006841bbc39526b858ed09705c7835ca6dfe23c756fdaa64a8ccd3ea54e4bc633d60833e39f2277cd7d011872cb2590f2557a55961842ac1cd624420e84f5
-EBUILD leptonica-1.78.0.ebuild 1995 BLAKE2B bc14325f908d06c6cb9d6002849d68b1a7b6844238c88103c16551bf661b45230491d50d1572d05508c1c974c0392a87412fa17100208cbf8b021731ff228fde SHA512 71f006841bbc39526b858ed09705c7835ca6dfe23c756fdaa64a8ccd3ea54e4bc633d60833e39f2277cd7d011872cb2590f2557a55961842ac1cd624420e84f5
+EBUILD leptonica-1.74.4.ebuild 1737 BLAKE2B 952fa5ef527febd946445011e8b44ed1b8f3157c95f7880ef838e8e2b4680ccf6f0dcdcc1384b93a344c96a5fff1e523aaf6a9916af65504e979cd8ad7100fa6 SHA512 5c701645ad32e88d4471813e70bcef641aa0b03ab65d24a82b2db0df59ab57ddf1cc8939260188e2d9e402be53c79943239120e441848e7d30261cc8838c7cbb
+EBUILD leptonica-1.77.0.ebuild 2022 BLAKE2B c85beb7d51ead3f8d623b3f827960f30be744daad608248c99cb4d26c726b1096d24019b1bdeadf55ce706c4f93d5a18d636f7fa7fd74396948d33ca6c0f45d5 SHA512 963f0a3e72ad715442aee66f6aa4b0f3e1c8efccb1718da3f1799319278afab2e99b12463204ea2a4d99d735063ed069c39d94cf4fe989da1d3bcf3991c59ecc
+EBUILD leptonica-1.78.0.ebuild 2022 BLAKE2B c85beb7d51ead3f8d623b3f827960f30be744daad608248c99cb4d26c726b1096d24019b1bdeadf55ce706c4f93d5a18d636f7fa7fd74396948d33ca6c0f45d5 SHA512 963f0a3e72ad715442aee66f6aa4b0f3e1c8efccb1718da3f1799319278afab2e99b12463204ea2a4d99d735063ed069c39d94cf4fe989da1d3bcf3991c59ecc
 MISC metadata.xml 518 BLAKE2B 59db99ac81e5c10275950d5c67e1c85c61c48f9eef84d533606a26beb1f3b6b3c1eb844a163687376a74dcd9561dfc91f6b85df4202a20ecf3c58f8e1201b88e SHA512 2a34197102a9d9d90faa90aa2f19e78e8a848e779ad3ad0f1bdb7d3d9d91572749ce2351c402403a0281019af1b59e0fd19c4e1809bd00836cede17647391773
diff --git a/media-libs/leptonica/leptonica-1.74.4.ebuild b/media-libs/leptonica/leptonica-1.74.4.ebuild
index b7780f8a88cf..65157c315747 100644
--- a/media-libs/leptonica/leptonica-1.74.4.ebuild
+++ b/media-libs/leptonica/leptonica-1.74.4.ebuild
@@ -12,6 +12,7 @@ LICENSE="Apache-2.0"
 SLOT="0/5"
 KEYWORDS="alpha amd64 arm arm64 ~mips ppc ppc64 ~sparc x86 ~ppc-macos"
 IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib"
+RESTRICT="!test? ( test )"
 
 # N.B. Tests need some features enabled:
 REQUIRED_USE="test? ( jpeg png tiff zlib )"
diff --git a/media-libs/leptonica/leptonica-1.77.0.ebuild b/media-libs/leptonica/leptonica-1.77.0.ebuild
index 1e8f7a678d8b..12157b1bdd76 100644
--- a/media-libs/leptonica/leptonica-1.77.0.ebuild
+++ b/media-libs/leptonica/leptonica-1.77.0.ebuild
@@ -12,6 +12,7 @@ LICENSE="Apache-2.0"
 SLOT="0/5"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
 IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib"
+RESTRICT="!test? ( test )"
 
 # N.B. Tests need some features enabled:
 REQUIRED_USE="test? ( jpeg png tiff zlib )"
diff --git a/media-libs/leptonica/leptonica-1.78.0.ebuild b/media-libs/leptonica/leptonica-1.78.0.ebuild
index 1e8f7a678d8b..12157b1bdd76 100644
--- a/media-libs/leptonica/leptonica-1.78.0.ebuild
+++ b/media-libs/leptonica/leptonica-1.78.0.ebuild
@@ -12,6 +12,7 @@ LICENSE="Apache-2.0"
 SLOT="0/5"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
 IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib"
+RESTRICT="!test? ( test )"
 
 # N.B. Tests need some features enabled:
 REQUIRED_USE="test? ( jpeg png tiff zlib )"
diff --git a/media-libs/libao/Manifest b/media-libs/libao/Manifest
index daea16621ead..1db39670bb7e 100644
--- a/media-libs/libao/Manifest
+++ b/media-libs/libao/Manifest
@@ -1,3 +1,5 @@
+AUX libao-1.2.2-implicit.patch 530 BLAKE2B 085b0782f7ba13088cac1d063183d6c0a6b5bf784e9ba90d1e2d1587579d78a6d58b5754733e2e2749815562513b0be0898f0709719eb6f7f55d5389040165bb SHA512 fac9d6628ad132215935190ba0d55f5837c638572988426996e3fb91053fed06739dbd57bea2518e11459af4f6e941e45d46bc3094aa2919318386dd93a448c8
 DIST libao-1.2.2.tar.gz 96134 BLAKE2B e5b5d87c4357ee113769732cb6a7e0afa28b2bc4923be8dacd1fa39ac5fb96d8a5e19bc45137ffc8ec63eef0382130ab9b311aad3a66be4566e0cb9761417b23 SHA512 d2736d25b60862e7d7469611ce31b1df40a4366ab160e2ff1b46919ae91692d1596c8468e4f016303b306fc3ac1bddc7b727f535a362f403c3fe7c6532e9045a
+EBUILD libao-1.2.2-r1.ebuild 1580 BLAKE2B dbcc5052f6e235526dd5f8e7079979493331faf01b9739da9ceb97758fc209f596e586cc1e477aedf98c5ae3852ae4f30c001142b7e1c63dd4ebeb34441aa1c9 SHA512 7c85d76923991cb4405575dcd5baf97ae804d7847401cc4d132956943209889664b033f926394130cda381a499593c7fb3128e88078f88473d3e7efe7bfbe62b
 EBUILD libao-1.2.2.ebuild 1513 BLAKE2B ed6ae7a6067fa5115936bb9c0446568c5c528e840b867ef98d3a1c795656ef23335cd57ab3885e8980f0d0a3310ee2ef701a6562b85dd96b12ce73397d94ba69 SHA512 b28055fbf0f708dbe793165702b0937b967fc123e5083f49f0a84c74c306463204738a98b3538f06c84876c80feed5c945e67fcc891816f95efd99906f7e2b1b
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libao/files/libao-1.2.2-implicit.patch b/media-libs/libao/files/libao-1.2.2-implicit.patch
new file mode 100644
index 000000000000..92542c802d0e
--- /dev/null
+++ b/media-libs/libao/files/libao-1.2.2-implicit.patch
@@ -0,0 +1,22 @@
+From 1f998f5d6d77674dad01b181811638578ad68242 Mon Sep 17 00:00:00 2001
+From: Tristan Matthews <tmatth@videolan.org>
+Date: Sun, 15 Jan 2017 12:15:07 -0500
+Subject: [PATCH] pulse: fix missing include warning for nanosleep
+
+---
+ src/plugins/pulse/ao_pulse.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/plugins/pulse/ao_pulse.c
++++ b/src/plugins/pulse/ao_pulse.c
+@@ -30,6 +30,7 @@
+ #include <assert.h>
+ #include <string.h>
+ #include <signal.h>
++#include <time.h>
+ #include <limits.h>
+ 
+ #include <pulse/pulseaudio.h>
+-- 
+2.24.0
+
diff --git a/media-libs/libao/libao-1.2.2-r1.ebuild b/media-libs/libao/libao-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..d03e0147608a
--- /dev/null
+++ b/media-libs/libao/libao-1.2.2-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools libtool multilib multilib-minimal
+
+DESCRIPTION="The Audio Output library"
+HOMEPAGE="https://www.xiph.org/ao/"
+#SRC_URI="https://downloads.xiph.org/releases/ao/${P}.tar.gz"
+#SRC_URI="https://git.xiph.org/?p=libao.git;a=snapshot;h=refs/tags/${PV};sf=tgz -> ${P}.tar.gz"
+SRC_URI="https://github.com/xiph/libao/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="alsa nas mmap pulseaudio static-libs"
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	nas? ( >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-implicit.patch
+)
+
+src_prepare() {
+	default
+	sed -i "s:/lib:/$(get_libdir):g" ao.m4 || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-arts
+		--disable-esd
+		$(use_enable alsa alsa)
+		$(use_enable mmap alsa-mmap)
+		$(use_enable nas)
+		$(use_enable pulseaudio pulse)
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}/html" install
+}
+
+multilib_src_install_all() {
+	dodoc AUTHORS CHANGES README TODO
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/media-libs/libcdr/Manifest b/media-libs/libcdr/Manifest
index 6a22ca4c82d8..75e8ade81113 100644
--- a/media-libs/libcdr/Manifest
+++ b/media-libs/libcdr/Manifest
@@ -1,4 +1,4 @@
 DIST libcdr-0.1.5.tar.xz 612252 BLAKE2B d23c7ae0d0f5cbdb535bfba4dff4ad40e8b0633115cbc8c5b3a40343d941eaeafbffafe99ba2107640eafdd8181ab6eed7917095d05644a43f2b11cfcc66f8f1 SHA512 e985389b0cbad65dbfa9f59d7f9dba55f1684f63e852f9acca9abb863cdaab17072e761b48dca690673360d643686b5e9bc9878530f0a3a8b5b98d917f892cf0
-EBUILD libcdr-0.1.5.ebuild 1159 BLAKE2B 6ca28abd906ae50dda0caf7b513c0fcf99bc72a3968c750b71187a03dafadd3a3e69655c6deb80c668f1fbe6c738704c07d5052d5922b016dbbdb2f0f2b668be SHA512 6a3a5e517b50b9ced7b2e86a376d7b9bcf2c8472c29df1cbcf8ad4f925efb32ea3bc6209b1c0894c009b380397ef628d41e03c0799d894a5ff97ddf21011470d
-EBUILD libcdr-9999.ebuild 1164 BLAKE2B 2ebed7c2dbd73964ea5a203693681b51c9e4dd4fcbfe24723dd3a92ee82ac286edbb9eef311fc891cff3cab2990084e176b6453b17dfbfb7df6120d29acd5389 SHA512 c4d2fdaeb651c2fa6065b7c7355375cfd813547d4007e0bdc37de70c785f99eee0f435b568e2dc7825390ee1832fc6b6e5d572ec6ea50a9a8b379cd254b55c94
+EBUILD libcdr-0.1.5.ebuild 1186 BLAKE2B 9d1625bb05adb07a2f90cf20b1ea16a23da8b821c34294ccd28de0ef1698d7e8b3b301bf41f6793de65393d7c28838ea2cc0cd871c42a7703b94ab86fd87738b SHA512 7252f07c3e3e383f9d7801003415a5ac4e4e2643eb6c2e0f53e343f46298d4a78f669b3913dda80e7165e13dbf784250e10144ea6609b614adc73c96642efa96
+EBUILD libcdr-9999.ebuild 1191 BLAKE2B a2b9d8a2fec8db775b6156c09b2e33c2245a19f9657c63924eb165ba935b810201295d2595b0c24e997b17beee43ef6b4be286a91f40375dea499cd50b76b6ed SHA512 babf24b0ec218b81de23fc9799f6f7efcd9b12b3534eed9ef339bcb867bf278635e3be05a70b2f05719ca6b2b88be3d10f38dc26eba28ef2589506cf273f3b3a
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/media-libs/libcdr/libcdr-0.1.5.ebuild b/media-libs/libcdr/libcdr-0.1.5.ebuild
index 32f49593d6a9..88fd7662e04b 100644
--- a/media-libs/libcdr/libcdr-0.1.5.ebuild
+++ b/media-libs/libcdr/libcdr-0.1.5.ebuild
@@ -19,6 +19,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr"
 LICENSE="MPL-2.0"
 SLOT="0"
 IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/icu:=
diff --git a/media-libs/libcdr/libcdr-9999.ebuild b/media-libs/libcdr/libcdr-9999.ebuild
index 091f92e616d7..723e5b807b62 100644
--- a/media-libs/libcdr/libcdr-9999.ebuild
+++ b/media-libs/libcdr/libcdr-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,6 +19,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr"
 LICENSE="MPL-2.0"
 SLOT="0"
 IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/icu:=
diff --git a/media-libs/libchamplain/Manifest b/media-libs/libchamplain/Manifest
index 0f00dbafdc1c..7674ee745153 100644
--- a/media-libs/libchamplain/Manifest
+++ b/media-libs/libchamplain/Manifest
@@ -2,5 +2,5 @@ AUX 0.12.19-gdk-meson-fixes.patch 4022 BLAKE2B 55d1c2710ae8fca1e0befeedc87fc49c5
 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 1436 BLAKE2B 53c407f5f1ff0f1586fcfe13cba5d9c584f9192cb3a1eeda7936a7eabd8685b518a4c2e2f5918991ea1ba0be8630b5a037123b64add94bbbe4ee6fa0280c8095 SHA512 e72484fcbe7612488e00c30c810d341d9b0ce0ae8a48820e2c20553bc809b383c76f10c4416dd446c894e5354276604db347768eeafe0cb909d69dcc59b56d32
+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/libchamplain-0.12.20.ebuild b/media-libs/libchamplain/libchamplain-0.12.20.ebuild
index d6c790ec238c..da000ff48237 100644
--- a/media-libs/libchamplain/libchamplain-0.12.20.ebuild
+++ b/media-libs/libchamplain/libchamplain-0.12.20.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libchamplain"
 
 SLOT="0.12"
 LICENSE="LGPL-2.1+"
-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 vala"
 REQUIRED_USE="
diff --git a/media-libs/libclthreads/Manifest b/media-libs/libclthreads/Manifest
index 6ac7704409c2..cad0f92556be 100644
--- a/media-libs/libclthreads/Manifest
+++ b/media-libs/libclthreads/Manifest
@@ -2,6 +2,6 @@ AUX libclthreads-2.4.0-Makefile.patch 1589 BLAKE2B 13640b1e9a449e87277c5a89fd1df
 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 739 BLAKE2B 8eb9711168dc0f54f2a662aad9f1595950e4c554fe016550532490dafadc2c137e67d1518e6346653df4e0f73aacb04a714022861f363023d164f688738ec807 SHA512 41cfe771ca41c61052cef3205a68864fd96e1ae93da38f22a30d72e0f1064fb95c55c122ebbdb88b97513b2e7feaa263dc5b01f9837c5c11e05420f43cca4714
-EBUILD libclthreads-2.4.2.ebuild 847 BLAKE2B d706afe41079d5ffef845dcefb943b92faf1e1009ad75b868fe6d1c655ae799dc1060d727f32a3595de5f044debc75c61c950802f6dcf715af03866cb705efac SHA512 7d062187f06f454d9fcdff5df85b1d5e2485c7baa587868d4a3f7d74287a1a3e0b695e65301a448cb495d4d6a824020df2d8a7fdc4f2bc2049278cc12b390ea5
+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/libclthreads-2.4.0-r1.ebuild b/media-libs/libclthreads/libclthreads-2.4.0-r1.ebuild
index 68b3a2233e65..22339f553e9c 100644
--- a/media-libs/libclthreads/libclthreads-2.4.0-r1.ebuild
+++ b/media-libs/libclthreads/libclthreads-2.4.0-r1.ebuild
@@ -28,6 +28,6 @@ src_compile() {
 }
 
 src_install() {
-	emake CLTHREADS_LIBDIR="/usr/$(get_libdir)" DESTDIR="${ED}" install || die "make install failed"
+	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
index 885e5e9700ea..6efe7ccf191e 100644
--- a/media-libs/libclthreads/libclthreads-2.4.2.ebuild
+++ b/media-libs/libclthreads/libclthreads-2.4.2.ebuild
@@ -32,5 +32,5 @@ src_install() {
 	default
 
 	cd "${S}"/source || die "Failed to cd to sources"
-	emake PREFIX="${EPREFIX}/usr" INCDIR="include" LIBDIR="$(get_libdir)" DESTDIR="${ED}" install || die "make install failed"
+	emake PREFIX="${EPREFIX}/usr" INCDIR="include" LIBDIR="$(get_libdir)" DESTDIR="${ED}" install
 }
diff --git a/media-libs/libcue/Manifest b/media-libs/libcue/Manifest
index 9f11de831bc4..a0bfc7c8ac61 100644
--- a/media-libs/libcue/Manifest
+++ b/media-libs/libcue/Manifest
@@ -1,5 +1,5 @@
 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 459 BLAKE2B 6393783c894758a7541a0356f40d5d6052f213020c6cf2fffe9d90d2d30473d1df54faa3687dda39a4a9ac20da4279a83f3ed05203739bce05399e612a7fd977 SHA512 5d6f4ef4d045f1deebbfde6c0d2b95d163e02412890008107c1016de306223dabd593db6f920064b9f9e0a88dff6f416fa1862652df56b0e5289f976839c8c44
+EBUILD libcue-2.2.1.ebuild 451 BLAKE2B b3b3692c4cc3032650d54386d450b1c02ac6c2592118cd294ddd70ccab97d1bd5bb073263584a76625665c15c6aa3cdb98fad52861b4d46a7cc13d27271055ce SHA512 e3100f11c3a9a510539e83472cdc0ed03d2c3964c26081681cc149f78ef51eecd3a360e03ebac8a8319ec0f4563d3be9b28d446b18bebd532ba112515382be4f
 MISC metadata.xml 333 BLAKE2B b53c2f4525fc5364906575900f0792aab5c4a6d21bf2559b9e830f9881815ee49bdaa70cd3a751edfe1dbaf9c7f5d14489d02752d5d19046cb5c7c4f071838c4 SHA512 80d51540185719f20f9a9fc16180ae49806ef5db4a5bec9e39d54785c98773e3ed2301aa9dcf2c646d028fa814d62e98daabddd2293c471eab8a4d93d301a3cd
diff --git a/media-libs/libcue/libcue-2.2.1.ebuild b/media-libs/libcue/libcue-2.2.1.ebuild
index 71fc1c53e024..0e6a6eef721e 100644
--- a/media-libs/libcue/libcue-2.2.1.ebuild
+++ b/media-libs/libcue/libcue-2.2.1.ebuild
@@ -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/libdca/Manifest b/media-libs/libdca/Manifest
index f062d065bf37..74469d4f28bb 100644
--- a/media-libs/libdca/Manifest
+++ b/media-libs/libdca/Manifest
@@ -2,5 +2,5 @@ AUX libdca-0.0.5-cflags.patch 492 BLAKE2B 3090b187518cd899b76fff017bc544ccafaac0
 AUX libdca-0.0.5-tests-optional.patch 508 BLAKE2B ed77381970c59dee10e0b32d36183b390574acb0cfec1216f83bc4f2af784bc973d303d051f6348fd4d69dcbbcbc8b1bbb2f3dc7857fdaf05c46c885a463aad5 SHA512 0998e84e4855367b4c43e27e73d87c2b12c849a80864de66805e344eb32ad8463d46602d63b92edf1dd177d4fe77aa119c07952c6c2bc5de6add13468a9082a6
 DIST libdca-0.0.5-constant.patch.bz2 3424 BLAKE2B 048d7afd856090b5f9d0db1d5894b78d037fa1c03086271342527a1bf04f41ed379b38fe6d72eb9bbf74a864c67710b5f9abe53177cdb2f4f53a8e7502d77c44 SHA512 37bd56b8c240f16a6ee86b04d44571345278f8b9dd395cbc307e9fb7e6c001487411d1b4775af19dc97f18fcaed63be97fafeb4fe504f0a76b87022ec792d23e
 DIST libdca-0.0.5.tar.bz2 393291 BLAKE2B 093e941e8cd25ca52ae43ab16607f8ff3c5ebb95ffc4b29c3cb771b6bf9ba45da4cc8ebd83cd91ccd66b0dd981c32a6c77cb3e90f46093b64b9a483dd854ffb6 SHA512 d9f0ed34efeb3f27af8424fcb3e6df56744c6735854a65b5709c02b42b4513b9c4618dcc19eb44293afa051bd95616651bda5fc3b49dfabe975d0babfb1bc287
-EBUILD libdca-0.0.5-r3.ebuild 1482 BLAKE2B 0bca35eac3ba34ac8a05250ddb88ff3fc938da49977bdd99d9eb9b3a845fe6d70925ac1fa35b3497d5f5c1707b37c1d07b611e39c1f73fca6e76dbe2ddaa8b4f SHA512 a6e10ec712f88fea01776d43ce73a81b7eb5deb03c4beb9aa079ad3d05774eb4d2b68a281c26c6832386ecd5315404bb9b87bd109ab84ba1b4e50f5541a18544
+EBUILD libdca-0.0.5-r3.ebuild 1468 BLAKE2B c5aefd0cab5e5daa79f92e0af5cd1852a1c18946b18d6becc28e3cae21f8f806c69cc002efe20bbaa5be67ae104a59ade5d94d4357e7d0c643fd143ea7d16244 SHA512 3838245c34b878d18666965fdcf7c1397dc84b1f9e994db0079d47eca8dc39fdffb37641ed9a78a98d9eb73e030ad582da0174aff0e43b7f04bd49ff4414a8da
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libdca/libdca-0.0.5-r3.ebuild b/media-libs/libdca/libdca-0.0.5-r3.ebuild
index 5135522c6500..e261e853d4f4 100644
--- a/media-libs/libdca/libdca-0.0.5-r3.ebuild
+++ b/media-libs/libdca/libdca-0.0.5-r3.ebuild
@@ -43,11 +43,11 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
-	emake OPT_CFLAGS="" || die
+	emake OPT_CFLAGS=""
 }
 
 multilib_src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
 	find "${ED}" -name '*.la' -exec rm -f '{}' +
 	rm -f "${ED}"/usr/$(get_libdir)/libdts.a
diff --git a/media-libs/libdv/Manifest b/media-libs/libdv/Manifest
index 92bfe394314f..dcbf096694fa 100644
--- a/media-libs/libdv/Manifest
+++ b/media-libs/libdv/Manifest
@@ -1,8 +1,8 @@
-AUX libdv-0.99-2.6.patch 439 BLAKE2B f7c373b2f2a5f36e4a040e0df2bbe4eec95c00f95503274fd8a18c1ac3c3f1beafb5532a53e37492f0fcfcb410d8e0eb1faa6d052fcbf414c2d9e68087b6b5ff SHA512 acc1923c8ef8bde6dcbb9159d5308c4477c5b6dc240bc521500b5cbe4143a69e19897f0b1d571f22a3580aa4e8cd00c00767346317b8b0be57fafd5bf09321cd
-AUX libdv-1.0.0-darwin.patch 1371 BLAKE2B c88fc5d63934b4fe5ac33b7d5d11e15051b266c48b2bf9a8c9fcea118e5bc166328b19d278420e578813f1617c01c16ec2ba2ae55787cf500154823c6b403598 SHA512 e3fc6f247dca712b1d32d9bc5ebafbc7f7bfc4cfe7f0c8cd24082fe866c383933dbc6fdef5d1d54134a55145fe89fdda04521bc6f49eac22f5f56b1b06735240
-AUX libdv-1.0.0-solaris.patch 4318 BLAKE2B 46506a694d6635bbc5ac2f26a470ebe924017e07e0440274ab1831049d9b3b678eec4921ac4b3a6464092409af40487b9c3ab028caeccdf2d1bd865d28069edd SHA512 dc28e7828ec0348b761e47ea2a113412f8ca3a3cf42d2beeaa3a5e5586885fc2b495509b36cf3ac7de82473be86476da46e998d785a11fd2cb6b8a3bf2232647
+AUX libdv-0.99-2.6.patch 360 BLAKE2B 9d50a7db83e137ec132d0f74205acdc91a2c60ac38a57399f73b00c37f2b665766c1f732ebaee4c2854b6e2901b4c00709cbac7d4b34005505daaf778ed207f6 SHA512 0f1d2f9ed2c35d9cd973cd28cde41992bf4e552e478c68af13de23a1abe11de9cc8b48cf307e965ccefc4242d65b6668050059a3fc394a56b5d0fd64518293f7
+AUX libdv-1.0.0-darwin.patch 1387 BLAKE2B 176cf7d2b8d8b6407615782f74a169c7d32d4b4db5d594a486d689a4881568605919bacb2b534436bf5007bed0025f27bb26d0f0232ebbcde9ff08bb5533c40a SHA512 63d65d7cfac1236c43cfb4b271113c8437a4394bf5eecf60761b516d1121e34d8f9690e62c917e2f8e1933a709eed79f3cf5d38e87c9bf9c74b413f3c0115cf9
+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 1344 BLAKE2B d0ea18cd95a43244a76a6913f133f68fde55a623988af7de9aa7c6eff70cfe693f3c19497a7b92e2b22e6ef83fc7031726b7f8761ff99e0b9a2e081477985c96 SHA512 6e39e98c1d746ede722d105388867b90ff32eb57e816b287dea6b77d41e4093b52ea993210670f0d98ea2e3a15c1dcf15efc39addb868160486a3b5f1187ffa5
+EBUILD libdv-1.0.0-r4.ebuild 1261 BLAKE2B 4acc813c74d46af4fe0926a5d4d7de71bfb74a17a9ab8934efbfec11bc311d104ebf2a552d6829bbb633c1e20986eec4448d28fa9226ed8a69f2f2cf32fc9643 SHA512 6a2860320d5f2163e5feeb7e05d96f231c2c1f31e71cd41914ad32afcc3763161410f53f94e79186d0a89c05085f2a471f6444b8849c7cffb195d817cac30118
 MISC metadata.xml 298 BLAKE2B 673bcb158cdfda64a33e7d107dfbe978badcbbd44312638f845fe3c1fe481d3060820f587d87277366955e47d65334e1365d87ae3b733ff22e1442bf399336be SHA512 7a9face79c85c9ddf6e562db5fe3c1702c20147adec5564dfb67695e5be198732c57d5592985466432ebf9201704dc848b9e8b73f9483096c942f0c5ecf87cb7
diff --git a/media-libs/libdv/files/libdv-0.99-2.6.patch b/media-libs/libdv/files/libdv-0.99-2.6.patch
index c2663be353d4..f9a5fb1e5fea 100644
--- a/media-libs/libdv/files/libdv-0.99-2.6.patch
+++ b/media-libs/libdv/files/libdv-0.99-2.6.patch
@@ -1,8 +1,8 @@
---- libdv-0.99/libdv/enc_input.c	2002-12-31 23:04:02.000000000 +0000
-+++ libdv-0.99/libdv/enc_input.c.plasmaroo	2003-12-30 16:42:19.000000000 +0000
-@@ -48,13 +48,13 @@
- 
- #if HAVE_DEV_VIDEO
+--- a/libdv/enc_input.c
++++ b/libdv/enc_input.c
+@@ -50,13 +50,13 @@
+ #define _DEVICE_H_
+ #define _LINUX_TIME_H
  #include <sys/types.h>
 -#include <linux/videodev.h>
  #include <sys/time.h>
diff --git a/media-libs/libdv/files/libdv-1.0.0-darwin.patch b/media-libs/libdv/files/libdv-1.0.0-darwin.patch
index c6d48d5a6949..5522e9d7e602 100644
--- a/media-libs/libdv/files/libdv-1.0.0-darwin.patch
+++ b/media-libs/libdv/files/libdv-1.0.0-darwin.patch
@@ -2,8 +2,8 @@
 
 https://sourceforge.net/tracker/index.php?func=detail&aid=2606558&group_id=4393&atid=304393
 
---- configure.ac
-+++ configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -244,7 +244,7 @@
  
  dnl Checks for library functions.
@@ -13,8 +13,8 @@ https://sourceforge.net/tracker/index.php?func=detail&aid=2606558&group_id=4393&
  
  AC_SUBST(ac_aux_dir)
  AC_SUBST(RPM_RELEASE)
---- configure
-+++ configure
+--- a/configure
++++ b/configure
 @@ -22621,7 +22621,7 @@
  rm -f conftest.mmap
  
@@ -24,8 +24,8 @@ https://sourceforge.net/tracker/index.php?func=detail&aid=2606558&group_id=4393&
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
  { echo "$as_me:$LINENO: checking for $ac_func" >&5
---- config.h.in
-+++ config.h.in
+--- a/config.h.in
++++ b/config.h.in
 @@ -24,6 +24,12 @@
  /* Define to 1 if you have the `gettimeofday' function. */
  #undef HAVE_GETTIMEOFDAY
@@ -39,8 +39,8 @@ https://sourceforge.net/tracker/index.php?func=detail&aid=2606558&group_id=4393&
  /* Define as 1 if you have gtk */
  #undef HAVE_GTK
  
---- encodedv/dvconnect.c
-+++ encodedv/dvconnect.c
+--- a/encodedv/dvconnect.c
++++ b/encodedv/dvconnect.c
 @@ -860,7 +860,7 @@
  
  int rt_raisepri (int pri)
diff --git a/media-libs/libdv/files/libdv-1.0.0-solaris.patch b/media-libs/libdv/files/libdv-1.0.0-solaris.patch
index e9cb440022af..8580d4ba7fd6 100644
--- a/media-libs/libdv/files/libdv-1.0.0-solaris.patch
+++ b/media-libs/libdv/files/libdv-1.0.0-solaris.patch
@@ -3,8 +3,8 @@
 
 https://sourceforge.net/tracker/index.php?func=detail&aid=2603455&group_id=4393&atid=304393
 
---- configure.ac
-+++ configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -208,6 +208,8 @@
  
  
@@ -23,8 +23,8 @@ https://sourceforge.net/tracker/index.php?func=detail&aid=2603455&group_id=4393&
  
  dnl Checks for typedefs, structures, and compiler characteristics.
  AC_C_CONST
---- configure
-+++ configure
+--- a/configure
++++ b/configure
 @@ -20895,6 +20895,92 @@
  
  fi
@@ -127,8 +127,8 @@ https://sourceforge.net/tracker/index.php?func=detail&aid=2603455&group_id=4393&
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
---- config.h.in
-+++ config.h.in
+--- a/config.h.in
++++ b/config.h.in
 @@ -30,6 +30,9 @@
  /* Define to 1 if you have the <inttypes.h> header file. */
  #undef HAVE_INTTYPES_H
@@ -139,8 +139,8 @@ https://sourceforge.net/tracker/index.php?func=detail&aid=2603455&group_id=4393&
  /* Define to 1 if you have the `m' library (-lm). */
  #undef HAVE_LIBM
  
---- encodedv/dvconnect.c
-+++ encodedv/dvconnect.c
+--- a/encodedv/dvconnect.c
++++ b/encodedv/dvconnect.c
 @@ -31,6 +31,9 @@
  
  #include <stdio.h>
diff --git a/media-libs/libdv/libdv-1.0.0-r4.ebuild b/media-libs/libdv/libdv-1.0.0-r4.ebuild
index 6788633e8d69..e519ffd56a41 100644
--- a/media-libs/libdv/libdv-1.0.0-r4.ebuild
+++ b/media-libs/libdv/libdv-1.0.0-r4.ebuild
@@ -1,44 +1,47 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit epatch epunt-cxx libtool ltprune flag-o-matic multilib-minimal
+inherit autotools 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
+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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="static-libs"
+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="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="dev-libs/popt:="
+DEPEND="
+	${RDEPEND}
+	media-libs/libsdl"
+BDEPEND="virtual/pkgconfig"
 
-DOCS=( AUTHORS ChangeLog INSTALL NEWS TODO )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.99-2.6.patch
+	"${WORKDIR}"/${PN}-1.0.0-pic.patch
+	"${FILESDIR}"/${PN}-1.0.0-solaris.patch
+	"${FILESDIR}"/${PN}-1.0.0-darwin.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.99-2.6.patch
-	epatch "${WORKDIR}"/${PN}-1.0.0-pic.patch
-	epatch "${FILESDIR}"/${PN}-1.0.0-solaris.patch
-	epatch "${FILESDIR}"/${PN}-1.0.0-darwin.patch
-	elibtoolize
-	epunt_cxx #74497
+	default
+	eautoreconf
 
 	append-cppflags "-I${S}"
 }
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}"	econf \
-		$(use_enable static-libs static) \
+		--disable-static \
 		--without-debug \
 		--disable-gtk \
-		--disable-gtktest \
 		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
+
 	if ! multilib_is_native_abi ; then
 		sed -i \
 			-e 's/ encodedv//' \
@@ -47,6 +50,8 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files --all
 	einstalldocs
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libebur128/Manifest b/media-libs/libebur128/Manifest
index 513af3093435..5d419d3ca8f1 100644
--- a/media-libs/libebur128/Manifest
+++ b/media-libs/libebur128/Manifest
@@ -1,6 +1,6 @@
 DIST ebu-loudness-test-setv05.zip 91631421 BLAKE2B 95a345b0700893ab96854c7563ecc9c667db30e8137352226d1f1ac7a666f6b08d1748d88ef11f72056d0a4bd513f365a1336de568ea45917a6ba9af5bc526ea SHA512 60d022fdac47ad0be2688411be9daecbff85da994d6fa4921bba6cffab841b081d8b15d9ce284ad2253efb686463450a84a0d19cb0bad7a934546cc52dd73771
 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 970 BLAKE2B 756ad8d9412bc752117965ec970f7b102626829b833a82d78ce40c84dd1b8ba3243c1a183cbff4a139a6e87468fc3ae862858cb429f61ed05c1e2d95de849111 SHA512 43df56ce963f83c6b87e7e2a4ecfd9b44317956b44ef58be7ba210ecfecf9da64dfa136eb2e8e016253e5af1f9e966a0ce4d853cbeb66fe435a1afb7c50d4514
-EBUILD libebur128-1.2.4.ebuild 978 BLAKE2B ccb54106d660b69e0d1fc10f1a7fd122e6f32fc62b83adfd567d5314c3a44dd43ff770f9e2b9cb091be039bb51554cd5f8f1ccd6ba3e9ce424f0d584b0187d40 SHA512 238457dd51c2319a80d27d6e8fce86b7cd6925b0acf20096cd54fd542efb365f62b0034fe52e06c103fb9d2cf55e6734b6042cdac03bc9e89da70af92b742f13
+EBUILD libebur128-1.2.3.ebuild 997 BLAKE2B 9c95e87e2eac5bf7128c442a3a4bc019c84c56cf82ba69e7ccf3d404690e8e903be514db85064a07c9da8d3debb18f62c6be7fe039f287f9add81dfdcae909db SHA512 dd326a7d274268382ff68a42db07546b5608bb181a5907d0aa130e33f086dd16fce447e691416f7fe0eaba81b1419a6cb31f95410067e883f98444a5c2486fe5
+EBUILD libebur128-1.2.4.ebuild 998 BLAKE2B f60bf628e84e9fc2141a24b2158778b5bc9e1ddaa3e52396a18fa782ac730cb2c72f67458c41ea9b903edd96bbaae13707d0520a27517832d7cd881ec0125f9c SHA512 d9de04e72d21415a612828f91fc12ac863f496954d3a060d1f76b6bec84bdb4ede62093048c1aaeac0a6903a2f057f156ad83bd4054dfbc878abc52fae05a989
 MISC metadata.xml 751 BLAKE2B dc363e6e8a40a11e18c8204cf4ce6b3054bb8edf61b872c836af6404230e6e9a1fe758bcc49bafc83dbb0fd36c9cb37a65d3b889cf2c323b441f7e763312dd8d SHA512 2fe85871c10acb1d2aed6ada85d2522e6bfdd4bc51f06c560e262438840e499bbec842e451074275431c94892d887eeeab715f3e8ad2a0b85fbb5a5fce200617
diff --git a/media-libs/libebur128/libebur128-1.2.3.ebuild b/media-libs/libebur128/libebur128-1.2.3.ebuild
index 6f67e6141e31..eebf2737fd23 100644
--- a/media-libs/libebur128/libebur128-1.2.3.ebuild
+++ b/media-libs/libebur128/libebur128-1.2.3.ebuild
@@ -14,6 +14,7 @@ LICENSE="MIT"
 SLOT="0/1"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( app-arch/unzip
 		media-libs/libsndfile[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/libebur128/libebur128-1.2.4.ebuild b/media-libs/libebur128/libebur128-1.2.4.ebuild
index 20e824cc1a28..c4b92f343ee3 100644
--- a/media-libs/libebur128/libebur128-1.2.4.ebuild
+++ b/media-libs/libebur128/libebur128-1.2.4.ebuild
@@ -12,8 +12,9 @@ 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 )"
 
 DEPEND="test? ( app-arch/unzip
 		media-libs/libsndfile[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index 4399ebd7242b..1c0f0a583504 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -1,4 +1,6 @@
 DIST libepoxy-1.5.3.tar.gz 326768 BLAKE2B 053665429a249adca4c9b3d57797949e3a0ffd0ed3f1c66cb8becfb884431e44a4cccb6b2fd3788a86ee01268ebad3cc36e67e391d2aa5cdea28837a162be9ad SHA512 e831f4f918f08fd5f799501efc0e23b8d404478651634f5e7b35f8ebcc29d91abc447ab20da062dde5be75e18cb39ffea708688e6534f7ab257b949f9c53ddc8
-EBUILD libepoxy-1.5.3-r1.ebuild 1289 BLAKE2B 9e159119dbebfdd182be34075c3d29c0aa1b827e6389d752a13d245ac56b187b9ce18ba442ee4e71f3f006dcba395c8776a4bd58769a70140a4bb22116b769ea SHA512 cc7cf93c2e54150e45ec68273b5ffca52153be81431ca25b1f0cfada0efc5393973ed4b6370130542ffe0ffcd7686455bcf29c93ac7a2a71eb7d9039509745df
-EBUILD libepoxy-9999.ebuild 1294 BLAKE2B d693bd46618793f86ac48d05ac49ac87716b987713c8ed0ff99fb7f53e9e2b11af343e8ec5a56671900d9a6b3a5fe6886ea5c5de1e854371dcb0f2ed86e2b030 SHA512 18c375fc8b8060c3f829095bb85a861f26bb90a4ef10cf43bc22ee70026078f878de331ec7a787bcd4c815049e60fc19bbee2eb7a9fb39fd8e4be1c83cb6bc7a
+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
 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 ac36a7ad49c6..708bfd86c630 100644
--- a/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild
@@ -25,6 +25,7 @@ fi
 LICENSE="MIT"
 SLOT="0"
 IUSE="+egl test +X"
+RESTRICT="!test? ( test )"
 
 RDEPEND="egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )"
 DEPEND="${PYTHON_DEPS}
diff --git a/media-libs/libepoxy/libepoxy-1.5.4.ebuild b/media-libs/libepoxy/libepoxy-1.5.4.ebuild
new file mode 100644
index 000000000000..667228151062
--- /dev/null
+++ b/media-libs/libepoxy/libepoxy-1.5.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://github.com/anholt/${PN}.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_REQ_USE='xml(+)'
+inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1
+
+DESCRIPTION="Epoxy is a library for handling OpenGL function pointer management for you"
+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"
+	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="!test? ( test )"
+IUSE="+egl test +X"
+
+RDEPEND="egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )"
+DEPEND="X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+	${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig"
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Degl=$(usex egl)
+		-Dglx=$(usex X)
+		$(meson_use X x11)
+		$(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/libepoxy/libepoxy-9999.ebuild b/media-libs/libepoxy/libepoxy-9999.ebuild
index 6c2f3fa8e696..667228151062 100644
--- a/media-libs/libepoxy/libepoxy-9999.ebuild
+++ b/media-libs/libepoxy/libepoxy-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 EGIT_REPO_URI="https://github.com/anholt/${PN}.git"
 
@@ -18,19 +18,19 @@ HOMEPAGE="https://github.com/anholt/libepoxy"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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
 
 LICENSE="MIT"
 SLOT="0"
+RESTRICT="!test? ( test )"
 IUSE="+egl test +X"
 
 RDEPEND="egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )"
-DEPEND="${PYTHON_DEPS}
-	${RDEPEND}
-	>=dev-util/meson-0.47.0
-	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+DEPEND="X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+	${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig"
 
 src_unpack() {
@@ -42,8 +42,8 @@ multilib_src_configure() {
 	local emesonargs=(
 		-Degl=$(usex egl)
 		-Dglx=$(usex X)
-		-Dx11=$(usex X true false)
-		-Dtests=$(usex test true false)
+		$(meson_use X x11)
+		$(meson_use test tests)
 	)
 	meson_src_configure
 }
diff --git a/media-libs/libexif-gtk/Manifest b/media-libs/libexif-gtk/Manifest
index 2bdeea42515c..3a9c13b4325f 100644
--- a/media-libs/libexif-gtk/Manifest
+++ b/media-libs/libexif-gtk/Manifest
@@ -1,5 +1,5 @@
-AUX libexif-gtk-0.3.5-confcheck.patch 720 BLAKE2B 395d86fc35747ae242a71899d1c707eb208a13423e2c7e28ff9d97383e3e5068bb56ec01ea1c83ec6209d3a3b09d95a2a715016bfa1128c4f84b8dfde2f0149c SHA512 be2dc1b269ff757b7bac2b178a47003e266a08bc6ff64ec06ecc2eda4e95fa6ee721cf79d9785738b4242fa3d8e9319e46a2fca805d9153ab86d35a59888588f
+AUX libexif-gtk-0.3.5-confcheck.patch 647 BLAKE2B 75bb71eb2e4b2678cf6b5e0ca8badca8c5e840230cc038ea4adf93a54ef3706e2fd858cb44d62cbd86a504670543e2f5a5cef97ddbf5058e37505415428fdced SHA512 b3cbef32167ce10845a6983ab648794d40c83f6f049493b18703f31148c91654a4362215a5d9ae554e9a88bd25875a067e41bda00a2f3ec41b8795e304c8947a
 AUX libexif-gtk-0.3.5-gtk212.patch 954 BLAKE2B 2312a0faa54ae07653f9b50265770137ff519ea2bfdb2ebf98956ec2f282b9f3b0bd4af51ed445ced57c0f5487645d5f784e9aa7120675fcef1f954888842cd6 SHA512 db07e9350c469129440adfed75fbb697589493a0dea2386c6e31bd8cc9c282f9c0f2de99e1a141a50651e816aabbda5da6aa54957d0d21d95fe882a9df87e0d3
 DIST libexif-gtk-0.3.5.tar.gz 396534 BLAKE2B 7ec81dee28893e42a80541b8d3c4129375c9fad2fa8c0a2c2b416eaebb0885d82cde51c2a7844b541c9c55e0f7d16380befcaee83fd0782e37a03289c76fc0c3 SHA512 c4df800f7bcc04fb27638ba56d8bda3ea27afadc94fae792a59673cef867f29976376f1ca00da899a7b2176ddb6f3e53bfe770a86171428cebe68bd413861baf
-EBUILD libexif-gtk-0.3.5-r2.ebuild 837 BLAKE2B 9808d54dcd123390196463149c9eb89b899abad2d700c4b37d2c1b9bfb40a281762ff60deeacbe5b26a81c9eb3e204bb28c35a57538e1bc95b33f6b8b60fa1a1 SHA512 88991e2e3abd65a303196e2691463d423c9f95de82c5a613df915f61b0fc4ab1bfd7252494457b376ffa6b774aa1cf5cd38be9bce381aae9aa66531207f04a90
+EBUILD libexif-gtk-0.3.5-r2.ebuild 869 BLAKE2B 9294bd38e75bf3df443f701c037df66caa0ec5d1c41011490053990600d94e96c1e6776b034f420c5527931d4d9cc7ddd4db0ba5e68c486ff21544c366fb4a55 SHA512 4a606451504d8198434785d0cdd76fe39c0d9a82c1fcbc52ada145bddf33cae2262e7f93f16367801c2e2f35459d18a1f918696e469b4e9bfd62bf130fb6e9b5
 MISC metadata.xml 346 BLAKE2B afa06166d278c5157eb097eb2d1c70fb929e86830868eddf353de6d8178f8966fc0ca06b52c95129555c3d0b4e15202f16135352bec3578cacbcaf7a9eceacb1 SHA512 195346710c3ead4bf9c050f5ebe548e0e7bb86bb1f9f61b2c1664cdda094c0523ee3c77769de7819b2d82cc4abd55e3b57c0827fdd0f97cc440f40b7519feec5
diff --git a/media-libs/libexif-gtk/files/libexif-gtk-0.3.5-confcheck.patch b/media-libs/libexif-gtk/files/libexif-gtk-0.3.5-confcheck.patch
index ed22ca64115f..33d130884a4a 100644
--- a/media-libs/libexif-gtk/files/libexif-gtk-0.3.5-confcheck.patch
+++ b/media-libs/libexif-gtk/files/libexif-gtk-0.3.5-confcheck.patch
@@ -1,5 +1,5 @@
---- configure.in.orig	2004-10-18 15:12:58.000000000 -0400
-+++ configure.in	2006-01-05 19:06:05.000000000 -0500
+--- a/configure.in
++++ b/configure.in
 @@ -52,7 +52,7 @@
  dnl ---------------------------------------------------------------------------
  CPPFLAGS_save="$CPPFLAGS"
diff --git a/media-libs/libexif-gtk/libexif-gtk-0.3.5-r2.ebuild b/media-libs/libexif-gtk/libexif-gtk-0.3.5-r2.ebuild
index 8afe10813437..8cf633a8fe0b 100644
--- a/media-libs/libexif-gtk/libexif-gtk-0.3.5-r2.ebuild
+++ b/media-libs/libexif-gtk/libexif-gtk-0.3.5-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit autotools eutils
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="GTK+ frontend to the libexif library (parsing, editing, and saving EXIF data)"
 HOMEPAGE="http://libexif.sf.net"
@@ -11,30 +12,35 @@ SRC_URI="mirror://sourceforge/libexif/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="nls static-libs"
+IUSE="nls"
 
-RDEPEND="x11-libs/gtk+:2
-	>=media-libs/libexif-0.6.12"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:2
+	media-libs/libexif:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-DOCS=( ChangeLog )
+PATCHES=(
+	"${FILESDIR}"/${P}-confcheck.patch
+	"${FILESDIR}"/${P}-gtk212.patch
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-confcheck.patch \
-		"${FILESDIR}"/${P}-gtk212.patch
-
+	default
+	mv configure.{in,ac} || die
 	AT_M4DIR="m4" eautoreconf
 }
 
 src_configure() {
 	econf \
-		$(use_enable static-libs static) \
+		--disable-static \
 		$(use_enable nls)
 }
 
 src_install() {
 	default
-	rm -f "${ED}"usr/lib*/${PN}.la
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest
index 647930a6bff4..c1228672aeb1 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 2805 BLAKE2B 294573819dbd18cc6adab42eda7b65044e34ff174626252b88ed6f0d3705c5620cd45fdad525886fabb1b9c73ce7498d23342373ee1d389cd3d8435b52164875 SHA512 e8705c0f1cd0b0a5ce47875d7993678e3b5680bf4c1b9aa8250e5db0f31305f3ed02e980ccf42cf0396b48cc182f3bc788b711ead2c9639381983cf48e477362
+EBUILD libffado-2.4.1.ebuild 2803 BLAKE2B 4b586f0498fccee8a340fbf2f9260119c9d0fba88627eed9077a0ca092f0fc51d88f055942e9eb40176e8e77c94a607d4745ac94359777b825ca82c373ac5ebc SHA512 c9255ad333bf63f5e0a8ed0e74e1ea6b288381e6ece7845841624c0883d147ac4aece3ee7020b24c74fb4b60833f951c5a0e472e24999460dbb640369bf01d3a
 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 f2e545402ef3..04743360d811 100644
--- a/media-libs/libffado/libffado-2.4.1.ebuild
+++ b/media-libs/libffado/libffado-2.4.1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" = "9999" ]]; then
 	ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/${PN}"
 else
 	SRC_URI="http://www.ffado.org/files/${P}.tgz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 fi
 
 LICENSE="GPL-2 GPL-3"
diff --git a/media-libs/libfreehand/Manifest b/media-libs/libfreehand/Manifest
index 9652b2e45336..7d66c790722d 100644
--- a/media-libs/libfreehand/Manifest
+++ b/media-libs/libfreehand/Manifest
@@ -1,5 +1,5 @@
 AUX libfreehand-0.1.2-icu-65.patch 993 BLAKE2B 80699fd1393f3234b2041eb0c15fe53cbb3fec9c0911b21fc4a4b9834be5dba781b68ea506c18ed34982f588b243c6df0757bdd720f71bb9927b2fda8a6211fa SHA512 ff271f6132417940c1269a4df76c956960014e44b15284f5b03e90ed2668517fdd864cd281ceda1d7cc02df46c194c9cefcfd52e71fd7ae6398a81684b976d71
 DIST libfreehand-0.1.2.tar.xz 516132 BLAKE2B 7c2dc629fd2a84f23dcd721ed6f9d4644e3bf7a160be9ca5ec0f15a72ae63b3cf861f80fafa12ef1f99b02e0fbc1c806bc37c466010a420bb425f4f9e2757928 SHA512 4112a76ac99999801d97d1b282596d631d8496a5bf65778ab26aa06da86637b1e2b630648a67ea01bf3316ecec9f2715546baff27af090b900267c87a011b963
-EBUILD libfreehand-0.1.2.ebuild 1233 BLAKE2B 4647efda1f1deacc37803685100f3be57f295c340b7a6b5f600a9eb10c86ddd644130190ce1451f9ea078c2c62a4bb7949a53dafc38e04195d9ccd4dc725a404 SHA512 1335465da62d7eba078160509d4ff6e89171614142b102e8a38843fc78cae34fbe096072324f24f88582c6e3acc548e3fd5caa8b33f40e6b2122a924073f3cb9
-EBUILD libfreehand-9999.ebuild 1219 BLAKE2B 1492965e949240027d702e3d1dcae52ba2d2f755969db240321375ab465229b31ecf1bb020305e3c8e5adf96b032fd88a0260f679639c9135dcca39f69ddfa5b SHA512 e4999e91f63a9767373d46bacac7e5617f2544838261c37d6f84332fb37b6bcc78f94eee5e3cdebe20b228685803e9b8377ff7b96bc2b674e76b9ae886607ce9
+EBUILD libfreehand-0.1.2.ebuild 1260 BLAKE2B 1525bee01d4398b95785a6ab933a660ad8a2ff843f72aa7bf5293b194942ed2331de75c27a3bb4566b7f2e2ff1fa9f021fabfda18dfe2c9d90df3f6aaab0cfbd SHA512 8d3d9882a6af58f20c0da16d963586f3f918b0d240e228030d4e8e4ce412431e2ab97cb567d34909274124e7be6989ff127d0ac6011ad67f4cc9e3d8b06a39be
+EBUILD libfreehand-9999.ebuild 1246 BLAKE2B 767d2896865fd15b611bc8fdeb7d18992ca93d357cee5c2d326819349e450edfda10e48f863a69a62e15debbf45e1b4806a51e5b85e38273b24d34e806c19046 SHA512 1a37677a4de0caa0d04876d8a46bed67a9a62318526bde2eb2623664583a27816d069a16e1ab2eeab5ccb27265020c91d53028392254283a4735e734030c6314
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/media-libs/libfreehand/libfreehand-0.1.2.ebuild b/media-libs/libfreehand/libfreehand-0.1.2.ebuild
index ac35aa0e43ab..0caf03f8f057 100644
--- a/media-libs/libfreehand/libfreehand-0.1.2.ebuild
+++ b/media-libs/libfreehand/libfreehand-0.1.2.ebuild
@@ -17,6 +17,7 @@ SLOT="0"
 [[ ${PV} == 9999 ]] || \
 KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/librevenge
diff --git a/media-libs/libfreehand/libfreehand-9999.ebuild b/media-libs/libfreehand/libfreehand-9999.ebuild
index b0b78cb0249e..37f65017def8 100644
--- a/media-libs/libfreehand/libfreehand-9999.ebuild
+++ b/media-libs/libfreehand/libfreehand-9999.ebuild
@@ -18,6 +18,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libfreehand"
 LICENSE="MPL-2.0"
 SLOT="0"
 IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	virtual/pkgconfig
diff --git a/media-libs/libgig/Manifest b/media-libs/libgig/Manifest
index 2f53c46d677b..87ea8d8654ea 100644
--- a/media-libs/libgig/Manifest
+++ b/media-libs/libgig/Manifest
@@ -1,3 +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-9999.ebuild 851 BLAKE2B ee61ed3123e3e45d21dd4653231e0163ab2459b412524c1f09a486e789b72abc569913777251ab27aa75801dd003d0d9df3fc7a5230c73387c3d6585ef8f1a64 SHA512 9f839169b0ab8e055519c0089b5414357347039ba29a6ee4acb058c2c49921f660bde6839489956095f170d52f7268afb8a57631bb2ee5f7265837aa03d7484e
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libgig/libgig-9999.ebuild b/media-libs/libgig/libgig-9999.ebuild
new file mode 100644
index 000000000000..561d6f46afc3
--- /dev/null
+++ b/media-libs/libgig/libgig-9999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools subversion
+
+DESCRIPTION="C++ library for loading Gigasampler and DLS level 1/2 files"
+HOMEPAGE="https://www.linuxsampler.org/libgig/"
+ESVN_REPO_URI="https://svn.linuxsampler.org/svn/libgig/trunk"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc"
+
+RDEPEND="
+	media-libs/audiofile
+	media-libs/libsndfile"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	default
+
+	emake -f Makefile.svn
+	eautoreconf
+}
+
+src_compile() {
+	emake
+	use doc && emake docs
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	use doc && HTML_DOCS=( doc/html/. )
+	einstalldocs
+
+	# For libgig.so to be found at runtime
+	printf "LDPATH=\"${EPREFIX}/usr/$(get_libdir)/libgig/\"" > 99${PN}
+	doenvd "99${PN}"
+}
diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index b60248d3efa6..a2b928ab177c 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,4 +1,6 @@
-DIST libglvnd-1.2.0.tar.gz 2030275 BLAKE2B b6b147f431ba9a177be9eada7af0e4ffc05c412e29f3a257746d74ff99078ecf87f7e66a97f7c1ce2779b3224bf3e7d1c4ab57c437074ae754e646c9275dae7f SHA512 f09a3ab3f1ba7397616cf2b0baf4385bd2127abb06817f8b383549cb21f36802be24a29598d7bfdd4c410b9ea95335b4ffc52529824dc88a719af52432c6b74c
-EBUILD libglvnd-1.2.0-r1.ebuild 1131 BLAKE2B 68103807f3f8628064fed57b7c95537b9daf1a2959a06fb6ff2a92037395397e88a5a6dc75140b1bb6d6166ea9719eb42c52dd2a14e0b342622e2b676931c21b SHA512 45a7e3ead4a35a2799b4495b2ab0cf9a5b77560c4d01209bb27ee60dce06a72fdfd590fccbd6cd24d5d3f4e4688d59c10ac95a0d971698496da3c4267981744d
-EBUILD libglvnd-9999.ebuild 1200 BLAKE2B c166dab6fd8fd1f0ab5adab02e9f3e701c1eee437c69fc8f15aadc54fd6edc90384a06dae0414361f0a65ccf9055a0c2db68ddb75f339071988acf64c66ebe5d SHA512 360491fd36d068ab479b8d9d597f802a72c97751d20d354ecf6c1292059b08c7aa8bf9105d23c756dc1adf499c1fce1e8a0277dd643a6324d58d2473bc2c4be1
+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
 MISC metadata.xml 314 BLAKE2B 34c95a3e321c3059bca39c7beb5b7b15e8085b54affb267947fb3676018fa183040a157716e979c5e0381acdea6e738294b37841e75da308c3632fb3587dec33 SHA512 fa12f7fa880b0721baf2eb40b9fd8a68e51c143dd8ede7a199c5afcd5a208f84c51a80fc1f4bc68b266338bac8bf4137b2443d88567150f2c54b2f11913df89c
diff --git a/media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-PPC64-build.patch b/media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-PPC64-build.patch
new file mode 100644
index 000000000000..51a26c8e0dc8
--- /dev/null
+++ b/media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-PPC64-build.patch
@@ -0,0 +1,54 @@
+From 5ffb8df0ae243f611a0752950443e7a9877e502c Mon Sep 17 00:00:00 2001
+From: Kyle Brenneman <kbrenneman@nvidia.com>
+Date: Fri, 6 Dec 2019 07:27:54 -0700
+Subject: [PATCH 2/2] meson: Fix the PPC64 build.
+
+Check for a cpu_family value of 'ppc64', not 'ppc'. 'ppc' is for 32-bit power.
+
+In GLdispatch, fix the file list for the PPC64 entrypoints.
+---
+ meson.build                          | 4 ++--
+ src/GLdispatch/vnd-glapi/meson.build | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 44c7172..602e837 100644
+--- a/meson.build
++++ b/meson.build
+@@ -55,7 +55,7 @@ if not with_asm.disabled()
+     add_project_arguments('-DUSE_ARMV7_ASM', language : 'c')
+   elif host_machine.cpu_family() == 'aarch64'
+     add_project_arguments('-DUSE_AARCH64_ASM', language : 'c')
+-  elif host_machine.cpu_family() == 'ppc' and host_machine.endian() == 'little'
++  elif host_machine.cpu_family() == 'ppc64' and host_machine.endian() == 'little'
+     add_project_arguments('-DUSE_PPC64LE_ASM', language : 'c')
+   elif with_asm.enabled()
+     error('No ASM available for @0@ (@1@ endian)'.format(host_machine.system(), host_machine.endian()))
+@@ -118,7 +118,7 @@ if use_asm
+   elif host_machine.cpu_family() == 'aarch64'
+     gl_dispatch_type = 'aarch64_tsd'
+   elif host_machine.cpu_family() == 'ppc64' and host_machine.endian() == 'little'
+-    gl_dispatch_type = 'ppc64le_@1@'.format(have_tls ? 'tls' : 'tsd')
++    gl_dispatch_type = 'ppc64le_@0@'.format(have_tls ? 'tls' : 'tsd')
+   endif
+ endif
+ add_project_arguments('-DGLDISPATCH_TYPE_@0@'.format(gl_dispatch_type.to_upper()), language : ['c'])
+diff --git a/src/GLdispatch/vnd-glapi/meson.build b/src/GLdispatch/vnd-glapi/meson.build
+index ce20178..200d476 100644
+--- a/src/GLdispatch/vnd-glapi/meson.build
++++ b/src/GLdispatch/vnd-glapi/meson.build
+@@ -55,9 +55,9 @@ else
+   elif gl_dispatch_type == 'aarch64_tsd'
+     _entry_files += 'entry_aarch64_tsd.c'
+   elif gl_dispatch_type == 'ppc64le_tls'
+-    _entry_files += 'entry_aarch64_tls.c'
++    _entry_files += 'entry_ppc64le_tls.c'
+   elif gl_dispatch_type == 'ppc64le_tsd'
+-    _entry_files += 'entry_aarch64_tsd.c'
++    _entry_files += 'entry_ppc64le_tsd.c'
+   else
+     error('No matching ASM file for @0@'.format(gl_dispatch_type))
+   endif
+-- 
+2.23.0
+
diff --git a/media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-armv7-build.patch b/media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-armv7-build.patch
new file mode 100644
index 000000000000..e520ae7ff4a8
--- /dev/null
+++ b/media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-armv7-build.patch
@@ -0,0 +1,36 @@
+From 9ccdb05cdd620c4ae9454010f419d7d11c0efcdc Mon Sep 17 00:00:00 2001
+From: Kyle Brenneman <kbrenneman@nvidia.com>
+Date: Fri, 6 Dec 2019 07:22:40 -0700
+Subject: [PATCH 1/2] meson: Fix the armv7 build.
+
+Fix the GLdispatch meson file so that it checks for the value "armv7_tsd" for
+gl_dispatch_type instead of "arm_tsd".
+---
+ src/GLdispatch/vnd-glapi/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/GLdispatch/vnd-glapi/meson.build b/src/GLdispatch/vnd-glapi/meson.build
+index c5319fc..ce20178 100644
+--- a/src/GLdispatch/vnd-glapi/meson.build
++++ b/src/GLdispatch/vnd-glapi/meson.build
+@@ -39,7 +39,7 @@ if gl_dispatch_type == 'pure_c'
+   _entry_files += 'entry_pure_c.c'
+ else
+   _entry_files += 'entry_common.c'
+-  if gl_dispatch_type != 'arm_tsd'
++  if gl_dispatch_type != 'armv7_tsd'
+     _entry_files += 'entry_simple_asm.c'
+   endif
+   if gl_dispatch_type == 'x86_tls'
+@@ -50,7 +50,7 @@ else
+     _entry_files += 'entry_x86_64_tls.c'
+   elif gl_dispatch_type == 'x86_64_tsd'
+     _entry_files += 'entry_x86_64_tsd.c'
+-  elif gl_dispatch_type == 'arm_tsd'
++  elif gl_dispatch_type == 'armv7_tsd'
+     _entry_files += 'entry_armv7_tsd.c'
+   elif gl_dispatch_type == 'aarch64_tsd'
+     _entry_files += 'entry_aarch64_tsd.c'
+-- 
+2.23.0
+
diff --git a/media-libs/libglvnd/libglvnd-1.2.0-r1.ebuild b/media-libs/libglvnd/libglvnd-1.2.0-r1.ebuild
deleted file mode 100644
index 42b0789af3bf..000000000000
--- a/media-libs/libglvnd/libglvnd-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2018-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://github.com/NVIDIA/${PN}.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-inherit autotools ${GIT_ECLASS} multilib-minimal python-any-r1
-
-DESCRIPTION="The GL Vendor-Neutral Dispatch library"
-HOMEPAGE="https://github.com/NVIDIA/libglvnd"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/NVIDIA/${PN}/releases/download/v${PV}/${P}.tar.gz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="X"
-
-RDEPEND="
-	!media-libs/mesa[-libglvnd(-)]
-	!<media-libs/mesa-19.2.2
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-	)"
-DEPEND="${PYTHON_DEPS}
-	${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-
-src_prepare() {
-	default
-	[[ $PV = 9999* ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	myconf=(
-		$(use_enable X x11)
-		$(use_enable X glx)
-	)
-	ECONF_SOURCE=${S} econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-multilib_src_test() {
-	emake check
-}
diff --git a/media-libs/libglvnd/libglvnd-1.3.0.ebuild b/media-libs/libglvnd/libglvnd-1.3.0.ebuild
new file mode 100644
index 000000000000..948292fe2583
--- /dev/null
+++ b/media-libs/libglvnd/libglvnd-1.3.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://gitlab.freedesktop.org/glvnd/libglvnd.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+PYTHON_COMPAT=( python3_{5,6,7,8} )
+VIRTUALX_REQUIRED=manual
+
+inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1 virtualx
+
+DESCRIPTION="The GL Vendor-Neutral Dispatch library"
+HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~riscv ~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
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test X"
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
+RDEPEND="
+	!media-libs/mesa[-libglvnd(-)]
+	!<media-libs/mesa-19.2.2
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-meson-Fix-the-armv7-build.patch
+	"${FILESDIR}"/${P}-meson-Fix-the-PPC64-build.patch
+)
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature X x11)
+		$(meson_feature X glx)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	if use X; then
+		virtx meson_src_test
+	else
+		meson_src_test
+	fi
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/media-libs/libglvnd/libglvnd-9999.ebuild b/media-libs/libglvnd/libglvnd-9999.ebuild
index 877b89fb3094..b98a84b1e5a6 100644
--- a/media-libs/libglvnd/libglvnd-9999.ebuild
+++ b/media-libs/libglvnd/libglvnd-9999.ebuild
@@ -9,24 +9,28 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-inherit autotools ${GIT_ECLASS} multilib-minimal python-any-r1
+PYTHON_COMPAT=( python3_{5,6,7,8} )
+VIRTUALX_REQUIRED=manual
+
+inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1 virtualx
 
 DESCRIPTION="The GL Vendor-Neutral Dispatch library"
 HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~amd64"
-	COMMIT=""
-	SRC_URI="https://github.com/NVIDIA/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S=${WORKDIR}/${PN}-${COMMIT}
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~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
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="X"
+IUSE="test X"
+RESTRICT="!test? ( test )"
 
+BDEPEND="${PYTHON_DEPS}
+	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
 RDEPEND="
 	!media-libs/mesa[-libglvnd(-)]
 	!<media-libs/mesa-19.2.2
@@ -34,28 +38,29 @@ RDEPEND="
 		x11-libs/libX11[${MULTILIB_USEDEP}]
 		x11-libs/libXext[${MULTILIB_USEDEP}]
 	)"
-DEPEND="${PYTHON_DEPS}
-	${RDEPEND}
+DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )"
 
-src_prepare() {
-	default
-	[[ $PV = 9999* ]] && eautoreconf
-}
-
 multilib_src_configure() {
-	myconf=(
-		$(use_enable X x11)
-		$(use_enable X glx)
+	local emesonargs=(
+		$(meson_feature X x11)
+		$(meson_feature X glx)
 	)
-	ECONF_SOURCE=${S} econf "${myconf[@]}"
+	meson_src_configure
 }
 
-multilib_src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
+multilib_src_compile() {
+	meson_src_compile
 }
 
 multilib_src_test() {
-	emake check
+	if use X; then
+		virtx meson_src_test
+	else
+		meson_src_test
+	fi
+}
+
+multilib_src_install() {
+	meson_src_install
 }
diff --git a/media-libs/libharu/Manifest b/media-libs/libharu/Manifest
index 756b375f3cdb..259d22d6e43a 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 952 BLAKE2B 83962ebf529d74897a708be8ce40beb2a2027a3f9e8bd071a7ffc27e5b10ac1d31efc2d970ddac7fc4ab14b88024b5fd78258718588270b502586cb2926af453 SHA512 3b63bbb49edab24bee89d72fdb262219cc91bf06fbdd41011c19c6d2e07ad22a64b489336f5907198cc8cc4e87d0e32e001281e246b3e7de1065da3604496644
+EBUILD libharu-2.3.0-r2.ebuild 977 BLAKE2B 11dfa82cc601b6ac1182c014e01d7b1de2d36c6ecff690f38d46a6f6ffbedc906f00a4acd57315e9e6bfd60392a45b49f0de0667505602215e4e678410d007ac SHA512 b84636e61c1a01c2c02b6c44c3b7c87f01dcebc05a7f7b936a8ace8784bacfa8f26c715f76b089692c29ae91b2aa4e5b187afe882fe05cb3e0d9e21995dc81b9
 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 057e405312a8..0d2427edfda0 100644
--- a/media-libs/libharu/libharu-2.3.0-r2.ebuild
+++ b/media-libs/libharu/libharu-2.3.0-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-multilib
 
@@ -18,7 +18,8 @@ IUSE=""
 
 DEPEND="
 	media-libs/libpng:0=[${MULTILIB_USEDEP}]
-	sys-libs/zlib:=[${MULTILIB_USEDEP}]"
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-${MYP}"
@@ -30,8 +31,10 @@ PATCHES=(
 	"${FILESDIR}"/${P}-4-Add-support-for-free-form-triangle-Shading-objects.patch
 )
 
-mycmakeargs=(
-	-DLIBHPDF_EXAMPLES=NO # Doesn't work
-	-DLIBHPDF_STATIC=NO
-	-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-)
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DLIBHPDF_EXAMPLES=NO # Doesn't work
+		-DLIBHPDF_STATIC=NO
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index e3fb1b74ef3a..842346ad6fb8 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,4 +1,6 @@
 DIST libheif-1.5.1.tar.gz 1510087 BLAKE2B 1dd5e913c8913c6b62b770653585f8ccf7cda14c4dd79ff2073bf085da4d730accaef8d0f8008ac941238a7e3e131add1a218e0c78a886847b3bcf253d66c9b6 SHA512 05e32ebff08d5f0e82e9b1107253c27882ae1694150033fe7b3ca07db8c64567f09002081276e92a3b490a63022a1522d577b094a7f489742139758d17f484b8
-EBUILD libheif-1.5.1.ebuild 1430 BLAKE2B 22f4dc1704f359e3f8dbba6365a9c7c228a959ff59957a96f3a3cf99827bbec8355ef6b9e6f12d8e5f819272cd3233158ce4379965ca54ef01c229a547e3d24a SHA512 ec9eb1aa4c8e071bc237668e50400658059939cfb3bf081dc44686c84cf7a8dcd195bb1ff9ae2ee172e48a44f6b400f60921ea63ce054337e9b48d8587fbd178
-EBUILD libheif-9999.ebuild 1433 BLAKE2B d081d416eda7b42dc78e5d14b25cd4587b9c9052a5ea16f9d5a9d865f7b8e1e88cdbc615f4520ffa7a475e5e5db0ffd2f336b1129ad32e5d8374fc867832fcaa SHA512 c58157d6add0a2160e3b05e4f170706b8b3758a904bc798a1256d5b12c264a66dd94ba01cfa2789e0d35b7315add323d0cbc9781e470590838ba7db5a3998857
+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
 MISC metadata.xml 369 BLAKE2B e85296d149b4ebfe852a79ed951dff87e3586617cac09f2e81bc501f2739599e7fda1835f1d677cd923a1324e4f6d85e4f1552eb0589511372dd603d239880c5 SHA512 70bbaa03beb93f3649271be35d4c90e7d79395efefd0cfb9915525a5c736629bcf56bd66e2d1bbf2a746c62a5f21ddb8874cdf28f61180fe9abc3ad22ab51fc8
diff --git a/media-libs/libheif/libheif-1.5.1.ebuild b/media-libs/libheif/libheif-1.5.1.ebuild
index 9ec9a7f716d2..e737b4ce1e4f 100644
--- a/media-libs/libheif/libheif-1.5.1.ebuild
+++ b/media-libs/libheif/libheif-1.5.1.ebuild
@@ -19,6 +19,7 @@ HOMEPAGE="https://github.com/strukturag/libheif"
 LICENSE="GPL-3"
 SLOT="0/1.5"
 IUSE="static-libs test +threads"
+RESTRICT="!test? ( test )"
 
 BDEPEND="test? ( dev-lang/go )"
 DEPEND="
diff --git a/media-libs/libheif/libheif-1.6.0.ebuild b/media-libs/libheif/libheif-1.6.0.ebuild
new file mode 100644
index 000000000000..cbf2d5eaaaad
--- /dev/null
+++ b/media-libs/libheif/libheif-1.6.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools xdg-utils multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/strukturag/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/strukturag/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
+HOMEPAGE="https://github.com/strukturag/libheif"
+
+LICENSE="GPL-3"
+SLOT="0/1.6"
+IUSE="static-libs test +threads"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-lang/go )"
+DEPEND="
+	media-libs/libde265:=[${MULTILIB_USEDEP}]
+	media-libs/libpng:0=[${MULTILIB_USEDEP}]
+	media-libs/x265:=[${MULTILIB_USEDEP}]
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	virtual/jpeg:0=[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i -e 's:-Werror::' configure.ac || die
+
+	eautoreconf
+
+	# prevent "stat heif-test.go: no such file or directory"
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable threads multithreading)
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+}
diff --git a/media-libs/libheif/libheif-9999.ebuild b/media-libs/libheif/libheif-9999.ebuild
index 0d11fc08e5b2..cbf2d5eaaaad 100644
--- a/media-libs/libheif/libheif-9999.ebuild
+++ b/media-libs/libheif/libheif-9999.ebuild
@@ -17,9 +17,11 @@ DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
 HOMEPAGE="https://github.com/strukturag/libheif"
 
 LICENSE="GPL-3"
-SLOT="0/1.5"
+SLOT="0/1.6"
 IUSE="static-libs test +threads"
 
+RESTRICT="!test? ( test )"
+
 BDEPEND="test? ( dev-lang/go )"
 DEPEND="
 	media-libs/libde265:=[${MULTILIB_USEDEP}]
@@ -33,8 +35,7 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	default
 
-	sed -i -e 's:-Werror::' \
-		configure.ac || die
+	sed -i -e 's:-Werror::' configure.ac || die
 
 	eautoreconf
 
diff --git a/media-libs/libiptcdata/Manifest b/media-libs/libiptcdata/Manifest
index ef8c09e802b4..797b4150e14e 100644
--- a/media-libs/libiptcdata/Manifest
+++ b/media-libs/libiptcdata/Manifest
@@ -1,3 +1,3 @@
 DIST libiptcdata-1.0.4.tar.gz 569132 BLAKE2B acfac5b4f5945f38da47a5280b92939089f2efa8e4ceae9ad00d9d21c7f062445f63c74d61493e711102789edb8c98ffe49083635f67e836a87c32e1127371e5 SHA512 8656b2febaec133d1a8783252047672bebd58ae9ceab5477c4acfa35bcc381dfda08b655a957b962878af28c69deff77d920e780c84b4debdff2f980b3de94e8
-EBUILD libiptcdata-1.0.4-r1.ebuild 1240 BLAKE2B d4c4a6e3eb9830b266054d2bc962bf6634b0baebdb164c698a62881a64ad73d84d21c529b7896c063a139f034d89d5fe875f870cdd37f72800972690bb1256c7 SHA512 eded54a7f1ba346962290ed6dd384a6f7050cec292a3b7ea1a95353c1fdfdfa81bced8e2b7d7624f2c40f6dac074606a7860d2124accf0233a059d4bf3e54c34
-MISC metadata.xml 975 BLAKE2B 307530f831f91c4ce735b1bc48e836a351ed7b2fcbb7ceb3fdf6d3527f70ded81bae639b2701bd6da54011842964af56b3a7890a0b240052bb81a0273261a103 SHA512 f72b79828ccfd7df1c7a9bbcd961dc73e57ece831ea97291efa52a484b97eb4fe1f7257aadc6a3bb70c7f9f36776b8ca296bedc43b5df86b17f6902a1ec33572
+EBUILD libiptcdata-1.0.4-r1.ebuild 1140 BLAKE2B b7fbf442ac9e5849c0ed8de47db2c4551f9c299960e59625d84861a51f2ec3503097d3d81071bd7de073c5669dfeaf8150d2e34cbd39565e9fcd6179a61decf1 SHA512 180f46ec30fa2137cac84a10becddc2fe91e36f1dda61e2e9e67235e34d98a0b312498d2efd293879dee3c194d2fc5e146c36af57de4180d66ac174593fd6d50
+MISC metadata.xml 891 BLAKE2B 295b069faa521215b2e2f347401697e7e9a679ccef8b9de59a45c7652bc316f1e3a78934342a24101f1855108ffe8b77245aa01c483732d01a931cc2498d539e SHA512 09fe6f1a7e13e09dedcde51d212282fc31809bd05051e0ec6678909a12b9229be50198c1f4e51272222f0d58eb526e9a9620bc2872eff1d3a404f46da7455aeb
diff --git a/media-libs/libiptcdata/libiptcdata-1.0.4-r1.ebuild b/media-libs/libiptcdata/libiptcdata-1.0.4-r1.ebuild
index 575825e620b6..f51580672d25 100644
--- a/media-libs/libiptcdata/libiptcdata-1.0.4-r1.ebuild
+++ b/media-libs/libiptcdata/libiptcdata-1.0.4-r1.ebuild
@@ -37,13 +37,13 @@ src_configure () {
 }
 
 src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed."
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog NEWS README TODO
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}/python
-		doins python/README || die "doins failed"
-		doins -r python/examples || die "doins 2 failed"
+		doins python/README
+		doins -r python/examples
 	fi
 
 	find "${D}" -name '*.la' -delete || die "failed to remove *.la files"
diff --git a/media-libs/libiptcdata/metadata.xml b/media-libs/libiptcdata/metadata.xml
index f6bb506c2b52..ddce428cece9 100644
--- a/media-libs/libiptcdata/metadata.xml
+++ b/media-libs/libiptcdata/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>eva@gentoo.org</email>
-		<name>Gilles Dartiguelongue</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		libiptcdata is a library, written in C, for manipulating the
 		International Press Telecommunications Council (IPTC) metadata stored
diff --git a/media-libs/libirman/Manifest b/media-libs/libirman/Manifest
index 480fe301f6b1..bbe4d1743b8b 100644
--- a/media-libs/libirman/Manifest
+++ b/media-libs/libirman/Manifest
@@ -1,3 +1,3 @@
 DIST libirman-0.4.5.tar.bz2 225330 BLAKE2B a8910631b4985e5ba8a425ea0914005fefb89329b9cb297e78a6c6775d386765aeabc86a92b63eadef17c7428e07213ebafc81d26fcf237f770ddf5aed06bff0 SHA512 5b0a8e1c0699bf1d8b43bbb2320b3abbd1f8d400264efd78d1cfb5ea942ff1d272b150012dfa61f5afc427824282a62755ec1e1189dd3d849a5f62293125ffb3
-EBUILD libirman-0.4.5.ebuild 689 BLAKE2B 467d476f060b13e19bef42a174feafb182b33a8a7f7846bd2f6628951cce32a57b6a90aeeb72a6365091dee6381cfc939b34f2dc4f4efbe9dd2819f8d669ef95 SHA512 8822f44a8d17a8ab02d1bd9ac5e1ecc62ff25ed9d14f49f9b2b2ad8d6c8ced3a2eb25b120deffa4d038da8065fdcaac89019ea15442193732c2976c8e624fc30
+EBUILD libirman-0.4.5.ebuild 676 BLAKE2B 8b457e11919b55c6e90d2576235159867d4a85fc036e028f43dac72ce966e28165bb83e72e7702ab2d7d41267ca025449de1517ad78f1322f1a54279a8b8a37d SHA512 635d68af8f61b6740d704b6a8eaf20a30b25ab3fa2418c0dcfb27fa2f645842abc6a8ddd7e1e7a9f222bc375c0990a25a4e013ce9626fa920a2531467d101e6f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-libs/libirman/libirman-0.4.5.ebuild b/media-libs/libirman/libirman-0.4.5.ebuild
index 5dddb2d83849..f8f4a774babb 100644
--- a/media-libs/libirman/libirman-0.4.5.ebuild
+++ b/media-libs/libirman/libirman-0.4.5.ebuild
@@ -1,30 +1,35 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils eutils toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="library for Irman control of Unix software"
 HOMEPAGE="http://www.lirc.org/software/snapshots/"
 SRC_URI="http://www.lirc.org/software/snapshots/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2 LGPL-2"
+SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="static-libs"
-
-DOCS=( TECHNICAL NEWS README TODO )
 
 src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
 	tc-export CC LD AR RANLIB
-	autotools-utils_src_prepare
+	econf --disable-static
 }
 
 src_install() {
-	autotools-utils_src_install LIRC_DRIVER_DEVICE="${D}/dev/lirc"
+	export LIRC_DRIVER_DEVICE="${ED}/dev/lirc"
+	default
+	dodoc TECHNICAL
+
+	dobin test_{func,io,name}
 
-	dobin ${AUTOTOOLS_BUILD_DIR}/test_{func,io,name}
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 3908beb8d657..43c25a8165b3 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -2,10 +2,8 @@ AUX libjpeg-turbo-1.2.0-x32.patch 1248 BLAKE2B 760f35a02c6a565a43702a4188186732f
 AUX libjpeg-turbo-1.5.3-cve-2018-11813.patch 1240 BLAKE2B 469eefb5673f48ca8892050507bc7566cacb0b7ff2d2914428971a994bb41d9d717be7fe0a4908cee2ee57a74f6ca8112bee53cb021f4fadbef201536ebee979 SHA512 2542833a6afdbf1f2112695c524197bf5a319ef99c1c6ecea0fe0436681c45321bb6eb59e25fa97d8fa923717452f609e3f85d25547751fa4f8fe99f4ee789c9
 AUX libjpeg-turbo-1.5.3-divzero_fix.patch 792 BLAKE2B 31d3617155ac639ebd49a5db9c3898fdd6b20dc04776003121d6c906a96a8963984405b674ad6bee81c6de97304da78fa1de249cca7000fa7eed42f011e5a918 SHA512 b8ba793319e1f8c658f550fe6427625b2053486d784133c6b9e6778fac74c4eedadb6b9c208c6725a27cf585b4857c719ae03efaf602e181c4b782d55cb9b47a
 DIST libjpeg-turbo-1.5.3.tar.gz 1658672 BLAKE2B 4d2182802aa9963fa57ec2c4fb5cf0a586847d43803e4c2d2e12cf1144c4da0ede7fdbace5965c77cd6df4547090165615960ebb65c964fd2fac823c021f50b7 SHA512 b611b1cc3d1ddedddad871854b42449d053a5f910ed1bdfa45c98e0270f4ecc110fde3a10111d2b876d847a826fa634f09c0bb8c357056c9c3a91c9065eb5202
-DIST libjpeg-turbo-2.0.2.tar.gz 2159562 BLAKE2B 3524c5577322c9fa6556ec263da35c85a6e7b7849dbdc51ec76606f975a46d1a8c40c32de5bb9add62a2dfc9c2ec131e5528591cf63d356bdf70496211e56a01 SHA512 204b6d083e99488c975c75efb08699e4dc1c409556e4dee4f21e3ee67e9c6682eb342f2e5712816b0342c00399fbe6e43fbce30c3d22f30f7ef91db006b3be08
 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.2.ebuild 2659 BLAKE2B 071d9d2d4464716dabf134e987c04db6f9f38c70ebb72a64273eef88f6da32c14f055dbce351b2f9e02ed445b6b9c38397aa80295308dc78f46c2f20db1f03d1 SHA512 a712aa0f7a869f7a7fe45a77db8833b632143845a541cb6ad772688f04872342e2e2b48ac39d65c2e3318f068f6cb620146853b99fcbde892f1778ab64062fbf
-EBUILD libjpeg-turbo-2.0.3.ebuild 2648 BLAKE2B a7df99e5ac31f633e0fb461b31712365078df5a860085abed01f770898911192cc6be8065a0be5b69e2a93e800ef177c94b595c0d06d91f8075640355aa2b44b SHA512 03a2ce306a23a9d23aa49888f0cf68c5116a653adca88183cbeec4bc7da0d58ea5bc95819a6320bf8af5c2c0c2a032f5e8e99ca490965a38bb11674b2c3618a5
+EBUILD libjpeg-turbo-2.0.3.ebuild 2647 BLAKE2B 1d40be98a60d2414bce4610e0be9e99630e587c930efbe12ebece5fec768678486616d1166fefe2c1a9dbfe0236c515a5b3eec57be007d02efcab8a1d06a7851 SHA512 27f98fbc8ab30591a22240d3429ab7fa554ad4c2036238762a557defef285694fac48e9c983cc492f8685b5233f6e650c492094e82850be3656c5d071eeff1b0
 MISC metadata.xml 425 BLAKE2B 675a25f38cc91c2d60d54acf1b07e58c682415b14f2a4fc61f363b743b8d00c8c7f0f8c763f8c6d3199afd2980a834b6a2acf587f6a6f94a6afeeae0d1d3ac25 SHA512 36f6245075da1d9925e7816a0014244e18c4cf5e2e634e7dedeb1aeba6f944449017a98bfa37f0724e1a04d30173533c81f770eca7a332191df7af8afab80959
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.2.ebuild
deleted file mode 100644
index 9110be06553a..000000000000
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib eapi7-ver java-pkg-opt-2 libtool toolchain-funcs
-
-DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
-HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
-
-LICENSE="BSD IJG"
-SLOT="0"
-[[ "$(ver_cut 3)" -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="java static-libs"
-
-ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
-COMMON_DEPEND="!media-libs/jpeg:0
-	!media-libs/jpeg:62"
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.5 )"
-DEPEND="${COMMON_DEPEND}
-	amd64? ( ${ASM_DEPEND} )
-	x86? ( ${ASM_DEPEND} )
-	amd64-fbsd? ( ${ASM_DEPEND} )
-	x86-fbsd? ( ${ASM_DEPEND} )
-	amd64-linux? ( ${ASM_DEPEND} )
-	x86-linux? ( ${ASM_DEPEND} )
-	x64-macos? ( ${ASM_DEPEND} )
-	x64-cygwin? ( ${ASM_DEPEND} )
-	java? ( >=virtual/jdk-1.5 )"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
-
-src_prepare() {
-	default
-
-	cmake-utils_src_prepare
-	java-pkg-opt-2_src_prepare
-}
-
-multilib_src_configure() {
-	if multilib_is_native_abi && use java ; then
-		export JAVACFLAGS="$(java-pkg_javac-args)"
-		export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DEFAULT_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DENABLE_STATIC="$(usex static-libs)"
-		-DWITH_JAVA="$(multilib_native_usex java)"
-		-DWITH_MEM_SRCDST=ON
-	)
-	[[ ${ABI} == "x32" ]] && mycmakeargs+=( -DREQUIRE_SIMD=OFF ) #420239
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	if multilib_is_native_abi ; then
-		pushd "${WORKDIR}/debian/extra" &>/dev/null || die
-		emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
-		popd &>/dev/null || die
-	fi
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	if multilib_is_native_abi ; then
-		pushd "${WORKDIR}/debian/extra" &>/dev/null || die
-		emake \
-			DESTDIR="${D}" prefix="${EPREFIX}"/usr \
-			INSTALL="install -m755" INSTALLDIR="install -d -m755" \
-			install
-
-		popd || die
-		if use java ; then
-			rm -rf "${ED%/}"/usr/classes || die
-			java-pkg_dojar java/turbojpeg.jar
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-
-	insinto /usr/share/doc/${PF}/html
-	doins -r "${S}"/doc/html/*
-	newdoc "${WORKDIR}"/debian/changelog changelog.debian
-	if use java; then
-		insinto /usr/share/doc/${PF}/html/java
-		doins -r "${S}"/java/doc/*
-		newdoc "${S}"/java/README README.java
-	fi
-}
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 c8d52485a086..2371b0b89b5d 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 LICENSE="BSD IJG"
 SLOT="0"
 [[ "$(ver_cut 3)" -ge 90 ]] || \
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="java static-libs"
 
 ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
diff --git a/media-libs/liblscp/Manifest b/media-libs/liblscp/Manifest
index 18c8ae147c73..4df9975a7ef3 100644
--- a/media-libs/liblscp/Manifest
+++ b/media-libs/liblscp/Manifest
@@ -1,3 +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
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/liblscp/liblscp-9999.ebuild b/media-libs/liblscp/liblscp-9999.ebuild
new file mode 100644
index 000000000000..de7d7ff9c249
--- /dev/null
+++ b/media-libs/liblscp/liblscp-9999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools subversion
+
+DESCRIPTION="C++ library for the Linux Sampler control protocol"
+HOMEPAGE="https://www.linuxsampler.org"
+ESVN_REPO_URI="https://svn.linuxsampler.org/svn/liblscp/trunk"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc"
+
+DEPEND="doc? ( app-doc/doxygen )"
+
+DOCS=( AUTHORS ChangeLog TODO NEWS README )
+
+src_prepare() {
+	default
+
+	emake -f Makefile.svn
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libmetalink/Manifest b/media-libs/libmetalink/Manifest
index 66c396b44fd6..8f1b0d84e1f4 100644
--- a/media-libs/libmetalink/Manifest
+++ b/media-libs/libmetalink/Manifest
@@ -1,3 +1,3 @@
 DIST libmetalink-0.1.3.tar.bz2 327482 BLAKE2B 08bf06323e38793a4ecdd3860236fe8a5b97a2deb6d91a63938197fbfc06e38fd6c8fc9968f6fcd883270339ddeba9821711ca3a8acdce5e096c167cec28c9ad SHA512 2c944a00f9460447ecf961685d7cfa80243fec7ad462dc2339fba0e944d0b92ff42bdf07032f2ee0695f0cd004e4c45bfe21e5246e1355a0d43756605894c632
-EBUILD libmetalink-0.1.3.ebuild 815 BLAKE2B 6f2b166d5e79d91bec9241d835498e868599e67c793062eee88094954798fe83a54c0a066b0b74187e392df038a75f61f780e10f938147bd447e64e6abff6b78 SHA512 7fa34b001e2b2124b47fdeceb1aa7cdb085f6eeac58313e45d59d0e0ec955510ba464cfce579bbd908f97070fbe1affb0fce42f3f5de993e357e1a9818de0108
+EBUILD libmetalink-0.1.3-r1.ebuild 959 BLAKE2B 8cfb429488aa299d2aeb53b7945a3d99a77413abb5802ed2d81e0482392688a63d5fff1c28a33f586f67e67a6ad831848122c693b256a9dcf23efa2015521ef1 SHA512 e787857cb30adc04c1951c45814e2062e2535d4f78fc923e79b6a6e49f662ebef8d2bc4d5d17ecd21f3d9124d29b98b2e746ce5b84bdadcb6835565b175dbb1e
 MISC metadata.xml 246 BLAKE2B 8de378056256c0217da9beda2aaea7afe4967f48fa4b62cf3d8cdf2428791003a6cf4bbef204342dadbfb05e1be7a8914a637de532ca6f8ea9f4f68273cb6f4a SHA512 c7a53354d3381e820c1a7cfdd90850f45dc034c96006ba7d6c9459727fd0f1adf5473a35ab52de8bde5a14b66099cc67333c75953199bcac9e7567dacea2838d
diff --git a/media-libs/libmetalink/libmetalink-0.1.3.ebuild b/media-libs/libmetalink/libmetalink-0.1.3-r1.ebuild
index 348e36cd3705..1cf2f2700602 100644
--- a/media-libs/libmetalink/libmetalink-0.1.3.ebuild
+++ b/media-libs/libmetalink/libmetalink-0.1.3-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 inherit multilib-minimal
 
@@ -20,11 +20,17 @@ DEPEND="${RDEPEND}
 	test? ( >=dev-util/cunit-2.1_p2[${MULTILIB_USEDEP}] )"
 
 REQUIRED_USE="^^ ( expat xml )"
+RESTRICT="!test? ( test )"
 
 multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_with expat libexpat) \
-		$(use_with xml libxml2) \
+	local myeconfargs=(
+		$(use_with expat libexpat)
+		$(use_with xml libxml2)
 		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/media-libs/libmp4v2/Manifest b/media-libs/libmp4v2/Manifest
index 3923082d3a6c..240e0231a317 100644
--- a/media-libs/libmp4v2/Manifest
+++ b/media-libs/libmp4v2/Manifest
@@ -2,5 +2,5 @@ AUX libmp4v2-2.0.0-clang.patch 1157 BLAKE2B cf4763c29017840322d0d31fd859057b2c51
 AUX libmp4v2-2.0.0-gcc7.patch 747 BLAKE2B 5bed55f8c9e9593261d9738871de162fdfaec6239078e3ffc0fc85352e60687ba93e37f63edd8fbaf576ffa5966aef07fd58171366ec60ac5969a80eb92f6016 SHA512 18433209711b88cf4a09dcf6ad26d7d717d6593d9b006258e80aac85fee01da17bbf7e67e60c75c82e18652eaddcdb2d945dec52f2f75aa0f236bd5328aab760
 AUX libmp4v2-2.0.0-mp4tags-corruption.patch 642 BLAKE2B 86a1b614dfc2e4dbcee97ebe9b029feac2078eb3d6c25793f291f625ad1e0dc1df85d028813fe96e980e2d8fef4a5eb821da8622f3ce3f8b28835dd020812d7f SHA512 565959560941ec0503b17a1e6a9cae85a03d6f97e4f4ea66cf457c941de96148606f23471525bf786bd95f78097b3376020a40d53fc7a4675c1db9819e7e8593
 DIST mp4v2-2.0.0.tar.bz2 495672 BLAKE2B 966c90b443bd6f7a81c96fd12f95b00c3ec89cd476aa0fff3e0450b315d54543578ef953c5e3f28d52ca800a0768c601dddc8e99a32ff512767cd65c12832bd5 SHA512 15eb882f33d72d4209053b54c883b67715f539c33096705a0e7bc79015b93f6f3ac80ae29c65a0ffe9eab1bf0dedf07198bdee23fa6eafcd6ccb34f984484be0
-EBUILD libmp4v2-2.0.0-r1.ebuild 1075 BLAKE2B 6ed35e97037d47949517530ac16e43bf5600513db70ce6689ec408e6825fd1e57618d18d5c5b736af26800a4b09658e84432118555bc0df2d95ad2ed81e8a1b1 SHA512 7aa00e3d133e9254ea3c57b032324a5215f192b39334beec19f1f8da9936b5dfe32e11d57e0b21639ac042c4189f85dbb100b0b9be5abe8ae1676d12e7b7b725
+EBUILD libmp4v2-2.0.0-r1.ebuild 1102 BLAKE2B 8557550082ddcd2d0454f09b700b6e565c19feabe8017627c6e3a31fdba5db4d38742759f47e1875ef618b3e0bf0a541184840204fcee2e88f90230bcb38685d SHA512 4d7cbe20f64e25fbd76c7f1687feafea8431ea80efd844ca1ce7034a43d939fa01094ea15498af3520ec4aaf0ea541264e02ecbd1e46a7022d4fe4481b61c5cc
 MISC metadata.xml 402 BLAKE2B ed37dabc480f00cf0f23df37f1e1f9203d81415f9c030f307f1265f9550f5e6a2466de8387b0f16eb7c40dd6e3705bff031df7b264594a7319751ba83c1c7d6b SHA512 63643195e04ecdb3a79a862991760894a4fc52aa073ee1aba1efba4babdd926002fe271d04f82e4e40dbf4cad2fa77fd7853620fe11badb14cc83d27c342ad70
diff --git a/media-libs/libmp4v2/libmp4v2-2.0.0-r1.ebuild b/media-libs/libmp4v2/libmp4v2-2.0.0-r1.ebuild
index 0a87c1961563..90120025c491 100644
--- a/media-libs/libmp4v2/libmp4v2-2.0.0-r1.ebuild
+++ b/media-libs/libmp4v2/libmp4v2-2.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,6 +14,7 @@ LICENSE="MPL-1.1"
 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 test utils"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	sys-apps/sed
diff --git a/media-libs/libmpdclient/Manifest b/media-libs/libmpdclient/Manifest
index 9f68a39f59bb..baebced8ae65 100644
--- a/media-libs/libmpdclient/Manifest
+++ b/media-libs/libmpdclient/Manifest
@@ -1,3 +1,3 @@
 DIST libmpdclient-2.16.tar.xz 60480 BLAKE2B ef7a077195b08f24304e08701a303a6709f71792112b096b0e1741f550f215352936f30e05f4afad29c0f7a5e4340e87de6d7fd8cfcd4c27f34eda91c7d21891 SHA512 520568f61cee447e48c04075d212c46e9640fd3f82604a5b9f4c6ded94eeb4a841e857e44e9f4edad12d93c1052692e7d32d3dbf505d4c0cde6cc217cff0cae5
-EBUILD libmpdclient-2.16.ebuild 1045 BLAKE2B 6b72700d212fc7772d9b96e7ba6f3bb35e5e80c28e5a6684a71ad49df852b902c7ebf4bf613a6746755c8eac5338c2b94d5ebb0493b48f2821a52c1b5ea44ace SHA512 eca07acc08932cfa96257249feede4676c05007feb15320e598748fa5a2157d71126922a72c4de5e68a5d5f4aa9b4d37841c4dbced9dd117269941f389f070d1
+EBUILD libmpdclient-2.16.ebuild 1072 BLAKE2B a63d00c701a4a3bf4b7b9c2b908546a6ce7fdb10a7f6d77e02b1631e5895d1b0dc395b6ab43dc681715a2c6f6e9371bcd2d107deb0255aa685de31c9a195eab1 SHA512 7f93a2b6abc274e3504da1900ba896de28fa42193c288bed754d358694e41ada10b3079363b61f6b51132ae2f13c2777d83d0bd1122c0e627f95f44319d22a98
 MISC metadata.xml 348 BLAKE2B 6c3a4f4924ca11d41c0c7fdcf062dbfd43f23f1181a83d4154a4a36a015999786962adb716f751e046127d37d2b88649b2ea9968330a85ae8f9307a96c7d9f96 SHA512 75efcb39f67cb2dfe31846b08e9daa02845a07006fe2002f43feabee680dcc57bd41a0fed3bbfe9e184892a5adad64efd3ed83931a91b924739355ec689f5b00
diff --git a/media-libs/libmpdclient/libmpdclient-2.16.ebuild b/media-libs/libmpdclient/libmpdclient-2.16.ebuild
index e50c68a1fbc6..d38c034493f9 100644
--- a/media-libs/libmpdclient/libmpdclient-2.16.ebuild
+++ b/media-libs/libmpdclient/libmpdclient-2.16.ebuild
@@ -13,6 +13,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ppc ppc64 ~sparc x86"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="
diff --git a/media-libs/libmygpo-qt/Manifest b/media-libs/libmygpo-qt/Manifest
index a2a6517a1abf..12166214347a 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 917 BLAKE2B ba6028461c4fe1b3f3f98ec90bbbd241a2370ecdfe9a44f9ce219db3bab73e5c6debdc42a31db2db1d0f57fd0f9784e2067517435f72809bfd40c6af3494c1d2 SHA512 c263ad175340f7d69c461df692940ff2f5dd082a9c6c61fdf32396e8ffb114069e2d078691aa9687928f121031bf103454f98e7d144ee9abaf31b0d945e9ea69
-EBUILD libmygpo-qt-9999.ebuild 772 BLAKE2B 0ff6f24271b4a5058ecda315855ee351a5e5ed04b546aaac5f3175ca0c31892928363c4a5c3c610a7d33feac880040c8d092585646bda54ec4375fde839d2fc1 SHA512 52834c2a3279fb8b27691e7277aa76a598c2896298171de7d607595dec71af81d94edce39aa61a24922ab9cf771a3f0cb9efd2aac60fca23b89157b181614ce7
+EBUILD libmygpo-qt-1.1.0.ebuild 941 BLAKE2B 514c644ff3dc0fd8b3bedbe3a6edd44dc202a313c324fa218289cc9eaf0a239e2164dd21fd6c9f23e784568b7c0c575a3e6d5672d94836220a82e6c8e48ffaff SHA512 6fe8106826d1b409b304e253d68b0efd576244238a22f5fd4609d8a6845723d499febac138da6338de77fc86c7ef4058ae017311b38c9955d53983aa77ca0e71
+EBUILD libmygpo-qt-9999.ebuild 799 BLAKE2B d6294cc4e1d0c2a19e32c21308e41e7048314271c1b4e022d0c911c9b357f14481107ec5a421a028ff7d5b05b69e4f1d3e947bd8185c2cf44bb6fbaaf8401f18 SHA512 75cf72284eb64da18efba16718624738ce654b013642c2799ff649e5d5ce9cc688d77ddd47f35344f2ffbf38e8ce1ee2c65ef46fac5fbecdff10ca9184bf9315
 MISC metadata.xml 347 BLAKE2B 22a365b5f63dd847e2b9ed77d778fd645c8ebb5cbe30f933488739b5e039f879eecb5d07b176a29cd43defc9bb9a73d241c898623c11b60e753fd9a801b823ea SHA512 c9a3b16cdced1a5876ed473cce964ed24e72fac4ed6e78de8d74ac0bac4c3d1a9b6d372e4f2271e1aca75125f22c25c84a2acae448e514d623d524e844bb68db
diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild
index 5aae16cca567..a133bbbcecbc 100644
--- a/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild
+++ b/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,6 +19,7 @@ fi
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-qt/qtcore:5
diff --git a/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild
index 0074f5e52b91..2e6fa31892f0 100644
--- a/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild
+++ b/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild
@@ -19,6 +19,7 @@ fi
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	virtual/pkgconfig
diff --git a/media-libs/libnsgif/Manifest b/media-libs/libnsgif/Manifest
index 320e2bc986fa..d1f887f7f8e2 100644
--- a/media-libs/libnsgif/Manifest
+++ b/media-libs/libnsgif/Manifest
@@ -1,3 +1,3 @@
 DIST libnsgif-0.2.1-src.tar.gz 268328 BLAKE2B ccebd1830db1caa016ebc0c1f2c421523963df16e38cdf85c5300d2a9a325dc9c52c89c79ccbddbc315535a20607458bbfedcde8df02b5e2977d383cd6603220 SHA512 29affce6de38574103a9777e741a44b448145d96ef63e4b86056f268c5d1389f6c5f25240a9f3ef2208fab229eabef2542f3d7ce7b37a0137071f204fbd736af
-EBUILD libnsgif-0.2.1-r1.ebuild 864 BLAKE2B 2f6a8b595e241cf40c4fc0483e1c9a9c2804bf54599e93db16c3be1ec5269bc15def420f202e5e86ba07afbb1bdf2653680d39adffaf1c0fc50c7dcdfb6f920a SHA512 83931d1cda15c6a056140b8d21ed34e2a1a065cc660f1cffde0505886f992a3d412a15e375ed176b91f84291ab793de5c6cb8dd1577d43009439e829795b147c
+EBUILD libnsgif-0.2.1-r1.ebuild 877 BLAKE2B e4357f2b0af2c0a7d381cf405b834ed1159b24497c36d966c0da04da94a95e3e73b9042b659a3cc42463553d21bd2cecc5b2de25284466bb4f7e082fe2a45482 SHA512 f739779b35ab9beb5ef9048da34d68fa2a4891506751267c2a928348cb60cc17126c7258a234719f94d18ee30e46c0de2e5e1632bca5a9c1e9bd9ad6311a5ade
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-libs/libnsgif/libnsgif-0.2.1-r1.ebuild b/media-libs/libnsgif/libnsgif-0.2.1-r1.ebuild
index 3ff1a9adecdf..283a0d110d46 100644
--- a/media-libs/libnsgif/libnsgif-0.2.1-r1.ebuild
+++ b/media-libs/libnsgif/libnsgif-0.2.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~m68k-mint"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~m68k-mint"
 IUSE=""
 
 DEPEND="
diff --git a/media-libs/libnspsl/Manifest b/media-libs/libnspsl/Manifest
index db551a349741..ceaf3593201c 100644
--- a/media-libs/libnspsl/Manifest
+++ b/media-libs/libnspsl/Manifest
@@ -1,3 +1,5 @@
 DIST libnspsl-0.1.3-src.tar.gz 311065 BLAKE2B ef846482c677e98a9eae646597e893f4e94161a60482127a88440a3786d2f9e3c4458a823ac878c64bc7d1b00080653facc28f408d2a44b571835958966297af SHA512 da4069dee152d126d53e442c8ced1438707db1ccee779bd2abe752a8d1dc30e40036037674e220bb24adad49fe406633e0d07e5d29d209b9fb223107c0e89415
+DIST libnspsl-0.1.5-src.tar.gz 316104 BLAKE2B e20d2ef94758943b848b6785bf462d5bab706c8396b10e22d3fa6d3718a78ee26aa1bb361e084dc28fcec3cc7498ed5774eea5fc086ca620c3c135e101a71300 SHA512 a46cc8eda6f22936e8d2477b16c094b1e7f9668071823aaf07d2a3c6cc0af645ea4d4cb3ae9fdafcc8dd77602bed736a8ae82f588ba7d56f5c774736da7e1baa
 EBUILD libnspsl-0.1.3-r1.ebuild 726 BLAKE2B d476ae693c24bd71b289cf13e5494850b24b35c6ee1e206b1b2eaf6525f4fab352fc8cc8edcd2d62d1a6c5903879761751dc8b84e109949f72d3fd8d026cde43 SHA512 eaa00f9e818a32a56c31f48232ebfb9d2b1a6bd9657fe4d2fcbd1a8d913663bfd4121c94b2cacf2de099470ddf08114d4743edb2b5ce382392275472b036a270
+EBUILD libnspsl-0.1.5.ebuild 727 BLAKE2B 88c017e94018428786e302321a864cc5ae1cb02080dfd297d36ab4145de976e0d536c8ebc0b3d0094ea24792791694c59a8c5a3303f99f203354cb676c83cbd9 SHA512 fc4237d96028eebf1d80254c57a319ec23bc74fd6111c21640df0e07a773182dc38232e891d48a6e447d452bbd35556c1793eabea7bd636d4144ac66df7bfb20
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-libs/libnspsl/libnspsl-0.1.5.ebuild b/media-libs/libnspsl/libnspsl-0.1.5.ebuild
new file mode 100644
index 000000000000..c7c011b72c72
--- /dev/null
+++ b/media-libs/libnspsl/libnspsl-0.1.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="decoding library for BMP and ICO image file formats, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/"
+SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~m68k-mint"
+IUSE=""
+
+BDEPEND="
+	dev-util/netsurf-buildsystem
+	virtual/pkgconfig"
+
+_emake() {
+	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
+	netsurf_define_makeconf
+	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
+}
+
+src_compile() {
+	_emake
+}
+
+src_install() {
+	_emake DESTDIR="${ED}" install
+}
diff --git a/media-libs/liboggz/Manifest b/media-libs/liboggz/Manifest
index ce1bbe087908..8ccdbcf4e908 100644
--- a/media-libs/liboggz/Manifest
+++ b/media-libs/liboggz/Manifest
@@ -1,4 +1,4 @@
 AUX liboggz-1.1.1-destdir.patch 550 BLAKE2B a8823cc2159aa869fb1f6888be83819407bcc9832cda8ed0b43d5b3292914ef1e9fbf2737814904650423df8e60f7e0b2892a5862494b8a9c9b6d63e64e280ae SHA512 e988d3eae103874b905929f749687eba6e539b06ba4d4a4963e6030ede04cb86af6a9dcf84bf7456a25d267fb02a3b55ccd20bb907c3cb7e5e19049f05a78fdf
 DIST liboggz-1.1.1.tar.gz 702261 BLAKE2B 0631d1c30a045c67b38b9de107a97dc8963890a867262b01271adfb4483c77f8d14e203dffd057194b19b4e6cc28169a3a085fbb79d683a48ee091316cca8a4f SHA512 8f5fc8ca49cb6f7a1160a9c1932876b771d55985d59ddc1f48497dfc08641414a58244d7a7e52bfcecdb69f52913d0123efd8f92513f8b9064e4abe1442f2cba
-EBUILD liboggz-1.1.1.ebuild 942 BLAKE2B 26163a6c849bd393d9f9eb8f072a56410fc8b033ca3d61ec6dfed4897375987372dbe4e26fb59a3733baf908f863bf9b26759942877ba07205c15f460ff29203 SHA512 2aa07ffc79bca53748d83e5df1bd4ea7f379d90fa552286d9540f34208ae222ef6a335b49b416702cb8c705dc299d06ef82469fade38dad4960bb4dc3ca708bb
+EBUILD liboggz-1.1.1.ebuild 969 BLAKE2B 38317971bab6c6468e376c446244cd5bf00bc898f5b46bb9b16328ce3fb59e18e91d327838b50f3a7e7d53a0417016806251070ca9c3f038847dfb5a48f64149 SHA512 d49f1b2d15f1e6e8ef8ae625df4b0647e6421cc612c14387db697147bf052f615a155413248e54c6d39b6adc127392e13de8f50ad7932a351d74178dcfbb0273
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/liboggz/liboggz-1.1.1.ebuild b/media-libs/liboggz/liboggz-1.1.1.ebuild
index 2e299bd0605c..83718e85ecd1 100644
--- a/media-libs/liboggz/liboggz-1.1.1.ebuild
+++ b/media-libs/liboggz/liboggz-1.1.1.ebuild
@@ -13,6 +13,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=media-libs/libogg-1.2.0"
 DEPEND="${RDEPEND}
diff --git a/media-libs/libopenglrecorder/Manifest b/media-libs/libopenglrecorder/Manifest
index fdae81e5e1be..94e223dc3b43 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 1018 BLAKE2B 6105b7bb44850f6a960727687e09372afd079a1c59cd9d956736bb5abd2e90d9bff0c67e698e1ca791db6ce0276c9c643258a2a26ffce24960218448c3092d97 SHA512 9e2fed49f6b5a21c3c238e2ea9a440562c6ffe6ba54c1e338605792c4588410daa9e61f6f7fcfecf6d892e41b94dc36f89dc1b30be2a9508825627dba58625a9
+EBUILD libopenglrecorder-0.1.0.ebuild 994 BLAKE2B 56b7f03d2d6394559dcd9e8e5f4326cc99852a9ee5c555901f3e846febbedfd3743fb709309816c54c629695f7f4bf1cdfa4fd0bec0c8029c8bc97ad5ba5e07e SHA512 4d5b88c42be3b0b7045010162da4e93eb1472dc035422a4c93897880fdec9f3cee2a5a654779bcaf5fb5b4de0bfce5ea7023303cde86d5a20d7ee5f1297db7ef
 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 317958e4f21a..f948ce3df0ba 100644
--- a/media-libs/libopenglrecorder/libopenglrecorder-0.1.0.ebuild
+++ b/media-libs/libopenglrecorder/libopenglrecorder-0.1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-multilib
 
@@ -14,7 +14,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="openh264 sound vpx"
 
-RDEPEND="media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
 	openh264? ( media-libs/openh264[${MULTILIB_USEDEP}] )
 	sound? (
 		media-libs/libvorbis[${MULTILIB_USEDEP}]
@@ -22,23 +26,17 @@ RDEPEND="media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
 	)
 	vpx? ( media-libs/libvpx:0=[${MULTILIB_USEDEP}] )"
 
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="${DEPEND}"
 
-DOCS=(
-	CHANGELOG.md
-	README.md
-	USAGE.md
-)
+DOCS=( CHANGELOG.md README.md USAGE.md )
 
 multilib_src_configure() {
 	local mycmakeargs=(
-			-DBUILD_PULSE_WO_DL=ON
-			-DBUILD_SHARED_LIBS=ON
-			-DSTATIC_RUNTIME_LIBS=OFF
-			-DBUILD_WITH_H264=$(usex openh264)
-			-DBUILD_RECORDER_WITH_SOUND=$(usex sound)
-			-DBUILD_WITH_VPX=$(usex vpx)
+		-DBUILD_PULSE_WO_DL=ON
+		-DSTATIC_RUNTIME_LIBS=OFF
+		-DBUILD_WITH_H264=$(usex openh264)
+		-DBUILD_RECORDER_WITH_SOUND=$(usex sound)
+		-DBUILD_WITH_VPX=$(usex vpx)
 	)
 	cmake-utils_src_configure
 }
diff --git a/media-libs/libopenmpt/Manifest b/media-libs/libopenmpt/Manifest
new file mode 100644
index 000000000000..58dbe6eacae0
--- /dev/null
+++ b/media-libs/libopenmpt/Manifest
@@ -0,0 +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
+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.10.ebuild
new file mode 100644
index 000000000000..091bc25c2d2b
--- /dev/null
+++ b/media-libs/libopenmpt/libopenmpt-0.4.10.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+MY_P="libopenmpt-${PV}+release.autotools"
+DESCRIPTION="Library to decode tracked music files (modules)"
+HOMEPAGE="https://lib.openmpt.org/libopenmpt/"
+SRC_URI="https://lib.openmpt.org/files/libopenmpt/src/${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="examples mp3 ogg static-libs test vorbis zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	mp3? ( media-sound/mpg123[${MULTILIB_USEDEP}] )
+	ogg? ( media-libs/libogg[${MULTILIB_USEDEP}] )
+	vorbis? ( media-libs/libvorbis[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+ECONF_SOURCE="${S}"
+
+multilib_src_configure() {
+	# A lot of these optional dependencies relate to openmpt123, which
+	# we package separately, so we disable them here.
+	econf \
+		$(use_enable static-libs static) \
+		--disable-openmpt123 \
+		--disable-examples \
+		$(use_enable test tests) \
+		--disable-doxygen-doc \
+		$(use_with zlib) \
+		$(use_with mp3 mpg123) \
+		$(use_with ogg) \
+		$(use_with vorbis) \
+		$(use_with vorbis vorbisfile) \
+		--without-pulseaudio \
+		--without-portaudio \
+		--without-portaudiocpp \
+		--without-sdl2 \
+		--without-sdl \
+		--without-sndfile \
+		--without-flac
+}
+
+multilib_src_install_all() {
+	rm \
+		"${ED}"/usr/*/*.la \
+		"${ED}"/usr/share/doc/${P}/LICENSE || die
+
+	if ! use examples; then
+		rm -r "${ED}"/usr/share/doc/${P}/examples || die
+	fi
+}
diff --git a/media-libs/libopenmpt/metadata.xml b/media-libs/libopenmpt/metadata.xml
new file mode 100644
index 000000000000..334feada06c3
--- /dev/null
+++ b/media-libs/libopenmpt/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">OpenMPT/openmpt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-libs/libopenraw/Manifest b/media-libs/libopenraw/Manifest
index 705d800fb55a..d73f1e869aa6 100644
--- a/media-libs/libopenraw/Manifest
+++ b/media-libs/libopenraw/Manifest
@@ -2,7 +2,7 @@ AUX libopenraw-0.0.9-jpeg-9a.patch 590 BLAKE2B e43ddad7d7c3e48a633bc8e8acc480ac6
 DIST libopenraw-0.0.9.tar.bz2 478687 BLAKE2B d51410aa2a4ce297c660f80f99c912374faf05c0920be0c9dff78c5979c553cd74aafed0591bd62d479825cb0fd7064b47b86747ecddc75cc177b54184eb42b1 SHA512 88d475d27719212686a0a5a08da04d6879fd456ec8f7531f401217df97f4f3d4c52dc8c4fb1c6ca88c12d6a67ecd516b151c5e9dceba9cbfcd13150fe81d6db5
 DIST libopenraw-0.1.2.tar.bz2 563981 BLAKE2B 60332274c72602e5b3eea3e41dfee8c62303a2f09028df4a637cea6f07391d912f354752cb6f354e06dd9e223dfabe5dbed1d50e0f325d85be42fb5012ecede6 SHA512 edd7e5a71feecbce1d5a20622bd3c7111acd2d4792038fd19920367ebb55d2cc7614627b9739512bbe34d6b5ae2eb65a4da9cee70c400b5cb846bf5fff08efc8
 DIST libopenraw-0.1.3.tar.bz2 565458 BLAKE2B dec7cda78b6ff4b1411b93c0d48758920b73e087eaca3c262a0850eb5a3423fee38ba7537694b1a04bdafa6bbb34b290c059f483a5a6af339b76c132ac77c413 SHA512 c56d84610f0cf5da970c4c0c791fccf2f7e9f7c7dacf2aeac0b2702ce9a0cd3aaa2f6db0794b0466e1dd8316771973db1e64d013f635c1166b7ff2eebdcbf029
-EBUILD libopenraw-0.0.9.ebuild 1154 BLAKE2B d3ad9a06d27602c7ce3e32fc774b692f0cbe9e317c536ec10f2f6f243fc9e4d810c26211d28f5f71143963655238aac700467df5d550fccc9176be97e1c08eff SHA512 43df9bfb3f2b19e2511c7f19ecb753d1a87a664a1d8db49bd4d49ff52ede31077151915f39a3f16c6be69ff90fa5e0781a9cbfd113e20d3272e4ed61f504b47e
-EBUILD libopenraw-0.1.2.ebuild 1093 BLAKE2B 2e5db979081de80cf3ad2b372ab4f6f73508632bdf5dd229cb4765b4c3716fe235e647a0ebb1e121ebdcb906fe71ae91ee6f2f6e1496cb5920945b14ee23137d SHA512 0ba7daa38f4bba45d6006c80887aadeb641502729ca37d9272f70486659ed44efc1af04a6c35567976d8425be469e63c15a61e5e1153168b37866b41521cb8b7
-EBUILD libopenraw-0.1.3.ebuild 1102 BLAKE2B 78d425a8ca9c028fbf7a8fce0e62580d99bfd00362f7e327a56abf47b89973c8747fdecd70887fc9cad84e6f96a5905a4cd3ecfa9c3c6406e2da9dbcb7488798 SHA512 967cc9878969b0be159d52ab2abcdc613f6e2e703c625f26302147b2c4e5d5c23345eb4447e28a011e718a12e19fc9af7115662c3900b9fb52792d3aec624f17
+EBUILD libopenraw-0.0.9.ebuild 1178 BLAKE2B b42afaa4e53c08c6faea25d0f499a9586735a836c8c23b7aedfde3830c4dfdf468804037a45d80198613e0b62c420dc239039b47fadca8ad8c7700cfc6fe74ad SHA512 180d057d4f8d4208924a2ec15073aa25649a87e99497d2d71e9b7db91907b288dec7320d06f46493ff6759cfbc65412077ea9173537add21baba3044a6770f60
+EBUILD libopenraw-0.1.2.ebuild 1120 BLAKE2B 3acae80d385ca5e340f241824d034a3e2d30be9dfc29dc7e9fe7521a8bc82cc10b0458579c84ee35c4c8a461fa787504ea7916682ac26613004d86bbcdaab753 SHA512 b2adb71326cc7ab50e4b0bd251774200c87cac99b4464eb47b5847790e459ef0fb72ec136a343a97e39257dcbf1464374eb05abeb0f394d28699e7d3be35d486
+EBUILD libopenraw-0.1.3.ebuild 1129 BLAKE2B 0cc1afa57570ff5844d593e70f387b15da8a9c6ce736ff903040b144840757aa3937dbc60d7a4a9d86dc71533731b4066f2b8c9efdfa4797f674b1434d0be48a SHA512 e72348c0051972daf41d9b96bb6afb6f16049c18ed2cffbb4f338fc2c9a642ccd2be4e1aadd559736ef5a6107308d89f24a2d0ffa7f0d1beceb649b4748ae4ed
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/media-libs/libopenraw/libopenraw-0.0.9.ebuild b/media-libs/libopenraw/libopenraw-0.0.9.ebuild
index d741bde0c6b5..9d66873b178b 100644
--- a/media-libs/libopenraw/libopenraw-0.0.9.ebuild
+++ b/media-libs/libopenraw/libopenraw-0.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,6 +12,7 @@ LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="gtk static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="virtual/jpeg:0
 	dev-libs/libxml2
diff --git a/media-libs/libopenraw/libopenraw-0.1.2.ebuild b/media-libs/libopenraw/libopenraw-0.1.2.ebuild
index e05da6d6a4e6..2c6336fcb1e7 100644
--- a/media-libs/libopenraw/libopenraw-0.1.2.ebuild
+++ b/media-libs/libopenraw/libopenraw-0.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="GPL-3 LGPL-3"
 SLOT="0/7"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="gtk static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/libxml2
diff --git a/media-libs/libopenraw/libopenraw-0.1.3.ebuild b/media-libs/libopenraw/libopenraw-0.1.3.ebuild
index f6574ac22c96..d3072df54c97 100644
--- a/media-libs/libopenraw/libopenraw-0.1.3.ebuild
+++ b/media-libs/libopenraw/libopenraw-0.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="GPL-3 LGPL-3"
 SLOT="0/7"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="gtk static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/libxml2
diff --git a/media-libs/libopenshot-audio/Manifest b/media-libs/libopenshot-audio/Manifest
index 928a8f621243..9cb928292791 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 633 BLAKE2B d5a2ad8a7ed97f37095942adbeacf83f2683cba5677992117edfb5605983cbd078451465f41ef2d32fb9b7f2245fecf54caa4b71f9b842302d51758fd682b951 SHA512 a650cea8ef85b49aea325b96ecf87c0b3582a393bff6352c97e771b1954c5032151f5a366243240c1178442f30f56babc316017db243cbee216b9dc7782eb846
+EBUILD libopenshot-audio-0.1.9_pre20190502.ebuild 631 BLAKE2B 331634541154349cf3c3d55b0ea207d99d4da28f32fac13e80248d5b69b44c0543ce3511d7082459b8c7559448dfdf228aa31c2d3e950cdc5739005f6db58d71 SHA512 b27144c088a7e653fbea29cdda0bc9cd557bb23efc11936d58828244a8a0279b902a66eefdb9a387f6edb4377fbcfbfce5b32815e74d42426aad035c97f24442
 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 c04e18d40fe6..73f879a2280b 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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/OpenShot/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3+"
 SLOT="0/6"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	media-libs/alsa-lib
diff --git a/media-libs/libopenshot/Manifest b/media-libs/libopenshot/Manifest
index 86811e08bd99..b1a48ae79853 100644
--- a/media-libs/libopenshot/Manifest
+++ b/media-libs/libopenshot/Manifest
@@ -2,5 +2,5 @@ AUX libopenshot-0.2.2-imagemagick7.patch 3545 BLAKE2B e2fe6ae205459c69ff288f14ba
 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 2530 BLAKE2B 3d7eebaa32640c90891e39202e594deb0b74268a8973d19962a134de011733c9f87c8e01293234d9721fec2f7e701e1b630d6513013bbe72c39a0bb008de9405 SHA512 d6875cbdeb5c0b90ed600bfba050396e168cceda296907871dee3c3c4a4b110dfe07c65a94e005e995a76243a3814fbaa28e49ebd73e3ee670e10a85f0cbd4e8
+EBUILD libopenshot-0.2.4_pre20190609.ebuild 2555 BLAKE2B e2825eb7f984ec6bf15dd7d8b98958c4780593706fdbf911d5c8c74a845ee55531b34b6c13b96cbb0f02ae79113fd5252da15f40deb2fcf1fdd10c5506630e11 SHA512 d350d81af3d099e194c4a70d9e45c6709fc8368fecba0095fc17c035dc19512d0189cf80adb7585b07fbc2ff26e7c91e2cfc44cf6c0d4626f784714f1fa9e6ed
 MISC metadata.xml 520 BLAKE2B d4eba07a3598f2fd073fb11a885ccb303a30624ea396fe43799348bc7284375d7223f0553cb01b582d5ceb7daa402878c89290eb27a7e6797d366c5bc1146e91 SHA512 19cdd8b9200c01945b48efbd52b78a45ee681244076bde7045d8d737d00fc7fe41cce6845459cccc2e4ff7b4be1e42eb3c6b14f43165435a9122ff266bbf0b15
diff --git a/media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild b/media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild
index 89b540bf332b..e0d560596b94 100644
--- a/media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild
+++ b/media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild
@@ -15,8 +15,9 @@ SRC_URI="https://github.com/OpenShot/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3+"
 SLOT="0/17"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples +imagemagick libav +python test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/media-libs/libpano13/Manifest b/media-libs/libpano13/Manifest
index c937a625a708..a4cd4ce1303c 100644
--- a/media-libs/libpano13/Manifest
+++ b/media-libs/libpano13/Manifest
@@ -1,5 +1,3 @@
-DIST libpano13-2.9.18.tar.gz 2723032 BLAKE2B 61402a30ff9c310a2c965ca10dc43d2ddbd43b0f04f2cad3123981010d8a91491414d00f32aad54552026486f48056d98f509fa5b0404bbb8b845466caa7c436 SHA512 bd8449a8ee01e990fa19784889c1afb0e64f90e25596c872e7470fb700c327aad4fc0c565977576dac34dca4cea55a46aad9dc547d3ee4ab6b353cd8b6656874
 DIST libpano13-2.9.19.tar.gz 3527845 BLAKE2B 59d6b46b75de60a3230eb46e42bbb0f7b8826ac5b84d1dc32d28cc384b6690b258c0c3a6b75d3423a1583daccbd0aecd3f010eb58fb356cae5c54d29e05672f0 SHA512 f9f147426d44d8babac09cb1a1b5111f88b9c2fc079f33df80133492bcf24cbd1edd771e6bec7bed4b0256bf15c700139c0a83119d3adf296ae5c567e006d868
-EBUILD libpano13-2.9.18.ebuild 1055 BLAKE2B 83c4bbcbf13cd77279c38fbf8aa7c4b9072e44d9bada413dac99d5a5d39d66b5e418bae05c3aa0e027089bb1330156c0eb6c5456bc2df9791c144e4fd88ad3f3 SHA512 dea68e475345f67d226e9c1964e2aa456ac77d09062be40d1179ac9d77fbde7f9a2bc997dcde75fc81a11d88a2c6062f437745c637146cd73a461d2363bbddca
 EBUILD libpano13-2.9.19.ebuild 893 BLAKE2B de08dc15d393ed9d20df015441273df2315a88173607daefc2d875fa14db457c0f2eb93c1bf178e2881edc6d4683ac7210287cd1445e5e166e304fea176f90d7 SHA512 7cb3664a3f61e7f6734addc9d5394c92273b7c40e1b7d34656343c521e242753208efde33bcc841c4b5aba54b1717181112e140249e2dad90c9583cb5538a392
 MISC metadata.xml 338 BLAKE2B 1ec5e22829216634d2abd6a1053661d8c226a7b852aa5725146d4ac2300c2ca308b2771a71c85cfce761a3c74eb70d10ee8bfc7fee9316d237bb80f298ca05ba SHA512 0797dff4c92d3f6a18f7d8244d39079e718e381ab04620c6f3b165ef1ae1e0357c9d56216e50290bf0f91d2803720a3e67ae7224c9f6f7097dbed2e33dd47929
diff --git a/media-libs/libpano13/libpano13-2.9.18.ebuild b/media-libs/libpano13/libpano13-2.9.18.ebuild
deleted file mode 100644
index 752123e3c714..000000000000
--- a/media-libs/libpano13/libpano13-2.9.18.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit versionator java-pkg-opt-2
-
-DESCRIPTION="Helmut Dersch's panorama toolbox library"
-HOMEPAGE="http://panotools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/panotools/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="java static-libs"
-
-DEPEND="media-libs/libpng
-	media-libs/tiff
-	sys-libs/zlib
-	virtual/jpeg
-	java? ( >=virtual/jdk-1.3 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
-
-src_configure() {
-	LIBS="-lm" econf \
-		$(use_with java java ${JAVA_HOME}) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README README.linux AUTHORS NEWS doc/*.txt
-
-	if ! use static-libs ; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
-
-pkg_postinst() {
-	ewarn "you should remerge all reverse dependencies (media-gfx/hugin and"
-	ewarn "media-gfx/autopano-sift-C) as they might not work anymore"
-}
diff --git a/media-libs/libpgf/Manifest b/media-libs/libpgf/Manifest
index 4753152abef3..432ac7100f06 100644
--- a/media-libs/libpgf/Manifest
+++ b/media-libs/libpgf/Manifest
@@ -1,3 +1,3 @@
 DIST libpgf-6.12.27.tar.bz2 1235651 BLAKE2B d155289398d6291d49a217a97e283d28440e398c330b3bb1006cdb2cf4c31bd7efef5db4cadd9d28812ffe4ef6deb12ab978b8feaac7c9119cff61ee26658628 SHA512 ad06b34d61219a61d06b87e05a26e8639cd7a93211943217832969c03c4dbc81fbbb287fa2d628b7e087b96e78665a3cbc78920c8ff5828dfb2a7748e04fe42a
-EBUILD libpgf-6.12.27.ebuild 696 BLAKE2B 2fef312f3c9f13be808d67bcd949f7a83e608096a235198ea2e28c1bf360b457c06a5bc21dcbe141b750980eb99c156b6cf92c8425db2240f9aea23bd887b8a3 SHA512 60f214e8999631e9bc1d94615e267fbde5f1a22e50362332e5bd57e555a1ddc7e502c295084d3cb46e88f7bee0b2284477082f8c73f8f044e171d324da16d729
+EBUILD libpgf-6.12.27.ebuild 689 BLAKE2B 69185c8148263d2a417ec73aecf2420018023fa3afcfcd4ee07897d700070ffed87bd841084fd2360a88c49bb808423772bce1975485684c0485962f1d255b7e SHA512 55a8a7b15893605867df7141efb8296aff302b87c5f6ea1bb1ef6d9ae35afb187a5cf4d66bbdac9ac1b3448e20de3ce8df2cccece97fd977eafc16c9f9b5c8ac
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-libs/libpgf/libpgf-6.12.27.ebuild b/media-libs/libpgf/libpgf-6.12.27.ebuild
index 4e0807e33311..1f8156146d8d 100644
--- a/media-libs/libpgf/libpgf-6.12.27.ebuild
+++ b/media-libs/libpgf/libpgf-6.12.27.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
+
 inherit autotools
 
 DESCRIPTION="Library to load, handle and manipulate images in the PGF format"
@@ -11,13 +12,15 @@ SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE="doc static-libs"
+IUSE="doc"
 
-RDEPEND=""
-DEPEND="doc? ( app-doc/doxygen )
-	app-arch/unzip"
+BDEPEND="
+	app-arch/unzip
+	doc? ( app-doc/doxygen )"
 
 src_prepare() {
+	default
+
 	if ! use doc; then
 		sed -i -e "/HAS_DOXYGEN/{N;N;d}" Makefile.am || die
 	fi
@@ -26,11 +29,12 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_install() {
 	default
 
-	find "${ED}" -name '*.la' -delete || die
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index 9b5d4fa59757..3bc2a4501a97 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -1,6 +1,4 @@
-DIST libplacebo-v1.18.0.tar.gz 322963 BLAKE2B 640accaa64b1a5abdcc60f89c1b80ccc880ed060799a48cb9d41c7b891648913b05d06c62fa6dd21ccce07ac61b7c89e1702ac26013c596dc4a4d71c7b10721f SHA512 a2ca4a8b2bf9e5242c39c704e579575ccbfd0a7dadc4f73fe1994abb6e3f132d19f6d95415704a62e285e3f94e7b0ab8aeed14b4fce466df1ba34952f7127686
 DIST libplacebo-v1.21.0.tar.gz 326918 BLAKE2B fe9500de23487d7d5dfc51d9f94dd3d33d22bdac3005fc3334814c53a76a46cebd40655675b5172f058d02dd865385a993b3c52a863b9e9b32ac0bc4801e0126 SHA512 5de95b8cc48ba4ec9bc3afb8c8f2c4fae0d53ce6e69ffb53884c3a3ee2580998bae46b8934e462740b6c9c2e66e3c5d5f009f9b0f8ad2cb7b4fba829891cf333
-EBUILD libplacebo-1.18.0.ebuild 1293 BLAKE2B b828eb4507eb436162fcfd64ed3a5f57674536d22f60336087ab94e99855f7d0554499cba67299aee32a7b98c160d84623d2cd5b32965c2fa6022e041cd01492 SHA512 4271adfb5341966ec1c37a9abbb8be3e599d2e21414b270572e1608174d3db07480be443cc3bc5f2943b37edceec0180a8e29114c877f2d0ba84b2c92788b8f4
-EBUILD libplacebo-1.21.0.ebuild 1293 BLAKE2B b828eb4507eb436162fcfd64ed3a5f57674536d22f60336087ab94e99855f7d0554499cba67299aee32a7b98c160d84623d2cd5b32965c2fa6022e041cd01492 SHA512 4271adfb5341966ec1c37a9abbb8be3e599d2e21414b270572e1608174d3db07480be443cc3bc5f2943b37edceec0180a8e29114c877f2d0ba84b2c92788b8f4
-EBUILD libplacebo-9999.ebuild 1288 BLAKE2B 283c89aeebb758473d5c9db5d84e774e6962a80b0cc625c08d3d0b4a07a459bc415c291e541b2cea07510268661336667f2a37cb6710f12e9d78d564e7a4746e SHA512 ed38e53a0d8f7ae09aa543f8a600047958f0cd1c716e75352c2a7e12a1db83db30e3687fc669c2df357b0a26f2c241bd9f756ed02aea614bc4e9c654e40d44a4
+EBUILD libplacebo-1.21.0-r1.ebuild 1315 BLAKE2B 6f07c094d183b1e7a001ef98e109625d7efcd3b3effbe635a848fa179641022e946cfcf27d986f79dde07e9881f4cfae26a6810b2b1ab5faaf7332999ce99266 SHA512 2d7a8ffd725a7d77021bf0728caab1b2c2b6586f9104615022d7c9f3ebbd0e77d6e81cbdfbbaadba4427f4f075e68bb64f83c284fb1e1d99f27b60063a8f3e76
+EBUILD libplacebo-9999.ebuild 1310 BLAKE2B 9a3c9efe511c8e2503432691a7cd0cdf20934954ed46a56e98b0d34ed8894796210c0a47c28d457555d931278d0012fe075aa0c9d46a5bcb8f86c396ae9c23c7 SHA512 ef9b721876b4dcc3c721e41f8c9ea4f2249c280851d143e05fade381f08663c7e061c23853d3f01a2959d940d2ba07c36896992b72adc049ab1571c0d63c7147
 MISC metadata.xml 807 BLAKE2B f04df70a40523ad668bfa7dda7c841ce098f2105d2bc94ab6291bb194bf1fec18445b779952db33614d685ee0964c7ac6b7666b3d8cf89f8bd9391b1ccd2c553 SHA512 48d5e93ca7e964d80dc579789c6f626f9590d102b451c4f0fced538aed1301e0cb7f93fce4d03deaddb72dcad22489aa3846d8fa8ac443fcdbc4fcb90ef19040
diff --git a/media-libs/libplacebo/libplacebo-1.18.0.ebuild b/media-libs/libplacebo/libplacebo-1.21.0-r1.ebuild
index ab132357b85c..04411d8db985 100644
--- a/media-libs/libplacebo/libplacebo-1.18.0.ebuild
+++ b/media-libs/libplacebo/libplacebo-1.21.0-r1.ebuild
@@ -22,13 +22,15 @@ SLOT="0"
 IUSE="glslang lcms +shaderc test +vulkan"
 REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )"
 
-RDEPEND="glslang? ( <dev-util/glslang-7.10[${MULTILIB_USEDEP}] )
+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)
diff --git a/media-libs/libplacebo/libplacebo-1.21.0.ebuild b/media-libs/libplacebo/libplacebo-1.21.0.ebuild
deleted file mode 100644
index ab132357b85c..000000000000
--- a/media-libs/libplacebo/libplacebo-1.21.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://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"
-IUSE="glslang lcms +shaderc test +vulkan"
-REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )"
-
-RDEPEND="glslang? ( <dev-util/glslang-7.10[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] )
-	shaderc? ( >=media-libs/shaderc-2017.2[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-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 eda8818f5919..1b5d610f2596 100644
--- a/media-libs/libplacebo/libplacebo-9999.ebuild
+++ b/media-libs/libplacebo/libplacebo-9999.ebuild
@@ -22,13 +22,15 @@ SLOT="0"
 IUSE="glslang lcms +shaderc test +vulkan"
 REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )"
 
-RDEPEND="glslang? ( <dev-util/glslang-7.10[${MULTILIB_USEDEP}] )
+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)
diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest
index 7a0f42ed97a4..649f3526ab32 100644
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -6,6 +6,7 @@ DIST libprojectm-3.1.0.tar.gz 52123464 BLAKE2B 9027adbbbd3458b0ac6c2a822b06d2596
 DIST libprojectm-3.1.1_rc4.tar.gz 51812800 BLAKE2B 5d300de10c18ff28ab63dcbaf6ab42e1094fe285443484b93020d7d66c36451238257cae57804aeaa192188826b0c8380d1cc82c1b1ffebd332207e4c3e7d44f SHA512 9b50da8389657bd6cd3a99155a5f231a7f94eda1cfeb4140757cc4e74234c38cda2cf0c3a8dcb22fb9e9ef0f6d31cceca3f598dbd9db50d64cbb380c87ec4040
 DIST libprojectm-3.1.1_rc5.tar.gz 54442291 BLAKE2B bc97843d0293aeac1b67ef48c08db146d48f809106113b8985921a6ba391ff96f37bf5f2f8701de73b95b4909b0cb0cf38675751df6dbd502d11b03e55ab4251 SHA512 09b91db8270eb5ae3ccce1efdcfddac3052ada6dca135ab5e67c1f000bdbd954cab409dcf336933d52b733e514a755391500583e55ce5ab7e38c04365aea6103
 DIST libprojectm-3.1.1_rc6.tar.gz 91295645 BLAKE2B d037a3912937774691fcffc857a6ecdf6bda7e82ef193a2e4bd8b7ac2a0c6d6b194b9b0a7a1a43aca2efee8871a9b33108d88b801939b5454858a558cab3d9d6 SHA512 65370e299b7c2791898cdad8794c3ae9e0362ba5d46b7dfbe1d90273f99035d7b4369df6ea7d7ad927c20a64f328def6f56d9367a6ce9d220b479c494c990928
+DIST libprojectm-3.1.1_rc7.tar.gz 54452667 BLAKE2B e815ed6969c636a347d171de50bbe1c48d812f7ad2de9411f8ed457fc880f860606c209f4d431fa656b73361672460fd3c056a24f229e08525502eb02f469ad6 SHA512 241448a8887d84acfb0911bc11d3c65822d41244092d49e96695c465501f09ed8e16fc6fb88979bd357ee29ab50b4ccbd184a76aee20af09e6c44a8e17ad3b44
 DIST projectM-complete-2.1.0-Source.tar.gz 31130351 BLAKE2B ec3540326751aba45b9620adfe1e7aed21347c97278de6d23b53ed7fb03878c2d02982fba17b4cda4f713d2cf624fd24adeb15b28fed9d2ab165567f9ff49eaa SHA512 53f4531208d2594f1c28a7f7842fb5ee3349ca9e48f9f0d999a90b6a62d315c9c0ae9cba1cdfacb8a149eba3e5ddc4517ac406ee2c53718191be8e26ee2cca5f
 EBUILD libprojectm-2.1.0-r2.ebuild 1474 BLAKE2B 68770604ffd40765826cad33ab29d2be3cdb415aaa14b8df3ec753e3dcde9db9dd4313361b49518326dbfb4076a5b986069dda0d41d99bf56e80b59fcd209dd7 SHA512 1a8fc1ce450a4e4433037f843d6ba55f160486738eb52938493680a9ccb9079b85341a1f90f366665a32b0c7b2620144143fcf9b46b6e0d0047672f539f688c4
 EBUILD libprojectm-3.1.0-r1.ebuild 1129 BLAKE2B f0a35d6b66e3c921af45c55ff8bacdc3b876848a98349392de50df8cd0cfc2f251dbbeccad025ed6ccef72109add791e90efe0fd7337148516b1a23cee9a9ea5 SHA512 d9a84e29a066c2d8bc1e868a91e138b9177fd3671eff91eaa8b606afedadf31aac7265353c4cab1a98b57216897f3973ca7c30d802fddca40364b6bba3edc8d5
@@ -13,5 +14,6 @@ EBUILD libprojectm-3.1.1_rc4.ebuild 1106 BLAKE2B dff46a700cb153575eec55334aabf73
 EBUILD libprojectm-3.1.1_rc5-r1.ebuild 1154 BLAKE2B 685c52406b461d66b74e495f5aa2c54ce4b7e84f8cda7c3d6e84561641393d7047d193063ae7a6dfab2f95bc0e630db0964e13f9068795fc07bcecc2eb7acc62 SHA512 716b5fc4348cdfca53bef24b598600602a56acbaf7f29548509b2ff1de8988fb8b8e95c5f91e5bde5acd8ff86940dc309468ffc7cdee0d4686ea704929940d45
 EBUILD libprojectm-3.1.1_rc5.ebuild 1107 BLAKE2B 79a6a20446cc5b54b52a32bbed793ac95f6f69e4b51e221bf2b927b171067ad7686a855fe407b6a12cc06e4b11b9ca626544946a90aec1017cf2a06012d995f2 SHA512 bd5b12c2f2355ad2a22c396df652ab23613982110223e6df9c4370662ca966a7c153edf595dd26b0f2cc5c841e356fa7bd923cab763d0eb7f25f17a8e595d7fe
 EBUILD libprojectm-3.1.1_rc6.ebuild 1154 BLAKE2B 685c52406b461d66b74e495f5aa2c54ce4b7e84f8cda7c3d6e84561641393d7047d193063ae7a6dfab2f95bc0e630db0964e13f9068795fc07bcecc2eb7acc62 SHA512 716b5fc4348cdfca53bef24b598600602a56acbaf7f29548509b2ff1de8988fb8b8e95c5f91e5bde5acd8ff86940dc309468ffc7cdee0d4686ea704929940d45
+EBUILD libprojectm-3.1.1_rc7.ebuild 1154 BLAKE2B 685c52406b461d66b74e495f5aa2c54ce4b7e84f8cda7c3d6e84561641393d7047d193063ae7a6dfab2f95bc0e630db0964e13f9068795fc07bcecc2eb7acc62 SHA512 716b5fc4348cdfca53bef24b598600602a56acbaf7f29548509b2ff1de8988fb8b8e95c5f91e5bde5acd8ff86940dc309468ffc7cdee0d4686ea704929940d45
 EBUILD libprojectm-9999.ebuild 1154 BLAKE2B 685c52406b461d66b74e495f5aa2c54ce4b7e84f8cda7c3d6e84561641393d7047d193063ae7a6dfab2f95bc0e630db0964e13f9068795fc07bcecc2eb7acc62 SHA512 716b5fc4348cdfca53bef24b598600602a56acbaf7f29548509b2ff1de8988fb8b8e95c5f91e5bde5acd8ff86940dc309468ffc7cdee0d4686ea704929940d45
 MISC metadata.xml 536 BLAKE2B 097c6a56c2e21ee9badc9f08053423f76341ade802b23ffc0ceb3c88c87daafbd5b8d614ffa7f2e4698211cc873412270ddc477ea58a33ffaed76b1f93012e00 SHA512 5f9fede51b40d834ba1078c410b1644f70c6b239b1ff8b1b343e13a0efe33f90464f9300ebe98c138bdf201014c6b6d22e90805efce2a80110007b00b99bdaa0
diff --git a/media-libs/libprojectm/libprojectm-3.1.1_rc7.ebuild b/media-libs/libprojectm/libprojectm-3.1.1_rc7.ebuild
new file mode 100644
index 000000000000..19885a4052bc
--- /dev/null
+++ b/media-libs/libprojectm/libprojectm-3.1.1_rc7.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A graphical music visualization plugin similar to milkdrop"
+HOMEPAGE="https://github.com/projectM-visualizer/projectm"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/projectM-visualizer/projectm.git"
+	inherit git-r3
+else
+	MY_PV="${PV/_/-}"
+	SRC_URI="https://github.com/projectM-visualizer/projectm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+	S=${WORKDIR}/projectm-${MY_PV}/
+fi
+
+LICENSE="LGPL-2"
+SLOT="0/2"
+IUSE="gles2 qt5 sdl"
+
+RDEPEND="gles2? ( media-libs/mesa[gles2] )
+	media-libs/glm
+	media-libs/mesa[X(+)]
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtopengl:5
+		media-sound/pulseaudio
+	)
+	sdl? ( >=media-libs/libsdl2-2.0.5 )
+	sys-libs/zlib"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable gles2 gles)
+		$(use_enable qt5 qt)
+		$(use_enable sdl)
+		--enable-emscripten=no
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/media-libs/libquvi-scripts/Manifest b/media-libs/libquvi-scripts/Manifest
index 9987f4bdd4d4..cda5d3c4f5db 100644
--- a/media-libs/libquvi-scripts/Manifest
+++ b/media-libs/libquvi-scripts/Manifest
@@ -1,18 +1,3 @@
-DIST libquvi-scripts-0.4.14.tar.xz 114996 BLAKE2B 6f0439d59cb9464688d4810532c710bc0c548f79ee7dff8054725fd0062a6c3c84a0d61515c1db3642bf591c2d981a562cd2bb7843494b44dd37931e23ef9f25 SHA512 2e01e85779a314ee92ae302992fecf8ec2b6702d7dc809f1595a409df48da4d815ad395acbf8fc8bbdd33fdf5c2cb1dd534a69ae5bcbcb9f4b21c85cd3807243
-DIST libquvi-scripts-0.4.19.tar.xz 118220 BLAKE2B a69f1cd9d69108626526f9b021565651e38c42a41cd29f7e690496f05a528370f1480f0aa896ddd3ae22a859d335ec04cff3ddc7a4bef2889e441976264ed518 SHA512 bd8e90c811474f9d878255675505e4cb2b6bc1a47e2d566ffb57e65025447d323b60c4c9d13903e2f74276a26b5b6678e8bf9899c96dd1b29308a9794a2857dc
-DIST libquvi-scripts-0.4.20.tar.xz 118812 BLAKE2B 390ca8284c32c7ea015da7c713d8b2deaddcbc2e1381885cf5c6fb77f0ac9b63bb6afec8a160ad479ee290dc56c870157470552c03da43a589f3fb3bce9b5e28 SHA512 a50bff8b4ac2923de18083133efc8b36b356c17d058d7ea65b00d0b1c5fe3d875208b00b4fa7e1f900336ee2921cb55d29b0c30b61f328174495af2c4ea72942
-DIST libquvi-scripts-0.4.21.tar.xz 121072 BLAKE2B f76762aee11f5c6299f91eada7be049537a3e60b07905f926e770474ce23fbd3ab6b2d985915d7a0b1921bf4fc2836d355720e630670092fe48a7c550d94aad3 SHA512 83a8ba10f688ceb57f37cae871dd71c0173b64f20dda4852b90a413665182aedf88e84ccd57a0f9ffee691760323e38c371aba5787fba17201847d4247c3616e
-DIST libquvi-scripts-0.9.20130903.tar.xz 306148 BLAKE2B d66f62dfbb3102ac9de0506140da8f679af4a9ddad4bc449aa7b849fcfde7720d6e110c54ad11f4f0da8ae4335f968a9b87e2b41bd20d89efbcf8a7037982a95 SHA512 32212e6305d70714c17ba27fe52fa51e3835de51d84a9f82b7b6d0c9f2f6d41c6f753699f15c487a7a82e2bdebcb967c1d55ec4c897245cc8b62de427cbc1cd9
-DIST libquvi-scripts-0.9.20131104.tar.xz 318844 BLAKE2B 5cabb503b7459bfd9fa7a298bd81ee1aefaf3879749ddffca37ea3a01fbd901f6637cd0af19d2b42e961c3429f3b4f1afc567312dbca06c9529dd77d370260f1 SHA512 48b3cc1e4d0c9e58110333807a3542d5d8f95d3ca1cf512fec850cf491e37fd1c4808ca0f5c88ca73b958ca46859f2e3f39a9173225de23acf76f09b876926dd
 DIST libquvi-scripts-0.9.20131130.tar.xz 322080 BLAKE2B 57a645185ee121e59cca1b50e4952f9abef67ce5b02f65176a23e3edd3ca50e57a6f70ed93dd5be3dbdad0a57b78aa669c386d1806bb3e0c0c826ac84cc66019 SHA512 97de4cead30dc181da700cbf3a0ad66ee709fef17f449f75cd43e0376a4aa53c7b2174188130aaa34dcc7ddc578581111f3655cb10f4b0c92df2f75d32c72a02
-EBUILD libquvi-scripts-0.4.14.ebuild 568 BLAKE2B dc9cd47c81079600846c97be9fb0bef2dbbde75d4a7000f6756495aec931f46beab9dca48d05ba7cc27e440631d06a5034ca62d65f1edf77eb753eace70dd97b SHA512 3dcfc94131a3a2d8b5f6242f8a29635d92bfd75334877695a3384e9afef734633a6eb133cb1b295c7029ab6c9a0564e6bcb4b1d69679dca5794d4b931beb5d13
-EBUILD libquvi-scripts-0.4.19.ebuild 575 BLAKE2B 7c782dbd282f2e7ad0da5cd53632046764b99fc1c85ab011ae9cc597414124c65a58ada7fd120f1cee9169259c9c9c0c8db04cfcaab6fe2879e3c42b46dcf77b SHA512 96949f2a61baf007130f8dc4eb1a8255d9b3c70755bd3d34187feba51f0b8306cde0cc6a813445f2e816eba531c0a1280a16ba3b897dbec0987e47199f248a89
-EBUILD libquvi-scripts-0.4.20.ebuild 575 BLAKE2B 7c782dbd282f2e7ad0da5cd53632046764b99fc1c85ab011ae9cc597414124c65a58ada7fd120f1cee9169259c9c9c0c8db04cfcaab6fe2879e3c42b46dcf77b SHA512 96949f2a61baf007130f8dc4eb1a8255d9b3c70755bd3d34187feba51f0b8306cde0cc6a813445f2e816eba531c0a1280a16ba3b897dbec0987e47199f248a89
-EBUILD libquvi-scripts-0.4.21-r1.ebuild 623 BLAKE2B 613f35db3901b324c6bbe31a03797a56b95b064b3f674579ab676814aeacef68ada433f81aeb2265dbda5f6f8337e43a2bd3c6b0740d6163d0a2faaf411eac98 SHA512 a375bb4ddd3662c92590980850f6334702285d71251163bf5e9c2cf805d37b0d19a0dee1ca473721499dcfd86bc9f85c26ace5178a06d3ddb7b88c1c36b9ce69
-EBUILD libquvi-scripts-0.4.21-r2.ebuild 674 BLAKE2B bdd10b71b59e3118c232f6a77f3e6d9f0a90980b440050fde6ce43f525869b30ed486db7cdaddff058e7639158974526ecf2610483b9a9cd4ff8fdf393a1b8ee SHA512 f3f1e8c0195efd34eeeaedbb0ba85790dd862691ebf2d96f80ac670e053838c405a2559bb074d86f7711ee4f5a68a84538f3ff18c227437eed62e1cfa66e69bb
-EBUILD libquvi-scripts-0.4.21.ebuild 575 BLAKE2B 7c782dbd282f2e7ad0da5cd53632046764b99fc1c85ab011ae9cc597414124c65a58ada7fd120f1cee9169259c9c9c0c8db04cfcaab6fe2879e3c42b46dcf77b SHA512 96949f2a61baf007130f8dc4eb1a8255d9b3c70755bd3d34187feba51f0b8306cde0cc6a813445f2e816eba531c0a1280a16ba3b897dbec0987e47199f248a89
-EBUILD libquvi-scripts-0.9.20130903.ebuild 610 BLAKE2B 3ad4ddba1f53e1d0919101663a5137c288a1d0b7e7fae7b8224278c934eb5ca128e7959502cf1a4eba3432b4bee5888866d0d732d004387460284336cb975c40 SHA512 d1e4aef5fc24b8fdfca10fc03787d4d8d947cd3a0e0da655e3123d3ac31655102157a60519d945bb938e86c9085704817d71ccc8296da4042a1ce4a0bdf21a2b
-EBUILD libquvi-scripts-0.9.20131104.ebuild 610 BLAKE2B 3ad4ddba1f53e1d0919101663a5137c288a1d0b7e7fae7b8224278c934eb5ca128e7959502cf1a4eba3432b4bee5888866d0d732d004387460284336cb975c40 SHA512 d1e4aef5fc24b8fdfca10fc03787d4d8d947cd3a0e0da655e3123d3ac31655102157a60519d945bb938e86c9085704817d71ccc8296da4042a1ce4a0bdf21a2b
 EBUILD libquvi-scripts-0.9.20131130-r1.ebuild 899 BLAKE2B 7e091468eda8c25edba2eda9acff481ce56da2e04be62e65a1927a9b68209d4e94e305d36a19f23779b6b911ee59ad588901a92de0b3c2438242645444ac6788 SHA512 f32e0a80a134975c474ac34d394fce7a22365c5f10fe1dff3669fcb746a2c40ff9140e3263cb8429783beff66e3f3674047e95ca7ac323acddacb291e4df6e05
-EBUILD libquvi-scripts-0.9.20131130.ebuild 625 BLAKE2B 2c24ac3289c1f4f860b76c19ed594352588776481770ea656245a0d5911b0cc1b5365ab14c56e3d044f094e3921faa62dfd288e7ebcd09ee7585bc8202a60512 SHA512 402b1b2ca0ceacdb336247e57551173deb9ccf9e46fa5a6dd71d944b609034264c4bc5b2ad67cc8e069c36370a7a7b8fc4a2b8dd244db13d40a237067b34c76e
 MISC metadata.xml 333 BLAKE2B 0a7c7e68bfe6ae4ad274ea5b1a44f4537f170552e10377ab8bfeea2ff1d3d400b007d142287943a8f56f333ae66b7b95112113331ae4bcdaa16e813c5ee06467 SHA512 700993d15bce12df8bffb39e9e1f985c1a51c52c6d1f67e47d7764c6daa6e044082fdc00c2fafadda70a4d2f5439620de4919e6cd03285e293d1e172667a3cd9
diff --git a/media-libs/libquvi-scripts/libquvi-scripts-0.4.14.ebuild b/media-libs/libquvi-scripts/libquvi-scripts-0.4.14.ebuild
deleted file mode 100644
index f4c6d8ebf13d..000000000000
--- a/media-libs/libquvi-scripts/libquvi-scripts-0.4.14.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Embedded lua scripts for libquvi"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/quvi/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="offensive"
-
-DEPEND="app-arch/xz-utils"
-
-# tests fetch data from live websites, so it's rather normal that they
-# will fail
-RESTRICT="test"
-
-src_configure() {
-	econf \
-		--with-manual \
-		$(use_with offensive nsfw)
-}
diff --git a/media-libs/libquvi-scripts/libquvi-scripts-0.4.19.ebuild b/media-libs/libquvi-scripts/libquvi-scripts-0.4.19.ebuild
deleted file mode 100644
index f2ba4353c92a..000000000000
--- a/media-libs/libquvi-scripts/libquvi-scripts-0.4.19.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Embedded lua scripts for libquvi"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/quvi/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="offensive"
-
-DEPEND="app-arch/xz-utils"
-
-# tests fetch data from live websites, so it's rather normal that they
-# will fail
-RESTRICT="test"
-
-src_configure() {
-	econf \
-		--with-manual \
-		$(use_with offensive nsfw)
-}
diff --git a/media-libs/libquvi-scripts/libquvi-scripts-0.4.20.ebuild b/media-libs/libquvi-scripts/libquvi-scripts-0.4.20.ebuild
deleted file mode 100644
index f2ba4353c92a..000000000000
--- a/media-libs/libquvi-scripts/libquvi-scripts-0.4.20.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Embedded lua scripts for libquvi"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/quvi/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="offensive"
-
-DEPEND="app-arch/xz-utils"
-
-# tests fetch data from live websites, so it's rather normal that they
-# will fail
-RESTRICT="test"
-
-src_configure() {
-	econf \
-		--with-manual \
-		$(use_with offensive nsfw)
-}
diff --git a/media-libs/libquvi-scripts/libquvi-scripts-0.4.21-r1.ebuild b/media-libs/libquvi-scripts/libquvi-scripts-0.4.21-r1.ebuild
deleted file mode 100644
index 1ab185a54824..000000000000
--- a/media-libs/libquvi-scripts/libquvi-scripts-0.4.21-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Embedded lua scripts for libquvi"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/quvi/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0.4"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="offensive"
-
-DEPEND="app-arch/xz-utils"
-RDEPEND="!=media-libs/libquvi-scripts-0.4*:0"
-
-# tests fetch data from live websites, so it's rather normal that they
-# will fail
-RESTRICT="test"
-
-src_configure() {
-	econf \
-		--without-manual \
-		$(use_with offensive nsfw)
-}
diff --git a/media-libs/libquvi-scripts/libquvi-scripts-0.4.21-r2.ebuild b/media-libs/libquvi-scripts/libquvi-scripts-0.4.21-r2.ebuild
deleted file mode 100644
index aa51e6c2df80..000000000000
--- a/media-libs/libquvi-scripts/libquvi-scripts-0.4.21-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib-minimal
-
-DESCRIPTION="Embedded lua scripts for libquvi"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/quvi/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0.4"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="offensive"
-
-DEPEND="app-arch/xz-utils"
-RDEPEND="!=media-libs/libquvi-scripts-0.4*:0"
-
-# tests fetch data from live websites, so it's rather normal that they
-# will fail
-RESTRICT="test"
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--without-manual \
-		$(use_with offensive nsfw)
-}
diff --git a/media-libs/libquvi-scripts/libquvi-scripts-0.4.21.ebuild b/media-libs/libquvi-scripts/libquvi-scripts-0.4.21.ebuild
deleted file mode 100644
index f2ba4353c92a..000000000000
--- a/media-libs/libquvi-scripts/libquvi-scripts-0.4.21.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Embedded lua scripts for libquvi"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/quvi/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="offensive"
-
-DEPEND="app-arch/xz-utils"
-
-# tests fetch data from live websites, so it's rather normal that they
-# will fail
-RESTRICT="test"
-
-src_configure() {
-	econf \
-		--with-manual \
-		$(use_with offensive nsfw)
-}
diff --git a/media-libs/libquvi-scripts/libquvi-scripts-0.9.20130903.ebuild b/media-libs/libquvi-scripts/libquvi-scripts-0.9.20130903.ebuild
deleted file mode 100644
index 11870ad40f68..000000000000
--- a/media-libs/libquvi-scripts/libquvi-scripts-0.9.20130903.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Embedded lua scripts for libquvi"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/quvi/${P}.tar.xz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="offensive"
-
-RDEPEND=">=dev-lua/LuaBitOp-1.0.1
-	>=dev-lua/luaexpat-1.2.0
-	>=dev-lua/luajson-1.1.1
-	>=dev-lua/luasocket-2.0.2"
-DEPEND="app-arch/xz-utils
-	virtual/pkgconfig"
-
-# tests fetch data from live websites
-RESTRICT="test"
-
-src_configure() {
-	econf \
-		$(use_with offensive nsfw) \
-		--with-manual
-}
diff --git a/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131104.ebuild b/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131104.ebuild
deleted file mode 100644
index 11870ad40f68..000000000000
--- a/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131104.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Embedded lua scripts for libquvi"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/quvi/${P}.tar.xz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="offensive"
-
-RDEPEND=">=dev-lua/LuaBitOp-1.0.1
-	>=dev-lua/luaexpat-1.2.0
-	>=dev-lua/luajson-1.1.1
-	>=dev-lua/luasocket-2.0.2"
-DEPEND="app-arch/xz-utils
-	virtual/pkgconfig"
-
-# tests fetch data from live websites
-RESTRICT="test"
-
-src_configure() {
-	econf \
-		$(use_with offensive nsfw) \
-		--with-manual
-}
diff --git a/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130.ebuild b/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130.ebuild
deleted file mode 100644
index 1f20009db1a7..000000000000
--- a/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Embedded lua scripts for libquvi"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/quvi/${P}.tar.xz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~mips x86"
-IUSE="offensive"
-
-RDEPEND=">=dev-lua/LuaBitOp-1.0.1
-	>=dev-lua/luaexpat-1.2.0
-	>=dev-lua/luajson-1.1.1
-	>=dev-lua/luasocket-2.0.2"
-DEPEND="app-arch/xz-utils
-	virtual/pkgconfig"
-
-# tests fetch data from live websites
-RESTRICT="test"
-
-src_configure() {
-	econf \
-		$(use_with offensive nsfw) \
-		--with-manual
-}
diff --git a/media-libs/libquvi/Manifest b/media-libs/libquvi/Manifest
index 99d284548700..9025cdc01a93 100644
--- a/media-libs/libquvi/Manifest
+++ b/media-libs/libquvi/Manifest
@@ -1,10 +1,4 @@
 AUX libquvi-0.9.1-headers-reinstall.patch 457 BLAKE2B 67b0509e6e10cfa1f10067f6522d91cc76f84f160f109d088fca9d5209e171d16a7381fa9ed09dc1b0507756610222d38c797f00d043930306abeafc98b977e6 SHA512 6acce5b6c5b6907d138bd4a8257e966ec9e77aedbc463d28e94813615cb1f5a703d241214d378778886ea629b8702b6bf5d0808f125cb9ebe4da49d30b0c2b77
-DIST libquvi-0.4.1.tar.xz 262740 BLAKE2B 9479f894ddeec020a73d86d8899fd507c04827ee1a08fbf2456639afb209655a6359d94f6cd08549f447617db9be1f38f294a2088e2f010c478a5fb7dce3b8f7 SHA512 a16b144651a3c7d7cf0a6b8d111fe9822e3d37531f82a2406b9ae5c32fd401301e7a281081be81857c9146d0af2fb4b53026248b2cb49929b36480596a6724dd
-DIST libquvi-0.9.3.tar.xz 372012 BLAKE2B f97251a94338054ef8a40318b488912309663da6537fc7cba42f29c0d97c3c82fb52a53628fc2a47ae4ff1fc24e780b7fb29332621c5a0ea59ecd28abc2c6c2a SHA512 3d80ad117a1698dbef49bd510a0d5686fb7562a895f0ba1897a28dbad4237f0249d3db65f3a497f297ba3f4c6084dde71a95b4eb65990e7a063df9d51c34bf26
 DIST libquvi-0.9.4.tar.xz 373172 BLAKE2B ab351a74d7cb3a19d3ddad615a476f139f76d1e8bfe4b6b049384bb6833f36cc5c0d1e87044f1d408241a90a898a55d7747eb5eb9daa009af512c281bc15cb94 SHA512 287015e370e7b7f98f0f4c3717f5b044c8fcfb8b823c7988cd248e56b5fbbfa1a1aa421fbdafb38d727b79495267ccd4dead71587052117db53f29236268b651
-EBUILD libquvi-0.4.1-r2.ebuild 995 BLAKE2B 259d57ce07e709cc935a83b3438ac411e18f897572e722d60f34a56b2e5be946bf2dc46050271f46f894ac1d13b6aa11bb42c198092d5f59ffcc92913387bef5 SHA512 14ef9d613d6295a056bac359a109d98fc2a08c94f9bcc2e29e4801b6e95fd6a5f7d68bc1a73f4b1b97509c4bf3274ad31cc410ddbdf92c0025ace5c96ecc640a
-EBUILD libquvi-0.4.1.ebuild 851 BLAKE2B 4cf9d5fe4fe02c50f06fea3180e41d89f4dc9e939d8e8b4e8f19834591b8a3363323eb0fe53fdae678bf4829e5f7d5e68e7ef869d12e34c6f8ed037e0231bb09 SHA512 df05fb66f5dfa3cfeff14ba39c613fb7ce723485342c29b3552a9b91c463266487c74302007ab3845ea537dbad3153f7ac6f985ed5d423a3a5d002f77ad661ea
-EBUILD libquvi-0.9.3.ebuild 1015 BLAKE2B 7ef66bef069213f0483cca027bfc2b8b93b86dbfacce88055017664705da9251811c8d503c418983af7b4679a6614921eb29a4b677cb7af69e700663e5ea0b9d SHA512 365fd4cb766c67f59f04e69db21fe668a89eed517bfe2049b86bbafdd93b5fd49bf8024c7fa0fb399ca4a1481c448c7970728fe5222c7d8f8525549598f79fa7
 EBUILD libquvi-0.9.4-r1.ebuild 1283 BLAKE2B b9065f6d85c7df9272671bffd1a78d4911248e227ea5ad193b49d059db1a42b2bc62986228cf208bf11b32bd4706666ae731cf0e9612a061e2ccfc317923c3d1 SHA512 5d4a6b1d7ad736866ba7ae87de415973671e72a176f5c7df76c5365a4dea112734d52e9f494ccc370a666e3d50b13de925fdb7967ef1f7eea47abcf9df47f8b9
-EBUILD libquvi-0.9.4.ebuild 1024 BLAKE2B d5128d741af3d2756dbbb3dcb687069064ff2f965918001b8166cdd9335492a0800c58b9dc937b61c69faf27d7106b71d01e18b6ea35034e2084a074e19aa923 SHA512 020425c10dc7f856927da84bd0112abffbc6198d2cb304e96a7e77daab34cfa23af06742e772b60f462b85dbbdcbb909561e70a09575cfb41264aba3f8f396f5
 MISC metadata.xml 333 BLAKE2B 0a7c7e68bfe6ae4ad274ea5b1a44f4537f170552e10377ab8bfeea2ff1d3d400b007d142287943a8f56f333ae66b7b95112113331ae4bcdaa16e813c5ee06467 SHA512 700993d15bce12df8bffb39e9e1f985c1a51c52c6d1f67e47d7764c6daa6e044082fdc00c2fafadda70a4d2f5439620de4919e6cd03285e293d1e172667a3cd9
diff --git a/media-libs/libquvi/libquvi-0.4.1-r2.ebuild b/media-libs/libquvi/libquvi-0.4.1-r2.ebuild
deleted file mode 100644
index 09c9c35ba3e9..000000000000
--- a/media-libs/libquvi/libquvi-0.4.1-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils multilib-minimal
-
-DESCRIPTION="Library for parsing video download links"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/quvi/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0.4"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="examples static-libs"
-
-RDEPEND=">=net-misc/curl-7.36.0[${MULTILIB_USEDEP}]
-	!<media-libs/quvi-0.4.0
-	>=media-libs/libquvi-scripts-0.4.21-r1:0.4[${MULTILIB_USEDEP}]
-	>=dev-lang/lua-5.1.5-r3[deprecated,${MULTILIB_USEDEP}]
-	!=media-libs/libquvi-0.4*:0"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--without-manual
-	)
-	autotools-utils_src_configure
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.{c,h}
-	fi
-}
diff --git a/media-libs/libquvi/libquvi-0.4.1.ebuild b/media-libs/libquvi/libquvi-0.4.1.ebuild
deleted file mode 100644
index bee14917443a..000000000000
--- a/media-libs/libquvi/libquvi-0.4.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="Library for parsing video download links"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/quvi/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="examples static-libs"
-
-RDEPEND=">=net-misc/curl-7.18.2
-	!<media-libs/quvi-0.4.0
-	>=media-libs/libquvi-scripts-0.4.0
-	>=dev-lang/lua-5.1[deprecated]"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_configure() {
-	local myeconfargs=(
-		--with-manual
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.{c,h}
-	fi
-}
diff --git a/media-libs/libquvi/libquvi-0.9.3.ebuild b/media-libs/libquvi/libquvi-0.9.3.ebuild
deleted file mode 100644
index cea22c17c9d0..000000000000
--- a/media-libs/libquvi/libquvi-0.9.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils
-
-DESCRIPTION="Library for parsing video download links"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/quvi/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="AGPL-3"
-SLOT="0/8" # subslot = libquvi soname version
-KEYWORDS="~amd64 ~x86"
-IUSE="examples nls static-libs"
-
-RDEPEND="!<media-libs/quvi-0.4.0
-	>=dev-libs/glib-2.24.2:2
-	>=dev-libs/libgcrypt-1.4.5:0=
-	>=media-libs/libquvi-scripts-0.9
-	>=net-libs/libproxy-0.3.1
-	>=net-misc/curl-7.21.0
-	>=dev-lang/lua-5.1[deprecated]
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.9.1-headers-reinstall.patch )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable nls)
-		--with-manual
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	use examples && dodoc -r examples
-}
diff --git a/media-libs/libquvi/libquvi-0.9.4.ebuild b/media-libs/libquvi/libquvi-0.9.4.ebuild
deleted file mode 100644
index 3022409cc330..000000000000
--- a/media-libs/libquvi/libquvi-0.9.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils
-
-DESCRIPTION="Library for parsing video download links"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/quvi/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="AGPL-3"
-SLOT="0/8" # subslot = libquvi soname version
-KEYWORDS="amd64 ~arm ~hppa x86"
-IUSE="examples nls static-libs"
-
-RDEPEND="!<media-libs/quvi-0.4.0
-	>=dev-libs/glib-2.24.2:2
-	>=dev-libs/libgcrypt-1.4.5:0=
-	>=media-libs/libquvi-scripts-0.9
-	>=net-libs/libproxy-0.3.1
-	>=net-misc/curl-7.21.0
-	>=dev-lang/lua-5.1[deprecated]
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.9.1-headers-reinstall.patch )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable nls)
-		--with-manual
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	use examples && dodoc -r examples
-}
diff --git a/media-libs/libsmf/Manifest b/media-libs/libsmf/Manifest
index 09249027254c..565b796980d5 100644
--- a/media-libs/libsmf/Manifest
+++ b/media-libs/libsmf/Manifest
@@ -1,3 +1,3 @@
 DIST libsmf-1.3.tar.gz 545850 BLAKE2B 32e1497825d16a1ecdb869dc8168a66c6ee2fbdea3bf03da3284aaf72453c2a4d8db38676cbc23f39e73f28c8517d3afd088d627402389865bb9c8a9e2d0b2aa SHA512 3c383ec8f2fbe48ddab1008b3ecfe6941c38e33cfd963eabdf07f09c8c04c1b8758c8774b25672f70c29b570f2c250c795979d19b39c5027810b54b07035497d
-EBUILD libsmf-1.3.ebuild 801 BLAKE2B 9752b036fffa46657de8f52901f9790764ff772a0757611a427549098c5ec3e6143c5159cc5d83ddf9436a1e1bbd39f1e3e83b292163d7f20a4e74e2b1eabdd1 SHA512 1224060cdbfd461c089ec6c1476e2fcda33b9e888f3dde866fc71c43d8102ab2b16ea4d8ea61d3a454c17fbcb0bae80ad36e5c9c0c1923d24efec07741f6ac1f
+EBUILD libsmf-1.3.ebuild 777 BLAKE2B 6d6afa2045ca151a9b2941b85e3a6fb06b766840c1ba9b2e60b708eece62b53a3c229defa8bb2c43095eb5c4e9377b43361645d37c844a342915dbdf162ccc38 SHA512 f9568fb42ee8d88eb69e5759b78ea201fc8a3a75a5760336c88054ec9fb06b422ffc907d73a5eb8653a70e7ae6b79adc6a16e501f6fa06cfc9fec3fbb1b3c0bf
 MISC metadata.xml 329 BLAKE2B 4892ad7a2779d3332a66c15990e6bb1d472a81ac9f3cd67de291b34fec2b066209f9f1e060a0b7077088264e94f84bf219353fb3659c345ce627fc9d46059f28 SHA512 cc8d2a9c33a93b443fd0f0b11b186774144848ca497d8047fe0692d2f370db2072ae62eedc86e206984d82ddb8506c728886aeab1d11836e1c0326bd32e3831d
diff --git a/media-libs/libsmf/libsmf-1.3.ebuild b/media-libs/libsmf/libsmf-1.3.ebuild
index e737d43b4406..374d68ee1085 100644
--- a/media-libs/libsmf/libsmf-1.3.ebuild
+++ b/media-libs/libsmf/libsmf-1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit autotools-utils
+inherit autotools
 
 DESCRIPTION="Standard MIDI File format library"
 HOMEPAGE="http://libsmf.sourceforge.net/api/"
@@ -12,32 +12,34 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE="doc readline static-libs"
+IUSE="doc readline"
 
-RDEPEND=">=dev-libs/glib-2.2:2
-	readline? ( sys-libs/readline )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-
-DOCS=( NEWS TODO )
+RDEPEND="
+	dev-libs/glib:2
+	readline? ( sys-libs/readline:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
 
 src_configure() {
-	local myeconfargs=(
+	econf \
+		--disable-static \
 		$(use_with readline)
-	)
-	autotools-utils_src_configure
 }
 
 src_compile() {
-	autotools-utils_src_compile
+	default
 
-	if use doc ; then
+	if use doc; then
 		doxygen doxygen.cfg || die
 	fi
 }
 
 src_install() {
-	autotools-utils_src_install
-	use doc && dohtml -r api
+	use doc && local HTML_DOCS=( api )
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index fe2b05b7be12..e509f5dbffd8 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 1857 BLAKE2B b6ad10928efd8a8fd049a95e5e9e61b9ae0ecd3b788deebdb304f7a84ee8ee786d06075480eb4ca3f67a6ab845321f568b85323a2eac8fdb665f00bf63df315a SHA512 2320d8655dd167f4f3cfc73b7a030d7387c411cd1c3aafb9887187508c67674f23c3008122bd836762d8209f2e252b7837fbeaea95c221527b029b46ffb0aaf3
-EBUILD libsndfile-1.0.29_pre2_p20191024.ebuild 1660 BLAKE2B 5d70825b18caaa238ae76db2d9238c90ebbfe1419c09c1c46f5b2b3fa547165bf3ddb5b781af4b944097f83a5b6f8e4be301d9f26df5eae7deea72423080c543 SHA512 a50ae28b06f7b943fc5e3cb0aad153f96b47b6dba9b7875b761e82a49df1d80b3a68ddd7dcb525600f7e022dd1ff4217452d5a6aa42e0616289835a6db10c2c1
-EBUILD libsndfile-9999.ebuild 1805 BLAKE2B d8af12140bfb970339b05477c28e6bbc5b0fa5a21f2971571f83626132688fb0cce471696ee783f99e7f2e5494bf1a80483f54319833cd713d6fa99a0f7a7518 SHA512 f3f8d1a89a5eac2dbacabac750123e0b55eb4d7f26e1c0d982efecdbc3853a70ed3953356b6ff9460ffab7daee2befc34d7f21d38a29510c5f27533e65d479fa
+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
 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 b316eb15ff8a..e5bd250a8826 100644
--- a/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
@@ -21,6 +21,7 @@ LICENSE="LGPL-2.1"
 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 ~x64-solaris ~x86-solaris"
 IUSE="alsa minimal sqlite static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	!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 c4cf210ec2ce..7a297f49c677 100644
--- a/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild
@@ -17,6 +17,7 @@ HOMEPAGE="http://www.mega-nerd.com/libsndfile"
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="alsa minimal sqlite static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	!minimal? (
diff --git a/media-libs/libsndfile/libsndfile-9999.ebuild b/media-libs/libsndfile/libsndfile-9999.ebuild
index d618e1668362..78bd34280491 100644
--- a/media-libs/libsndfile/libsndfile-9999.ebuild
+++ b/media-libs/libsndfile/libsndfile-9999.ebuild
@@ -20,6 +20,7 @@ HOMEPAGE="http://www.mega-nerd.com/libsndfile"
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="alsa minimal sqlite static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	!minimal? (
diff --git a/media-libs/libsoundio/Manifest b/media-libs/libsoundio/Manifest
index 5b359dc4e1bb..ebd9152f70b8 100644
--- a/media-libs/libsoundio/Manifest
+++ b/media-libs/libsoundio/Manifest
@@ -1,6 +1,3 @@
-AUX libsoundio-1.1.0_missing_include.patch 610 BLAKE2B 7d545cbe90072bb125b705a0443cb73e134d5455508cd3da683ec5f2a2e716481c7db28e41c16a1c32fb14f74997b14ac83e499b019dd003787f621811447a19 SHA512 7477d305d84a9bb5482928ed600d39864e43a07790156ead7bac5c8237cbd2a1f57690cdde04d2ef19f5c19eafb47449d3579f5b57da2c59fa18b10b474db683
-DIST libsoundio-1.1.0.tar.gz 118672 BLAKE2B bafebad3a45cabca18cd1f73c4d8c2a404cacd5c1f23f333678300b4300eb1724faffd60caec7c35925f42c019d4a9bc51685892efb30cd259c2d3f84dae5d59 SHA512 3de35fa83395faea5e6f4478cd82d49615e470b09847fb076647664238e232ff3d4597ca7a07ce06012ae084f11e5d3903b42d8f4afe64c27b1a4b92d2081b5f
 DIST libsoundio-2.0.0.tar.gz 120387 BLAKE2B d4005667767633cf90fbf524cdf102c69e04e4e37cad55b4f9b1af7fb3f89f7b1a6ff47569c86bf5d86649fd34d9d080b8ed74d6da07c4155abadb3cad0797f0 SHA512 347a9be1789a41e778ea8d0efa1d00e03e725a4ab65e3aaf6c71e49138643f08a50a81bd60087d86a3b4d63beaeec617e47ba6b81f829ece8a3ac17418eb5309
-EBUILD libsoundio-1.1.0-r1.ebuild 1100 BLAKE2B c56e7ea9340115858b497ec15814337a348f2f6be7849dd610a6800b14b75bcf262df336fd9e30da7c67efb172acb81e720833f992f1a278dbd1be67591677c5 SHA512 f9a677fbfc3de77565b1a64c5b6c76025f4050a67d0c12b3ec2600fded77bbce4775e8c77a00af318093f99f2f8161344c8177b68c6b45c871eeefc3dfc512c6
 EBUILD libsoundio-2.0.0.ebuild 977 BLAKE2B 4337c4d0513d4275364ead8ef335eb57de2a7652c9bd0bbe65524905557ea8e6334eb1af3ab8cadc47b0a659891f5f8154bd68d2e0a5023fab44935eb5020c45 SHA512 e74c357b163fdd2323718b8f23e78dd0effd081e9b7b9b1f79350042e9ccaf57117866565e2bf82ad615a6108f2ff9cbb006c59bd8ec97a3d36563a52ac250c3
 MISC metadata.xml 901 BLAKE2B 8ef7fda2362a78865ad8321bb4724bd9caaf269ace631ada2bdb70fcfc6a8327637718fd1c0134445f51e127e1fe24a55a3527c8b319505bfee25e1e674b127d SHA512 156acbf89a915ba57049e365ef53abaf6c1c986d6ccb07e679bf1f7e39de8d708c8cc321aaf8588a7c529e878fea8b182f1eef60748c12287e4dd6ff16c77fb3
diff --git a/media-libs/libsoundio/files/libsoundio-1.1.0_missing_include.patch b/media-libs/libsoundio/files/libsoundio-1.1.0_missing_include.patch
deleted file mode 100644
index 4a0989525a9b..000000000000
--- a/media-libs/libsoundio/files/libsoundio-1.1.0_missing_include.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From e8b908243d58760d7815525d18bddd64ec97a5d2 Mon Sep 17 00:00:00 2001
-From: Andrew Kelley <superjoe30@gmail.com>
-Date: Fri, 22 Apr 2016 10:24:32 -0700
-Subject: [PATCH] add missing include directive
-
-fixes compilation when no backends are available. closes #67
----
- src/soundio_private.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/soundio_private.h b/src/soundio_private.h
-index 13d1d7a..213b36f 100644
---- a/src/soundio_private.h
-+++ b/src/soundio_private.h
-@@ -10,6 +10,7 @@
- 
- #include "soundio_internal.h"
- #include "config.h"
-+#include "list.h"
- 
- #ifdef SOUNDIO_HAVE_JACK
- #include "jack.h"
diff --git a/media-libs/libsoundio/libsoundio-1.1.0-r1.ebuild b/media-libs/libsoundio/libsoundio-1.1.0-r1.ebuild
deleted file mode 100644
index 09ee009fe3ed..000000000000
--- a/media-libs/libsoundio/libsoundio-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="C library for cross-platform real-time audio input and output"
-HOMEPAGE="http://libsound.io/"
-SRC_URI="http://libsound.io/release/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa coreaudio examples jack pulseaudio static-libs"
-
-DEPEND="alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	jack? ( || (
-		>=media-sound/jack-audio-connection-kit-0.125.0[${MULTILIB_USEDEP}]
-		>=media-sound/jack2-1.9.11_rc1[${MULTILIB_USEDEP}] ) )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}_missing_include.patch" )
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_ALSA=$(usex alsa)
-		-DENABLE_COREAUDIO=$(usex coreaudio)
-		-DENABLE_JACK=$(usex jack)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_WASAPI=no
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		-DBUILD_EXAMPLE_PROGRAMS=$(multilib_native_usex examples)
-		-DBUILD_TESTS=no
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-libs/libvisio/Manifest b/media-libs/libvisio/Manifest
index 9987f3bc13f5..85b5bbbc90ff 100644
--- a/media-libs/libvisio/Manifest
+++ b/media-libs/libvisio/Manifest
@@ -1,4 +1,4 @@
 DIST libvisio-0.1.7.tar.xz 854296 BLAKE2B db5dd96d769c237bc2926d52a43c2496adca50b74133ea3c81df7ba5a61824891623eb33b4801b463b27f5c03946ea7ffcf827b98c95139c9659b0a1b0f7b604 SHA512 c26f67a09fa6a6d0bf6f3fff5590d5cf16983630d4f7cfcf86d9461baec58dbdf7989fd934be6db0639ca043c160aac2d008275afb9e047766bc878ac579a9ea
-EBUILD libvisio-0.1.7.ebuild 1246 BLAKE2B afa59dfdd9b3fbb9b5772c93e0ac2cacfd9f704d80a16214e551e7fb9799530d505d3ac0d5af92cca8f48b8c356ccba12c72219bd0f534238c6d200843630602 SHA512 5c4f4227135b87506d9c17824b7ecc2d85749a6c93f1e47833ddf443d3f33d0e8428b1fdf0c8f324c8fa0ce57d0e91ae0ff5c93ad7c5d13cd6009bd50d6d8d29
-EBUILD libvisio-9999.ebuild 1251 BLAKE2B 2bc8acf7656e4a83c5de89d5a33d0bbc39d50865786eb10c3966ec2ec306e7ba00cfb93717aba30aaea9cdaff6b56fd9265bb606c21cb891b37f9ba9ec2b9a5e SHA512 4857277b54992988cf485cc82bbaefbe05504a73e87817dca51e79bb1b1f51b79fac81f0b6775b3552e5f60d4f4b1a31d6449f25ae66bc66babf5d7c184d4471
+EBUILD libvisio-0.1.7.ebuild 1273 BLAKE2B b319fa306a851e698b940098e7311b4041ee9c4155f92b0cd36fa4954fe4ce2c0c96682efbdcf70f474457408f26e12ef83592377c16f909193fbf24c6fb17ec SHA512 0e4b3731bfd1c16ea4ea5e58ee6d05f4e4c50074be8c15c9d9b90f7ac48df2988aef831e082f3da349550a60d92b12797a14617188b69ce3cc317f177e453b78
+EBUILD libvisio-9999.ebuild 1278 BLAKE2B a0859dce0feca532841d025e28887216983c177b4644d1fc12639892c8b81014feca91a45c26f07d8d4ca888d415660c7f756686d536686107d6d0c52ae7ba41 SHA512 1031f68271963f500cd2c1012552cb00068ef5410ba7589e77f56251bd517bbf072eb476dd64e0f701c7ac778bb5e850f724d7a91f5c3373eae31ac3413ab5b1
 MISC metadata.xml 321 BLAKE2B 845e098f8136b178e62b70bb06d8ce26ed7e2b9aec93358180d36cc8de5d4436501fa13521dcc7b4a7f8e311603b25c9d30d23db216008d3d96af5e462611a9a SHA512 a9d2208bf93a05e3406aee66412b46e731ce5a858e3e5e4a6668568b3ccba863d540f3e6224bc7e5ed8c6ad22d330fc0e30ecc90df2f8a866280bb138040fc12
diff --git a/media-libs/libvisio/libvisio-0.1.7.ebuild b/media-libs/libvisio/libvisio-0.1.7.ebuild
index 83b59cef84f4..4c75d052c916 100644
--- a/media-libs/libvisio/libvisio-0.1.7.ebuild
+++ b/media-libs/libvisio/libvisio-0.1.7.ebuild
@@ -19,6 +19,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libvisio"
 LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
 SLOT="0"
 IUSE="doc static-libs test tools"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	dev-lang/perl
diff --git a/media-libs/libvisio/libvisio-9999.ebuild b/media-libs/libvisio/libvisio-9999.ebuild
index e4147a14c125..1e677b234bae 100644
--- a/media-libs/libvisio/libvisio-9999.ebuild
+++ b/media-libs/libvisio/libvisio-9999.ebuild
@@ -19,6 +19,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libvisio"
 LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
 SLOT="0"
 IUSE="doc static-libs test tools"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	dev-lang/perl
diff --git a/media-libs/libvorbis/Manifest b/media-libs/libvorbis/Manifest
index fabd783fc72a..59aa86de8362 100644
--- a/media-libs/libvorbis/Manifest
+++ b/media-libs/libvorbis/Manifest
@@ -1,3 +1,6 @@
+AUX libvorbis-1.3.6-CVE-2017-14160.patch 738 BLAKE2B 799426d01cb7a55a79e518d4014a50ba0145987a7763a797ddb8d6e29eb51af29f435858dd01b3cc24dc31989037aa8e9efb0b2ec964a713134a7e5d6359a423 SHA512 a33e36b11e868063203771b62ded24f2dbb3fa83422687e5cda4cd1f75e9c1f2012de075b688f2604f5cfc85d082e32792505fd8993727c3c6d347947e1e1a45
+AUX libvorbis-1.3.6-CVE-2018-10392.patch 728 BLAKE2B 774165f3b0483924d464289bc6ae28b774e6307c3be7b388b33ff73d52f5e77d4180648af5644e28e23abce4561d09ae0e3fe8b548e06bd0c9138a77ea555676 SHA512 294de5e0c40b64d495df7f53196260be5ffaba11c75fc4a1a54ec0c058eeba4793c1ef685c8cf866195a2972c91a7a896df5f05f478b7f25a564abb3f82f331f
 DIST libvorbis-1.3.6.tar.xz 1195388 BLAKE2B 9fc1dd125fdecb95687ea159b75cd66eed21329ec0795a3050e52e6cc58e1aac7b084ca25c4e52ca6f251ff474f6d71a716c0fbb2367beda8eb6a51a8fa9049a SHA512 a5d990bb88db2501b16f8eaee9f2ecb599cefd7dab2134d16538d8905263a972157c7671867848c2a8a358bf5e5dbc7721205ece001032482f168be7bda4f132
+EBUILD libvorbis-1.3.6-r1.ebuild 1377 BLAKE2B 1fc6bc31966d5aeb94d3b7f73dcc17c5add462df6683cf9c936b16b180686c9d695466eb608e3bc1cbab838fc9fafcb08dbe92dc3b8f1b033a6be94fa138c605 SHA512 b0f57d36f92f234fb4359202776f83698065bd8e351e439e33b0c623b2c541b5c66a3063759f6b6a512bf71faed72586de7fe871e629486a7cd9f93aa7bd742b
 EBUILD libvorbis-1.3.6.ebuild 1035 BLAKE2B c4c5e4045311b4e9ddd5f226024f7cd8e6fb1b2a02e94741612d83369594c551424c17ce953e57cb1d274a4f2a601c5e11a4eda77afb7623529c799d54366e7e SHA512 28992e302e610af02c665710cef8ae0503151aeb3a30d0a5463cb5991fb0c321001dac1179cf8065f329453a60e965f0bf04d3acab454bfd74f3b6634644ef9a
 MISC metadata.xml 329 BLAKE2B a6d5d9be9186aaf3d6735d864b6cb04bffa351cc1a1ddc13e469ca002502048e74ae672f4079626afcb89798faa4628b6b859d200b241c4d643b65ff9c23e6ca SHA512 2fde69847e03cd50deb51ecb44508c41ffbdada22e1838a4e4a6f8165f550aa107849705b666166fe5cd9b1372a76bc5c50eeadb560a76043563dfdc98ce14bf
diff --git a/media-libs/libvorbis/files/libvorbis-1.3.6-CVE-2017-14160.patch b/media-libs/libvorbis/files/libvorbis-1.3.6-CVE-2017-14160.patch
new file mode 100644
index 000000000000..7759e2eb2a6c
--- /dev/null
+++ b/media-libs/libvorbis/files/libvorbis-1.3.6-CVE-2017-14160.patch
@@ -0,0 +1,29 @@
+This is also the patch for CVE-2018-10393.
+
+From 018ca26dece618457dd13585cad52941193c4a25 Mon Sep 17 00:00:00 2001
+From: Thomas Daede <daede003@umn.edu>
+Date: Wed, 9 May 2018 14:56:59 -0700
+Subject: [PATCH] CVE-2017-14160: fix bounds check on very low sample rates.
+
+---
+ lib/psy.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lib/psy.c b/lib/psy.c
+index 422c6f1..1310123 100644
+--- a/lib/psy.c
++++ b/lib/psy.c
+@@ -602,8 +602,9 @@ static void bark_noise_hybridmp(int n,const long *b,
+   for (i = 0, x = 0.f;; i++, x += 1.f) {
+ 
+     lo = b[i] >> 16;
+-    if( lo>=0 ) break;
+     hi = b[i] & 0xffff;
++    if( lo>=0 ) break;
++    if( hi>=n ) break;
+ 
+     tN = N[hi] + N[-lo];
+     tX = X[hi] - X[-lo];
+-- 
+2.22.0
+
diff --git a/media-libs/libvorbis/files/libvorbis-1.3.6-CVE-2018-10392.patch b/media-libs/libvorbis/files/libvorbis-1.3.6-CVE-2018-10392.patch
new file mode 100644
index 000000000000..a12038a94235
--- /dev/null
+++ b/media-libs/libvorbis/files/libvorbis-1.3.6-CVE-2018-10392.patch
@@ -0,0 +1,25 @@
+From 112d3bd0aaacad51305e1464d4b381dabad0e88b Mon Sep 17 00:00:00 2001
+From: Thomas Daede <daede003@umn.edu>
+Date: Thu, 17 May 2018 16:19:19 -0700
+Subject: [PATCH] Sanity check number of channels in setup.
+
+Fixes #2335.
+---
+ lib/vorbisenc.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/vorbisenc.c b/lib/vorbisenc.c
+index 4fc7b62..64a51b5 100644
+--- a/lib/vorbisenc.c
++++ b/lib/vorbisenc.c
+@@ -684,6 +684,7 @@ int vorbis_encode_setup_init(vorbis_info *vi){
+   highlevel_encode_setup *hi=&ci->hi;
+ 
+   if(ci==NULL)return(OV_EINVAL);
++  if(vi->channels<1||vi->channels>255)return(OV_EINVAL);
+   if(!hi->impulse_block_p)i0=1;
+ 
+   /* too low/high an ATH floater is nonsensical, but doesn't break anything */
+-- 
+2.22.0
+
diff --git a/media-libs/libvorbis/libvorbis-1.3.6-r1.ebuild b/media-libs/libvorbis/libvorbis-1.3.6-r1.ebuild
new file mode 100644
index 000000000000..92f52227407f
--- /dev/null
+++ b/media-libs/libvorbis/libvorbis-1.3.6-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools multilib-minimal
+
+DESCRIPTION="The Ogg Vorbis sound file format library"
+HOMEPAGE="https://xiph.org/vorbis/"
+SRC_URI="https://downloads.xiph.org/releases/vorbis/${P}.tar.xz"
+
+LICENSE="BSD"
+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 ~x64-solaris ~x86-solaris"
+IUSE="static-libs test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND=">=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-CVE-2017-14160.patch
+	"${FILESDIR}"/${P}-CVE-2018-10392.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/CFLAGS/s:-O20::' \
+		-e '/CFLAGS/s:-mcpu=750::' \
+		-e '/CFLAGS/s:-mno-ieee-fp::' \
+		configure.ac || die
+
+	# Un-hack docdir redefinition.
+	find -name 'Makefile.am' \
+		-exec sed -i \
+			-e 's:$(datadir)/doc/$(PACKAGE)-$(VERSION):@docdir@/html:' \
+			{} + || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable test oggtest)
+	)
+
+	einfo "Running configure in ${BUILD_DIR}"
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index 1e82a370ea39..73b4aff93724 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -1,19 +1,23 @@
 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 3888 BLAKE2B 3edbc7d114e705d821208a5c9547fccf5c91289ac2875dc594d046609231368b27cd8e1b5db1706111856c911d07e2e889a340a8f8c54ac4d7af157d4c722ca3 SHA512 0cd8cafffc1d6b315726f9ce0f3232dbcb4ca1164cc1191292b6540381680bee9dd2003c38cc6b1d0f14f6404a1b695f467755b99c31e732f6bf86e6c0fd98f2
-EBUILD libvpx-1.6.0-r1.ebuild 3531 BLAKE2B 8249b477e74e648c6de984e83193ff9dd462c7e76b0ce586f45a169105f7b35c8c26f6538b0ad75b1bb1d19c10db03ecc504ef0cd025d9f152edea851b714b46 SHA512 7cfe71249b0ade5bcd8cab71280b957cf36d915b4562316f529b6333b2bd1591d0db5792052de5d99d3334fbb900bc762e996ea9a8f0ee3c1aee1e825e0f46df
+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.ebuild 3842 BLAKE2B e306ae8e04884091c2d3b918a07d6996aa3488cff30dc12a291e05b03c293fa5468795ffd50c864ef7ea6b262fbeba1b052501e9f6229f162df8edc2996fbc91 SHA512 88c0c9638d922700ea87d825d337537e9d2fd4ec589e40792016e4c3e497f7243176b075c120e7fa0e9b9862c3f8ca3db1b8a0f20e7a15581fee83ea8beb2e34
-EBUILD libvpx-1.8.0-r1.ebuild 3317 BLAKE2B 63b57a82320b28284380c603c8fcc1b2c50800c4bc39affe4a3877bed50d5129b32c4e7e18c64ae32cca8045d4fb25984f3d6c686e21f000e99a699cd32495bc SHA512 a4eb1f7938edea9dfd3cd52efae6f39e1f96f700f1f443e906fd35080866b3b6b3fe28c287ba7e8895092ffb64255802e4de5270f8b374205de3b7718b47054c
-EBUILD libvpx-1.8.0.ebuild 3882 BLAKE2B 3eca48075feb41dfe6992148854c76269f34e1996202c9661129a92812a55fff4de0cbe4119c4762d4a0fccca35133b8809e0765ad0196fd910078c1fd88ae4b SHA512 520b2958b347e5bd25cb55f469b9ed7bca0d579eff1b4ab380f69a120f127cb2bb620ee37deacd4b12ffaeb0f3ef06455d152b744efe434cb2fd58718c9fee0c
+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.8.1.ebuild 3387 BLAKE2B 7043498569960ffaaec8a29e4289790af78b856c5b7f49ee4a966d1b6dd8750dbca10dc19ab10fa9a935d2fd655e86988c689ab54ce386dc9e87e5bb5e6a0d3b SHA512 9c5eb382a9706f491892697a1721a12bd6b057b8e91a7fbd8e02e420128ac2ab91d549271924af9d1babc6754407e56911a8b968b44b86ec4deb9b57f3dfa6ed
 MISC metadata.xml 664 BLAKE2B 78c866b8ee8a4b266156652bd6352d1ad0b7f28c88922dd31868623b1eca6530aab0a391c7264e5f1dffb9c1379adeb3b115846e99e1ab8a2ae1e58f527234ca SHA512 96644cef2185474da831eb928645cb7607216242097e8d1f1b887071817e282e22ae5646583208bfacf4467029b9dc2d3cfb888bba085bbf5b493dc98c3a7ef9
diff --git a/media-libs/libvpx/files/libvpx-1.7.0-CVE-2019-9232_9325_9371_9433.patch b/media-libs/libvpx/files/libvpx-1.7.0-CVE-2019-9232_9325_9371_9433.patch
new file mode 100644
index 000000000000..623eccda902d
--- /dev/null
+++ b/media-libs/libvpx/files/libvpx-1.7.0-CVE-2019-9232_9325_9371_9433.patch
@@ -0,0 +1,211 @@
+Backports of
+
+From 46e17f0cb4a80b36755c84b8bf15731d3386c08f Mon Sep 17 00:00:00 2001
+From: kyslov <kyslov@google.com>
+Date: Fri, 4 Jan 2019 17:04:09 -0800
+Subject: [PATCH] Fix OOB memory access on fuzzed data
+
+From 0681cff1ad36b3ef8ec242f59b5a6c4234ccfb88 Mon Sep 17 00:00:00 2001
+From: James Zern <jzern@google.com>
+Date: Tue, 24 Jul 2018 21:36:50 -0700
+Subject: [PATCH] vp9: fix OOB read in decoder_peek_si_internal
+
+From f00890eecdf8365ea125ac16769a83aa6b68792d Mon Sep 17 00:00:00 2001
+From: James Zern <jzern@google.com>
+Date: Tue, 11 Dec 2018 18:06:20 -0800
+Subject: [PATCH] update libwebm to libwebm-1.0.0.27-352-g6ab9fcf
+
+From 34d54b04e98dd0bac32e9aab0fbda0bf501bc742 Mon Sep 17 00:00:00 2001
+From: James Zern <jzern@google.com>
+Date: Tue, 9 Apr 2019 18:37:44 -0700
+Subject: [PATCH] update libwebm to libwebm-1.0.0.27-358-gdbf1d10
+
+From 52add5896661d186dec284ed646a4b33b607d2c7 Mon Sep 17 00:00:00 2001
+From: Jerome Jiang <jianj@google.com>
+Date: Wed, 23 May 2018 15:43:00 -0700
+Subject: [PATCH] VP8: Fix use-after-free in postproc.
+
+to address CVE-2019-9232 CVE-2019-9325 CVE-2019-9371 CVE-2019-9433
+
+
+--- a/test/decode_api_test.cc
++++ b/test/decode_api_test.cc
+@@ -138,8 +138,30 @@ TEST(DecodeAPI, Vp9InvalidDecode) {
+   EXPECT_EQ(VPX_CODEC_OK, vpx_codec_destroy(&dec));
+ }
+ 
+-TEST(DecodeAPI, Vp9PeekSI) {
++void TestPeekInfo(const uint8_t *const data, uint32_t data_sz,
++                  uint32_t peek_size) {
+   const vpx_codec_iface_t *const codec = &vpx_codec_vp9_dx_algo;
++  // Verify behavior of vpx_codec_decode. vpx_codec_decode doesn't even get
++  // to decoder_peek_si_internal on frames of size < 8.
++  if (data_sz >= 8) {
++    vpx_codec_ctx_t dec;
++    EXPECT_EQ(VPX_CODEC_OK, vpx_codec_dec_init(&dec, codec, NULL, 0));
++    EXPECT_EQ((data_sz < peek_size) ? VPX_CODEC_UNSUP_BITSTREAM
++                                    : VPX_CODEC_CORRUPT_FRAME,
++              vpx_codec_decode(&dec, data, data_sz, NULL, 0));
++    vpx_codec_iter_t iter = NULL;
++    EXPECT_EQ(NULL, vpx_codec_get_frame(&dec, &iter));
++    EXPECT_EQ(VPX_CODEC_OK, vpx_codec_destroy(&dec));
++  }
++
++  // Verify behavior of vpx_codec_peek_stream_info.
++  vpx_codec_stream_info_t si;
++  si.sz = sizeof(si);
++  EXPECT_EQ((data_sz < peek_size) ? VPX_CODEC_UNSUP_BITSTREAM : VPX_CODEC_OK,
++            vpx_codec_peek_stream_info(codec, data, data_sz, &si));
++}
++
++TEST(DecodeAPI, Vp9PeekStreamInfo) {
+   // The first 9 bytes are valid and the rest of the bytes are made up. Until
+   // size 10, this should return VPX_CODEC_UNSUP_BITSTREAM and after that it
+   // should return VPX_CODEC_CORRUPT_FRAME.
+@@ -150,24 +172,18 @@ TEST(DecodeAPI, Vp9PeekSI) {
+   };
+ 
+   for (uint32_t data_sz = 1; data_sz <= 32; ++data_sz) {
+-    // Verify behavior of vpx_codec_decode. vpx_codec_decode doesn't even get
+-    // to decoder_peek_si_internal on frames of size < 8.
+-    if (data_sz >= 8) {
+-      vpx_codec_ctx_t dec;
+-      EXPECT_EQ(VPX_CODEC_OK, vpx_codec_dec_init(&dec, codec, NULL, 0));
+-      EXPECT_EQ(
+-          (data_sz < 10) ? VPX_CODEC_UNSUP_BITSTREAM : VPX_CODEC_CORRUPT_FRAME,
+-          vpx_codec_decode(&dec, data, data_sz, NULL, 0));
+-      vpx_codec_iter_t iter = NULL;
+-      EXPECT_EQ(NULL, vpx_codec_get_frame(&dec, &iter));
+-      EXPECT_EQ(VPX_CODEC_OK, vpx_codec_destroy(&dec));
+-    }
++    TestPeekInfo(data, data_sz, 10);
++  }
++}
++
++TEST(DecodeAPI, Vp9PeekStreamInfoTruncated) {
++  // This profile 1 header requires 10.25 bytes, ensure
++  // vpx_codec_peek_stream_info doesn't over read.
++  const uint8_t profile1_data[10] = { 0xa4, 0xe9, 0x30, 0x68, 0x53,
++                                      0xe9, 0x30, 0x68, 0x53, 0x04 };
+ 
+-    // Verify behavior of vpx_codec_peek_stream_info.
+-    vpx_codec_stream_info_t si;
+-    si.sz = sizeof(si);
+-    EXPECT_EQ((data_sz < 10) ? VPX_CODEC_UNSUP_BITSTREAM : VPX_CODEC_OK,
+-              vpx_codec_peek_stream_info(codec, data, data_sz, &si));
++  for (uint32_t data_sz = 1; data_sz <= 10; ++data_sz) {
++    TestPeekInfo(profile1_data, data_sz, 11);
+   }
+ }
+ #endif  // CONFIG_VP9_DECODER
+--- a/third_party/libwebm/mkvparser/mkvparser.cc
++++ b/third_party/libwebm/mkvparser/mkvparser.cc
+@@ -5307,8 +5307,8 @@ long VideoTrack::Parse(Segment* pSegment, const Info& info,
+ 
+   const long long stop = pos + s.size;
+ 
+-  Colour* colour = NULL;
+-  Projection* projection = NULL;
++  std::unique_ptr<Colour> colour_ptr;
++  std::unique_ptr<Projection> projection_ptr;
+ 
+   while (pos < stop) {
+     long long id, size;
+@@ -5357,11 +5357,19 @@ long VideoTrack::Parse(Segment* pSegment, const Info& info,
+       if (rate <= 0)
+         return E_FILE_FORMAT_INVALID;
+     } else if (id == libwebm::kMkvColour) {
+-      if (!Colour::Parse(pReader, pos, size, &colour))
++      Colour* colour = NULL;
++      if (!Colour::Parse(pReader, pos, size, &colour)) {
+         return E_FILE_FORMAT_INVALID;
++      } else {
++        colour_ptr.reset(colour);
++      }
+     } else if (id == libwebm::kMkvProjection) {
+-      if (!Projection::Parse(pReader, pos, size, &projection))
++      Projection* projection = NULL;
++      if (!Projection::Parse(pReader, pos, size, &projection)) {
+         return E_FILE_FORMAT_INVALID;
++      } else {
++        projection_ptr.reset(projection);
++      }
+     }
+ 
+     pos += size;  // consume payload
+@@ -5392,8 +5400,8 @@ long VideoTrack::Parse(Segment* pSegment, const Info& info,
+   pTrack->m_display_unit = display_unit;
+   pTrack->m_stereo_mode = stereo_mode;
+   pTrack->m_rate = rate;
+-  pTrack->m_colour = colour;
+-  pTrack->m_projection = projection;
++  pTrack->m_colour = colour_ptr.release();
++  pTrack->m_projection = projection_ptr.release();
+ 
+   pResult = pTrack;
+   return 0;  // success
+--- a/vp8/common/postproc.c
++++ b/vp8/common/postproc.c
+@@ -65,7 +65,7 @@ void vp8_deblock(VP8_COMMON *cm, YV12_BUFFER_CONFIG *source,
+   double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065;
+   int ppl = (int)(level + .5);
+ 
+-  const MODE_INFO *mode_info_context = cm->show_frame_mi;
++  const MODE_INFO *mode_info_context = cm->mi;
+   int mbr, mbc;
+ 
+   /* The pixel thresholds are adjusted according to if or not the macroblock
+--- a/vp8/decoder/dboolhuff.h
++++ b/vp8/decoder/dboolhuff.h
+@@ -76,7 +76,7 @@ static int vp8dx_decode_bool(BOOL_DECODER *br, int probability) {
+   }
+ 
+   {
+-    register int shift = vp8_norm[range];
++    const unsigned char shift = vp8_norm[(unsigned char)range];
+     range <<= shift;
+     value <<= shift;
+     count -= shift;
+--- a/vp9/vp9_dx_iface.c
++++ b/vp9/vp9_dx_iface.c
+@@ -97,7 +97,7 @@ static vpx_codec_err_t decoder_peek_si_internal(
+     const uint8_t *data, unsigned int data_sz, vpx_codec_stream_info_t *si,
+     int *is_intra_only, vpx_decrypt_cb decrypt_cb, void *decrypt_state) {
+   int intra_only_flag = 0;
+-  uint8_t clear_buffer[10];
++  uint8_t clear_buffer[11];
+ 
+   if (data + data_sz <= data) return VPX_CODEC_INVALID_PARAM;
+ 
+@@ -158,6 +158,9 @@ static vpx_codec_err_t decoder_peek_si_internal(
+         if (profile > PROFILE_0) {
+           if (!parse_bitdepth_colorspace_sampling(profile, &rb))
+             return VPX_CODEC_UNSUP_BITSTREAM;
++          // The colorspace info may cause vp9_read_frame_size() to need 11
++          // bytes.
++          if (data_sz < 11) return VPX_CODEC_UNSUP_BITSTREAM;
+         }
+         rb.bit_offset += REF_FRAMES;  // refresh_frame_flags
+         vp9_read_frame_size(&rb, (int *)&si->w, (int *)&si->h);
+--- a/vpx_dsp/bitreader.h
++++ b/vpx_dsp/bitreader.h
+@@ -94,7 +94,7 @@ static INLINE int vpx_read(vpx_reader *r, int prob) {
+   }
+ 
+   {
+-    register int shift = vpx_norm[range];
++    const unsigned char shift = vpx_norm[(unsigned char)range];
+     range <<= shift;
+     value <<= shift;
+     count -= shift;
+--- a/vpx_dsp/bitreader_buffer.c
++++ b/vpx_dsp/bitreader_buffer.c
+@@ -23,7 +23,7 @@ int vpx_rb_read_bit(struct vpx_read_bit_buffer *rb) {
+     rb->bit_offset = off + 1;
+     return bit;
+   } else {
+-    rb->error_handler(rb->error_handler_data);
++    if (rb->error_handler != NULL) rb->error_handler(rb->error_handler_data);
+     return 0;
+   }
+ }
diff --git a/media-libs/libvpx/libvpx-1.5.0.ebuild b/media-libs/libvpx/libvpx-1.5.0.ebuild
index a7deea01f3c9..700c5256f736 100644
--- a/media-libs/libvpx/libvpx-1.5.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.5.0.ebuild
@@ -27,6 +27,7 @@ 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 )
diff --git a/media-libs/libvpx/libvpx-1.6.0-r1.ebuild b/media-libs/libvpx/libvpx-1.6.0-r1.ebuild
index 79d68925dd81..4d34056abc3e 100644
--- a/media-libs/libvpx/libvpx-1.6.0-r1.ebuild
+++ b/media-libs/libvpx/libvpx-1.6.0-r1.ebuild
@@ -15,6 +15,7 @@ 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 )
diff --git a/media-libs/libvpx/libvpx-1.7.0-r1.ebuild b/media-libs/libvpx/libvpx-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..ecb112e13f96
--- /dev/null
+++ b/media-libs/libvpx/libvpx-1.7.0-r1.ebuild
@@ -0,0 +1,131 @@
+# 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.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
+	"${FILESDIR}"/${P}-CVE-2019-9232_9325_9371_9433.patch
+)
+
+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.7.0.ebuild b/media-libs/libvpx/libvpx-1.7.0.ebuild
index 877d221cedb9..ed1286201bc2 100644
--- a/media-libs/libvpx/libvpx-1.7.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.7.0.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="
@@ -95,6 +95,9 @@ multilib_src_configure() {
 		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.
diff --git a/media-libs/libvpx/libvpx-1.8.0-r1.ebuild b/media-libs/libvpx/libvpx-1.8.0-r1.ebuild
index 9c2b048cea49..f0bd95847496 100644
--- a/media-libs/libvpx/libvpx-1.8.0-r1.ebuild
+++ b/media-libs/libvpx/libvpx-1.8.0-r1.ebuild
@@ -84,6 +84,9 @@ multilib_src_configure() {
 		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.
diff --git a/media-libs/libvpx/libvpx-1.8.0.ebuild b/media-libs/libvpx/libvpx-1.8.0.ebuild
index 5d7954ec89c1..a05ed4eb72ff 100644
--- a/media-libs/libvpx/libvpx-1.8.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.8.0.ebuild
@@ -96,6 +96,9 @@ multilib_src_configure() {
 		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.
diff --git a/media-libs/libvpx/libvpx-1.8.1.ebuild b/media-libs/libvpx/libvpx-1.8.1.ebuild
new file mode 100644
index 000000000000..6c41b598eb92
--- /dev/null
+++ b/media-libs/libvpx/libvpx-1.8.1.ebuild
@@ -0,0 +1,119 @@
+# 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
+)
+
+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/libwebp/Manifest b/media-libs/libwebp/Manifest
index c2af921dd454..4dce92af4007 100644
--- a/media-libs/libwebp/Manifest
+++ b/media-libs/libwebp/Manifest
@@ -1,5 +1,5 @@
 DIST libwebp-1.0.2.tar.gz 4036397 BLAKE2B 708c1083f62bdb3526f8319d9b6ce1e8aeba2bc785105ff7db07c9c7041311cedcfff000de5b8fd8e93550fc86ec149f6dd4a21f576709b80cb6a4b20ddd2863 SHA512 e095b8fdf0096395daf12892b3b74c472868e727f23640ba7aa5922a5a028b778a6a60d8a94f696f6c0ca49577dfc9a0b599ecb74ad831ade48c6db812b71d2e
 DIST libwebp-1.0.3.tar.gz 4029909 BLAKE2B c2b7f65515e455658153ef3042c50d35f3a1e11668f3c75bdcedeee91d232d8724ca34cad0b893912463efc28658b48ff7ea08d98d7f02050a831f50d77691a4 SHA512 3ccdc62e5906f8de791053560e932b39df3cfdd7793617bd4562b7d95e2f6feac1535bc035e1b02591cab14b117ab15e51af6f9e4e3af1df0869c63945ec86b9
-EBUILD libwebp-1.0.2.ebuild 1809 BLAKE2B 8d0b0dcfddd5d6b37a5e55ec9437fe71cbdc7f32a080198c44a92f547f72e75345bc1d77dd9a69557f3bc7b940eec949a8546b189b30e50835f27cb4dd05d64b SHA512 1acb6820e1f66b27c09c97fd6163378861c44c91cf9de982069209286a464488190923a69b60f3c94db2213abfea8c466dcc518a02822644a77aa1bdfcf5e4e4
-EBUILD libwebp-1.0.3.ebuild 1828 BLAKE2B 7e3a2203d5dc2f5da598fdaab1089a1d386cf99bb6280b97b08a0497be420180565df6d3c552049faf6c42459a8a1a6f27b3652ad194b728dca51f99b6e12b1e SHA512 86fc9fa50a4daf7f2d0da10f3117b5a10dd020525d89ac92b4e156116fe45611c663120a551c714be7eb53c0f5e9291c1ff3f9346e42ba153e73e8e86bca4792
+EBUILD libwebp-1.0.2.ebuild 1842 BLAKE2B 0b9147ede3fd2f2ed6911921aba75a36fc31a456654c916beeece2bb568367105079311c8eec669edcdf00b543d50c13a2dae6c093d5c98328369593575fcc51 SHA512 a480cb1b46b53dd920328c511a0c43d698e59e387eea75ac13ba8d9da1bb616ca652596345d84b7c2316f2260cce6991dedfa5a11bf0765366e9da488e28e4f9
+EBUILD libwebp-1.0.3.ebuild 1861 BLAKE2B 680a8c445d2774d9975141ae2d095e7d5e0d301e3477cd67e0b13cb3a56c69f1160fda01b482b51ca7f585be24292917fb2324e52efbe581173b71de1aa8c908 SHA512 ad6284c84c4902c2af31272162564be381072d467ea2513d74f685115c6520e317d8621d0c3e72f361eedf464480aa50559b653d6dd733e1c00f7cd899ce2131
 MISC metadata.xml 551 BLAKE2B be0c5dde4ced33103958fc19f5c5f4e9f17c417ced75f9ca065f35fadd50cf286c2a5dba0889dbbe439aa59a5a60d975725984687c1e008cf338cf1cff0ff7ed SHA512 8557a448b4d83f68911d02ef4d2cc003eddae753f28a57f3f87670cbe7e89fbce784416270ecf4f471c883e2bfcabafc3340e16026c883712b96f8b295c868be
diff --git a/media-libs/libwebp/libwebp-1.0.2.ebuild b/media-libs/libwebp/libwebp-1.0.2.ebuild
index ac156cbefe94..6bcbd544fcd4 100644
--- a/media-libs/libwebp/libwebp-1.0.2.ebuild
+++ b/media-libs/libwebp/libwebp-1.0.2.ebuild
@@ -14,7 +14,7 @@ LICENSE="BSD"
 SLOT="0/7" # subslot = libwebp soname version
 [[ "${PV}" = *_rc* ]] || \
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg neon opengl +png static-libs swap-16bit-csp tiff"
+IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg opengl +png static-libs swap-16bit-csp tiff"
 
 # TODO: dev-lang/swig bindings in swig/ subdirectory
 RDEPEND="gif? ( media-libs/giflib:= )
@@ -51,7 +51,7 @@ multilib_src_configure() {
 
 		$(use_enable cpu_flags_x86_sse2 sse2)
 		$(use_enable cpu_flags_x86_sse4_1 sse4.1)
-		$(use_enable neon)
+		$(use_enable cpu_flags_arm_neon neon)
 
 		# Only used for gif2webp binary wrt #486646
 		$(multilib_native_use_enable gif)
diff --git a/media-libs/libwebp/libwebp-1.0.3.ebuild b/media-libs/libwebp/libwebp-1.0.3.ebuild
index ac73ea539ef2..7c952320c635 100644
--- a/media-libs/libwebp/libwebp-1.0.3.ebuild
+++ b/media-libs/libwebp/libwebp-1.0.3.ebuild
@@ -14,7 +14,7 @@ LICENSE="BSD"
 SLOT="0/7" # subslot = libwebp soname version
 [[ "${PV}" = *_rc* ]] || \
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg neon opengl +png static-libs swap-16bit-csp tiff"
+IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg opengl +png static-libs swap-16bit-csp tiff"
 
 # TODO: dev-lang/swig bindings in swig/ subdirectory
 RDEPEND="gif? ( media-libs/giflib:= )
@@ -51,7 +51,7 @@ multilib_src_configure() {
 
 		$(use_enable cpu_flags_x86_sse2 sse2)
 		$(use_enable cpu_flags_x86_sse4_1 sse4.1)
-		$(use_enable neon)
+		$(use_enable cpu_flags_arm_neon neon)
 
 		# Only used for gif2webp binary wrt #486646
 		$(multilib_native_use_enable gif)
diff --git a/media-libs/libxspf/Manifest b/media-libs/libxspf/Manifest
index d9b56a87a450..d3a6a8808fca 100644
--- a/media-libs/libxspf/Manifest
+++ b/media-libs/libxspf/Manifest
@@ -1,5 +1,5 @@
 AUX libxspf-1.2.0-gcc44.patch 520 BLAKE2B 711be1facee0b15d1575daf6f9aadf54a084f733e2f3faeb86918a197464bfcb912efb1f4b93d7c3058d71a8c7f111d6c554ea672644ef5c267a419fa501ac08 SHA512 aa2ee2626504f8b98d1903f1e04e8aab68ea541022f03234b034d477d8d60c8c56af0ca2e1e64aeb28dbde04ca14db2c5ec7b893e6697233752fe629adf169c9
 AUX libxspf-1.2.0-gcc47.patch 267 BLAKE2B bd7c26c5148eed4b936aa811cb98bebcc3ad9b8049827157aea858aa2a48e1283a78d6d8a3fe1726372249a262f029e3a0ccb2269e84ca8bee77b9df037d6d7a SHA512 2e84721ea7e51750ebc3ecad492310ac474563552d46b20aa3184cc26052b91d881ccec7ac283ae76f2b82db7032d371b34a824b4194291427f726c48e8552b6
 DIST libxspf-1.2.0.tar.bz2 372483 BLAKE2B 6a1af724e993bff93979d9e641754e9964dd57363481fda09e91985a773a083f698759e0c4bca6d794ee272bf070304e09282538343fe64bd91a6b876c627868 SHA512 56667b6df89e30517e2e388e2e3b1c083b19d98d69b4ee328d2784bba57a8d50c6b6ae1876cf17e6f9eb1ff872680c8f33b84b826d1290b890ac173c76bea491
-EBUILD libxspf-1.2.0.ebuild 1017 BLAKE2B ca6c00513f893d9f8befb3f1e558e76b6a24481672eabfc7affeba8cad7f8b5688088fcb53576d6bc3b0e8875683e9eda337ba7bf9280cb6b85042cf271d4715 SHA512 a4027b33b273a361fdb55687ccc6d48f5dd08df04757d9f8e48b9ad9e346c7b042a2e2cb6116472a98427be3820ec9c51b0dcdb588a81e16eafa4c26d4c35c14
+EBUILD libxspf-1.2.0.ebuild 1041 BLAKE2B 66287fd7d64a97a8f7d40059a33333468326f791f61416864013fca4f72f4b95736196ba0355c3e9bba4f3ee34cf0a88bb64fadcbb827517c56a681f19673f1e SHA512 e6ac22c36827be2507382033a0f9ae7fd58aff3640b2bd4275c3c425054acd9deafe2a76236963559e729dd709682640e35e0029b8b8591eebf1f6bff68bb060
 MISC metadata.xml 517 BLAKE2B 12f2175a02bdb84c679ff437352cbac8267dac2bd12a3a04fb2e853c4049acac001160daf124b97b9c6170bd73beddf238ea454b8588a2c635efdefee8773ca7 SHA512 eb605d2fb0dfe1fd3e6fc50f29e6408626e2a4fe255db65a0b20844adf1634b9bd0b0bc69c55a2a6ceedaabb41aca03f330af9258d408896042805f7b78cad33
diff --git a/media-libs/libxspf/libxspf-1.2.0.ebuild b/media-libs/libxspf/libxspf-1.2.0.ebuild
index fa7f0ecfa6f8..14c675757897 100644
--- a/media-libs/libxspf/libxspf-1.2.0.ebuild
+++ b/media-libs/libxspf/libxspf-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="BSD LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/expat-2
diff --git a/media-libs/libyami/Manifest b/media-libs/libyami/Manifest
index 3a1a48f4a531..b3041876e0cc 100644
--- a/media-libs/libyami/Manifest
+++ b/media-libs/libyami/Manifest
@@ -2,9 +2,9 @@ DIST libyami-1.0.1.tar.gz 480656 BLAKE2B 245c26dcfd396000eaf60d25bf437aad8dcd525
 DIST libyami-1.1.0.tar.gz 491537 BLAKE2B fc3b948954ceda10894ff29f5f540a5817a962e2da6d549f0d0b4d89602577437778a244bcaff5fee4f3760d98472d8cd1c0ac07146e3b6ad34618c9f937eeec SHA512 04ef34a994d23f8f5182c17975d6a28048a311c8090393d8cd54dd1fc74ec8b76af4028e1d5506568fb698e15f14833a01d4eaeb4ccd2484801f806a05cc86fa
 DIST libyami-1.2.0.tar.gz 508386 BLAKE2B ed4892dddd66d03a5f37c4d28a449c18c722bd1a09aae6261d3b3a210fc4912f728f629a216efd7176c8a37de768a6fa2d1272ca223a387e5cfb8cb4e7cb284d SHA512 1d253d67e3aab7ff2a1add50f7a5ebd284518d12fa689e6160a2dadb3fd1c2a5ab1a1c5f66dfd3801d46d9666c73dabcd5302ca495b069f60671337c0d0bc539
 DIST libyami-1.3.0.tar.gz 820807 BLAKE2B 3764e591269f3c38e7b5f6f5c3dbfb59fe4cdb198cd80858a2c0150274be073c1b064b8c8482b87ba770a6ee3534430b00155b34fa70f6bab7ed537a85ba1ed1 SHA512 8858c7f8d0fa7ce4547f762484e4b82477e49a8cb893cde29d7a26ba0f39dfcabc530659722ee5b84dc6f95e65c3373057ef470c78b9c1d790907e7bd6c6fd75
-EBUILD libyami-1.0.1.ebuild 2050 BLAKE2B b666dbb77df924c06b73feb8da459190694606314f55cea4bfc7ca1ea5a885edb7e031819ca926bebc43305ba2d740c0c9644dec4fcc8c5650de9453bdacedac SHA512 d638f274ad45924231e7579ff860f7c1900ba5ffca6aaacc7c45db1251982639e24e9a7498122b8219825f32c627553dd8ae6c1bdc976da8ed0a4b1070931512
-EBUILD libyami-1.1.0.ebuild 2076 BLAKE2B 08bee3c7949783a42b9202911c9fec39b3765b721447223188791bc964a0e95b75637f0a3dea18819d40b64bf0f90d99cc482c5bf3317cdd390d4932e3198f54 SHA512 fe3b20beaa845d3edc83ff20330a9c2a486e5cb662fa6add675ccf87f8e2f73fa92b297aae232375b8e443464d1d337751de8bd0692c0ca91d5e26508d1e6356
-EBUILD libyami-1.2.0.ebuild 2110 BLAKE2B 5949d871b479b23dfe0636ac2e196c43e2686b60950e16b2ee0c435337f6bf142d3e0e266c12cd306c2de8feb851353f4b40bfe47f95b8665db33f72039ace85 SHA512 ba8452590a7ed51d79b0112d84432a11d7df43b7bdc7319e2d21f724488bbf61e66fd3cbdc91f2ac34718c15b6cca3677b9bf584f1b8657767c5eb7c147c78c1
-EBUILD libyami-1.3.0.ebuild 2180 BLAKE2B 3d0cb7206b72b44f2c2c4cf40fde1183dc435fa9c4698aec2df409f9d0dcc3b01cafa844e9fbdad6e94a8df6aacca7cea7927a5ea2fe4b0ae6e1eb1b2882f0ce SHA512 38f4bf856c559f46b36281d1f4bc4c525522a84ca1726500fecbac49c679c5add2d4a3357faa1ad0bbd6d618de2cc5b54c5bae177c05aeae84b29afdff321dcc
-EBUILD libyami-9999.ebuild 2150 BLAKE2B a32aca3ad5fe2302ec78cde3ab6e00c0fc4b273060e7052eb5193f51565418d0e1316030a8f8d1557ade41def205f6e3a272425ddba51030111abf2f1f7f4626 SHA512 5dce12e388b7de296e26d3c471effa4829bc0f954173bc291438eb0b081ce2d71d89a6f1957401921fbbe440a2149ea65143f075721f299578d4535c9e38ba30
+EBUILD libyami-1.0.1.ebuild 2074 BLAKE2B 37716a2166d5d332770d5a9b187fd9a3b20591d55bb2b6b8dd4d126f2cdb7b36c31406584a16d729d4812be5f580c0f907cd9e76ebf4b9dd5b23f7abca646078 SHA512 06d1c46650057b955ecffbf1b8bd935244a3f2642fdccf4192e9ac0217c3d971ab589e37bd1e4b5df59375b386bd957f3bc92166c72cc10e4b6b71e528a716a7
+EBUILD libyami-1.1.0.ebuild 2100 BLAKE2B e4f2d47816aec5535f2c60dba3e1a9912c2b32b125d567339d4eb75f603f675a3269924d24ab31c9a2053ff03468b9df884cfa385d5de63c33d63a6f9ebc8051 SHA512 82d08826b704ee00ccd0e8195c710fa95273d85171c11ef00b0dedca4ef670678c523ecf252914ee9b7cadfd5820cead79dec747099c7ad6cffc186c358bfc32
+EBUILD libyami-1.2.0.ebuild 2134 BLAKE2B 94e44fdd15ee0a6fc7dca0011fe2371249effb8ebab915defb653e2baa704ce14e731f2c34ec4860b42403d2f01f7fcd3d9d7d72d25cfcc71e03b4cc9f58eefe SHA512 c0972e6252c0d6e386c93da1988b39284dfbc08dd8542d0a3fe44c464df6f0de4e9814badfa36bd3c57cf37b314ec88b31413614e77b50f25be5139ed7261f71
+EBUILD libyami-1.3.0.ebuild 2204 BLAKE2B 45bcc846d25c5a31ff488969236a65a438c7f576de4c0ccefac410faee4d05b7d6da394fe7c0cdb92e08b5681dc2372f9b911c56852bf6f86a2a145cd113e5a3 SHA512 13988b6636f511043a8ac7e5ea192e03d000c54d9c8b9260163035c620ecaffd44a0d6c4efb762b2a7c0be892d620a591355394db5d1b1cd927460ea1787fde5
+EBUILD libyami-9999.ebuild 2174 BLAKE2B 83484e68e06e6127220d70777088986cf09487263d052b9a4bfe469a628cbe7003922fe73fa9f833bcc39e3d73854ff70546d8560396ea7eb9c587205fdb9267 SHA512 2fae9a0e0afa216dcc395ee3e5dc8a74e332f27b1e6e7c678b622acfc24df331e456c14ec3ff5c465ee039f19aa9d704876c52c7ef6599a2f6b4c4f29fcde3ff
 MISC metadata.xml 564 BLAKE2B 5e0cdea946bb891106c1c04123df9ec34b6de1e92dc3ab8002ff0ae9d38eb580da6f7765efb99a299e073f5fa35f8d91c190aedb2040a6c8a95b71142c9495ea SHA512 db74b69f443e310f95f17b9c8112cb9f6ed5ba4600971b7eff65a1c98ccc2391d5d5a53f46efee8b4b6aa87a0becf8883a0a5dafb10e5d708dc8a8e584865008
diff --git a/media-libs/libyami/libyami-1.0.1.ebuild b/media-libs/libyami/libyami-1.0.1.ebuild
index 4a72f11306d1..c794ddbb7383 100644
--- a/media-libs/libyami/libyami-1.0.1.ebuild
+++ b/media-libs/libyami/libyami-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,6 +26,7 @@ fi
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="debug dmabuf doc md5 v4l X test wayland"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=x11-libs/libva-1.7.2[drm,X?,wayland?,${MULTILIB_USEDEP}]
diff --git a/media-libs/libyami/libyami-1.1.0.ebuild b/media-libs/libyami/libyami-1.1.0.ebuild
index 61e906a3381d..72dd062364d1 100644
--- a/media-libs/libyami/libyami-1.1.0.ebuild
+++ b/media-libs/libyami/libyami-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,6 +26,7 @@ fi
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="debug egl dmabuf doc md5 v4l X test wayland"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=x11-libs/libva-1.7.2[drm,X?,wayland?,${MULTILIB_USEDEP}]
diff --git a/media-libs/libyami/libyami-1.2.0.ebuild b/media-libs/libyami/libyami-1.2.0.ebuild
index fd902dd2fd96..0b6bd2f08c04 100644
--- a/media-libs/libyami/libyami-1.2.0.ebuild
+++ b/media-libs/libyami/libyami-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,6 +25,7 @@ fi
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="debug egl dmabuf doc md5 v4l X test wayland"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=x11-libs/libva-1.7.2[drm,X?,wayland?,${MULTILIB_USEDEP}]
diff --git a/media-libs/libyami/libyami-1.3.0.ebuild b/media-libs/libyami/libyami-1.3.0.ebuild
index 4df453a98755..ccd9e97aa740 100644
--- a/media-libs/libyami/libyami-1.3.0.ebuild
+++ b/media-libs/libyami/libyami-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,6 +26,7 @@ fi
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="debug egl dmabuf doc md5 v4l X test wayland"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=x11-libs/libva-1.7.2:=[drm,X?,wayland?,${MULTILIB_USEDEP}]
diff --git a/media-libs/libyami/libyami-9999.ebuild b/media-libs/libyami/libyami-9999.ebuild
index 33937920eec0..be54eaa446bf 100644
--- a/media-libs/libyami/libyami-9999.ebuild
+++ b/media-libs/libyami/libyami-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,6 +26,7 @@ fi
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="debug egl dmabuf doc md5 v4l X test wayland"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=x11-libs/libva-1.7.2:=[drm,X?,wayland?,${MULTILIB_USEDEP}]
diff --git a/media-libs/libzmf/Manifest b/media-libs/libzmf/Manifest
index 629339c6a1c5..fe4ca2f38214 100644
--- a/media-libs/libzmf/Manifest
+++ b/media-libs/libzmf/Manifest
@@ -1,4 +1,4 @@
 DIST libzmf-0.0.2.tar.xz 320952 BLAKE2B 0fb3a88da7e37f32c46a8c5d388e235ffdb61edaa9dfbd810fe88160c5a19be78a32c537d4953f8b86dd250d4f753c3d7c472bb74613291873f6dee452d546f6 SHA512 ad4a8e65e85434e43caa239ff2a3f358c6db6411235c4bb73d8d2aa1527a4f411433370706db391f8f8110a36759249ee19b27be75bae5f361c491006d1b9aa2
-EBUILD libzmf-0.0.2.ebuild 1018 BLAKE2B 19150af50a62fb840b2e1d789c7ee806e206e4cef7c90b6aea2bc2980c3c9174d27a836d4961eac6cde3ecba14834c2135547f7d93ebf822207773475da0d538 SHA512 45c92dee3f83ee41cd0f23706dc5e584d9cc96880823eee0269a745f06816988ec7bbbded2acf19471d4d5ae794228461803ccd7b740fd7ddc50122806d6598a
-EBUILD libzmf-9999.ebuild 1014 BLAKE2B 255a8b8d4297d17e4ebc7040156a964bf9b474d7c1bcc140d2331aff5b2018815d1e2bdb4a81a6b779a7525294055de52d59422fd1d19837f7822cb78522e0ba SHA512 19d2c912737d51cffd1a1908316ccb2a3784e3c2f5ebc3c5c7fe212fe6fd3d08ef7b226cd72a74000554bb9b6ca84e4618ced4c7463b97da34148bcc486f532b
+EBUILD libzmf-0.0.2.ebuild 1045 BLAKE2B 5007b0ccc92ce90a80477557c2bf4ff0b3a74fb3ec006be97d63db78af7aa67887387fd4bbffa0942c3ae75e8d53b635beea19150f2b163672fec31fdc23d476 SHA512 3eef2082d76da8f828e88e15b1f011773d65cbff393fc9b4b3e66b592fc462bd4ab6cb49e35e8b29158cfb91e79b2cd9476dcf4bf001689185f359e44de4e837
+EBUILD libzmf-9999.ebuild 1038 BLAKE2B 59ff70c72dde0cbd532f574b09b088e4e6b39a842d351ea8369d8e99e5e1b5064c786d8de449791152de2bbebce9adb30c24dec5bd9ea44ccd98ae3236c64c20 SHA512 599b94e7651b8f64aab01e2ef78af5ff79197f2c252ab43d2de160a8658a65c29150bdd8b774f83b72070619a8a92c70835c9357117d1b87de3169238e438513
 MISC metadata.xml 321 BLAKE2B 845e098f8136b178e62b70bb06d8ce26ed7e2b9aec93358180d36cc8de5d4436501fa13521dcc7b4a7f8e311603b25c9d30d23db216008d3d96af5e462611a9a SHA512 a9d2208bf93a05e3406aee66412b46e731ce5a858e3e5e4a6668568b3ccba863d540f3e6224bc7e5ed8c6ad22d330fc0e30ecc90df2f8a866280bb138040fc12
diff --git a/media-libs/libzmf/libzmf-0.0.2.ebuild b/media-libs/libzmf/libzmf-0.0.2.ebuild
index bd353a89f5fe..a2d9bddf410b 100644
--- a/media-libs/libzmf/libzmf-0.0.2.ebuild
+++ b/media-libs/libzmf/libzmf-0.0.2.ebuild
@@ -16,6 +16,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
 
 IUSE="debug doc test tools"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/icu:=
diff --git a/media-libs/libzmf/libzmf-9999.ebuild b/media-libs/libzmf/libzmf-9999.ebuild
index 029727cdcae1..f58ce3535bde 100644
--- a/media-libs/libzmf/libzmf-9999.ebuild
+++ b/media-libs/libzmf/libzmf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,6 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 IUSE="debug doc test tools"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/icu:=
diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index 556241c48e0d..0f66a1f595cc 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -1,4 +1,4 @@
 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 1605 BLAKE2B 9b04246067a15c76937b937ab0f407bf48d1aed27218566ca9d2c48bad155b56af8d250f44f29dc4367d0d122e4336f9aa507eb8d6df90eaba471215732f2aef SHA512 0b878b04db42e0b2912e49c2b770a96cd3c8815e88419777025596c4c451eb4bca607dc3881c685fd8e682aee84851d3d32e978f5b4cf07f16fca8945181199d
+EBUILD lilv-0.24.4-r1.ebuild 1632 BLAKE2B ec9110400bfd23e9c3ffe718a4e6cfaeaa9e8525a8a46b3b6b067a5248d9c2c91c600622636c4a94ed14b0b60d7f80dcdafaabc1ccd5d5ff800e9c75fdc92417 SHA512 75eaa825908a6804468c25abe199ab93eb89f3540d2090628dd843e2351564ebbc94d54ce2ea79c199c68743201aeff0757d743792e0c2296aad3e70b3568c92
 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 7c05d945b149..e94612339761 100644
--- a/media-libs/lilv/lilv-0.24.4-r1.ebuild
+++ b/media-libs/lilv/lilv-0.24.4-r1.ebuild
@@ -16,6 +16,7 @@ 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.28.0-r1[${MULTILIB_USEDEP}]
diff --git a/media-libs/lv2/Manifest b/media-libs/lv2/Manifest
index ac817ab07e8e..9c8805efe575 100644
--- a/media-libs/lv2/Manifest
+++ b/media-libs/lv2/Manifest
@@ -1,3 +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
 MISC metadata.xml 340 BLAKE2B e8469f758a451316b9d89c286f2d47c82b62d57ff9d43a6f2f93da8cf0abb5579fa8e568d8e6422e5d144a368310ccdec6e89ce2672f53b9db149bbf838afa68 SHA512 a31345dfd0bb1ac92461cd26ffcd20197775288be0ee4a2d660e90b8655f5288166c9613ba42ef3eef6dff6c97d268ffc85af3429eb093ffb29ad9581a5fa33d
diff --git a/media-libs/lv2/files/lv2-1.16.0-python3.patch b/media-libs/lv2/files/lv2-1.16.0-python3.patch
new file mode 100644
index 000000000000..330fc4cfcac7
--- /dev/null
+++ b/media-libs/lv2/files/lv2-1.16.0-python3.patch
@@ -0,0 +1,22 @@
+diff --git a/lv2specgen/lv2specgen.py b/lv2specgen/lv2specgen.py
+index ddd0ba5..224ace8 100755
+--- a/lv2specgen/lv2specgen.py
++++ b/lv2specgen/lv2specgen.py
+@@ -329,7 +329,7 @@ def getComment(m, urinode, classlist, proplist, instalist):
+         if have_lxml:
+             try:
+                 # Parse and validate documentation as XHTML Basic 1.1
+-                doc = """<?xml version="1.0" encoding="UTF-8"?>
++                doc = """<?xml version="1.0"?>
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN"
+                       "DTD/xhtml-basic11.dtd">
+ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+@@ -340,7 +340,7 @@ def getComment(m, urinode, classlist, proplist, instalist):
+ %s
+   </body>
+ </html>
+-""" % str(markup.decode())
++""" % str(markup)
+ 
+                 oldcwd = os.getcwd()
+                 os.chdir(specgendir)
diff --git a/media-libs/lv2/lv2-1.16.0.ebuild b/media-libs/lv2/lv2-1.16.0.ebuild
new file mode 100644
index 000000000000..9284873bc1ff
--- /dev/null
+++ b/media-libs/lv2/lv2-1.16.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-single-r1 waf-utils multilib-build multilib-minimal
+
+DESCRIPTION="A simple but extensible successor of LADSPA"
+HOMEPAGE="http://lv2plug.in/"
+SRC_URI="http://lv2plug.in/spec/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc plugins"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	plugins? ( virtual/pkgconfig )
+	doc? ( app-doc/doxygen dev-python/rdflib )
+"
+CDEPEND="
+	${PYTHON_DEPS}
+	plugins? ( x11-libs/gtk+:2 media-libs/libsndfile )
+"
+DEPEND="${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/rdflib[${PYTHON_USEDEP}]
+"
+DOCS=( "README.md" "NEWS" )
+
+PATCHES=(
+	"${FILESDIR}/${P}-python3.patch"
+)
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--lv2dir="${EPREFIX}"/usr/$(get_libdir)/lv2 \
+		$(use plugins || echo " --no-plugins") \
+		$(multilib_native_usex doc --docs "")
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${D}"
+}
diff --git a/media-libs/mediastreamer/Manifest b/media-libs/mediastreamer/Manifest
index 927037d9a4f9..51fbe097b5fd 100644
--- a/media-libs/mediastreamer/Manifest
+++ b/media-libs/mediastreamer/Manifest
@@ -6,5 +6,5 @@ AUX mediastreamer-2.9.0-underlinking.patch 1969 BLAKE2B 6c820661cc5cb0c8dee4523e
 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 4605 BLAKE2B a55639acb20c085a0045ee4a5b8fa324c0271d478fb661e769682bf38faa9e1b71c37706143fec51fa60ee3da007722a65f5e45caf11e536235f5c7c45bba75a SHA512 eba4f73b44bc9e3195f46e66c9e9b286ef2ab1a34450335bc5b802e38ca7bd67c320e2aff20b279d2e128e5abd8190bdcb7030d85467af0d1036456fb3d52bed
+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/mediastreamer-2.9.0-r2.ebuild b/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild
index 971c8789bb6b..e74122e5af50 100644
--- a/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild
+++ b/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild
@@ -19,6 +19,7 @@ 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 )
diff --git a/media-libs/memphis/Manifest b/media-libs/memphis/Manifest
index 9de13a9b457a..d68e4aa57df2 100644
--- a/media-libs/memphis/Manifest
+++ b/media-libs/memphis/Manifest
@@ -1,4 +1,4 @@
 AUX memphis-0.2.3-link_gobject.patch 350 BLAKE2B f222f0febd245e835ef095b718903aec8e73fd6187324c0276679648b11eb3e8488253408272b4578dcad2383ee74e29a5da928fea2694efdb721a16433f07a6 SHA512 013790ca4124dcb070e5ffb1f398a8804c494e2cc4024ddcdcbd909108a5854223bed43acc8bc1c77f5528fe1eb25642c750d50a8b1949b82a90bfb3f2877b20
 DIST memphis-0.2.3.tar.gz 459423 BLAKE2B a2f9f1a86feb058e911051b0c0c4cc1b6a47dced6a24096e91e27e869099d1ae86e13b5e55c4639c70bc9536a266d60d07023e863675d0a9e716e2f539a331ce SHA512 effac6efbf6e8fb8c3c436013447a27f4bcbea661268e2e6b5ec69cd93b117cee6c56f78a557223c7dd45020a27e51807a4e2682d6d311b319c783e714064b01
-EBUILD memphis-0.2.3.ebuild 1140 BLAKE2B ed8daf767b0e2089be1b197ffdfc52fd3449c079069987efa70b1305d7be04d82f6cd2d7c5a3213e070e017cfe16aa32a666919715431f1d447508e2bfb9edca SHA512 761c389e2e6d417c0881469885af9ec764b4f980bb1d541c9e3b97468ff493d3401a97e50f54c31ef663d066f1701fe17e2705fb97645e1a096876e14205df6d
+EBUILD memphis-0.2.3.ebuild 1056 BLAKE2B 28a32edf0c77ef5456d096474c2b681cefc73a9b16fe1947000a11c0555ae48641d3efa2141b4a6287d1ae42afe7feaf1103be91b5d2d9524b30af9f8aec8034 SHA512 89871511ec4c683b662f910dc2790edf6e78c9e8482d1ba97b399b819a9decce7a2b783657a409144ae04f83fb9c23c84bec6132bbd700e015b8370a7acbe90d
 MISC metadata.xml 275 BLAKE2B 054c49c4cc7e0607212f55ec7e66b38585457f74ce21e0483503814df58d31dee0b784e9b0bd9cdf0c8fca04e7454bd1b515085e5aac2c0d7fd2700df08c9b26 SHA512 5877508750864819a1d129ac2406c0d11721cd0e4e64d55c9bd6a44649991fda435e7752e841cca94b348f74078226f12e90dcdd323915bce3d601e65865c225
diff --git a/media-libs/memphis/memphis-0.2.3.ebuild b/media-libs/memphis/memphis-0.2.3.ebuild
index 368aa1b04541..9063f96e9072 100644
--- a/media-libs/memphis/memphis-0.2.3.ebuild
+++ b/media-libs/memphis/memphis-0.2.3.ebuild
@@ -1,14 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 WANT_AUTOMAKE=1.11
 
-AUTOTOOLS_AUTORECONF=true
-VALA_MIN_API_VERSION=0.12
-
-inherit autotools-utils vala
+inherit autotools vala
 
 DESCRIPTION="A map-rendering application and a library for OpenStreetMap"
 HOMEPAGE="http://trac.openstreetmap.ch/trac/memphis/"
@@ -17,36 +14,40 @@ SRC_URI="http://wenner.ch/files/public/mirror/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0.2"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-IUSE="debug doc +introspection vala static-libs"
+IUSE="debug doc +introspection vala"
 
 RDEPEND="
-	dev-libs/expat
+	dev-libs/expat:=
 	dev-libs/glib:2
-	x11-libs/cairo
+	x11-libs/cairo:=
 	introspection? ( dev-libs/gobject-introspection )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	doc? ( dev-util/gtk-doc )
 	vala? ( $(vala_depend) )"
 
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
 PATCHES=( "${FILESDIR}"/${P}-link_gobject.patch )
 
 src_prepare() {
+	default
+	eautoreconf
+
 	unset VALAC
 	use vala && vala_src_prepare
-	autotools-utils_src_prepare
 }
 
 src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable doc gtk-doc)
-		$(use_enable introspection)
+	econf \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_enable doc gtk-doc) \
+		$(use_enable introspection) \
 		$(use_enable vala)
-	)
-	CFLAGS="${CFLAGS}" \
-		autotools-utils_src_configure
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index f4beb051b547..12aecffa5cc0 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,8 +1,8 @@
 DIST mesa-19.1.8.tar.xz 10945480 BLAKE2B df2ce0561cd0a61f0f35a406a5a9b2384c0c5869efadabfa40b07cf96a592214aa5c6d03423598c531f117075c3b59aa5af6f9b1c5dfa5914aabe41f60b592a0 SHA512 3bcc90c17cf966ce3399434ca2d4f363c5778e52c56b8184d6cdf22ef2e4a4fdb9c3fbff5c98efc856e3535f81259608a6daa74af1f3bdce30ea251d86435c74
-DIST mesa-19.2.4.tar.xz 11458340 BLAKE2B 2403f50e3d31f87981b8f243d8473672305c88f93daa11c0d9a373d5b68f52af105b134d9deda71bc9d4f56e6c8b2d6358b298060229802987ef88dd58bc5d21 SHA512 e8a0e90460f3153d730f8fb13f2c912a9826c05d2af9e22dc575bcd8885bf6a33c0af1c6659e81701ff097a132df88eead208e89dceb552b9da809ab543fa479
-DIST mesa-19.3.0-rc3.tar.xz 11790800 BLAKE2B c7ed3f2a01b64df3a411f60c53e9462d663ccbe047c60df6ea025437e3baa15a26b2f6923dac7479d5b9e95a2994ee842c06298b1aa60d347fbf9995c72387dc SHA512 a95318f8778c79f611b2915e48bb6270e02735a2325b3538825012bd5ea06477f395b683c63e21b6f1635122f7002d819c8239a36d8e34e0331cec019f4a8c99
+DIST mesa-19.2.7.tar.xz 11460812 BLAKE2B 27408d28d24ea397a0e60d1e4dc56ebe11c269720c31285794e611f41db6f2691c914892910b468210bb43f2111e5caf210e0dac287fb28a24825ad54e5643cc SHA512 87a82664381432e956ee23dc92bec5accf667606232e38d9458d67132c16fdc44584f65671293b83f00c58ad7742b80e942a5d1bd66d457705be60aaaf35395b
+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.4.ebuild 14529 BLAKE2B 32f66c7981c79569b03e561fad1dff4a6bc2cef2ab895732f354d60c25e61df34ee045e782f5f0151f13f1dd348824367b0ed6b6d6b81e21a8d959dda3df9e7a SHA512 ba0d797949a1b1be41cf1436dac3ff41d5708148a3c3647c8ce91ef1a22a78a44e418306aec62bac72fd23b534764de78bdf53e9de8173f7fd3fd53dbe05fdb9
-EBUILD mesa-19.3.0_rc3.ebuild 14553 BLAKE2B 6b39b52b60222f4af0b3e001a749bd416998d28ec5611dea1544b142fbe35db420fa5fd33622ed8572ee86bdbe4c09a87c798b52bcad2333cd423dccb72efdb9 SHA512 e5fdf87caf58f4c8a7ef66a1445192d0ca76b55db727f2f4cb52deda25048492c171630d62c295c059756dd058ea222e7803fd9d0aab28019b6f3757a6210dfb
-EBUILD mesa-9999.ebuild 14594 BLAKE2B ca59d90c807441c8f556dde89a06f8fe2e2c8dec78bc85caa78ae1e046448940c5ae5efbf654b57bb95e23415970e379ca31530ec9496c66525aa2e5cd35de7c SHA512 9e49ac1228c6002d1ad5855c4eef6097cedcd35589207c95282ef42a7c7d1201323b88417d8d5809ea8cacff5c1983037532df9c429273392dab5ca478da40a5
+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
 MISC metadata.xml 2000 BLAKE2B c38c6f85a08bdb71f3921847d03c8a2849a43def253c200cb3f21d68142f3a5065cb2e1a2170093d91f3aba34c99fdd9bab840f2bc62ce05f11484b2edb3cb40 SHA512 d55b9c0ff6a97d995a150ee10643c869359370222ab29712da25f69c5671a4e6988e2d508c956082cc7165db96f42289d25daecf230d36efe2240e4f377d1c72
diff --git a/media-libs/mesa/mesa-19.2.4.ebuild b/media-libs/mesa/mesa-19.2.7.ebuild
index 9fb49167ff44..9fb49167ff44 100644
--- a/media-libs/mesa/mesa-19.2.4.ebuild
+++ b/media-libs/mesa/mesa-19.2.7.ebuild
diff --git a/media-libs/mesa/mesa-19.3.0_rc3.ebuild b/media-libs/mesa/mesa-19.3.0.ebuild
index d8de3e17e493..199a28668ea7 100644
--- a/media-libs/mesa/mesa-19.3.0_rc3.ebuild
+++ b/media-libs/mesa/mesa-19.3.0.ebuild
@@ -104,7 +104,6 @@ RDEPEND="
 				)
 		vaapi? (
 			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
 		)
 		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
 		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
@@ -151,7 +150,6 @@ LLVM_DEPSTR="
 	|| (
 		sys-devel/llvm:9[${MULTILIB_USEDEP}]
 		sys-devel/llvm:8[${MULTILIB_USEDEP}]
-		sys-devel/llvm:7[${MULTILIB_USEDEP}]
 	)
 	sys-devel/llvm:=[${MULTILIB_USEDEP}]
 "
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 8f593918a1ac..db1fd34bf9ab 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -36,8 +36,8 @@ 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"
+	lm-sensors opencl osmesa 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 ) )
@@ -104,7 +104,6 @@ RDEPEND="
 				)
 		vaapi? (
 			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
 		)
 		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
 		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
@@ -459,11 +458,6 @@ multilib_src_configure() {
 		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) )
diff --git a/media-libs/musicbrainz/Manifest b/media-libs/musicbrainz/Manifest
index 680023217f76..c30d892a945b 100644
--- a/media-libs/musicbrainz/Manifest
+++ b/media-libs/musicbrainz/Manifest
@@ -1,3 +1,3 @@
 DIST libmusicbrainz-5.1.0.tar.gz 77220 BLAKE2B c655ae4a9a11adb15de559a1e518b5c5aab47ce3c36e3a264faddda36112d9caccc42d2013e451ffdf200147ffca4cbba883affa1a6465f6071fa14e1d67fbe5 SHA512 daa7ccb94e517e90f7d88a0659c84b00f04c6a73ef7771b7e3bd9101fa6569b1935a68a3689502ed0cc8c0d71ba9d2d0ebd9c074dd5eed9f75a3db390b222e03
-EBUILD musicbrainz-5.1.0.ebuild 1027 BLAKE2B 440be7ce8494dfb767dc0f196057335c2c01921bc73f982b0764fab5556b5138eb1f0e2b75387aec6b5897aa2011027874a95d5e58dac5a795f2c0d079bdbfdd SHA512 9f935e29be6f8b67df836eaccb9ea50df531ed30dd8d7b6138675aac5b28f66f4fb992b481f33c58a377d00c90bbbfcf1011351981e389847422a56a4094f5af
+EBUILD musicbrainz-5.1.0.ebuild 1054 BLAKE2B 4f9721b8177bfa487da5f30a3cbef80ebdcd0c727707c1bc3283caa4bf4f2860f3204892c65bf13c4314047e220ee18ae9a9521ed3f08dc81c153f7c52f19285 SHA512 1b8dd8e3733cfda34bfcb2ea18dccf74bbe7f9420819e5fa833e7bee2c997169c31a9dbce923d358edb24ee086490c7e386bbd9650112ef919c9c9eafb78bf10
 MISC metadata.xml 416 BLAKE2B 07504a54a7396e2213d1a031ed5c2aef46c3d321da8aee0dad87ca63c4d257574c3a06bfc57116557ec4a81017eca9a193e236f5119f504fafd6752250368511 SHA512 c2517eaf706a3672812c02189fc33a866b4a27950010c5d1d3e957cab1097d2bb011a6958342f5a840af7b787089bfccde5e7c044873c0dd2d4247ff9b294a6b
diff --git a/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild b/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild
index 9ea4846387ed..ea6694fb386f 100644
--- a/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild
+++ b/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild
@@ -13,6 +13,7 @@ LICENSE="LGPL-2.1"
 SLOT="5/1"	# soname of libmusicbrainz5.so
 KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/libxml2
diff --git a/media-libs/mutagen/Manifest b/media-libs/mutagen/Manifest
index 695684180d40..8184a2324f43 100644
--- a/media-libs/mutagen/Manifest
+++ b/media-libs/mutagen/Manifest
@@ -1,13 +1,5 @@
-DIST mutagen-1.35.1.tar.gz 883772 BLAKE2B 933c689bf4e578c1acb6c16af4071e879db4e0e55d9391f63dc778f535e13337f61812b1fd21741552ac3f9dfb2cd53f210d27b3c98ef7b6bf05b4b046d20d8f SHA512 e411b86d50a7689589b7d300317dc2a2c4893efe47b66d07bdf5fe92f1d08fcc00c314e3ae1f97d706fcaae6c83c7569bb22b557af2dfc469b1d3c4f0388a260
-DIST mutagen-1.38.tar.gz 913243 BLAKE2B 08281ed0ea9307a6caa64cc5f66dbea43d09ab6dffba49bab3bea8d3878ae1062b0b7dcb772f0880848adbbd3c3c89a73e0d59b496fb635f7308c66869aa2531 SHA512 1430901539cddc7f58978f59125b793228c611cee9cc19535142e3095a7caaeee7a2431c244054affa33fb6518123b46cd187715d8353fd1b165496bd358a995
-DIST mutagen-1.39.tar.gz 916084 BLAKE2B e67de0f0c2b33283ea276511f5537f5f12a35d336927dff662a5044a05163c7dc5677dc2e5b2696fc62ac3888a9602a566b43ffb511d3eee1c8f07f17bc08302 SHA512 0508c3dfa31a4af29845204664819bc8af8121a785b8e5cc307a12bdf7c151acf4cd72e0820fb9d284c859dd6d63d7d7a6c7ebad8e3ca19db52f0c496ce74736
-DIST mutagen-1.40.0.tar.gz 917874 BLAKE2B 69405942af849a8c82d14424a242e77cd9d554155494976402c3eb5d95dcccbf14de5fd3268cb9cf12e0035dcbf88c3724d1684c21612b2f0b0a87cb48de1ec8 SHA512 ad4accccc3457d1ff7238c2941b20aeb532e9b41bf2bf1cb130e428f9af9a7dd18a0e81a4d45fbc98783d8cf90cd105de09d703c70beea7cba5eca58dab1bb69
-DIST mutagen-1.41.1.tar.gz 918398 BLAKE2B e164cdca199bd1d18703604ca67722a3bb35ef6d53d8b8be1adbb0baf103ef7e45d4871929085242778726326a927771c589836a021dbd0dfdb83c0d5836f656 SHA512 d40fd74480eedc514d7b7b1d701c0403490cffc8ed3b8aa114ffe91a40c41de0daa0c54d9ad1a89ec211fab59ec271a3b1775c9efcc5661a5e1607e1ecadbea6
 DIST mutagen-1.42.0.tar.gz 925894 BLAKE2B fe85f2c47a19276078183f426450ca50ccabab64eec39dfb1535054ee6571b01375210b164dc6c824f74631eb8393c8d5d48b7a7a29443349f30fdb627a74b6f SHA512 26c307023d1ff29c0377cdee1317732a8aba70433a3679127a3d9c8cc5df9e81d143700e7e74a42975485b0510d8bd09dc2b5ec9a737442a6e676f1f0b14c80a
-EBUILD mutagen-1.35.1.ebuild 1159 BLAKE2B c1d8d0da10719a46e2a77e0325df7adcdc2d917d4e18ee1ba9bd1cd757c06eb91e8c8d25ac9f880eddc597595b6709707d5417a88f2548c5ed99186d0aaf3395 SHA512 08a964c493ef1b1d2f68faf9cfc5e119a553f855de2ec44aa3ea34180bc095f8a7994bc1c98b335519ab3dde6f81547ddf09c8f325672e6b1c8899b749502afc
-EBUILD mutagen-1.38.ebuild 1031 BLAKE2B eef55684a41c17d279d3e58041a1b7ae42bf4effb5fddc38ec24f442ca282b8668da560993de976c051954891218df5640528464834d4fe1ca2f6b11bdb82653 SHA512 cc019871ccbc9b2990f95ae7a281790a109009fd2e9b3dda24ea75920e9acc5b01f918475e0323da610ce6644ef170513c983cfbc9209729193f93508b9ace37
-EBUILD mutagen-1.39.ebuild 1076 BLAKE2B 0883613d632c85c68008af015ddc38c0737b020e9118a7f87a0c7cdbf60b52565f46aa86516b21557dd102e939af2d1cc683456932a9ab5be766d8395ae3a63d SHA512 27b94a87fdd1c01c80d3e37844918766a6f17b74e1b24f15e40892502fdebcd63e1c7fcb1390a683ca27487b3d924b219cdfce44b26fc05931ccc80d2bc55be7
-EBUILD mutagen-1.40.0.ebuild 1085 BLAKE2B 8a4e6f2aa3d65a3c6342e033e7c73931aafd133ce2313d517eff837ad4f1164d4c7ee3c79e893a01c8c88f351ed38b4dd9b8e49581c995c89ee9d8a75b1357a4 SHA512 d226ad490c6033dcaefb83d00fd26e1c0d94322f3274f4a043c1f1ef6198e9d1576d3dcdf6814ef91f366805c1ec858d5872e00dc0d997ef1c95bbd82b20476e
-EBUILD mutagen-1.41.1.ebuild 1093 BLAKE2B c09f23a432d820b157f7eb0d7dd79ebe9531e2666332e860989b205093d57505a5a66df012963ad4ae7e512c0573d00c83a853f50ef5d185cf4fecc8a430062d SHA512 e9e175cafef034d670853150b79a3b5148608396a68515b398ed5e9cb0b93dea081609936b40532a1ec939a729f1f5fb6b2cf327ee25943df33ff3dbef839b0c
-EBUILD mutagen-1.42.0.ebuild 1086 BLAKE2B 660c5efbdd2e2f794d14c7d3b8c49b3ab7be386e2816f65c44945e27f50e4741140967edaa6eb564f60a7bf49f98acb74fb6cfa1a81ee05d669f8260af1d7140 SHA512 b4a8eb287c455cefbed547636f5172c4cae4d900350c3489d68f20796cd08689b0891c9bd1b5b9effba107ea468b66912def0cf3afce699cde24cd037d801b68
+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
 MISC metadata.xml 380 BLAKE2B 9fd70ca6ca6e8d17b66ea703f65885b87714ed0560ffe7502d85da3ee8fdf1d62545c1166b64d99f2bd2bfa6105f8f8865bc28769069c1ae3da4b1c3c174fd69 SHA512 87ce1f85bd6aff7c159fd22a412eb9ea95ac4f58fb2cc70fd4c4f470bfe9f6366b906bc9cef833ae5c10b7a3601c15edab9e8418cf78d7d9e993191873f41d59
diff --git a/media-libs/mutagen/mutagen-1.35.1.ebuild b/media-libs/mutagen/mutagen-1.35.1.ebuild
deleted file mode 100644
index 6a033ff26f50..000000000000
--- a/media-libs/mutagen/mutagen-1.35.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Audio metadata tag reader and writer implemented in pure Python"
-HOMEPAGE="https://bitbucket.org/lazka/mutagen https://pypi.org/project/mutagen/"
-SRC_URI="https://bitbucket.org/lazka/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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
-# test? ( >=dev-python/eyeD3-0.7 )
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_compile_all() {
-	use doc && emake -C docs
-}
-
-src_test() {
-	# tests/test_flac.py uses temp files with a constant path.
-	# If we had multiple python implementations, we would hit a race.
-	distutils-r1_src_test
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( NEWS README.rst )
-	use doc && local HTML_DOCS=( docs/_build/. )
-	distutils-r1_python_install_all
-}
diff --git a/media-libs/mutagen/mutagen-1.38.ebuild b/media-libs/mutagen/mutagen-1.38.ebuild
deleted file mode 100644
index 0fada8d16940..000000000000
--- a/media-libs/mutagen/mutagen-1.38.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Audio metadata tag reader and writer implemented in pure Python"
-HOMEPAGE="https://github.com/quodlibet/mutagen https://pypi.org/project/mutagen/"
-SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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
-# test? ( >=dev-python/eyeD3-0.7 )
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_compile_all() {
-	use doc && emake -C docs
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( NEWS README.rst )
-	use doc && local HTML_DOCS=( docs/_build/. )
-	distutils-r1_python_install_all
-}
diff --git a/media-libs/mutagen/mutagen-1.39.ebuild b/media-libs/mutagen/mutagen-1.39.ebuild
deleted file mode 100644
index b7064f996baf..000000000000
--- a/media-libs/mutagen/mutagen-1.39.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Audio metadata tag reader and writer implemented in pure Python"
-HOMEPAGE="https://github.com/quodlibet/mutagen https://pypi.org/project/mutagen/"
-SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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
-# test? ( >=dev-python/eyeD3-0.7 )
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	use doc && emake -C docs
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( NEWS README.rst )
-	use doc && local HTML_DOCS=( docs/_build/. )
-	distutils-r1_python_install_all
-}
diff --git a/media-libs/mutagen/mutagen-1.40.0.ebuild b/media-libs/mutagen/mutagen-1.40.0.ebuild
deleted file mode 100644
index e8d16d7b54e0..000000000000
--- a/media-libs/mutagen/mutagen-1.40.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Audio metadata tag reader and writer implemented in pure Python"
-HOMEPAGE="https://github.com/quodlibet/mutagen https://pypi.org/project/mutagen/"
-SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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
-# test? ( >=dev-python/eyeD3-0.7 )
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	use doc && emake -C docs
-}
-
-python_test() {
-	esetup.py test --no-quality
-}
-
-python_install_all() {
-	local DOCS=( NEWS README.rst )
-	use doc && local HTML_DOCS=( docs/_build/. )
-	distutils-r1_python_install_all
-}
diff --git a/media-libs/mutagen/mutagen-1.42.0.ebuild b/media-libs/mutagen/mutagen-1.42.0.ebuild
index 9d4af6135fed..e5926fd19733 100644
--- a/media-libs/mutagen/mutagen-1.42.0.ebuild
+++ b/media-libs/mutagen/mutagen-1.42.0.ebuild
@@ -13,8 +13,9 @@ 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"
+RESTRICT="!test? ( test )"
 
 # TODO: Missing support for >=dev-python/eyeD3-0.7 API
 # test? ( >=dev-python/eyeD3-0.7 )
diff --git a/media-libs/mutagen/mutagen-1.41.1.ebuild b/media-libs/mutagen/mutagen-1.43.0.ebuild
index 64281a77a2ce..43af0777006e 100644
--- a/media-libs/mutagen/mutagen-1.41.1.ebuild
+++ b/media-libs/mutagen/mutagen-1.43.0.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+EAPI=7
 
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} )
 inherit distutils-r1
 
 DESCRIPTION="Audio metadata tag reader and writer implemented in pure Python"
@@ -18,15 +17,18 @@ IUSE="doc test"
 
 # TODO: Missing support for >=dev-python/eyeD3-0.7 API
 # test? ( >=dev-python/eyeD3-0.7 )
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx )
 	test? (
 		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pyflakes[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 	)
 "
 
+RESTRICT="!test? ( test )"
+
 python_compile_all() {
 	use doc && emake -C docs
 }
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index 2ef2dcda14d5..fb5210768df3 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1,3 +1,5 @@
 DIST openal-soft-1.19.1.tar.bz2 577310 BLAKE2B f6ed5b2bce1bfcaa7f8085375d5d3e3323ea2f03896ba871fe3ec247e6e1bf524a9c5180399b0f0908aa69756a1f2ee8095f14a69e6a7eac55a25cc7c2ac545b SHA512 356a3f12bbe284bfac71f4f2a9f83d084083a832012222e73743042ac27812cf051c12b0ddcf53c010ff77e44ae2e9033cea9b9324d316a22a59a154307a64a4
-EBUILD openal-1.19.1.ebuild 2077 BLAKE2B adb207ddfb34dc5ec327a8cd65501f02ff2913ad8675394e257f344b1481fbdc9a8f429d5453b4c1513dc3b529bc4c5af51e0453ab4cb3910b631231501efbed SHA512 3a06ba9352be0e80a3f278d1a1e8c511cc57fb2ced986cc5b3e0863063a7e99ca56a658558397eab32f343c95055993fbc4cd046cf8aa8084c85e919a13c5001
+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
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/openal/openal-1.19.1.ebuild b/media-libs/openal/openal-1.19.1.ebuild
index e1a74e794ce3..697ded9ec997 100644
--- a/media-libs/openal/openal-1.19.1.ebuild
+++ b/media-libs/openal/openal-1.19.1.ebuild
@@ -43,13 +43,13 @@ src_configure() {
 	# -DEXAMPLES=OFF to avoid FFmpeg dependency wrt #481670
 	my_configure() {
 		local mycmakeargs=(
-			-DALSOFT_BACKEND_SDL2=$(usex sdl)
 			-DALSOFT_REQUIRE_ALSA=$(usex alsa)
 			-DALSOFT_REQUIRE_COREAUDIO=$(usex coreaudio)
 			-DALSOFT_REQUIRE_JACK=$(usex jack)
 			-DALSOFT_REQUIRE_OSS=$(usex oss)
 			-DALSOFT_REQUIRE_PORTAUDIO=$(usex portaudio)
 			-DALSOFT_REQUIRE_PULSEAUDIO=$(usex pulseaudio)
+			-DALSOFT_REQUIRE_SDL2=$(usex sdl)
 			-DALSOFT_CPUEXT_SSE=$(usex cpu_flags_x86_sse)
 			-DALSOFT_CPUEXT_SSE2=$(usex cpu_flags_x86_sse2)
 			-DALSOFT_CPUEXT_SSE4_1=$(usex cpu_flags_x86_sse4_1)
diff --git a/media-libs/openal/openal-1.20.0.ebuild b/media-libs/openal/openal-1.20.0.ebuild
new file mode 100644
index 000000000000..ba3fa7758905
--- /dev/null
+++ b/media-libs/openal/openal-1.20.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+MY_P="${PN}-soft-${PV}"
+
+DESCRIPTION="A software implementation of the OpenAL 3D audio API"
+HOMEPAGE="https://www.openal-soft.org/"
+SRC_URI="https://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="
+	alsa coreaudio debug jack oss portaudio pulseaudio sdl qt5
+	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
+	cpu_flags_arm_neon
+"
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	oss? ( virtual/os-headers )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( alsoftrc.sample docs/env-vars.txt docs/hrtf.txt ChangeLog README.md )
+
+src_configure() {
+	# -DEXAMPLES=OFF to avoid FFmpeg dependency wrt #481670
+	my_configure() {
+		local mycmakeargs=(
+			-DALSOFT_REQUIRE_ALSA=$(usex alsa)
+			-DALSOFT_REQUIRE_COREAUDIO=$(usex coreaudio)
+			-DALSOFT_REQUIRE_JACK=$(usex jack)
+			-DALSOFT_REQUIRE_OSS=$(usex oss)
+			-DALSOFT_REQUIRE_PORTAUDIO=$(usex portaudio)
+			-DALSOFT_REQUIRE_PULSEAUDIO=$(usex pulseaudio)
+			-DALSOFT_REQUIRE_SDL2=$(usex sdl)
+			-DALSOFT_CPUEXT_SSE=$(usex cpu_flags_x86_sse)
+			-DALSOFT_CPUEXT_SSE2=$(usex cpu_flags_x86_sse2)
+			-DALSOFT_CPUEXT_SSE4_1=$(usex cpu_flags_x86_sse4_1)
+			-DALSOFT_UTILS=$(multilib_is_native_abi && echo "ON" || echo "OFF")
+			-DALSOFT_NO_CONFIG_UTIL=$(usex qt5 "$(multilib_is_native_abi && echo "OFF" || echo "ON")" ON)
+			-DALSOFT_EXAMPLES=OFF
+		)
+
+		use cpu_flags_arm_neon && mycmakeargs+=( -DALSOFT_CPUEXT_NEON=$(usex cpu_flags_arm_neon) )
+
+		cmake-utils_src_configure
+	}
+
+	multilib_parallel_foreach_abi my_configure
+}
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 34992ca6258f..2bade290b159 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -16,14 +16,19 @@ AUX opencv-3.4.1-popcnt.patch 890 BLAKE2B 553352472eaf2a2c97f148f97856a103e8a190
 AUX opencv-3.4.1-python-lib-suffix-hack.patch 723 BLAKE2B bc4b1c68f2c73b40d20372ce4e3232b2db3b414ce2da16a8d84710fc53902211f17585c7ce6daf2d54025b53c04aa74f0c3eb3a30f26bfbc9af24e246f56b71a SHA512 54d2c8189fc1ff06ee1cacf5f375ea976faf339563ee804085feb0ec1f55cdbe10eea7335a786706b6a6152b6f9145156b3e74ce802c3d15b5a23014b25044b8
 AUX opencv-3.4.1-python37.patch 452 BLAKE2B c4a2850c17a0f9e01f537df6123e7c4262862ec0cd1dd43f8cebd21d4d6e8903205813b2a200eb6b60efdc43e74b0c9222d0b6bba504bacb84f87cfcf7d80d1a SHA512 c7fac2a6425c4afbef3b3cae5307e6035e3f4ef77ba0006c4dfd3a1cfc15c4648e978cc305ce598ec70c049e2cdc36f5f85cf24a75a4d3f3dc025091993e66e2
 AUX opencv-3.4.1-remove-git-autodetect.patch 1549 BLAKE2B 0ed44deddea20d5a57dded6a51d40645e5376411d9c055995fdbdbfbf4252817eaa9158925276661e4958f894898122ec273a352491be53511207345a481db52 SHA512 8496677542981c64ba9763f0d494885f71747884ae3e02de0bc8f96c1802356d917dcc7aed84ddfc2af093456c250bf2fafbdd06f7789aae8c720f5a412c07a0
+AUX opencv-4.1.2-opencl-license.patch 519 BLAKE2B 6dcdf809c3c75a39d0e44f02e157a0c0ee074fd15144565ed51ade7e7849cb313c084100f499cc1240424f4647a2ff73c8d5e61cbdf6d0499846db61b8a30729 SHA512 2874a5140ef5028eb6c64f36325904000edd722560cf876fc49d63b040633bcfea01cae27c156b18191564805cafd2986f26eea322b1376af4f2982d66ed7653
+AUX opencv-4.1.2-pkg-config-file.patch 345 BLAKE2B ba3968a5dbdcc981cc513055ca99b8726ba2fe993cb8c128d574688a748dbd6fc287089bc0c04af89f6b9b62b37cae9663a81c329b6a2dab4919470450b9f6c7 SHA512 0fa66ca24c0fa72dc9e13c0c40592cf5ca5aa5856d1747613f9c4528f0b00f05dd224662c022563db994f7e43879b97d1ba1f0afa2703c30e4a3efc520dc332d
 DIST opencv-2.4.13.tar.gz 91669572 BLAKE2B 7f6be39e29c0db5d005cb14215fdf5955fa69c34d72c4f1e1fa8bf8de1e748a0d2fe5febb43296ef529c57e4dec8d1b6739c0c4df9e64657b9550ed382fbc4b9 SHA512 efdc4340fdf557dae44ac604c8c20f61ced89f99274264b61c2640f28741504462c6b57076e207040ca2513e3921275bdfbe6c22fc123bd50df78745e6b7bcd6
 DIST opencv-3.4.0-face_landmark_model.tar.gz 63299830 BLAKE2B 58f08cd8c030ee1c8b66e76a561fd625e112face427d001185f8d7c0eaace55adbd8474663021841a1382bfe393a210e64c51223441713cdb9156fac866a845c SHA512 2cd29ce42c08b2966db3ef4a2bc217ab3d07051819757ec6de8f3deea29e28f60abab39f101dba03f766f17018598e411bd687a7eaab0c681c113e10a2de2b23
 DIST opencv-3.4.0-res10_300x300-caffeemodel.tar.gz 10036604 BLAKE2B 2a2de48fc420f13e7be146ac88f311901c5b4e409c30e466152e33cae1f8afd87dcb6d758af447c268d90bd67989c8798cd80cab172b10499a6ad5224509dbdf SHA512 96fee9f447d5739bc01a5cab37c453cf7237457dfb5d2bf93ac37f8e5aa557ac222316f449cd58e37e856abe4d8e9d4a7820daaba32f0b22cbcde8e340287d4b
 DIST opencv-3.4.1.tar.gz 87051748 BLAKE2B 87c83ab9b3d7fb048263f047aa5d6e95b153e1a28f3e34cc885eff7eb080a2258cfa1aa494cd56b32f1098ab158c17c23fc8464fcbe70642a3a1842f2fd1b4ac SHA512 e1fc14285090c6fe9e26e721f2d67d7096650c523147e925567426ef76aa7f4c6f12035d6f6ce3ec7991a75a6828a810fd4f9b75f78ed5fcccecefbadd79944b
 DIST opencv-3.4.1_contrib.tar.gz 57126844 BLAKE2B 63d9d5cb088371754eb132607789c8f1d4820f3e0e486593d6f64ee8f918ea4362152f050baec16f17904c03a6cdc0abc6e5fb2510308dcbabebe97b29285fbc SHA512 431dfba0f413071d7faa18bc6e6f5e4f015285e2cc730c5dd69b2a4d6aa4250b7e0bcb1814ac6f06f5c76f103aea1f93f72f32aee6bc0cd7ddacdaf1f40075c1
+DIST opencv-4.1.2.tar.gz 87468598 BLAKE2B 9e0fbd8499f783cd1a2b5ffddf557aef424b0a446f71f826522ffd4526d04742e0c408b99810fe6b39753d40c475922d2e273732fdc0a0b4ee0bc56052a7a26c SHA512 d18d2cc35dc1c95c8870d35feb14459db27ebf6d09ff89a185918b1faff1b36dedacc18f268a6483570c404aca19b83ba627ce7af2265af7195a029cb766c09f
+DIST opencv-4.1.2_contrib.tar.gz 60881937 BLAKE2B c461aaa62306b226bde9211e2d611dcf705510e32c8598458737eb09c510cfdb49c33e11f1a7c591090d8243590e915b779fdb55955550fe44dab7545e4cc308 SHA512 1e14f94f9228c5d6a598493eed265aab1d8a740d5bfa00639afb05287732220eb71f88bb374de47dcd440f4376486f9db0e8b338e90e5dc4f6af8d355340b622
 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-r5.ebuild 18644 BLAKE2B 51d5bdf871fb91c0b89db7dd33e52d357c26fceb575631abc63d9bbaed98a583d8731c0deb1e0e5d39745d01ab9a32a78aaa6922d231b1ec7b1cff0ec6976557 SHA512 512add3c726f89329d3fda55d541d68ca8099aa537ebed6833d0667bd8304c8f3af7d45bac23991be5b99e6559b771546a6b69e4c6a9a72a108b695d0f93ef36
-EBUILD opencv-3.4.1-r6.ebuild 18717 BLAKE2B 419a8c987559d22076ddd3154172c2ae11c4986dcded798c46da3569f46c3cc78f9a1e602ef5d91c3760ea4ba8ae6e2240bf20d007d77af7d1226794e2da77ef SHA512 510a0a6d6266961d88097c39146fe19488fad8c2539c2ae02440dee8623d17d36c010b5e6305a04e52c68c421e6d2942534d7aa1e652fe7ea09b3a5a5735089c
-MISC metadata.xml 2458 BLAKE2B 3102d768cb8308fa243ab9388110312ddf1a2adfd6aa31d8261192530bdb13e222338eb424c2102c12af129494d3025097b79e1cb34770238c8ef90d10b0a535 SHA512 e364a0811b3eab96adc83e800d6fad7ceb51d56b5c78ba1d363af19fe27c17bf644bb99a30e6235a6154971caeec389dcced8ba1cdca9586d8cfead8927617a0
+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
+MISC metadata.xml 2728 BLAKE2B aff1160741e363d0bfd7b7d6c96a28025f885a785c6d106e5fb2dd5704883d2542ad627cdaf0d8c612522720006a1df18104fa225cf47eb0e5aff029b8ebc6fb SHA512 924e3f9c58cee3e00ed7f3690444637f0889cc9140cd5ca14fcff8fd35d84724703516f07c803c79c242e209f50edf24b7156ca4ad79fffbc19e1166d4e730bd
diff --git a/media-libs/opencv/files/opencv-4.1.2-opencl-license.patch b/media-libs/opencv/files/opencv-4.1.2-opencl-license.patch
new file mode 100644
index 000000000000..f69a88db0a49
--- /dev/null
+++ b/media-libs/opencv/files/opencv-4.1.2-opencl-license.patch
@@ -0,0 +1,10 @@
+--- a/cmake/OpenCVDetectOpenCL.cmake.ORIG	2019-11-29 11:29:00.642852106 +0100
++++ b/cmake/OpenCVDetectOpenCL.cmake	2019-11-29 11:37:57.088822546 +0100
+@@ -5,7 +5,6 @@
+ else()
+   set(OPENCL_LIBRARY "" CACHE STRING "OpenCL library")
+   set(OPENCL_INCLUDE_DIR "${OpenCV_SOURCE_DIR}/3rdparty/include/opencl/1.2" CACHE PATH "OpenCL include directory")
+-  ocv_install_3rdparty_licenses(opencl-headers "${OpenCV_SOURCE_DIR}/3rdparty/include/opencl/LICENSE.txt")
+ endif()
+ mark_as_advanced(OPENCL_INCLUDE_DIR OPENCL_LIBRARY)
+ 
diff --git a/media-libs/opencv/files/opencv-4.1.2-pkg-config-file.patch b/media-libs/opencv/files/opencv-4.1.2-pkg-config-file.patch
new file mode 100644
index 000000000000..496216186af3
--- /dev/null
+++ b/media-libs/opencv/files/opencv-4.1.2-pkg-config-file.patch
@@ -0,0 +1,11 @@
+--- a/cmake/templates/opencv-XXX.pc.in	2019-12-04 21:28:09.686525699 +0100
++++ b/cmake/templates/opencv-XXX.pc.in	2019-12-04 21:29:21.319265154 +0100
+@@ -3,7 +3,7 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+-includedir_old=@includedir@/opencv
++includedir_old=@includedir@/opencv2
+ includedir_new=@includedir@
+ 
+ Name: OpenCV
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index e9ef881716dc..f7bccfa408e7 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -13,16 +13,19 @@ Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Under
 	<use>
 		<flag name="contrib">Install user contributed scripts from opencv_contrib (Experimental!)</flag>
 		<flag name="cuda">Enable NVIDIA Cuda computations support (Experimental!)</flag>
+		<flag restrict="&gt;=media-libs/opencv-4.1.2" name="download">Enable download during cmake configure</flag>
 		<flag name="eigen">Enable usage of <pkg>dev-cpp/eigen</pkg> for computations</flag>
+		<flag name="features2d">Enable features2d module</flag>
 		<flag name="gdal">Enable support for sci-libs/gdal library</flag>
+		<flag restrict="&gt;=media-libs/opencv-4.1.2" name="opencvapps">Enable compilation with opencvapps</flag>
 		<flag restrict="&gt;=media-libs/opencv-3.1.0" name="gflags">Use Google's C++ argument parsing library</flag>
 		<flag restrict="&gt;=media-libs/opencv-3.1.0" name="glog">Use Google's C++ loggin library</flag>
-		<flag restrict="&gt;=media-libs/opencv-3.1.0" name="contrib_xfeatures2d">Enables xfeatures2d and autodownload of samples in contrib</flag>
-		<flag restrict="&gt;=media-libs/opencv-3.1.0" name="contrib_cvv">CVV module requires Qt5</flag>
-		<flag restrict="&gt;=media-libs/opencv-3.3.0" name="contrib_dnn">DNN module contrib requires tiny dnn</flag>
-		<flag restrict="&gt;=media-libs/opencv-3.1.0" name="contrib_hdf">HDF module requires <pkg>sci-libs/hdf5</pkg></flag>
-		<flag restrict="&gt;=media-libs/opencv-3.1.0" name="contrib_sfm">SFM module requires eigen, gflags, and glog</flag>
-		<flag restrict="&gt;=media-libs/opencv-3.4.0" name="dnn_samples">Download dnn caffeemodel samples</flag>
+		<flag restrict="&gt;=media-libs/opencv-3.1.0" name="contribxfeatures2d">Enables xfeatures2d and autodownload of samples in contrib</flag>
+		<flag restrict="&gt;=media-libs/opencv-3.1.0" name="contribcvv">CVV module requires Qt5</flag>
+		<flag restrict="&gt;=media-libs/opencv-3.3.0" name="contribdnn">DNN module contrib requires tiny dnn</flag>
+		<flag restrict="&gt;=media-libs/opencv-3.1.0" name="contribhdf">HDF module requires <pkg>sci-libs/hdf5</pkg></flag>
+		<flag restrict="&gt;=media-libs/opencv-3.1.0" name="contribsfm">SFM module requires eigen, gflags, and glog</flag>
+		<flag restrict="&gt;=media-libs/opencv-3.4.0" name="dnnsamples">Download dnn caffeemodel samples</flag>
 		<flag name="opencl">Add support for OpenCL</flag>
 		<flag restrict="&gt;=media-libs/opencv-3.1.0" name="tesseract">Use Google's OCR Engine</flag>
 		<flag name="testprograms">Build and install programs for testing OpenCV (performance)</flag>
diff --git a/media-libs/opencv/opencv-3.4.1-r6.ebuild b/media-libs/opencv/opencv-3.4.1-r7.ebuild
index 92376a497c45..12cd224b4001 100644
--- a/media-libs/opencv/opencv-3.4.1-r6.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r7.ebuild
@@ -12,33 +12,33 @@ DESCRIPTION="A collection of algorithms and sample code for various computer vis
 HOMEPAGE="https://opencv.org"
 TINY_DNN_PV="1.0.0a3"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	dnn_samples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
+	dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
 	contrib? (
 		https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
-		contrib_dnn? (
+		contribdnn? (
 			https://github.com/tiny-dnn/tiny-dnn/archive/v${TINY_DNN_PV}.tar.gz -> tiny-dnn-${TINY_DNN_PV}.tar.gz
 			https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz
 		)
-		contrib_xfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
+		contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
 	)"
 
 LICENSE="BSD"
 SLOT="0/3.4.1" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnn_samples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux"
+IUSE="contrib contribcvv contribdnn contribhdf contribsfm contribxfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnnsamples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
 # OpenGL needs gtk or Qt installed to activate, otherwise build system
 # will silently disable it Wwithout the user knowing, which defeats the
 # purpose of the opengl use flag.
 REQUIRED_USE="
 	cuda? ( tesseract? ( opencl ) )
-	dnn_samples? ( examples )
+	dnnsamples? ( examples )
 	gflags? ( contrib )
 	glog? ( contrib )
-	contrib_cvv? ( contrib qt5 )
-	contrib_dnn? ( contrib )
-	contrib_hdf? ( contrib )
-	contrib_sfm? ( contrib eigen gflags glog )
-	contrib_xfeatures2d? ( contrib cuda )
+	contribcvv? ( contrib qt5 )
+	contribdnn? ( contrib )
+	contribhdf? ( contrib )
+	contribsfm? ( contrib eigen gflags glog )
+	contribxfeatures2d? ( contrib cuda )
 	java? ( python )
 	opengl? ( || ( gtk qt5 ) )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -54,7 +54,7 @@ RDEPEND="
 	dev-libs/protobuf:=[${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
-	contrib_hdf? ( sci-libs/hdf5 )
+	contribhdf? ( sci-libs/hdf5 )
 	ffmpeg? (
 		libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] )
 		!libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
@@ -103,7 +103,6 @@ RDEPEND="
 	xine? ( media-libs/xine-lib )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	contrib_dnn? ( dev-libs/cereal )
 	eigen? ( dev-cpp/eigen:3 )
 	java?  ( >=virtual/jdk-1.6 )
 	vaapi?  ( x11-libs/libva )"
@@ -255,7 +254,7 @@ src_prepare() {
 	sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
 		-i CMakeLists.txt cmake/*cmake || die
 
-	if use dnn_samples; then
+	if use dnnsamples; then
 		mv  "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" "${WORKDIR}/${P}/samples/dnn/" || die
 	fi
 
@@ -263,7 +262,7 @@ src_prepare() {
 		cd  "${WORKDIR}/${PN}_contrib-${PV}" || die
 		eapply "${FILESDIR}/${PN}-3.3.0-remove-tiny-dnn-autodownload.patch"
 
-		if use contrib_xfeatures2d; then
+		if use contribxfeatures2d; then
 			mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
 		fi
 	fi
@@ -429,13 +428,13 @@ multilib_src_configure() {
 	# ===================================================
 	if use contrib; then
 		GLOBALCMAKEARGS+=(
-			-DBUILD_opencv_dnn=$(usex contrib_dnn ON OFF)
+			-DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
 			-DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
 			-DBUILD_opencv_dnns_easily_fooled=OFF
-			-DBUILD_opencv_xfeatures2d=$(usex contrib_xfeatures2d ON OFF)
-			-DBUILD_opencv_cvv=$(usex contrib_cvv ON OFF)
-			-DBUILD_opencv_hdf=$(multilib_native_usex contrib_hdf ON OFF)
-			-DBUILD_opencv_sfm=$(usex contrib_sfm ON OFF)
+			-DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
+			-DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
+			-DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
+			-DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
 		)
 
 		if multilib_is_native_abi; then
@@ -461,7 +460,7 @@ multilib_src_configure() {
 
 	# Copy face_land_model to ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}
 	# TODO patch ocv_download to copy files into destination dirs
-	if use contrib_dnn; then
+	if use contribdnn; then
 		mkdir -p "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
 		cp "${WORKDIR}"/face_landmark_model.dat "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
 	fi
diff --git a/media-libs/opencv/opencv-3.4.1-r5.ebuild b/media-libs/opencv/opencv-4.1.2-r1.ebuild
index 662a0e1a266e..02fb2d8d7340 100644
--- a/media-libs/opencv/opencv-3.4.1-r5.ebuild
+++ b/media-libs/opencv/opencv-4.1.2-r1.ebuild
@@ -1,43 +1,40 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 inherit java-pkg-opt-2 java-ant-2 python-r1 toolchain-funcs cmake-multilib
 
 DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
 HOMEPAGE="https://opencv.org"
 TINY_DNN_PV="1.0.0a3"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	dnn_samples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
+	dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
 	contrib? (
 		https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
-		contrib_dnn? ( https://github.com/tiny-dnn/tiny-dnn/archive/v${TINY_DNN_PV}.tar.gz -> tiny-dnn-${TINY_DNN_PV}.tar.gz
-			       https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz
-		)
-		contrib_xfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
+		contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
+		contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
 	)"
 
 LICENSE="BSD"
-SLOT="0/3.4.1" # subslot = libopencv* soname version
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux"
-IUSE="contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnn_samples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+SLOT="0/4.1.2" # subslot = libopencv* soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="contrib contribcvv contribdnn contribhdf contribsfm contribxfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnnsamples -download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg jpeg2k lapack libav opencl openexr opengl openmp opencvapps pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
 # OpenGL needs gtk or Qt installed to activate, otherwise build system
 # will silently disable it Wwithout the user knowing, which defeats the
 # purpose of the opengl use flag.
 REQUIRED_USE="
 	cuda? ( tesseract? ( opencl ) )
-	dnn_samples? ( examples )
+	dnnsamples? ( examples )
 	gflags? ( contrib )
 	glog? ( contrib )
-	contrib_cvv? ( contrib qt5 )
-	contrib_dnn? ( contrib )
-	contrib_hdf? ( contrib )
-	contrib_sfm? ( contrib eigen gflags glog )
-	contrib_xfeatures2d? ( contrib cuda )
+	contribcvv? ( contrib qt5 )
+	contribdnn? ( contrib )
+	contribhdf? ( contrib )
+	contribsfm? ( contrib eigen gflags glog )
+	contribxfeatures2d? ( contrib download )
 	java? ( python )
 	opengl? ( || ( gtk qt5 ) )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -53,7 +50,7 @@ RDEPEND="
 	dev-libs/protobuf:=[${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
-	contrib_hdf? ( sci-libs/hdf5 )
+	contribhdf? ( sci-libs/hdf5:= )
 	ffmpeg? (
 		libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] )
 		!libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
@@ -102,7 +99,6 @@ RDEPEND="
 	xine? ( media-libs/xine-lib )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	contrib_dnn? ( dev-libs/cereal )
 	eigen? ( dev-cpp/eigen:3 )
 	java?  ( >=virtual/jdk-1.6 )
 	vaapi?  ( x11-libs/libva )"
@@ -222,18 +218,22 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/opencv2/cudev/warp/scan.hpp
 	/usr/include/opencv2/cudev/warp/shuffle.hpp
 	/usr/include/opencv2/cudev/warp/warp.hpp
+	# [opencv4]
+	/usr/include/opencv4/opencv2/core/cv_cpu_dispatch.h
+	/usr/include/opencv4/opencv2/core/cvdef.h
+	/usr/include/opencv4/opencv2/dnn.hpp
+	/usr/include/opencv4/opencv2/core/cuda/transform.hpp
+	/usr/include/opencv4/opencv2/core/opencl/runtime/opencl_core.hpp
+	/usr/include/opencv4/opencv2/cvconfig.h
+	/usr/include/opencv4/opencv2/core/utils/allocator_stats.impl.hpp
+	/usr/include/opencv4/opencv2/video/tracking.hpp
+	/usr/include/opencv4/opencv2/objdetect.hpp
 )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.0.0-gles.patch"
 	"${FILESDIR}/${PN}-3.4.0-disable-download.patch"
-	"${FILESDIR}/${P}-compilation-C-mode.patch" # https://bugs.gentoo.org/656530
-	"${FILESDIR}/${P}-python-lib-suffix-hack.patch"
-	"${FILESDIR}/${P}-cuda-add-relaxed-constexpr.patch"
-	"${FILESDIR}/${P}-remove-git-autodetect.patch"
-	"${FILESDIR}/${P}-fix-build-with-va.patch" # bug https://bugs.gentoo.org/656576
-	"${FILESDIR}/${P}-popcnt.patch" # https://bugs.gentoo.org/633900
-	"${FILESDIR}/${P}-fix-on-x86.patch" # https://bugs.gentoo.org/682104
+	"${FILESDIR}/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch"
 )
 
 pkg_pretend() {
@@ -253,15 +253,13 @@ src_prepare() {
 	sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
 		-i CMakeLists.txt cmake/*cmake || die
 
-	if use dnn_samples; then
+	if use dnnsamples; then
 		mv  "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" "${WORKDIR}/${P}/samples/dnn/" || die
 	fi
 
 	if use contrib; then
 		cd  "${WORKDIR}/${PN}_contrib-${PV}" || die
-		eapply "${FILESDIR}/${PN}-3.3.0-remove-tiny-dnn-autodownload.patch"
-
-		if use contrib_xfeatures2d; then
+		if use contribxfeatures2d; then
 			mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
 		fi
 	fi
@@ -280,7 +278,8 @@ multilib_src_configure() {
 	GLOBALCMAKEARGS=(
 	# Optional 3rd party components
 	# ===================================================
-		-DENABLE_DOWNLOAD=OFF
+		-DENABLE_DOWNLOAD=$(usex download)
+		-DWITH_QUIRC=OFF # Do not have dependencies
 		-DWITH_1394=$(usex ieee1394)
 	#	-DWITH_AVFOUNDATION=OFF # IOS
 		-DWITH_VTK=$(multilib_native_usex vtk)
@@ -317,7 +316,7 @@ multilib_src_configure() {
 		-DWITH_UNICAP=OFF		# Not packaged
 		-DWITH_V4L=$(usex v4l)
 		-DWITH_LIBV4L=$(usex v4l)
-		-DWITH_DSHOW=ON			# direct show supp
+		#-DWITH_DSHOW=ON			# direct show supp
 		-DWITH_MSMF=OFF
 		-DWITH_XIMEA=OFF	# Windows only
 		-DWITH_XINE=$(multilib_native_usex xine)
@@ -348,10 +347,10 @@ multilib_src_configure() {
 	# ===================================================
 	# OpenCV build components
 	# ===================================================
-		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_SHARED_LIBS=$(usex java OFF ON)
 		-DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
 		-DBUILD_ANDROID_EXAMPLES=OFF
-		-DBUILD_opencv_apps=
+		-DBUILD_opencv_apps=$(usex opencvapps ON OFF)
 		-DBUILD_DOCS=OFF # Doesn't install anyways.
 		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
 		-DBUILD_PERF_TESTS=OFF
@@ -372,6 +371,7 @@ multilib_src_configure() {
 		-DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
 	#	-DINSTALL_ANDROID_EXAMPLES=OFF
 		-DINSTALL_TO_MANGLED_PATHS=OFF
+		-DOPENCV_GENERATE_PKGCONFIG=ON
 		# opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
 		# to set its destination libdir
 		-DLIB_SUFFIX=
@@ -409,17 +409,9 @@ multilib_src_configure() {
 	# cpu flags, should solve 633900
 	#===================================================
 		-DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
+		-DCPU_BASELINE=$(printf "%s," "${cpu_flags[@]}")
 		-DCPU_DISPATCH=
-		-DENABLE_SSE=$(usex cpu_flags_x86_sse)
-		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2)
-		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3)
-		-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3)
-		-DENABLE_SSE41=$(usex cpu_flags_x86_sse4_1)
-		-DENABLE_SSE42=$(usex cpu_flags_x86_sse4_2)
-		-DENABLE_POPCNT=$(usex cpu_flags_x86_popcnt)
-		-DENABLE_AVX=$(usex cpu_flags_x86_avx)
-		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2)
-		-DENABLE_FMA3=$(usex cpu_flags_x86_fma3)
+		-DBUILD_opencv_features2d=$(usex features2d ON OFF)
 	)
 
 	# ===================================================
@@ -427,13 +419,13 @@ multilib_src_configure() {
 	# ===================================================
 	if use contrib; then
 		GLOBALCMAKEARGS+=(
-			-DBUILD_opencv_dnn=$(usex contrib_dnn ON OFF)
+			-DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
 			-DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
 			-DBUILD_opencv_dnns_easily_fooled=OFF
-			-DBUILD_opencv_xfeatures2d=$(usex contrib_xfeatures2d ON OFF)
-			-DBUILD_opencv_cvv=$(usex contrib_cvv ON OFF)
-			-DBUILD_opencv_hdf=$(multilib_native_usex contrib_hdf ON OFF)
-			-DBUILD_opencv_sfm=$(usex contrib_sfm ON OFF)
+			-DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
+			-DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
+			-DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
+			-DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
 		)
 
 		if multilib_is_native_abi; then
@@ -453,13 +445,15 @@ multilib_src_configure() {
 	local mycmakeargs=( ${GLOBALCMAKEARGS[@]}
 		-DPYTHON_EXECUTABLE=OFF
 		-DINSTALL_PYTHON_EXAMPLES=OFF
+		-DBUILD_opencv_python2=OFF
+		-DBUILD_opencv_python3=OFF
 	)
 
 	cmake-utils_src_configure
 
 	# Copy face_land_model to ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}
 	# TODO patch ocv_download to copy files into destination dirs
-	if use contrib_dnn; then
+	if use contribdnn; then
 		mkdir -p "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
 		cp "${WORKDIR}"/face_landmark_model.dat "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
 	fi
@@ -476,7 +470,6 @@ python_module_compile() {
 		# to the correct interpreter we are building for
 		-DPYTHON_DEFAULT_EXECUTABLE=python
 		-DINSTALL_PYTHON_EXAMPLES=$(usex examples)
-		-DLIBPY_SUFFIX=64
 	)
 
 	# Regenerate cache file. Can't use rebuild_cache as it won't
diff --git a/media-libs/opencv/opencv-4.1.2-r2.ebuild b/media-libs/opencv/opencv-4.1.2-r2.ebuild
new file mode 100644
index 000000000000..c97e2fcb3f48
--- /dev/null
+++ b/media-libs/opencv/opencv-4.1.2-r2.ebuild
@@ -0,0 +1,498 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit java-pkg-opt-2 java-ant-2 python-r1 toolchain-funcs cmake-multilib
+
+DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
+HOMEPAGE="https://opencv.org"
+TINY_DNN_PV="1.0.0a3"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
+	contrib? (
+		https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
+		contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
+		contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
+	)"
+
+LICENSE="BSD"
+SLOT="0/4.1.2" # subslot = libopencv* soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="contrib contribcvv contribdnn contribhdf contribsfm contribxfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnnsamples -download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg jpeg2k lapack libav opencl openexr opengl openmp opencvapps pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+# OpenGL needs gtk or Qt installed to activate, otherwise build system
+# will silently disable it Wwithout the user knowing, which defeats the
+# purpose of the opengl use flag.
+REQUIRED_USE="
+	cuda? ( tesseract? ( opencl ) )
+	dnnsamples? ( examples )
+	gflags? ( contrib )
+	glog? ( contrib )
+	contribcvv? ( contrib qt5 )
+	contribdnn? ( contrib )
+	contribhdf? ( contrib )
+	contribsfm? ( contrib eigen gflags glog )
+	contribxfeatures2d? ( contrib download )
+	java? ( python )
+	opengl? ( || ( gtk qt5 ) )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tesseract? ( contrib )"
+
+# The following logic is intrinsic in the build system, but we do not enforce
+# it on the useflags since this just blocks emerging pointlessly:
+#	gtk? ( !qt5 )
+#	openmp? ( !threads )
+
+RDEPEND="
+	app-arch/bzip2[${MULTILIB_USEDEP}]
+	dev-libs/protobuf:=[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
+	contribhdf? ( sci-libs/hdf5:= )
+	ffmpeg? (
+		libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] )
+		!libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
+	)
+	gdal? ( sci-libs/gdal:= )
+	gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
+	glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+	)
+	gtk? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:2[${MULTILIB_USEDEP}]
+		opengl? ( x11-libs/gtkglext[${MULTILIB_USEDEP}] )
+	)
+	ieee1394? (
+		media-libs/libdc1394[${MULTILIB_USEDEP}]
+		sys-libs/libraw1394[${MULTILIB_USEDEP}]
+	)
+	java? ( >=virtual/jre-1.6:* )
+	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+	lapack? ( virtual/lapack )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/opengl[${MULTILIB_USEDEP}]
+		virtual/glu[${MULTILIB_USEDEP}]
+	)
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
+	qt5? (
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qttest:5
+		dev-qt/qtconcurrent:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	tesseract? ( app-text/tesseract[opencl=] )
+	threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] )
+	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+	v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
+	vtk? ( sci-libs/vtk[rendering] )
+	webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] )
+	xine? ( media-libs/xine-lib )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	eigen? ( dev-cpp/eigen:3 )
+	java?  ( >=virtual/jdk-1.6 )
+	vaapi?  ( x11-libs/libva )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/opencv2/cvconfig.h
+	/usr/include/opencv2/opencv_modules.hpp
+	# [contrib_cvv]
+	/usr/include/opencv2/cvv.hpp
+	/usr/include/opencv2/cvv/call_meta_data.hpp
+	/usr/include/opencv2/cvv/cvv.hpp
+	/usr/include/opencv2/cvv/debug_mode.hpp
+	/usr/include/opencv2/cvv/dmatch.hpp
+	/usr/include/opencv2/cvv/filter.hpp
+	/usr/include/opencv2/cvv/final_show.hpp
+	/usr/include/opencv2/cvv/show_image.hpp
+	# [contrib_hdf]
+	/usr/include/opencv2/hdf.hpp
+	/usr/include/opencv2/hdf/hdf5.hpp
+	# [vtk]
+	/usr/include/opencv2/viz.hpp
+	/usr/include/opencv2/viz/types.hpp
+	/usr/include/opencv2/viz/viz3d.hpp
+	/usr/include/opencv2/viz/vizcore.hpp
+	/usr/include/opencv2/viz/widget_accessor.hpp
+	/usr/include/opencv2/viz/widgets.hpp
+	# [cudev]
+	/usr/include/opencv2/cudaarithm.hpp
+	/usr/include/opencv2/cudabgsegm.hpp
+	/usr/include/opencv2/cudacodec.hpp
+	/usr/include/opencv2/cudafeatures2d.hpp
+	/usr/include/opencv2/cudafilters.hpp
+	/usr/include/opencv2/cudaimgproc.hpp
+	/usr/include/opencv2/cudalegacy.hpp
+	/usr/include/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
+	/usr/include/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
+	/usr/include/opencv2/cudalegacy/NCV.hpp
+	/usr/include/opencv2/cudalegacy/NCVPyramid.hpp
+	/usr/include/opencv2/cudalegacy/NPP_staging.hpp
+	/usr/include/opencv2/cudaobjdetect.hpp
+	/usr/include/opencv2/cudaoptflow.hpp
+	/usr/include/opencv2/cudastereo.hpp
+	/usr/include/opencv2/cudawarping.hpp
+	/usr/include/opencv2/cudev/block/block.hpp
+	/usr/include/opencv2/cudev/block/detail/reduce.hpp
+	/usr/include/opencv2/cudev/block/detail/reduce_key_val.hpp
+	/usr/include/opencv2/cudev/block/dynamic_smem.hpp
+	/usr/include/opencv2/cudev/block/reduce.hpp
+	/usr/include/opencv2/cudev/block/scan.hpp
+	/usr/include/opencv2/cudev/block/vec_distance.hpp
+	/usr/include/opencv2/cudev/common.hpp
+	/usr/include/opencv2/cudev/expr/binary_func.hpp
+	/usr/include/opencv2/cudev/expr/binary_op.hpp
+	/usr/include/opencv2/cudev/expr/color.hpp
+	/usr/include/opencv2/cudev/expr/deriv.hpp
+	/usr/include/opencv2/cudev/expr/expr.hpp
+	/usr/include/opencv2/cudev/expr/per_element_func.hpp
+	/usr/include/opencv2/cudev/expr/reduction.hpp
+	/usr/include/opencv2/cudev/expr/unary_func.hpp
+	/usr/include/opencv2/cudev/expr/unary_op.hpp
+	/usr/include/opencv2/cudev/expr/warping.hpp
+	/usr/include/opencv2/cudev/functional/color_cvt.hpp
+	/usr/include/opencv2/cudev/functional/detail/color_cvt.hpp
+	/usr/include/opencv2/cudev/functional/functional.hpp
+	/usr/include/opencv2/cudev/functional/tuple_adapter.hpp
+	/usr/include/opencv2/cudev/grid/copy.hpp
+	/usr/include/opencv2/cudev/grid/detail/copy.hpp
+	/usr/include/opencv2/cudev/grid/detail/histogram.hpp
+	/usr/include/opencv2/cudev/grid/detail/integral.hpp
+	/usr/include/opencv2/cudev/grid/detail/minmaxloc.hpp
+	/usr/include/opencv2/cudev/grid/detail/pyr_down.hpp
+	/usr/include/opencv2/cudev/grid/detail/pyr_up.hpp
+	/usr/include/opencv2/cudev/grid/detail/reduce.hpp
+	/usr/include/opencv2/cudev/grid/detail/reduce_to_column.hpp
+	/usr/include/opencv2/cudev/grid/detail/reduce_to_row.hpp
+	/usr/include/opencv2/cudev/grid/detail/split_merge.hpp
+	/usr/include/opencv2/cudev/grid/detail/transform.hpp
+	/usr/include/opencv2/cudev/grid/detail/transpose.hpp
+	/usr/include/opencv2/cudev/grid/histogram.hpp
+	/usr/include/opencv2/cudev/grid/integral.hpp
+	/usr/include/opencv2/cudev/grid/pyramids.hpp
+	/usr/include/opencv2/cudev/grid/reduce.hpp
+	/usr/include/opencv2/cudev/grid/reduce_to_vec.hpp
+	/usr/include/opencv2/cudev/grid/split_merge.hpp
+	/usr/include/opencv2/cudev/grid/transform.hpp
+	/usr/include/opencv2/cudev/grid/transpose.hpp
+	/usr/include/opencv2/cudev.hpp
+	/usr/include/opencv2/cudev/ptr2d/constant.hpp
+	/usr/include/opencv2/cudev/ptr2d/deriv.hpp
+	/usr/include/opencv2/cudev/ptr2d/detail/gpumat.hpp
+	/usr/include/opencv2/cudev/ptr2d/extrapolation.hpp
+	/usr/include/opencv2/cudev/ptr2d/glob.hpp
+	/usr/include/opencv2/cudev/ptr2d/gpumat.hpp
+	/usr/include/opencv2/cudev/ptr2d/interpolation.hpp
+	/usr/include/opencv2/cudev/ptr2d/lut.hpp
+	/usr/include/opencv2/cudev/ptr2d/mask.hpp
+	/usr/include/opencv2/cudev/ptr2d/remap.hpp
+	/usr/include/opencv2/cudev/ptr2d/resize.hpp
+	/usr/include/opencv2/cudev/ptr2d/texture.hpp
+	/usr/include/opencv2/cudev/ptr2d/traits.hpp
+	/usr/include/opencv2/cudev/ptr2d/transform.hpp
+	/usr/include/opencv2/cudev/ptr2d/warping.hpp
+	/usr/include/opencv2/cudev/ptr2d/zip.hpp
+	/usr/include/opencv2/cudev/util/atomic.hpp
+	/usr/include/opencv2/cudev/util/detail/tuple.hpp
+	/usr/include/opencv2/cudev/util/detail/type_traits.hpp
+	/usr/include/opencv2/cudev/util/limits.hpp
+	/usr/include/opencv2/cudev/util/saturate_cast.hpp
+	/usr/include/opencv2/cudev/util/simd_functions.hpp
+	/usr/include/opencv2/cudev/util/tuple.hpp
+	/usr/include/opencv2/cudev/util/type_traits.hpp
+	/usr/include/opencv2/cudev/util/vec_math.hpp
+	/usr/include/opencv2/cudev/util/vec_traits.hpp
+	/usr/include/opencv2/cudev/warp/detail/reduce.hpp
+	/usr/include/opencv2/cudev/warp/detail/reduce_key_val.hpp
+	/usr/include/opencv2/cudev/warp/reduce.hpp
+	/usr/include/opencv2/cudev/warp/scan.hpp
+	/usr/include/opencv2/cudev/warp/shuffle.hpp
+	/usr/include/opencv2/cudev/warp/warp.hpp
+	# [opencv4]
+	/usr/include/opencv4/opencv2/core/cv_cpu_dispatch.h
+	/usr/include/opencv4/opencv2/core/cvdef.h
+	/usr/include/opencv4/opencv2/dnn.hpp
+	/usr/include/opencv4/opencv2/core/cuda/transform.hpp
+	/usr/include/opencv4/opencv2/core/opencl/runtime/opencl_core.hpp
+	/usr/include/opencv4/opencv2/cvconfig.h
+	/usr/include/opencv4/opencv2/core/utils/allocator_stats.impl.hpp
+	/usr/include/opencv4/opencv2/video/tracking.hpp
+	/usr/include/opencv4/opencv2/objdetect.hpp
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.0-gles.patch"
+	"${FILESDIR}/${PN}-3.4.0-disable-download.patch"
+	"${FILESDIR}/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch"
+	"${FILESDIR}/${P}-pkg-config-file.patch"
+	"${FILESDIR}/${P}-opencl-license.patch"
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# remove bundled stuff
+	rm -rf 3rdparty || die "Removing 3rd party components failed"
+	sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
+		-i CMakeLists.txt cmake/*cmake || die
+
+	if use dnnsamples; then
+		mv  "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" "${WORKDIR}/${P}/samples/dnn/" || die
+	fi
+
+	if use contrib; then
+		cd  "${WORKDIR}/${PN}_contrib-${PV}" || die
+		if use contribxfeatures2d; then
+			mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
+		fi
+	fi
+
+	java-pkg-opt-2_src_prepare
+
+	# this really belongs in src_prepare() too
+	JAVA_ANT_ENCODING="iso-8859-1"
+	# set encoding so even this cmake build will pick it up.
+	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
+	java-ant-2_src_configure
+}
+
+multilib_src_configure() {
+	# please dont sort here, order is the same as in CMakeLists.txt
+	GLOBALCMAKEARGS=(
+	# Optional 3rd party components
+	# ===================================================
+		-DENABLE_DOWNLOAD=$(usex download)
+		-DWITH_QUIRC=OFF # Do not have dependencies
+		-DWITH_1394=$(usex ieee1394)
+	#	-DWITH_AVFOUNDATION=OFF # IOS
+		-DWITH_VTK=$(multilib_native_usex vtk)
+		-DWITH_EIGEN=$(usex eigen)
+		-DWITH_VFW=OFF # Video windows support
+		-DWITH_FFMPEG=$(usex ffmpeg)
+		-DWITH_GSTREAMER=$(usex gstreamer)
+		-DWITH_GSTREAMER_0_10=OFF	# Don't want this
+		-DWITH_GTK=$(usex gtk)
+		-DWITH_GTK_2_X=$(usex gtk)
+		-DWITH_IPP=OFF
+		-DWITH_JASPER=OFF
+		-DWITH_JPEG=$(usex jpeg)
+		-DWITH_WEBP=$(usex webp)
+		-DWITH_OPENEXR=$(usex openexr)
+		-DWITH_OPENGL=$(usex opengl)
+		-DWITH_OPENVX=OFF
+		-DWITH_OPENNI=OFF	# Not packaged
+		-DWITH_OPENNI2=OFF	# Not packaged
+		-DWITH_PNG=$(usex png)
+		-DWITH_GDCM=OFF
+		-DWITH_PVAPI=OFF
+		-DWITH_GIGEAPI=OFF
+		-DWITH_ARAVIS=OFF
+		-DWITH_QT=$(multilib_native_usex qt5 5 OFF)
+		-DWITH_WIN32UI=OFF		# Windows only
+	#	-DWITH_QUICKTIME=OFF
+	#	-DWITH_QTKIT=OFF
+		-DWITH_TBB=$(usex threads)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_CSTRIPES=OFF
+		-DWITH_PTHREADS_PF=ON
+		-DWITH_TIFF=$(usex tiff)
+		-DWITH_UNICAP=OFF		# Not packaged
+		-DWITH_V4L=$(usex v4l)
+		-DWITH_LIBV4L=$(usex v4l)
+		#-DWITH_DSHOW=ON			# direct show supp
+		-DWITH_MSMF=OFF
+		-DWITH_XIMEA=OFF	# Windows only
+		-DWITH_XINE=$(multilib_native_usex xine)
+		-DWITH_CLP=OFF
+		-DWITH_OPENCL=$(usex opencl)
+		-DWITH_OPENCL_SVM=OFF
+		-DWITH_OPENCLAMDFFT=$(usex opencl)
+		-DWITH_OPENCLAMDBLAS=$(usex opencl)
+		-DWITH_DIRECTX=OFF
+		-DWITH_INTELPERC=OFF
+		-DWITH_IPP_A=OFF
+		-DWITH_MATLAB=OFF
+		-DWITH_VA=$(usex vaapi)
+		-DWITH_VA_INTEL=$(usex vaapi)
+		-DWITH_GDAL=$(multilib_native_usex gdal)
+		-DWITH_GPHOTO2=$(usex gphoto2)
+		-DWITH_LAPACK=$(multilib_native_usex lapack)
+		-DWITH_ITT=OFF # 3dparty libs itt_notify
+	# ===================================================
+	# CUDA build components: nvidia-cuda-toolkit takes care of GCC version
+	# ===================================================
+		-DWITH_CUDA=$(multilib_native_usex cuda)
+		-DWITH_CUBLAS=$(multilib_native_usex cuda)
+		-DWITH_CUFFT=$(multilib_native_usex cuda)
+		-DWITH_NVCUVID=OFF
+#		-DWITH_NVCUVID=$(usex cuda)
+		-DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
+	# ===================================================
+	# OpenCV build components
+	# ===================================================
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
+		-DBUILD_ANDROID_EXAMPLES=OFF
+		-DBUILD_opencv_apps=$(usex opencvapps ON OFF)
+		-DBUILD_DOCS=OFF # Doesn't install anyways.
+		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
+		-DBUILD_PERF_TESTS=OFF
+		-DBUILD_TESTS=$(multilib_native_usex testprograms)
+		-DBUILD_WITH_DEBUG_INFO=$(usex debug)
+	#	-DBUILD_WITH_STATIC_CRT=OFF
+		-DBUILD_WITH_DYNAMIC_IPP=OFF
+		-DBUILD_FAT_JAVA_LIB=OFF
+	#	-DBUILD_ANDROID_SERVICE=OFF
+		-DBUILD_CUDA_STUBS=$(multilib_native_usex cuda)
+		-DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "")
+	# ===================================================
+	# OpenCV installation options
+	# ===================================================
+		-DINSTALL_CREATE_DISTRIB=OFF
+		-DINSTALL_C_EXAMPLES=$(multilib_native_usex examples)
+		-DINSTALL_TESTS=$(multilib_native_usex testprograms)
+		-DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
+	#	-DINSTALL_ANDROID_EXAMPLES=OFF
+		-DINSTALL_TO_MANGLED_PATHS=OFF
+		-DOPENCV_GENERATE_PKGCONFIG=ON
+		# opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
+		# to set its destination libdir
+		-DLIB_SUFFIX=
+	# ===================================================
+	# OpenCV build options
+	# ===================================================
+		-DENABLE_CCACHE=OFF
+		-DENABLE_PRECOMPILED_HEADERS=$(usex pch)
+		-DENABLE_SOLUTION_FOLDERS=OFF
+		-DENABLE_PROFILING=OFF
+		-DENABLE_COVERAGE=OFF
+
+		-DHAVE_opencv_java=$(multilib_native_usex java YES NO)
+		-DENABLE_NOISY_WARNINGS=OFF
+		-DOPENCV_WARNINGS_ARE_ERRORS=OFF
+		-DENABLE_IMPL_COLLECTION=OFF
+		-DENABLE_INSTRUMENTATION=OFF
+		-DGENERATE_ABI_DESCRIPTOR=OFF
+		-DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
+	# ===================================================
+	# things we want to be hard off or not yet figured out
+	# ===================================================
+		-DBUILD_PACKAGE=OFF
+	# ===================================================
+	# Not building protobuf but update files bug #631418
+	# ===================================================
+		-DBUILD_PROTOBUF=OFF
+		-DPROTOBUF_UPDATE_FILES=ON
+	# ===================================================
+	# things we want to be hard enabled not worth useflag
+	# ===================================================
+		-DCMAKE_SKIP_RPATH=ON
+		-DOPENCV_DOC_INSTALL_PATH=
+	# ==================================================
+	# cpu flags, should solve 633900
+	#===================================================
+		-DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
+		-DCPU_BASELINE=$(printf "%s," "${cpu_flags[@]}")
+		-DCPU_DISPATCH=
+		-DBUILD_opencv_features2d=$(usex features2d ON OFF)
+	)
+
+	# ===================================================
+	# OpenCV Contrib Modules
+	# ===================================================
+	if use contrib; then
+		GLOBALCMAKEARGS+=(
+			-DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
+			-DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
+			-DBUILD_opencv_dnns_easily_fooled=OFF
+			-DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
+			-DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
+			-DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
+			-DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
+		)
+
+		if multilib_is_native_abi; then
+			GLOBALCMAKEARGS+=(
+				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract)
+			)
+		else
+			GLOBALCMAKEARGS+=(
+				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
+			)
+		fi
+	fi
+
+	# workaround for bug 413429
+	tc-export CC CXX
+
+	local mycmakeargs=( ${GLOBALCMAKEARGS[@]}
+		-DPYTHON_EXECUTABLE=OFF
+		-DINSTALL_PYTHON_EXAMPLES=OFF
+		-DBUILD_opencv_python2=OFF
+		-DBUILD_opencv_python3=OFF
+	)
+
+	cmake-utils_src_configure
+
+	# Copy face_land_model to ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}
+	# TODO patch ocv_download to copy files into destination dirs
+	if use contribdnn; then
+		mkdir -p "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
+		cp "${WORKDIR}"/face_landmark_model.dat "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
+	fi
+
+}
+
+python_module_compile() {
+	local BUILD_DIR=${orig_BUILD_DIR}
+	local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
+
+	# Set all python variables to load the correct Gentoo paths
+	mycmakeargs+=(
+		# python_setup alters PATH and sets this as wrapper
+		# to the correct interpreter we are building for
+		-DPYTHON_DEFAULT_EXECUTABLE=python
+		-DINSTALL_PYTHON_EXAMPLES=$(usex examples)
+	)
+
+	# Regenerate cache file. Can't use rebuild_cache as it won't
+	# have the Gentoo specific options.
+	rm -rf CMakeCache.txt || die "rm failed"
+	cmake-utils_src_configure
+	cmake-utils_src_compile
+	cmake-utils_src_install
+
+	# Remove compiled binary so new version compiles
+	# Avoid conflicts with new module builds as build system doesn't
+	# really support it.
+	rm -rf modules/python2 || die "rm failed"
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+
+	# Build and install the python modules for all targets
+	if multilib_is_native_abi && use python; then
+		local orig_BUILD_DIR=${BUILD_DIR}
+		python_foreach_impl python_module_compile
+	fi
+}
diff --git a/media-libs/openglide/Manifest b/media-libs/openglide/Manifest
index 86730f1a5f2f..db107d1c835d 100644
--- a/media-libs/openglide/Manifest
+++ b/media-libs/openglide/Manifest
@@ -1,4 +1,4 @@
 AUX OpenGLid.ini 605 BLAKE2B 5f51d0a6d15e253bffb0919ec078b2081005fc1f86f8058ec969820e32f3bea621b5dc941cec23a24595c01dd87f8f37db582b5307ada6a52a34d28f7c123f22 SHA512 dbd4ab26d5a556fcd9656f151c156dd29eaa1b815d1a5eaf841cc23f2c8aee5f385f085febfeabe900014b63c5cc2234aafc9388e1940fa72cb7a4aaab2cf14c
-DIST openglide-0.09_rc9_p20160913.tar.gz 450667 BLAKE2B d8b362fb163e7b3a41632b00fc884b861cf6d44f507896180998d1f90f9bf92132fb62af678b1c141d658902f2d0e214a84c9e817e201c5ced7881e050b5ad68 SHA512 4a64b74c2a96639d9fac732f72419ced652989b347b484f4abf7ac6a33d7b8d89ee56e6c04aaaf7475cae332b69a98ec0b7c58a9aac25a24d8acaad92392cb38
-EBUILD openglide-0.09_rc9_p20160913.ebuild 1296 BLAKE2B 5f1aa78a76271e981f6bf68af287c40368e42ea36fa1a11a20dcb1c8a966e5cab372bc435691abbf3b929b2276257672e7148569c2f706f1960c25841975621b SHA512 58e0b5e7242456ababf772526a942595c768d9118cc396574e56e5c7154e5a3c9eb586d9ff7f513025112998e61e1e9d9a164526f541ac072a686acc2ee81761
+DIST openglide-0.09_rc9_p20191120.tar.gz 470278 BLAKE2B 234b83b4688e120f6ea00f5583c7546d8a7a4d2ca7ab12d52a7a4f52a5375508418866b7c9547ba495c48abe9ff4caf49a104de1a34f208db1028082bb71fb46 SHA512 c83c1c04aa77fe47f381385c8d946da49c2eb8ceba0164b660af1564bfb580015f196cd4063bb73f2c76405517f90e8b5a6e7969afbdd7ef2c9fce7520227478
+EBUILD openglide-0.09_rc9_p20191120.ebuild 1290 BLAKE2B 5618a33b29df9588104557a6ab13d9fa823ef3e99705d9ab31a96452b8d53773224e38cedb36c9fd9e046e086f8d71df3e6e0c9156327707f638aea9afa75071 SHA512 ce30069a050caa0adf3e7ee3ae2c4044edde806eb7c41c9b04cf55d5e7859ee56ad618c8ddbc422f3ea41557a6ccbc16020476065af3c01e78eca9c8f7be3477
 MISC metadata.xml 693 BLAKE2B 92dde15413f18f0bc359c3ef821e8a62fd70bc621c4de1a3d5c85bfb88410c80d99111dea375509617d8d81eedad447b7422dba9b22fb206e12ec77a01fb13c3 SHA512 9d5f988dac6a2a3c0556718c3ce5e883931b68175d9c6bb6e3a9c5b5bcec10f144d8df9a6fc95a447ba6e6d5a5860d3c8456480273c3cab4a6914129e4ac102d
diff --git a/media-libs/openglide/openglide-0.09_rc9_p20160913.ebuild b/media-libs/openglide/openglide-0.09_rc9_p20191120.ebuild
index ecc63ab83242..967005ed1c3d 100644
--- a/media-libs/openglide/openglide-0.09_rc9_p20160913.ebuild
+++ b/media-libs/openglide/openglide-0.09_rc9_p20191120.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-COMMIT="3722fc563b737d2d7933df6a771651c2154e6f7b"
+COMMIT="c300160d0a8292bc04e79dd59e6cc178aa648dec"
 
 inherit autotools eutils multilib-minimal
 
@@ -15,15 +15,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+sdl static-libs"
 
-RDEPEND="virtual/glu:=[${MULTILIB_USEDEP}]
-	virtual/opengl:=[${MULTILIB_USEDEP}]
+RDEPEND="virtual/glu[${MULTILIB_USEDEP}]
+	virtual/opengl[${MULTILIB_USEDEP}]
 	sdl? (
-		media-libs/libsdl:=[${MULTILIB_USEDEP}]
+		media-libs/libsdl[${MULTILIB_USEDEP}]
 	)
 	!sdl? (
-		x11-libs/libICE:=[${MULTILIB_USEDEP}]
-		x11-libs/libSM:=[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm:=[${MULTILIB_USEDEP}]
+		x11-libs/libICE[${MULTILIB_USEDEP}]
+		x11-libs/libSM[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
 	)"
 
 DEPEND="${RDEPEND}"
@@ -56,6 +56,6 @@ multilib_src_install_all() {
 	newexe platform/dosbox/glide2x.ovl glide2x-dosbox.ovl
 	newexe platform/dosemu/glide2x.ovl glide2x-dosemu.ovl
 
-	prune_libtool_files
+	rm "${ED}"/usr/*/*.la || die
 	einstalldocs
 }
diff --git a/media-libs/openicc/Manifest b/media-libs/openicc/Manifest
index ea71c5581d57..d7ca066972c6 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 1066 BLAKE2B 0d241edcfbad47cf5ae39426eba770b71033c900433eb598fb5712e985107ace76856b6d4d301fb8e16f4439eb0fed3a3bb475dbce9d110f18378dda0a2160ce SHA512 dc0acf30cc98d449e270a95ad4630c8628d921d5856a82f22ee4a5422c290b6657e7df802d43f2bf02ba92543570dc582240822daf8365f9e0c8a870f442f71d
+EBUILD openicc-0.1.0.ebuild 1093 BLAKE2B 20f0ace51a67c57f032029eff41553610ad3e1f6612a1fda0cd742ad609cafdb026eb0e8c749c69d8b09324e99290b2cfc8075e054b43064bd3134be0443929a SHA512 50ec9fd91b0e991f0ea38830049cd482c3daec571680501f87c88231f2914be2269be4933a86ef0b6203270408fcea4fc15113d77b3ee1dd27ec7c059e162db5
 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 b1a307e6ee25..a3bda95e3ab8 100644
--- a/media-libs/openicc/openicc-0.1.0.ebuild
+++ b/media-libs/openicc/openicc-0.1.0.ebuild
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	sys-devel/gettext
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 9822cf9bf211..0125858abdda 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 3137 BLAKE2B fe760def3e3e728504c3c1b974897a60d3487e9e8f1b7dd286e1d09e54efcae14143447767fd5ee2feb500643e8ddfcf6491bf9f664132d3bbd539e5745d9b6e SHA512 9ed1b289abb1c2fb42024a262a83ac8b108b6634facd8ea711053b603871445e41085f285bf186590a4d8b952442272cc82d550c56521c3c51ef553683a7ff37
+EBUILD openimageio-1.8.17-r1.ebuild 3139 BLAKE2B 992dc6542e252c123f8695f90476e74bdb9755ae7351d02cba70578fef2b8e3ab6838e6c9affa1590cfb0e7b536e2a6bc94650077557b7fad74e291715d7088f SHA512 30b75485e0dd1eb476cf75a34727214c64f391e3144e810883240732ad2bae74db23bf22c0aa2865fd05acee3358f868de2e5c5dc77329065791074959bae8fc
 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 8e563d74595e..0ce713b21a93 100644
--- a/media-libs/openimageio/openimageio-1.8.17-r1.ebuild
+++ b/media-libs/openimageio/openimageio-1.8.17-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 inherit cmake-utils python-single-r1
 
 DESCRIPTION="A library for reading and writing images"
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index dcc546f68fd5..3b2fdafc68f1 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 4150 BLAKE2B 01764bc1f11779d8b666fe5eab6ec67fa30c617fa2eb28846d390fdc40d62c4dc0d2098c98b834c2879c8f96c645d64db3338684da93a880535043d392a42123 SHA512 4e4acd20ec2b778ef44c4fb80b2f19ef2eff4d6004db73a9cda879511d70e89a94e22a6ad46c55d8a625ab18ebc69646f8168cd1b6e6d0b776e595e6710f02c7
+EBUILD openjpeg-2.3.1.ebuild 4177 BLAKE2B 3bbe63e5a9c4a2d1a97fd8781fa93d1f5da6b0d3e83e19aa190a5ae68c14014509b4d9386cf96c38fd36996cd352fa45e2833dae898752132b5f35790245a839 SHA512 a76c784db55c6a428aba9988f91858707d967e15a5147331d27188da3c767d8246f521a7e00f512b8d672f3f2b41c3d1b9a0bd47a2bfeb4740712e715c0c5c2b
 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 041bd067b459..ff710267180c 100644
--- a/media-libs/openjpeg/openjpeg-2.3.1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
@@ -18,6 +18,7 @@ LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
 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="doc static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	media-libs/lcms:2
diff --git a/media-libs/phonon-gstreamer/Manifest b/media-libs/phonon-gstreamer/Manifest
index 0545f4056da6..877b32594623 100644
--- a/media-libs/phonon-gstreamer/Manifest
+++ b/media-libs/phonon-gstreamer/Manifest
@@ -1,7 +1,3 @@
-AUX phonon-gstreamer-4.9.0-no-paused-on-zero-vol.patch 998 BLAKE2B 6f659a6a6aad157ad708934a165f17ca4766dec3baf3cdd03e5b10b41201751f17008b43b6183df9afeba7303603fc9c1fcc413bb16a2e97cd571196ce2e6905 SHA512 c97a88e86ef3f56fdcdb12d3256afce34381ec1072ebbeda7c427db7a9c000feecab5f84a44d9a86fd099b26cda6a8a50a0a4c20139167e4e8b96c96368feddb
-AUX phonon-gstreamer-4.9.0-qt-5.11.patch 2144 BLAKE2B a11065fab61037e11f54ab2b3a41f55231ac2175372077b302b033bbf7483030e763e50e8dce00886394ce94feb205b75d3bf5f4ea4b0c11f3e0c0fba42f14f3 SHA512 b13fe80bf493d33ef942babf084f823e9d6314f489496007dd43e9c0efba4c8e354067cba5ccae53806156d631a8bbf115b84e654052086aeb1d5d32f15b6f08
 DIST phonon-backend-gstreamer-4.10.0.tar.xz 98532 BLAKE2B b9182a50810536c46999266bd40996bb59ac982e44d2066c2afd897d3a2feb99e5570e36dcc869098f5b171018f4c339a2e3b8df124eaeb88236073245069859 SHA512 3beaba9ea3a332a6908ebdaa966958e8e8056d79cfb210e82a8edaf08f0a8bacbf8094e91b1b1b936406aa634dabb962e6c1468e4dde3febd9efac1a63ea70a4
-DIST phonon-backend-gstreamer-4.9.0.tar.xz 75960 BLAKE2B 676810dc99f3734a6932bfe355a37df1334c3460eba9a6d96e039442ce2729b61db61798c1f7207aef68a30f79355703c80e6aeb1a2ca7156f22e9fd7e07027b SHA512 9c13d37c6c7070c2bd8fcc562f743ac2f55289bc7cc82147ef0ae990e5d380d541cc1d9ce61e6ad1549ed1935d41faafaeeb0cd5463e4c656ea8fee636ff4dfe
-EBUILD phonon-gstreamer-4.10.0.ebuild 959 BLAKE2B 12157ba58c97ae856d93e558e2edf2aa731f5ed769fad34eab301419e07574ccc14faa778328d52ea5866b110390b2fb528a29820938a2477d574c746c2e4fb6 SHA512 c9eaca3934463165a6b52c0aa6e5c6efc6afcb72410d641aebe02d26ee9fd853c72c0d3e96e237f73efba3db39990ab5fa81d378694571d6e081fb8998aa292f
-EBUILD phonon-gstreamer-4.9.0-r3.ebuild 1250 BLAKE2B 759dcf7e4bf9fb29b2fb3fc788d5e00a8586490cdfc97ed4cab79bc03ed2869a8327a533ba4ba157849a51822ee574d15bb63f8519e9a5e10a8dfc68bda88fc3 SHA512 706b83e5c5c1079cb467558b88eae314f1b3eb9d31a34fd4b4e917272fb0850c57460971b357dba222cda8d74ceea6ea9abba919e1cadfbda25c4c5717ecc721
+EBUILD phonon-gstreamer-4.10.0.ebuild 956 BLAKE2B 7b6477b9b3eb92f46e7903d83fb04a26ab9d92f85a33e87522d280aa0a4b8df250c46df6e93f2405828d188e3b987602da970feffe69d3b711529ca582601cb1 SHA512 18544e6177af879704ca4bc3eb600d8c50ea3ba3717ebbedcb12f11fa4ff31cbc2b08a349943b947d6ddae6d323493939ea9765a2ab10b1595f8779aa3f56248
 MISC metadata.xml 339 BLAKE2B 2e6fd710b9791c7dd1f8836dac9209a84608dcb54d5ebef458acef6651c03eb55d8733d23df0a6cd0dbe470f00d43e0413b3d18b432f8a38a765af458e5662fc SHA512 c481721ab8e7762b2b951501cc99f7e2d2263ffd682dce3731fb415b677b74f7fbfe7770e9d2b1b1ce496c10254b84bb7489ff971593dac90c151a9ff1623e9a
diff --git a/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.9.0-no-paused-on-zero-vol.patch b/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.9.0-no-paused-on-zero-vol.patch
deleted file mode 100644
index 51887e99c8e1..000000000000
--- a/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.9.0-no-paused-on-zero-vol.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From fca0714fd37b2276eb663f649b6b9871a3973fa4 Mon Sep 17 00:00:00 2001
-From: Anthony Fieroni <bvbfan@abv.bg>
-Date: Mon, 10 Dec 2018 16:19:51 +0200
-Subject: Do not trigger paused state on 0 percentage
-
-Differential Revision: https://phabricator.kde.org/D14241
-
-Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>
----
- gstreamer/pipeline.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/gstreamer/pipeline.cpp b/gstreamer/pipeline.cpp
-index 7025418..0d0b253 100644
---- a/gstreamer/pipeline.cpp
-+++ b/gstreamer/pipeline.cpp
-@@ -325,6 +325,11 @@ gboolean Pipeline::cb_buffering(GstBus *bus, GstMessage *gstMessage, gpointer da
-     gint percent = 0;
-     gst_message_parse_buffering(gstMessage, &percent);
- 
-+    // we should not trigger paused state or gstreamer will starts buffering again
-+    if (percent == 0) {
-+        return true;
-+    }
-+
-     debug() << Q_FUNC_INFO << "Buffering :" << percent;
- 
-     // Instead of playing when the pipeline is still streaming, we pause
--- 
-cgit v1.1
diff --git a/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.9.0-qt-5.11.patch b/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.9.0-qt-5.11.patch
deleted file mode 100644
index 1e500058cf38..000000000000
--- a/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.9.0-qt-5.11.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 38532b45ea32d5355cc19ff32ef69c2f462cad5d Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 13 Apr 2018 23:47:34 +0200
-Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
-
-Also replace automoc4_add_library with add_library.
----
- gstreamer/CMakeLists.txt | 26 +++++++++++++++-----------
- 1 file changed, 15 insertions(+), 11 deletions(-)
-
-diff --git a/gstreamer/CMakeLists.txt b/gstreamer/CMakeLists.txt
-index cb01285c..4536d042 100644
---- a/gstreamer/CMakeLists.txt
-+++ b/gstreamer/CMakeLists.txt
-@@ -104,18 +104,26 @@ if (BUILD_X11RENDERER)
-   add_definitions(-DBUILD_X11RENDERER)
- endif()
- 
--automoc4_add_library(phonon_gstreamer MODULE ${phonon_gstreamer_SRCS})
-+add_library(phonon_gstreamer MODULE ${phonon_gstreamer_SRCS})
- set_target_properties(phonon_gstreamer PROPERTIES
-  PREFIX ""
-  AUTOMOC_MOC_OPTIONS ${AUTOMOC_MOC_OPTIONS}
- )
- 
--qt5_use_modules(phonon_gstreamer Core Widgets)
--
--if(Qt5X11Extras_FOUND)
--  qt5_use_modules(phonon_gstreamer X11Extras)
--  target_link_libraries(phonon_gstreamer Qt5::X11Extras)
--endif(Qt5X11Extras_FOUND)
-+if(PHONON_BUILD_PHONON4QT5)
-+    target_link_libraries(phonon_gstreamer Qt5::Core Qt5::Widgets)
-+    if(Qt5X11Extras_FOUND)
-+        target_link_libraries(phonon_gstreamer Qt5::X11Extras)
-+    endif()
-+    if(OPENGL_FOUND)
-+        target_link_libraries(phonon_gstreamer Qt5::OpenGL ${OPENGL_gl_LIBRARY})
-+    endif()
-+else()
-+    target_link_libraries(phonon_gstreamer ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-+    if(OPENGL_FOUND)
-+        target_link_libraries(phonon_gstreamer ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY})
-+    endif()
-+endif()
- 
- target_link_libraries(phonon_gstreamer
-   ${PHONON_LIBRARY}
-@@ -126,10 +134,6 @@ target_link_libraries(phonon_gstreamer
- if(USE_INSTALL_PLUGIN)
-    target_link_libraries(phonon_gstreamer ${GSTREAMER_PLUGIN_PBUTILS_LIBRARIES})
- endif(USE_INSTALL_PLUGIN)
--if(OPENGL_FOUND)
--  qt5_use_modules(phonon_gstreamer OpenGL)
--  target_link_libraries(phonon_gstreamer ${OPENGL_gl_LIBRARY})
--endif(OPENGL_FOUND)
- 
- install(TARGETS phonon_gstreamer DESTINATION ${BACKEND_INSTALL_DIR})
- 
--- 
-2.17.0
-
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0.ebuild
index 7f09ca61b211..456356c259ff 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://phonon.kde.org/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild
deleted file mode 100644
index 5af2b0308fcf..000000000000
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="phonon-backend-gstreamer"
-MY_P=${MY_PN}-${PV}
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-else
-	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
-	inherit git-r3
-fi
-
-inherit cmake-utils xdg-utils
-
-DESCRIPTION="Phonon GStreamer backend"
-HOMEPAGE="https://phonon.kde.org/"
-
-LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-IUSE="alsa debug +network"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	>=media-libs/phonon-4.10.0
-	media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis]
-	virtual/opengl
-	network? ( media-plugins/gst-plugins-soup:1.0 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-qt-5.11.patch"
-	"${FILESDIR}/${P}-no-paused-on-zero-vol.patch"
-)
-
-src_configure() {
-	local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest
index 9d94f6853ac2..cf05fa2efeac 100644
--- a/media-libs/phonon-vlc/Manifest
+++ b/media-libs/phonon-vlc/Manifest
@@ -1,6 +1,3 @@
-AUX phonon-vlc-0.10.1-qt-5.11.patch 998 BLAKE2B e182ed8a038577c48c8798e6769b992a3099930a8332c0cdf146af699f7ca5020df3e9d2f072cf83f43e5570307f90558b2facdf526d216c423a705fa6121d4b SHA512 2bc6f4e08693ff8d02eab9a1aad9ef1f425ced736b7cb11ebfadbe33c111ec053dc60bd48220130f4a80cc117a08fb53e3fd5789554bd0e57f81a61203d2ba9c
-DIST phonon-backend-vlc-0.10.2.tar.xz 60568 BLAKE2B 7ee5ea6cc627ec2bd872b4c60f9c915f383e9b2826b30c4b0db96e8348b1a26ea4f710076b68892c28c73d45dae118f06a315093b6e954d48967891f1e31eec4 SHA512 3c4e7c60582d7871b209f4b38b139f43ab5f97618399164ecc649cd0e077a1d4c7848bc5c5c213d747cf7e5f1252ff53ded745880dfd36247494479840789ba5
 DIST phonon-backend-vlc-0.11.1.tar.xz 65064 BLAKE2B 2380d31f574b71e2552b37e5c2a8b22239268aac9c2875417486fd77496c89820b5b4c7e94d39bfebad62a5175a35767945e3f57830e69041ed7c58be4b978cc SHA512 4a068478eb1467477cf5c21813723779742eb15766aee2df8184da8c0b58598c5eff8aecefdcfed8e6136495f3caf7691c99d43e98226ab477c162ff19e1fa4e
-EBUILD phonon-vlc-0.10.2.ebuild 887 BLAKE2B 97ac0090629d73ac4c0cdc17540fbeaf4258869ad16934b0277887c8bcf1de1ca4346a35b360089c029d289cd979dd11f6256794e418c0ff7fc3234de1c39c9b SHA512 33d774dc5a0c613d96de315754dc274fe9297eae6e7b08c42e7c6ebd283eb99674ec98b5afc480054265dfb0b5f6d39160b06a8fe101427de68b17e7c4b7b3e4
-EBUILD phonon-vlc-0.11.1.ebuild 712 BLAKE2B 6b9bb437f86e368635471fab3f2ef68002de1d207f346d82ef2176282dd7378f24650bf650077b72dfca699b52550552e7c43d8deca26b101e06bcdba628f699 SHA512 fc71636cae074b1cc0a2a03f615639df55d58b765b76781bf010ebb253160bab5cc446339030377c74458335665a99f2fcf58183c71c744b8a379889d10c4959
+EBUILD phonon-vlc-0.11.1.ebuild 709 BLAKE2B bf668e8d74709027bded7a2496db9393ea36880ad3fbcfde22d5232209d1900d915df7390d1c5235b4c2023d8ed0a4dc2c990e9c01f5cc60d0916c4fbdbde7be SHA512 03cf7b3953d003960eb2c8d44563f03c710d77f4235f73b516af9b9f625c774bae85b7c4fb0b56e80597d07236066b32d124a78db69e580a169c37adf641c226
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-qt-5.11.patch b/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-qt-5.11.patch
deleted file mode 100644
index b87a1e175777..000000000000
--- a/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-qt-5.11.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From d053719a405ceaea58bffc2f08580875322e4158 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 13 Apr 2018 23:16:52 +0200
-Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
-
-Also replace automoc4_add_library with add_library.
----
- src/CMakeLists.txt | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 47427b2..f91975e 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -80,8 +80,12 @@ if(APPLE)
-         video/mac/vlcmacwidget.mm)
- endif(APPLE)
- 
--automoc4_add_library(phonon_vlc MODULE ${phonon_vlc_SRCS})
--qt5_use_modules(phonon_vlc Core Widgets)
-+add_library(phonon_vlc MODULE ${phonon_vlc_SRCS})
-+if(PHONON_BUILD_PHONON4QT5)
-+    target_link_libraries(phonon_vlc Qt5::Core Qt5::Widgets)
-+else()
-+    target_link_libraries(phonon_vlc ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-+endif()
- 
- set_target_properties(phonon_vlc PROPERTIES
-     PREFIX ""
--- 
-2.17.0
-
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild
deleted file mode 100644
index 9480384f2a52..000000000000
--- a/media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="phonon-backend-vlc"
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-else
-	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
-	inherit git-r3
-fi
-
-inherit cmake-utils
-
-DESCRIPTION="Phonon VLC backend"
-HOMEPAGE="https://phonon.kde.org/"
-
-LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-IUSE="debug"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	>=media-libs/phonon-4.10.0
-	media-video/vlc:=[dbus,ogg,vorbis]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/${PN}-0.10.1-qt-5.11.patch" )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_configure() {
-	local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
-	cmake-utils_src_configure
-}
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.11.1.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.11.1.ebuild
index 58b0b5b22056..e186b6bba7d7 100644
--- a/media-libs/phonon-vlc/phonon-vlc-0.11.1.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-0.11.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://phonon.kde.org/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index 2455c83354c5..a487f31e9f74 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,5 +1,3 @@
-DIST phonon-4.10.2.tar.xz 322176 BLAKE2B a73fa78e732ba56745e0791559a1ab195e9a5d867d368935ebc779cc1705a405dfd8302f6b5d92678098da8b6fdb52ec4cc2d553c361c3fefc738d502e3c38b6 SHA512 205c2f41691ed37a2b24aa5e900f7720ba024d2046ea4bf0a9b9c46235ffd72dfb4010287ccf753b13e395f84c2a202cbb76454806de3519faf52c3ac7001c4e
 DIST phonon-4.11.1.tar.xz 314732 BLAKE2B 9be341f8df643b352392a208c7f24d799edcc94146b71c73d93974a7ef02cc75b5baa1e2ddd037e7e2d3afeb52347d96caaa8b3a2319631802261735a3a751df SHA512 858b2b0d7b0336af76d226b30f3acd1914e7297e0879d5a417fa1b87b13c812f9aab7e20adcad33ce1a03624ce78323dd9968b4b277caf85f800ca60aa134f74
-EBUILD phonon-4.10.2.ebuild 1311 BLAKE2B f9b4f8cca3197c50af85aa3c38be8cf8e85850d25a576685db9d387c1658cce58a59d0c9b9dfd03897189c99e129ada3e5e70ba5a9458c3a7e30d17c9b1020c4 SHA512 5f0ed443fb5678c60cea87ad5322451e39207558612054e34d9b0cf77275b7c8ddf55f75eec22bedda8d875dc2e6032970ed441634d00cdae95ce02f6ba0ed91
-EBUILD phonon-4.11.1.ebuild 1263 BLAKE2B 9505aa4e350f4c5813c30a8a9dd0ece1a25148ad1ffb9e610fe759217e9c0a1be4847fa7cbcd8406ca1caea280153437c3259338353586fe770c88644a48db3e SHA512 a7c0eac64e4b88829d72227379ff3ca1eb5f23af8830554a7011a9e5f6bb4cf7d3f63e4ed163ae6943ffd60943e1be793b16472fb65510390f3b92317aa29d03
+EBUILD phonon-4.11.1-r1.ebuild 1220 BLAKE2B bd2abaf505c48db7be2f0be7713dd866f227ea5a94fd5991b93f3eb6c070aa2c6b51e335636f9ae013a53df8326286127ddd353b408c521dce2eab8bf10ed1c2 SHA512 3e649d8dd4f6f078ed166abf6b2bbabd4c24d790cb257f0f43c2f00e57d7192a4577a47196a2ccd113694ce691e7eab33e60744a2e7c30d214a2267583b8becf
 MISC metadata.xml 394 BLAKE2B e551fa12fcce92bd237d1cdb3fcbd496768e012004ace1e08a89f1e0e5f5c997d5b9d1488afce03925337d28a9c431994ce23244ffcb46f7138cde951dc26662 SHA512 963308198d2057bc2869eb21b644c59211f3c4bb04a46de3cca04dc85cdcf67b113555870149b971c8c43a0c64fb88cd141ccf20740f6428d1573485844574a6
diff --git a/media-libs/phonon/phonon-4.10.2.ebuild b/media-libs/phonon/phonon-4.10.2.ebuild
deleted file mode 100644
index 1899bbdc0c79..000000000000
--- a/media-libs/phonon/phonon-4.10.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-else
-	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
-	inherit git-r3
-fi
-
-inherit cmake-utils qmake-utils
-
-DESCRIPTION="KDE multimedia API"
-HOMEPAGE="https://phonon.kde.org/"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-IUSE="debug designer gstreamer pulseaudio +vlc"
-
-RDEPEND="
-	!!dev-qt/qtphonon:4
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	designer? ( dev-qt/designer:5 )
-	pulseaudio? (
-		dev-libs/glib:2
-		>=media-sound/pulseaudio-0.9.21[glib]
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	kde-frameworks/extra-cmake-modules:5
-	virtual/pkgconfig
-"
-PDEPEND="
-	gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt5(+)] )
-	vlc? ( >=media-libs/phonon-vlc-0.9.0[qt5(+)] )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DPHONON_BUILD_PHONON4QT5=ON
-		-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
-		-DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON
-		-DWITH_GLIB2=$(usex pulseaudio)
-		-DWITH_PulseAudio=$(usex pulseaudio)
-		-DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)"/qmake
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-libs/phonon/phonon-4.11.1.ebuild b/media-libs/phonon/phonon-4.11.1-r1.ebuild
index 0ebc2ce06621..1f8000e23411 100644
--- a/media-libs/phonon/phonon-4.11.1.ebuild
+++ b/media-libs/phonon/phonon-4.11.1-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://phonon.kde.org/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 fi
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 ) !pulseaudio? ( || ( GPL-2 GPL-3 ) )"
@@ -41,14 +41,13 @@ src_configure() {
 		-DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)
 		-DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=$(usex !pulseaudio)
 		-DCMAKE_DISABLE_FIND_PACKAGE_PulseAudio=$(usex !pulseaudio)
-		-DPHONON_BUILD_SETTINGS=$(usex !pulseaudio)
+		-DPHONON_BUILD_SETTINGS=ON
 	)
 	ecm_src_configure
 }
 
 src_install() {
 	ecm_src_install
-	use pulseaudio || \
-		make_desktop_entry "${PN}settings" \
-			"Phonon Audio and Video" preferences-desktop-sound
+	make_desktop_entry "${PN}settings" \
+		"Phonon Audio and Video" preferences-desktop-sound
 }
diff --git a/media-libs/qhull/Manifest b/media-libs/qhull/Manifest
index 488a1ade2d09..9831b093417a 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 1026 BLAKE2B c096a92af8a7b44c5bdf7f994c304f5508c32b75e29f3b82e408e8e554c7b85ab28fd3ea83142e1d47b2636138d9dec678163824145f12394c68784289c2b7d4 SHA512 0b3b46e7d7dec6c7ebde18a155586f1c7b62ea875841bc371c34af9d4a6f5551f41b78b282aac7c7e4fe66309c43909c89982abc839dbc670aa8d1d72ff944d7
+EBUILD qhull-2015.2.ebuild 1022 BLAKE2B 29f417a5154e7d2b785e2b7462cc536a1bb0be920d6dd96b3f1e4cb2403b38261c6e4cfae36118b5ac239d0bf6e862b64d68f751b0d578a050f87b8478b3fa4a SHA512 8e2e24ba4e043a9c48ec602a2c567e517248133ade0e18dcb05a2da60b0f1355875944644d2640bb182a7fc2b7dfd85e16b031eafe06c842b1c76ea4dda1c658
 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 c63282d1cc21..cdcf4f62489e 100644
--- a/media-libs/qhull/qhull-2015.2.ebuild
+++ b/media-libs/qhull/qhull-2015.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}/download/${PN}-2015-src-7.2.0.tgz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs"
 
 DOCS=( Announce.txt File_id.diz README.txt REGISTER.txt )
diff --git a/media-libs/quvi/Manifest b/media-libs/quvi/Manifest
index 91cb7302b4d9..b2a7c40e33e2 100644
--- a/media-libs/quvi/Manifest
+++ b/media-libs/quvi/Manifest
@@ -1,10 +1,4 @@
 AUX quvi-0.9.1-automagic.patch 1586 BLAKE2B 59ed8c56bdcf3eb2b96a485be50396b8ca6d6432a402929bf877e2c932e35276bf452f8f453d1a00a3d051fda075b49e0138ced9cf8dde5c63ee53d50ac0434a SHA512 cc13530109553c4ebe652faa74e29ce159ef807eb24000b472434e1d3307b677cfbc5db20851041ab6cc4d024db84cd2a1a6ee91f9787880588fc692aafecc52
-DIST quvi-0.2.19.tar.xz 363120 BLAKE2B c1ae1fbfabe6e1cc63bc7518fe1100cb1481b77aa8e3f07f6673a840b281c7224d14d759821bc87e5b78552d3274ba284f9202e7459799a9bbdef650ccc3f4ae SHA512 a013f3ffcbb8a970148e7a2a40c6994600c6430f10f604df57884205f25cb1dbb56608d5a48b4b8b1c280230cef4c35db89fbb7678834fefee524e9ee4146ffb
-DIST quvi-0.4.2.tar.xz 118756 BLAKE2B 4b00ef7ba8cc784177070c2146a42a827ec78ce08f3bdb7422ea18dc074d92410d0d6350acf03246648aea1c8e4253a20ba9fbd998e6023657474c60f79a01bc SHA512 a0cd26711123bd61e91534e510dd96fe290eb19eacaabe52c36b0064dee1ce410e80eddbe5995392e3769ae3c602b93b5132507a2d43d765e2b98e8488ea8f86
-DIST quvi-0.9.4.tar.xz 315768 BLAKE2B 307fb6f45567f1fd5ab15cc0b110eda06404c8a165d93063bdeeac33c39a7fce631e8b73934d6b14d1cdd5488e6101ea2688f7a1ec70044005d3e69bf482ae63 SHA512 fcec2a95de1a93734803177b515f0578a0722950d145ac8a37c48864281152005190bb9c9a76473b94df9b74ca80a58363435e196106b15093f484e6d4a1316d
 DIST quvi-0.9.5.tar.xz 316676 BLAKE2B f9d8aa9ffd1cc70b17c4ce77648bc46f178b5eb0faa238636bb702701d8a1f249fb3a56a0fa0f5840efcd53532609bdcc0010fd90163f4619746a196ab269267 SHA512 ef50160b7f2b6b8c9049eb995cb26da3100b10e7af8206d98d2e128cde300ceb05a24dded06d7d49c0e691fcc2de5a4c5c9e9f439d40ca52cd0a3a24330c6d79
-EBUILD quvi-0.2.19.ebuild 803 BLAKE2B f9a8b2aaab2a3bdc5d5e96bf8d3377311ce4a112d6674e5c1a803c316d0c5fd6ae2595950ff3a7eba55ba2229ed81099ba15c50d679ebb5a564cdccdec7f430e SHA512 befc7d4d598d418ba904a04735c7d8ee1af0ea89ee80ed714f9fb106f157bb3393cb3e5550e487674c3cdcd4545b05012119a8c7b6eb9acff2ea4e78760e1feb
-EBUILD quvi-0.4.2.ebuild 519 BLAKE2B cbc7978c65ad69480db2e3c7e9661825977ccc8f412b61323e1cd0ccb1fed840457d67c2e1ce94442b5663545ad982108ea62b0790ddd74a1b483e6ae509732b SHA512 155095ea23816d46945b2931111ee6d8ebcf4e615b9207a9e0eb6fa50b5bc31f401e8833b8443c340e7bffdca18789c6a465e7a0fa2232b6208bc0acee3c45e0
-EBUILD quvi-0.9.4.ebuild 862 BLAKE2B 408c9555ced18d363eb441bc74f6200d3ae46e352cdc7cc224ec241c69172ae66b897a2791734b5cbcb8a1001c27dd6c5922c65b6bcbff9f07b8a003ac2fdeef SHA512 f1edcc22e4b455468803bef27261d18d1f51739d2b0f7224090b83630aeb33042e539e078ffbe68543013d326169c9bc3a0d53c9ea0fe524eebdaabbacf8ad2c
-EBUILD quvi-0.9.5.ebuild 872 BLAKE2B 5c38283f277af0af760b0d0d68e2c0ed501e5575f3f0f04f0ea552b3a8fda5a58b49b68d4012fbb01022c61656acdbd8c48606e3e847518bef4f1f789a6b3a5e SHA512 76dfe4b1f86b8be4c1327df96f6e4204031547bff0308850b11802aaf5a6f34ddd3767ccf94eac97c0dd4bc4a9cdcbdf183f5529dd028923a0e8d6fee3fa40bd
+EBUILD quvi-0.9.5.ebuild 822 BLAKE2B ccb1f9ef1382a07b97c1bdba298ac3437417e2064dca1ada714ce9835be9a4a3eecd13a6fa1b141c848b32c755df7050c40a642b12352c0914680c217eeda598 SHA512 89de8474a819a8592f8a4fb3cf3fb79d9d15e0d7f6367ac4cafc7f2054eefe096b32bf108dcc836b27a648f7ee78c3db1a5388c91083be119e1553769fd5a900
 MISC metadata.xml 406 BLAKE2B de0ee5d493972dd342457e1e5ba80e373188ce6157b0d88b543164088964032c3e8ff65e4283afb192ed0cb3cb831faf24e56b88aa028c7a20eb4e4bbb3b28f5 SHA512 ce7e3fcd2383246bb40af7fe0b95dbb888d9ee10f1bae6d3edf7f612eb07baa8093777bedd271e3f7c629ddfb255fd407a658555ecb32bf5fe8dde02ebd6f1f4
diff --git a/media-libs/quvi/quvi-0.2.19.ebuild b/media-libs/quvi/quvi-0.2.19.ebuild
deleted file mode 100644
index e1ad2513f8c7..000000000000
--- a/media-libs/quvi/quvi-0.2.19.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="library for parsing video download links"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="examples test offensive static-libs"
-
-RDEPEND=">=net-misc/curl-7.18.0
-	dev-lang/lua[deprecated]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-# tests fetch data from live websites, so it's rather normal that they
-# will fail
-RESTRICT="test"
-
-src_configure() {
-	econf \
-		$(use_enable offensive nsfw) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.{c,h}
-	fi
-
-	find "${D}" -name '*.la' -delete
-}
diff --git a/media-libs/quvi/quvi-0.4.2.ebuild b/media-libs/quvi/quvi-0.4.2.ebuild
deleted file mode 100644
index e25009604857..000000000000
--- a/media-libs/quvi/quvi-0.4.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="A command line tool for parsing video download links"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=net-misc/curl-7.18.2
-	>=media-libs/libquvi-0.4.0"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--with-manual
-}
diff --git a/media-libs/quvi/quvi-0.9.4.ebuild b/media-libs/quvi/quvi-0.9.4.ebuild
deleted file mode 100644
index 37b11ccaf8fa..000000000000
--- a/media-libs/quvi/quvi-0.9.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils
-
-DESCRIPTION="A command line tool for parsing video download links"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="json nls xml"
-
-RDEPEND=">=dev-libs/glib-2.24:2
-	>=net-misc/curl-7.21.0
-	>=media-libs/libquvi-0.9.2:=
-	json? ( >=dev-libs/json-glib-0.12 )
-	nls? ( virtual/libintl )
-	xml? ( >=dev-libs/libxml2-2.7.8:2 )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.9.1-automagic.patch )
-
-src_configure() {
-	local myeconfargs=(
-		--with-manual
-		$(use_enable json)
-		$(use_enable xml)
-	)
-	autotools-utils_src_configure
-}
diff --git a/media-libs/quvi/quvi-0.9.5.ebuild b/media-libs/quvi/quvi-0.9.5.ebuild
index bed5ac447b8b..a5e505fb63dd 100644
--- a/media-libs/quvi/quvi-0.9.5.ebuild
+++ b/media-libs/quvi/quvi-0.9.5.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-AUTOTOOLS_AUTORECONF=1
+EAPI=7
 
-inherit autotools-utils
+inherit autotools
 
 DESCRIPTION="A command line tool for parsing video download links"
 HOMEPAGE="http://quvi.sourceforge.net/"
@@ -12,27 +11,32 @@ SRC_URI="mirror://sourceforge/${PN}/${PV:0:3}/${P}.tar.xz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc64 x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 IUSE="json nls xml"
 
-RDEPEND=">=dev-libs/glib-2.24:2
-	>=net-misc/curl-7.21.0
-	>=media-libs/libquvi-0.9.2:=
-	json? ( >=dev-libs/json-glib-0.12 )
+RDEPEND="
+	dev-libs/glib:2
+	net-misc/curl:=
+	media-libs/libquvi:=
+	json? ( dev-libs/json-glib:= )
 	nls? ( virtual/libintl )
-	xml? ( >=dev-libs/libxml2-2.7.8:2 )"
-DEPEND="${RDEPEND}
+	xml? ( dev-libs/libxml2:2= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-arch/xz-utils
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
 PATCHES=( "${FILESDIR}"/${PN}-0.9.1-automagic.patch )
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
-	local myeconfargs=(
-		--with-manual
-		$(use_enable json)
+	econf \
+		--with-manual \
+		$(use_enable json) \
 		$(use_enable xml)
-	)
-	autotools-utils_src_configure
 }
diff --git a/media-libs/raul/Manifest b/media-libs/raul/Manifest
index 9c3b742cc453..c36a2514c7b2 100644
--- a/media-libs/raul/Manifest
+++ b/media-libs/raul/Manifest
@@ -1,5 +1,5 @@
 AUX ldconfig2.patch 366 BLAKE2B 03262a8edcbc1a597fa2472c8b140755c80d00abd9418e55ff844b569d61efd101b3a0ec2118a9383b383a44081eca9e51ef2685a9adef341d3350eb6022fb14 SHA512 008c6699afadc123139e66736588f83612a9d301870726178782a58807951f2231891e4968ce83d6eb72f38388e2e8df78deec25a352d754a801b63b2541775e
 AUX raul-0.8.0-gcc47.patch 1466 BLAKE2B b0952da4adaac185e4517944d51861040dd957263f9a0c69d5a3920d82bd4df7075baad920e62e011f586cae3289452bd079b4ef5ca419d66881534bcff321b9 SHA512 6056c680136bade273cf5b061591556b6f1e6d0045b6afc6b3f950e9a37def4a22356d45dccea52a29bd6b9c455744ac60ba51cccabb5965fdc31c67452344b7
 DIST raul-0.8.0.tar.bz2 155450 BLAKE2B 9347e0b3505452ebdcfef89a25ab2b134f9c65d0c3ed0d1c456c309fa073cf81f1f1f901d7e2728f08d481fdefec26e57227923a75946e7b35d4c902c2fe8832 SHA512 7ad48c551945aad104309448bcdb86a4a2ca07c44af53b37492e7cddce6a093529f1e1e75c4b27cb8e292ec46424969cdea270883d44b2f1badc48df8943a0a1
-EBUILD raul-0.8.0-r1.ebuild 1205 BLAKE2B b9faf056bd92e7fc9901d44c6b9f52a4d6f2e934d181c6b5957556157e3090b4c37bdf7c13fa130d7951833d6007d0d7b313bcac906a9c1ea30869511d96f2a4 SHA512 4f450353f9fbb5d6a97b18f1668d580a23b17057e41807f3f14fbfc42ab25b7b11731323935ff2cc5a2ed28082cf1dc4b5764f3aada23ea00f645f8b49767d4c
+EBUILD raul-0.8.0-r1.ebuild 1229 BLAKE2B 0ff9c3829663d8380d7988a5339bd0e49e6be80aaa2eea8d6f368aeac833f98b911f1ad3b13975f287903b2594a4d871673efb084b1c00056b7a06ed1d8886ea SHA512 a3270389b41eaf2b514bf945b324f43586d5548bab6728b780c55bfcdd8efa5fac758a63de1ad705a279d2261c7ca8bce4a6e2385ff8091f2bb2b1454f499176
 MISC metadata.xml 415 BLAKE2B 602cc66e3d57378c7e2b62d3104dfc85e1d058832f93008d2f1e93a43421f1598a93cd82b5a636f143e0c3ef9e555c2340abc9d43e8a04e8242a6e77f506555d SHA512 88de311ef1dc5590377c173508b1ad36346f9c69d518e8705c89af8cb3642fd9f838038489fe6f0a429370417db013b3df5f89e97ba9a67ff1f34df0ac4b359d
diff --git a/media-libs/raul/raul-0.8.0-r1.ebuild b/media-libs/raul/raul-0.8.0-r1.ebuild
index 6677b4b654cd..9989f107c4ff 100644
--- a/media-libs/raul/raul-0.8.0-r1.ebuild
+++ b/media-libs/raul/raul-0.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,6 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="debug doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/boost
 	>=dev-libs/glib-2.14.0"
diff --git a/media-libs/rlottie/Manifest b/media-libs/rlottie/Manifest
index 92cf74e6608e..94a57457553c 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_pre20191101.tar.gz 7896379 BLAKE2B 2361415074af71340c80b91595edab0b53e85ce704400ba5574e1efc19e6bc2cd7dff8b0e2d32b9f0666889c4d8bd2abbffa943f551b4ee3e4787aa94cfbbe01 SHA512 c4c4dae0f0da4d0bd4b3ea63066335794111f1bd4a33f8844494b9b9e79de46cd994b5e9d185b175cba19d1665ef1fdb0d89babfd71cf7dd0fbf0535ba83ab96
-EBUILD rlottie-0.0.1_pre20191101.ebuild 899 BLAKE2B 2a1c3304841d9df0b47a5c384294a1d29d7558b552133558f1558e31071536b24c7da01097885f8815030af7043261ac6a78a7e3004a11af52edfbe6838e2dea SHA512 b9f3e3731a5c2f1df4b9a00d9fea4b6a2c6abff1bc259e1fb6067d13de6053e419e9852f73d9b016daa4eddeb58ee766daed02c55334c02c41ccdd979c98a9a9
+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
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/media-libs/rlottie/rlottie-0.0.1_pre20191101.ebuild b/media-libs/rlottie/rlottie-0.0.1_pre20191214.ebuild
index 37f6c9638e02..df2d12389f47 100644
--- a/media-libs/rlottie/rlottie-0.0.1_pre20191101.ebuild
+++ b/media-libs/rlottie/rlottie-0.0.1_pre20191214.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit meson
 
-MY_COMMIT="ddf0f149aaee7625f8cde1ae15f0605e57274445"
+MY_COMMIT="87f485e2247925ceaead99c4bca997e4c44e3a20"
 
 DESCRIPTION="A platform independent standalone library that plays Lottie Animations"
 HOMEPAGE="https://www.tizen.org/ https://github.com/Samsung/rlottie"
diff --git a/media-libs/sdl2-net/Manifest b/media-libs/sdl2-net/Manifest
index 279d64f561a7..a7352e38544e 100644
--- a/media-libs/sdl2-net/Manifest
+++ b/media-libs/sdl2-net/Manifest
@@ -1,3 +1,3 @@
 DIST SDL2_net-2.0.1.tar.gz 347436 BLAKE2B 9c7bb46cf97581f75543b9e2695e4ce87b78c66dada3ac1a3ddf7b8e6eeaf2540532aece3e7a6dc7f6dfcfd3ecf5148d5bfb9a84bc2775e57f68b3adf32e5828 SHA512 d27faee3cddc3592dae38947e6c1df0cbaa95f82fde9c87db6d11f6312d868cea74f6830ad07ceeb3d0d75e9424cebf39e54fddf9a1147e8d9e664609de92b7a
-EBUILD sdl2-net-2.0.1.ebuild 782 BLAKE2B e7367faa53a3edbefa06c759e267e55d3e4a7ae1714347119b42992522a7f13b5903a736955e2bb3a47dc983ada000d1263c093fb3183b4f538b8a73289f215c SHA512 325f62bc9ff04db9e67fa0f21f8b4109241cd7067caf9be9c2007d141059fa8fb9797533bed74142feb539bbda601cffd82b92838e160914578a6bce66956296
+EBUILD sdl2-net-2.0.1.ebuild 791 BLAKE2B ce286711b2b6a1054a69eb0b1276108c101a33a2d9c4060f23cd1cc234883be9ea9de3577570693dedec5fc620b046db7204660d2a062e17c0b1c1f2c48f11be SHA512 9e24bc4e6ef646cbc9c95f90ec1c8c40635ad9ae00eec72b94ddbb150c3281409b9415ff9a5cdf642d209c221ab537ef78740633cd21a0c83ad4d0729d7aef25
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/media-libs/sdl2-net/sdl2-net-2.0.1.ebuild b/media-libs/sdl2-net/sdl2-net-2.0.1.ebuild
index 5753833c2ecc..3b446b3060d9 100644
--- a/media-libs/sdl2-net/sdl2-net-2.0.1.ebuild
+++ b/media-libs/sdl2-net/sdl2-net-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_net/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="static-libs"
 
 RDEPEND=">=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-libs/skstream/Manifest b/media-libs/skstream/Manifest
index 5eb26af61b9b..2411f499a22c 100644
--- a/media-libs/skstream/Manifest
+++ b/media-libs/skstream/Manifest
@@ -1,4 +1,4 @@
 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 538 BLAKE2B ec5f0bfb5ed258d2da2f6a9d2643fd926981a00d2835f40eccf5cee9038849f8b5fa097cb48e14c346d9b62cf4c6150cdc256caef5f156c96692f72e6b5e9cb5 SHA512 9e2a05fbe8e3e0dc5a4d11b76e1069ac80cae6f2744ee78144187ff74ff54cc8d486a9e4deca51ed14261c3c04d57912004cb6714f7dc97b51f9716ba781551a
+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/skstream-0.3.9.ebuild b/media-libs/skstream/skstream-0.3.9.ebuild
index f4dc2d81af1a..37ecfd729421 100644
--- a/media-libs/skstream/skstream-0.3.9.ebuild
+++ b/media-libs/skstream/skstream-0.3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-util/cppunit )"
 RDEPEND=""
diff --git a/media-libs/slv2/Manifest b/media-libs/slv2/Manifest
index d3f1359cb6d7..1634b346a1d5 100644
--- a/media-libs/slv2/Manifest
+++ b/media-libs/slv2/Manifest
@@ -1,5 +1,7 @@
-AUX ldconfig.patch 441 BLAKE2B 2d09de5800627c4c7c725bad1dba0bd7422dc32e027afe5f6765aec262fed8d44215ded6fcabe53912a8c72024323f492574f0403176db5ec7952357fc0e2fa2 SHA512 0b42b212448ba01f92a324146d5a39dac20532dae9c5a5be1af8ddb10503e431eb8b1391bc091f0459706cc309cab92cd39ac00f94f0da7c6354b24cb35c6c7a
+AUX ldconfig.patch 407 BLAKE2B f88ea3421336605fc6f1221028fbf1ad98dd1cf1c5d893b68f872d74fab4e013614ddd487d8743eee73803997e05bcb1a61fccddd325e891f6a6add00960509f SHA512 7099cb8e13cb3b16a51df0e55f7bee64c961224aa5308117c32762aa1db5c6331abcd33936057633edf697204df0ccf6b66e50f495dff82a058bf2c54f725912
+AUX slv2-0.6.6-python3.patch 730 BLAKE2B d54f5e3c26d1ba23b7f60b48ac77a65bf0ef5f9d0576722cbdf5563449fa5fe03163958156d937e7c5466ecac494c7802fbfb852d01e5e520914232c8868d1f9 SHA512 1b478920e30ba4efa92a708a7643e9e797d8a2b94a18c180cd1a3d77e1af976be24a82202a63e853f21c017bb38bb87f79a97cb07dcda2a120a0d5bffbf4af7a
 AUX slv2-0.6.6-raptor2-link.patch 1127 BLAKE2B ed06ce40cc7da13cd02f114223e6bd5e9a06fd7308559dfd4d0273d48062211d2eefb3c72b861b54f993406131b314ecb7f80e2e6569e5df12e53c7f98020f56 SHA512 a906f820e7fb423636845ab3466060c5d6c180334f4701187c6dfcdde641836534faa4c896cb1f93f1ba1f1168b079bc4b1156f2a24c9fd37482e5c3a9eccf36
 DIST slv2-0.6.6.tar.bz2 170859 BLAKE2B 167ca7a1b1c27f54e8896874689a8a65c46ad9797d8090651c27f918fd42bc8a0ce83796ef521da1d69e52ca4ea8db5bf194381c888eade60969aeec0d787f83 SHA512 b9751b944e4a4d9639fcbfe73cdb31bc4d7f1256c0b1b75f9ab58f5f951767d12a4dd6bb8fc95743de9f6787c663e6815c3e41c025299a4228325d0568b08359
-EBUILD slv2-0.6.6-r2.ebuild 957 BLAKE2B 021d3948a5018dfd0fe7f5571329497b96fa164431576b57308f19340283d7258e1d0d43946c6a5b970117cdd2aa73f959c3a4fffd2f07c8c7a17abf55d90bfd SHA512 c9217995e51db02e5d0befc54611c95fe09e51c09f07f1623f8382a729a7df5d65ebd7e1903d8fe4049aab7b8d95b03e8112efc3ad9e9e0e192905533dff54cb
+EBUILD slv2-0.6.6-r2.ebuild 1059 BLAKE2B c8aaff2051c924512f081e8bd967773c66205ca6a80711f6afdc4631c285ca197587babe86df266c910e4f491fe432fa07a78f411aadffe6b0bc632d84ad413a SHA512 b5b166238dd2d03662f03a9a634e31e167b61fe80bfd46c7bc4bdc6287700c8d70788be54410136841b88563fbde127ba49e7d49b04225bf3efb0a6071bfc36a
+EBUILD slv2-0.6.6-r3.ebuild 1141 BLAKE2B 8a29f541f60d5f9c2f17b964fec34743b51f0808cb22afecf4200a12c9e3770d4e8e7ea79849ff8cb253abff3486642d857bdf7dabd5aa6257394c4c66598141 SHA512 61d48ba455c48f3471b3008bb2925791f4ae68b9e06a5fb77ed50efe97a87899b432be6349917ae06763fd5aa6fa690412d4ff02c72bb65d631d750ae89e8f5e
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/slv2/files/ldconfig.patch b/media-libs/slv2/files/ldconfig.patch
index f53ff9e7df59..ea0492bd1d3a 100644
--- a/media-libs/slv2/files/ldconfig.patch
+++ b/media-libs/slv2/files/ldconfig.patch
@@ -1,9 +1,9 @@
-Index: slv2-0.6.2/autowaf.py
-===================================================================
---- slv2-0.6.2.orig/autowaf.py
-+++ slv2-0.6.2/autowaf.py
-@@ -324,8 +324,5 @@ def build_dox(bld, name, version, srcdir
- 	out1.command_is_external = True
+diff --git a/autowaf.py b/autowaf.py
+index 4797ea3..f32f994 100644
+--- a/autowaf.py
++++ b/autowaf.py
+@@ -375,8 +375,5 @@ def build_version_files(header_path, source_path, domain, major, minor, micro):
+ 	return None
  
  def shutdown():
 -	# This isn't really correct (for packaging), but people asking is annoying
diff --git a/media-libs/slv2/files/slv2-0.6.6-python3.patch b/media-libs/slv2/files/slv2-0.6.6-python3.patch
new file mode 100644
index 000000000000..651c761d988c
--- /dev/null
+++ b/media-libs/slv2/files/slv2-0.6.6-python3.patch
@@ -0,0 +1,22 @@
+diff --git a/autowaf.py b/autowaf.py
+index 4797ea3..90db9be 100644
+--- a/autowaf.py
++++ b/autowaf.py
+@@ -354,7 +354,7 @@ def build_version_files(header_path, source_path, domain, major, minor, micro):
+ 		o.write(text)
+ 		o.close()
+ 	except IOError:
+-		print "Could not open", source_path, " for writing\n"
++		print("Could not open", source_path, " for writing\n")
+ 		sys.exit(-1)
+ 
+ 	text  = "#ifndef __" + domain + "_version_h__\n"
+@@ -369,7 +369,7 @@ def build_version_files(header_path, source_path, domain, major, minor, micro):
+ 		o.write(text)
+ 		o.close()
+ 	except IOError:
+-		print "Could not open", header_path, " for writing\n"
++		print("Could not open", header_path, " for writing\n")
+ 		sys.exit(-1)
+ 		
+ 	return None
diff --git a/media-libs/slv2/slv2-0.6.6-r2.ebuild b/media-libs/slv2/slv2-0.6.6-r2.ebuild
index a2d0bf16a6d1..39c9070abce8 100644
--- a/media-libs/slv2/slv2-0.6.6-r2.ebuild
+++ b/media-libs/slv2/slv2-0.6.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -27,6 +27,8 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	epatch "${FILESDIR}"/ldconfig.patch
 	epatch "${FILESDIR}"/${P}-raptor2-link.patch
+
+	 has_version ">=media-libs/lv2-1.16.0" && (sed -i "s/lv2core/lv2/" wscript || die "Failed to fix lv2")
 }
 
 src_configure() {
diff --git a/media-libs/slv2/slv2-0.6.6-r3.ebuild b/media-libs/slv2/slv2-0.6.6-r3.ebuild
new file mode 100644
index 000000000000..24cd431efebd
--- /dev/null
+++ b/media-libs/slv2/slv2-0.6.6-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+inherit eutils multilib python-any-r1 toolchain-funcs waf-utils
+
+DESCRIPTION="A library to make the use of LV2 plugins as simple as possible for applications"
+HOMEPAGE="http://wiki.drobilla.net/SLV2"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc jack"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+CDEPEND="
+	>=dev-libs/redland-1.0.6
+	jack? ( virtual/jack )
+	media-libs/lv2
+"
+RDEPEND="${CDEPEND}"
+DEPEND="
+	${CDEPEND}
+	${PYTHON_DEPS}
+"
+
+PATCHES=(
+	"${FILESDIR}"/ldconfig.patch
+	"${FILESDIR}"/${P}-raptor2-link.patch
+	"${FILESDIR}"/${P}-python3.patch
+)
+
+src_prepare() {
+	default
+	 has_version ">=media-libs/lv2-1.16.0" && (sed -i "s/lv2core/lv2/" wscript || die "Failed to fix lv2")
+}
+
+src_configure() {
+	waf-utils_src_configure \
+		--prefix=/usr \
+		--libdir=/usr/$(get_libdir) \
+		--htmldir=/usr/share/doc/${PF}/html \
+		$(use doc && echo --build-docs) \
+		$(use jack || echo --no-jack)
+}
diff --git a/media-libs/soxr/Manifest b/media-libs/soxr/Manifest
index d77d71bd49ab..2e6034faad84 100644
--- a/media-libs/soxr/Manifest
+++ b/media-libs/soxr/Manifest
@@ -1,5 +1,5 @@
 AUX soxr-0.1.1-nodoc.patch 480 BLAKE2B e7e31df74004b58e584964eed26acb18717faa912fa5eae84d03a62f40d2260e039595c33518ff6fdcf2c5db7fe0bc7f73680bc64418e387ff30f2488d0ebae1 SHA512 6c585eacc6919bfe6f158f1ab45fe5dd0b3a0b3f534ff5d2f5e07e3e8e505a7c7da3bb16d2d4b6dc2f0a361190bd21639f74ae09abd3e0209b33ae2174726017
 AUX soxr-0.1.3-fix-pkgconfig.patch 595 BLAKE2B f35e4c8ca382db0d05b9c50c3a02c568befc1dbf671fb503c610f2b4fa05dd7361d6b8184aeb4be050d224bc534e87ae760130e1e3ce1c36e6042ff4208411fe SHA512 45206a00747d387e4bec62edf93e9fa19b04096240f567773070b7c87667713ca7bcfea2e2df665f128b6b4d4c53fdb87571bdf018e2066ff6e6acf39870b762
 DIST soxr-0.1.3-Source.tar.xz 94384 BLAKE2B 5b7078f71404b9ef83917dcabc0c99cf17fd625d3e033d1b934382a7b60e55e359931a6ab53f8adaf955c0d811d6cbf231cd6a226549560b3506a3867e845607 SHA512 f4883ed298d5650399283238aac3dbe78d605b988246bea51fa343d4a8ce5ce97c6e143f6c3f50a3ff81795d9c19e7a07217c586d4020f6ced102aceac46aaa8
-EBUILD soxr-0.1.3-r1.ebuild 1072 BLAKE2B fc5ec6632e8562c68e13df59a93dd37693a12c79f111b1d2f532b49b0272c43e73b5385d16cf06e6c748e22959e79e106bb82dfacc5d2d3213f76097a3e95038 SHA512 291f6749edaa84654948e72f948af86070d39f3a57dfef84f3d7efdf7843698a1d088b2c40a3338eccd839f3977793655f8226079c848c732f676555555b0264
+EBUILD soxr-0.1.3-r1.ebuild 1099 BLAKE2B 5fb0c8bbb3fe6787c6dbbf6d458f88d0b80fdcee8375cd7b6d26444939fd380508f4eec1e7ca8bfd4e2ae2465be8c759336706aa335b995ded1f777c95ec7376 SHA512 7935f196810f0efa559c9f844703978aeeada7ce0128ef954696a4fe560cd182e0aa403a8632196d4a5ff04b97a7fe3da576d899031c868838f966179dd3366b
 MISC metadata.xml 337 BLAKE2B 9b011942361de08f2263ad43a16d18bc8940e539b045a4907ced6c93dce455450bd754bce933ad33591b001dab99c253c781b26ffc26f0972425f75837186f7b SHA512 7f028b48874ab0d30aadbf0370e3ef5b555785aa4e7ab1bd1755ec2cb5c33d3e99e83ed166d011a94773b3c50b0e5a5403b42ed6d9d0c51ff7f7f2ddf48d064e
diff --git a/media-libs/soxr/soxr-0.1.3-r1.ebuild b/media-libs/soxr/soxr-0.1.3-r1.ebuild
index d78d648f10af..7711f8f83af3 100644
--- a/media-libs/soxr/soxr-0.1.3-r1.ebuild
+++ b/media-libs/soxr/soxr-0.1.3-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-multilib
 
@@ -14,6 +14,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="examples test"
+RESTRICT="!test? ( test )"
 
 # CMakeLists.txt builds examples if either test or examples USE flag is enabled.
 REQUIRED_USE="test? ( examples )"
diff --git a/media-libs/sratom/Manifest b/media-libs/sratom/Manifest
index a47a3ace28ad..f0b04465bb2b 100644
--- a/media-libs/sratom/Manifest
+++ b/media-libs/sratom/Manifest
@@ -1,3 +1,3 @@
 DIST sratom-0.6.0.tar.bz2 149340 BLAKE2B c661e0c4fba0cdf6cfb8a7dba90ff92135422557a0721bc394c7500853aeb9370554df8a02b7faea2fa222b96db36b20b265cc1fa50e6e06655946dbe992f815 SHA512 899bb01896e2b65b69482041c7e06edc9e45e9a3466392c82a58f16dfc71462a6c3e3e16a5aa50a6347c8366ea72898468910a59a084762f75eb8c7031ceacf8
-EBUILD sratom-0.6.0-r1.ebuild 1211 BLAKE2B c7ac22383157bbcd5c5a0822eb34cc6a1e41fa89153d26e28e37e2e7134b34679c30409eda5cbb8956d04983fcde35f7d6a0bb600a9a2b0e7a30303cbdbd51d0 SHA512 dba6568ecb5c3fc3ccc6c10b12297e356cecca7028adfc003d6eb6abb2a1dc98baf4a334f4783ec3fea902fb026602e1751d4d055c0db52fa6a319587143ec80
+EBUILD sratom-0.6.0-r1.ebuild 1238 BLAKE2B f8e1e6bee9fc63df46598097b8beca466489cbebf50a424c2c8f42080150cfc2d2adda0315abf75ae8f82421cf865dbfdef2775fd2ae3cca9615e97281b0cc39 SHA512 573283d49db0f40d337f32b603d2c5d6889e796e58ad904be5392a0d69068077a23c0e21b3d0b5039d8a8acbde14ed30060dc2d97053648c1c2301ed83ae1146
 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 2e3ea8e2b561..2d1ccb39a811 100644
--- a/media-libs/sratom/sratom-0.6.0-r1.ebuild
+++ b/media-libs/sratom/sratom-0.6.0-r1.ebuild
@@ -15,6 +15,7 @@ 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.14.0-r1
 	>=dev-libs/serd-0.28.0-r1
diff --git a/media-libs/stimg/Manifest b/media-libs/stimg/Manifest
index 3e58351e953b..aaf0baede6f3 100644
--- a/media-libs/stimg/Manifest
+++ b/media-libs/stimg/Manifest
@@ -1,4 +1,4 @@
-AUX stimg-0.1.0-libpng15.patch 1445 BLAKE2B 69e11359652b1b075efa7a6a9d46decbecaa464f88b5cad7b2f23d43f3b1e825e9a017f107d1b0f80b735de5f5445b67d10aed92bc33f72ffb3a0e15c5aba03e SHA512 a615da45ba3579e92e246ead3784cba6802b4543c60528d7fbf7d660a7593e8083bab8d05a7c0f42fa4b0628c59c9cec5fc567a48f3c4627e05742e229f1fb94
+AUX stimg-0.1.0-libpng15.patch 1605 BLAKE2B ae89ad0ec25eb68dd8293aeba40bfa741bb4db06b98cba895cb286580fe382402f1d97cf8a6c59bb53016c5910d349a2eddca178ca6e178779f4c431cc297954 SHA512 16e6e34c059cc419808b42f0ff8d5414b92e8aafbba47ed42f51bb76eb6e0490247726cbb9a3171c285d1dd710090e96e631f3733f9b8be785b2d743b143cca4
 DIST stimg-0.1.0.tar.gz 187172 BLAKE2B 5e0a4d9874243bb1e1d3a092cc16cade427399de73cfb91fbf72e5bbd231d1e1ebaaccf4e0275dd5ec5a596ba35e7e6a124cd362c19759f88c2ea6c8363533ed SHA512 6a2b938e3fdac9bd079664a276e7091adc62fe60a386e5f575afe455e355e3639799171c0729131ee8d99c6b86776d64fecb3a85f15eb4ec5a4559e4cc1326a9
-EBUILD stimg-0.1.0.ebuild 731 BLAKE2B cf94329f2221488913362b853600619e9b2306c5301aa80b3a9178da20958be16b1d393a6f261caddc59652696d4af811f77cafe55ccc997eb8b4d419f534fa4 SHA512 9b7b00e5f4f49380747c66b8b1d264fde910abc85d92afb71e357640b40f16f258fd7ea633c2dd0216dba0a28fd362ecdc4372e1176a13c3af1aac97ae61ed93
+EBUILD stimg-0.1.0.ebuild 665 BLAKE2B c5abe082cc70769388845ae451859ffebf1c8e4f1e3fc9b7c52b09a66d8bdfc1300932121b9f76e03ee6ffe778edda39a9d10d7039c218c29c00e7e8a78149e5 SHA512 a5705001457f4e87bd19583df662b376a9a936ed0933d7d14626324c2d38f3aee64c2160b015827b7955b79e02f1cc9717fa6d40e6fa8eba6deec51fa782a1f3
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-libs/stimg/files/stimg-0.1.0-libpng15.patch b/media-libs/stimg/files/stimg-0.1.0-libpng15.patch
index 41ae138f1b1f..a1b48ac36e2c 100644
--- a/media-libs/stimg/files/stimg-0.1.0-libpng15.patch
+++ b/media-libs/stimg/files/stimg-0.1.0-libpng15.patch
@@ -1,6 +1,13 @@
---- src/png.c
-+++ src/png.c
-@@ -102,8 +102,8 @@
+--- a/src/png.c
++++ b/src/png.c
+@@ -1,5 +1,6 @@
+ /* $Id: png.c,v 1.1.1.1 2003/01/30 12:22:26 hito Exp $ */
+ #include <stdio.h>
++#include <string.h>
+ #include <png.h>
+ #include "stimg.h"
+ 
+@@ -102,8 +103,8 @@
  		0x00,
  		NULL);
  
@@ -11,7 +18,7 @@
  
     if (image == NULL) {
        png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
-@@ -112,18 +112,18 @@
+@@ -112,18 +113,18 @@
     }     
  
     row_pointers = png_get_rows(png_ptr, info_ptr);
diff --git a/media-libs/stimg/stimg-0.1.0.ebuild b/media-libs/stimg/stimg-0.1.0.ebuild
index 3a7be52b0efc..dba7db45095a 100644
--- a/media-libs/stimg/stimg-0.1.0.ebuild
+++ b/media-libs/stimg/stimg-0.1.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="Simple and tiny image loading library"
 HOMEPAGE="http://homepage3.nifty.com/slokar/fb/"
@@ -11,26 +12,23 @@ SRC_URI="http://homepage3.nifty.com/slokar/stimg/${P}.tar.gz"
 LICENSE="LGPL-2+ MIT-with-advertising"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc x86"
-IUSE="static-libs"
 
-RDEPEND="media-libs/libpng
-	media-libs/tiff
+RDEPEND="
+	media-libs/libpng:=
+	media-libs/tiff:=
 	virtual/jpeg"
 DEPEND="${RDEPEND}"
 
-DOCS=( AUTHORS )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libpng15.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-libpng15.patch )
 
 src_configure() {
 	tc-export CC
-	econf $(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -exec rm -f {} +
-	dodoc README.ja
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/suil/Manifest b/media-libs/suil/Manifest
index 0706e5375bde..7c86f0f71247 100644
--- a/media-libs/suil/Manifest
+++ b/media-libs/suil/Manifest
@@ -1,3 +1,5 @@
 DIST suil-0.10.0.tar.bz2 159059 BLAKE2B 1293d817df7e60cd89946c3f5b0e6689b0942284cc2f25a93bce830e9f43db1e93067d1a9e85cf201ab8bf580cafefe06c46cf100a855a590a58022f3036d3db SHA512 721b73d987c1712e82493386e5d71957002c8a713595fce4372f1a5eb306c64a559db1ca794cec96295f72e22a9c0e9193f9a68b7f5846f2db45ce16b253fbea
-EBUILD suil-0.10.0.ebuild 993 BLAKE2B 66f2c549bc66fa9282f8bacf7b7d9b8ee02fb946f41e521632edd35627404b370ba81d9751b7b00e6cf7d6073d74e991391348c7308ca83e0f3de6f5794d37e8 SHA512 400156652f1375ad336e98d5609323457df6df9a1faf6f9f087124c7d65435404e457685e535459460686b16222402e4893c0e2912f88b788c5e0db641f82f4f
+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
 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 d9474e5a7f3d..01f73203c66d 100644
--- a/media-libs/suil/suil-0.10.0.ebuild
+++ b/media-libs/suil/suil-0.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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
new file mode 100644
index 000000000000..ff3178b1579b
--- /dev/null
+++ b/media-libs/suil/suil-0.10.6.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit flag-o-matic python-any-r1 waf-utils
+
+DESCRIPTION="Lightweight C library for loading and wrapping LV2 plugin UIs"
+HOMEPAGE="http://drobilla.net/software/suil/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gtk qt5"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+"
+CDEPEND="
+	>=media-libs/lv2-1.16.0
+	gtk? ( x11-libs/gtk+:2 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+	)"
+RDEPEND="${CDEPEND}"
+DEPEND="
+	${CDEPEND}
+	${PYTHON_DEPS}
+"
+
+DOCS=( AUTHORS NEWS README.md )
+
+src_prepare() {
+	default
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+}
+
+src_configure() {
+	waf-utils_src_configure \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--no-qt4 \
+		$(usex gtk '' --no-gtk) \
+		$(usex qt5 '' --no-qt5) \
+		$(usex doc --docs '')
+}
diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest
index ba0ac898fc5b..97737fd3b645 100644
--- a/media-libs/taglib/Manifest
+++ b/media-libs/taglib/Manifest
@@ -1,8 +1,6 @@
 AUX taglib-1.11-install-examples.patch 371 BLAKE2B ee42b80e8c6093dbfc4c89c25bcb6bd25e2f5152c14743fa49c6c44a14f93a961f08a4d53337efe0800d98126a8aa58627a330e19386283cc16d8f20c9637262 SHA512 149ce1256ec557ee1e896b56e361f2fcf69633424f9b125666827eda610e84c35bf28e5c3fe5f38d4d87f1eacf977fc5b8b8c2d9c6634997bfe4e4bac122fc37
 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_p20181028.tar.gz 1299993 BLAKE2B d281873a87742ba417ea764bb01f9a4c5553a4624d2c257dd82bbb2f0b7e3103ab6ca253f78c0167908f449aac833873ca1cce6f24b1eb5f608131382833262a SHA512 e26439b65ab579455f79e87a94c33a98e17209b31a19b531e5964a2c0ded395c35067655e31ad22b6205149e2e920d7bd145993f064d3ad13e1de8a9f7e37256
 DIST taglib-1.11.1_p20190920.tar.gz 1290100 BLAKE2B 38f65450b5e7c33b14187ab461bfd18d77f93d1ecab5ccf0c898ca6e67fd05aebac09318d4e1cabf1fdbca38800332ef9d0d5d1317087e69672734d1dec1dfe2 SHA512 4f7ad2a0713d38e8885b10d08041abdfb6c669369edd16e8345d7d679c16c15f191ca378e6690e06347f29e0e9cadebcb95ba26dc583c1127c4531558df27173
-EBUILD taglib-1.11.1_p20181028.ebuild 1406 BLAKE2B 830c53acc2e2f09b53908c5d287a8cb1c7c0ea0d7e7a5c1cd1a63a7c25f6c45082194619ad251eac83adb27d9120612ba615352516b96b942e040f031db96ace SHA512 9c8432a4579e5b55a9b5a825bc6503e4b3cf43cecce312e34f00a8e0b0bd106ec46f6815f3f92126d56895eaa07325df23138546bec09759472f974af6426448
-EBUILD taglib-1.11.1_p20190920-r1.ebuild 1328 BLAKE2B 414d835a744cf0ec1d409b72e78a1859259ac2577b665cb5da0d2acd40d2ccc3ac27cfb667038e8043029495b783b8f56eb10d0854e92c2169be2f7a7d53d941 SHA512 3f2cdfb72e3d1c4e104e270c6ac923eb4bd11910b881438f60b457e20b6df4b8975d5dbcaee420e2fef5d7e15407c5cbb0e47143b8feb271c8c98fbd2dec461a
+EBUILD taglib-1.11.1_p20190920-r1.ebuild 1349 BLAKE2B 372e6d1cb55a390b161c8625c96396319975910a55fb006ea07979f905db6dc40ae5c77bd29f6a5134086cdb59e5647ee0d7aa6f8f6993264a9901c649caf3d0 SHA512 68a8f7c57864b84777fc2d728b255aefb1155eb030e7c80dae892e346c49352c64fa8ec6dca5372420004cfdf939a0426683a51810541dbad83f8083de0d7c1f
 MISC metadata.xml 327 BLAKE2B 3972cb6de796dc7ba0d48715a30f265c10bfebe2e192d634267ffa0dc2323283b16c38f9bd891dbd1b7c646929e41116a5924d426fb1df46e63f3a4b4f5920be SHA512 05909165d6fff2283a6d55d1c454d97541e4e5ac35a6997123f548b3a86d108231928a4136cea35a323c942a82d50072f66840347fd1b651d4c1f3a53928c721
diff --git a/media-libs/taglib/taglib-1.11.1_p20181028.ebuild b/media-libs/taglib/taglib-1.11.1_p20181028.ebuild
deleted file mode 100644
index 09fcc98658bc..000000000000
--- a/media-libs/taglib/taglib-1.11.1_p20181028.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT=5cb589a5b82c13ba8f0542e5e79629da7645cb3c
-inherit cmake-multilib flag-o-matic
-
-DESCRIPTION="A library for reading and editing audio meta data"
-HOMEPAGE="https://taglib.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1 MPL-1.1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-SLOT="0"
-IUSE="debug examples test"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? ( >=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}] )
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.11-install-examples.patch
-	"${FILESDIR}"/${P}-version-1.11.2.patch
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/taglib-config
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e "s/BUILD_TESTS AND NOT BUILD_SHARED_LIBS/BUILD_TESTS/" \
-		-i CMakeLists.txt \
-		-i ConfigureChecks.cmake || die
-
-	# bug 651744
-	append-cxxflags -std=c++11
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_TESTS=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_test() {
-	# ctest does not work
-	emake -C "${BUILD_DIR}" check
-}
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 0719d05784e0..5cac4484ce05 100644
--- a/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild
+++ b/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild
@@ -11,9 +11,10 @@ HOMEPAGE="https://taglib.github.io/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MPL-1.1"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 SLOT="0"
 IUSE="debug examples test"
+RESTRICT="!test? ( test )"
 
 BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 88c271c92b95..cd2d161ca39d 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -4,6 +4,6 @@ AUX tiff-4.0.10-CVE-2019-6128-pal2rgb-leak.patch 1427 BLAKE2B e2c392cd2bfe6f90dc
 AUX tiff-4.0.10-CVE-2019-7663-tiffcpIntegerOverflow.patch 1996 BLAKE2B 1e654cc81d66b050e17a1234016b103332dcfcf03f3d7670d35942efc56fbeff0d66d9b6cc71a059ff6602a7c7cef1a3644ae7ea4ca59e88e9004914bea1be32 SHA512 93d386c62d29715b7e84177c7caaba0a9e284f8b9c730db93cf8fbc76faab2e798c81aab20b1210f0342fa6651e56fcbd07655205957b06bf9236ed0903f00a4
 DIST tiff-4.0.10.tar.gz 2402867 BLAKE2B 0305453f22150c31d00d2de756736f58c49a288e19b2a66bdd01319ce4688742f6eab4009eaf1817125d41f53a23de17eb6265a3ebae458ec24f5dbb3d49764e SHA512 d213e5db09fd56b8977b187c5a756f60d6e3e998be172550c2892dbdb4b2a8e8c750202bc863fe27d0d1c577ab9de1710d15e9f6ed665aadbfd857525a81eea8
 DIST tiff-4.1.0.tar.gz 2421581 BLAKE2B 1f9b92d08dc95633bb005a635bbcecd8fa5e4f30c14f059b42aafbb4a52b4fb1b84b1e97cea33f3102f5808cb28f93bc8fcbae2b041c6227c97f90b4f9b8e631 SHA512 fd541dcb11e3d5afaa1ec2f073c9497099727a52f626b338ef87dc93ca2e23ca5f47634015a4beac616d4e8f05acf7b7cd5797fb218758cc2ad31b390491c5a6
-EBUILD tiff-4.0.10-r2.ebuild 2340 BLAKE2B f9a6c9987bb58960077e7e202041ca80b55cf11985e78bb5fec489d3c0554675ba7a5c62fc97d6ea2392e99e9d813340feca3f4b353f22411ce005b7599ec0eb SHA512 fc394130ab882c5a116fde976b1e9a7e35d79198574af18984039220d82c5b3de8d069a9f080d07b72f0efe4733fdaf4b1ddc08fe99fcc96ad0983dd2e18a374
-EBUILD tiff-4.1.0.ebuild 2094 BLAKE2B 826a21227785d78f57ceaf3bf1b5e6b31577aed0f5c268026051c6c8daeb079720f2f7cfce6a8b419d21719164b4d7be85c2a2a1659d7281b4cee740569be9a0 SHA512 dbbf33c981c01422b881cabf5277bae0d2f8b9943e640c729e1e12f89988c103e78dde215a3acc8a849cb0605474b528aa45f48dac08163d4a491f5cdab9e50d
+EBUILD tiff-4.0.10-r2.ebuild 2367 BLAKE2B 4bacfc5763a8129702ba3f24089f117a5549550f5908f14d08bbacd6360fd1295b50710019f6b3cd0f9c8d5825646edce6623cc8d8b5d3bf3ca8a6f9924a6d48 SHA512 bb4ef3e8022185c0faf619cf4bd29433d2a2bc597674006152db46aeb7fdf32d659c9637cd316055dd63e2fbccfd361b221e0f40f3af73341877e41e91aebbb6
+EBUILD tiff-4.1.0.ebuild 2090 BLAKE2B 975090be5d813498799d0b9745ab52cb2a90f795773f207fc0d214ef773918267d412a6fc394daa1c63b6a38fe5f8efa1c68260a7808c33188b53b510a8d8bf9 SHA512 8feee152330763e4567cd658341f3a150ca64aeac808879aa7a4a72689a6731fcd87dc18fc36227ae0e2e331e584c677a8972ca0ac92b714aaa6d2388a97f97b
 MISC metadata.xml 565 BLAKE2B 3d487835599974795ba6007439bf1d08756ab1c5dbe191509832b302f3199e4ffc05be64df3e26b4d4a1c11d1292c48cbb59ffa6e412831d16d7415e076f1062 SHA512 289043206dbb512c97e4bb703b32549ac4a77f40e212548b80ea865052b80fed9d4562f9fc94638fda54da9bc3e0c19ba303c027e66e7b75c772aeec91aebe6f
diff --git a/media-libs/tiff/tiff-4.0.10-r2.ebuild b/media-libs/tiff/tiff-4.0.10-r2.ebuild
index c2da1f35e406..62ed2cd031b9 100644
--- a/media-libs/tiff/tiff-4.0.10-r2.ebuild
+++ b/media-libs/tiff/tiff-4.0.10-r2.ebuild
@@ -13,6 +13,7 @@ LICENSE="libtiff"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] )
diff --git a/media-libs/tiff/tiff-4.1.0.ebuild b/media-libs/tiff/tiff-4.1.0.ebuild
index 0c0ca3bc33e0..e3faea1531fb 100644
--- a/media-libs/tiff/tiff-4.1.0.ebuild
+++ b/media-libs/tiff/tiff-4.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/libtiff/${P}.tar.gz"
 
 LICENSE="libtiff"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/vidstab/Manifest b/media-libs/vidstab/Manifest
index 4d6c64e444c0..e45022e9bfa9 100644
--- a/media-libs/vidstab/Manifest
+++ b/media-libs/vidstab/Manifest
@@ -2,7 +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-r1.ebuild 1768 BLAKE2B 862e5546b1fba5af977cecbe54590ff125274f244e4ecd0aeb161151653ba9fcc40903e19304f6808e1dfd1e90226497088423081a976c7bb19379866b309d6e SHA512 47ff47ce9945610f2cac2b5bfad15415133bcfa30b5f09bde8934efb27217892d21fcf13949e0d2bd5040d7de906122a62293eb840b3a2e4aa32c9482bdd583c
-EBUILD vidstab-1.1.0.ebuild 1411 BLAKE2B ed2ee8eeee6a37a3a4ec92aabffa867dfcaee7a55fb9ca9ac3bbdf1d8d199aa8015459e0d1a84ed3e7898d1c3a6ae8189708883d77cedfb9e8088d40cf7463b3 SHA512 da075da882878bfe41f8e156ce1268b87d681d32c15aea74a454727557c6e5985b0974978d1d04e0b473dfd3fe1f035a4413fab4ce4c21bcae9809328701b671
-EBUILD vidstab-9999.ebuild 1487 BLAKE2B 48a7211ee43e3f96a97e9dcf23e9781bebeb5da7f70b814d303d9a3effb053569857530edd326c977915ac13fa5697bbca59b6256b94837cd8e1b24aeda3065b SHA512 d1124e1c93b4d50e60a7b65b6046787baa15c3ff3a37dbe5ff06b4a67a0012ead3f9a709de6ebc370582d45bca6d1f45f51811f1bd627219f65a7030175748fb
+EBUILD vidstab-1.1.0-r2.ebuild 1768 BLAKE2B f126fb8c0bfe63e3deb83d6a956e94a1b2b8dd20523af1e13d26abdc56245dd889e02b9cdac69d2a71241c575ace678c00fc7427742674bc389867e84f138f94 SHA512 7e7b96d5e7852b08ebfafa761d20deb9d4889f58e68f5ff355085a9a495c17c479f17c8a2ef9a19561dbd3d8b3d7b5b76e78b26e3b56291d33f333486a53ea82
+EBUILD vidstab-9999.ebuild 1528 BLAKE2B 384143417b094da0cbb1299f6789ef890f81fa1efa0b13ab314e8831360b19312b28c92bb49efd97450260f42a9499e7c1533d586e762eac0c99654c1206cb97 SHA512 f72ca678d3999a9f2a0d194383529a08526d22dee764ac95097d0e57f7808d172d1da2e825842cd8c73b4504c097721aa47846a308fa124bb834ec4768c5be53
 MISC metadata.xml 584 BLAKE2B dfcfa874a9ee0f9cbc884646e9ca898a3caa58eeb17b55459c9e591144d124c2e476f65c88e6994a183204e555ead73d9411bc4e663af307a17e967f5f8b7316 SHA512 48868512f6f5ad2c60e7ef6b092682f73df8540c785bef65f75a2777978612d449d83bcdf350887f4da9c9069c3ff13b25050180c5de9698d7a269c232fb1bfb
diff --git a/media-libs/vidstab/vidstab-1.1.0-r1.ebuild b/media-libs/vidstab/vidstab-1.1.0-r2.ebuild
index 229007a4aa8d..7f3c294a36f2 100644
--- a/media-libs/vidstab/vidstab-1.1.0-r1.ebuild
+++ b/media-libs/vidstab/vidstab-1.1.0-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2018-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 
diff --git a/media-libs/vidstab/vidstab-1.1.0.ebuild b/media-libs/vidstab/vidstab-1.1.0.ebuild
deleted file mode 100644
index 71caeda13785..000000000000
--- a/media-libs/vidstab/vidstab-1.1.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2018-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils toolchain-funcs
-
-DESCRIPTION="Video stabilization library"
-HOMEPAGE="http://public.hronopik.de/vid.stab/"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/georgmartius/vid.stab.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/georgmartius/vid.stab/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/vid.stab-${PV}"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="openmp cpu_flags_x86_sse2"
-PATCHES=(
-	"${FILESDIR}/vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch"
-)
-src_prepare() {
-	# USE=cpu_flags_x86_sse2 instead
-	sed -E 's#include (FindSSE)##' -i CMakeLists.txt
-	# strip some CFLAGS
-	for FILE_TO_PATCH in {,transcode/,tests/}CMakeLists.txt; do
-		sed -E 's#(add_definitions.* )-g #\1#' -i ${FILE_TO_PATCH}
-		sed -E 's#(add_definitions.* )-O3 #\1#' -i ${FILE_TO_PATCH}
-	done
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	use openmp && tc-check-openmp
-	local mycmakeargs=(
-		-DUSE_OMP="$(usex openmp)"
-		-DSSE2_FOUND="$(usex cpu_flags_x86_sse2)"
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd tests || die
-	local mycmakeargs=(
-		-DUSE_OMP="$(usex openmp)"
-	)
-	local CMAKE_USE_DIR="${CMAKE_USE_DIR}/tests"
-	local BUILD_DIR="${BUILD_DIR}/tests"
-	cmake-utils_src_configure
-	cmake-utils_src_make
-	"${BUILD_DIR}"/tests || die
-}
diff --git a/media-libs/vidstab/vidstab-9999.ebuild b/media-libs/vidstab/vidstab-9999.ebuild
index 447fa8556869..f4bd05f45203 100644
--- a/media-libs/vidstab/vidstab-9999.ebuild
+++ b/media-libs/vidstab/vidstab-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2018-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/georgmartius/vid.stab/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 	S="${WORKDIR}/vid.stab-${PV}"
 fi
 
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index 35cedbbd4e5e..d9b23bf7f1e8 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -1,6 +1,11 @@
+AUX vigra-1.11.1-boost-python.patch 930 BLAKE2B dc791871c9a51bd98a7666c64733d7929147f54433ff140cc255e0b4a6c2ff0be9905e82a628a91d6ff9c2674d76422d0d97a2a149be22ae7a95c943fb10d76a SHA512 246596b5ea323d2e69489646afa3574fc385dc88e0a0e936b1fc508b58943d25c41e466e182aec8d8ca5793d88af7471bfcbf1ac9eb55ac034b6906c7b82d62a
+AUX vigra-1.11.1-cmake-module-dir.patch 673 BLAKE2B 9dcd11f5754c59bee64d4a4ead62da0e0cb5cde74923871a377ca06a0f639be3a63d6b1769258d09da474e4110ad499a5402660912d8bb07ac0d5bbe199bc36c SHA512 9ab597ea7413d276b22d3cc46ac4179748b98bbaaa44234f71145d69e987b5162d38f87c3317d9bb863cabbcef7c1f3d77f727d19576df7892b2df7272055ce4
 AUX vigra-1.11.1-fix-incorrect-template-parameter-type.patch 7890 BLAKE2B 523eec06ad9a5ef07d852e6ec8633ed480a82224a16a3028ae7f35b31518f537af94a4fa0b90ff52dc8400649928526ad391b4731aeaa948622c186d72e0a2e9 SHA512 7ea26793457eabced61470c4b25b5409cbc961443639d6c126ea479727884baf1c8b3c9808e126ae11b43675de75c510c4272e8c51fd4df111c75e88d1b24b33
 AUX vigra-1.11.1-lib_suffix.patch 1032 BLAKE2B ce1b73b89c4d10c3b2ef3185a3c9a7ca791f58efe85eb205bb5f4e638ddc18d171bb7f4a9487670bb1a276c998f0e5096e2efa4fee0f167907d3d02df01bcb42 SHA512 c1cb242eb2ebdf398c81e16acc5a493312b310836caa7f25717dd20d23e885800beeef9ca0589c75ec3a0bd1ba2d879b1e999094cfef3956134e0d6d13f25d0f
+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 3617 BLAKE2B 0fd6ace945e05d9d155f7eaa6f2d0f8f73a64e5b72e2e0ab6467e8af983f9d02f524d4ed96d0f811989dcf92b3fa97f9bb42bbf64a434fa8beffc1abe50afbe3 SHA512 b7793841d2b02ef95207aea37370a654c570bae3be099eb8871f4194f4845bda6112de9c8a488191745bfee8b9913c4d1c42605ac535f1199d308cbc2f4266b5
-EBUILD vigra-9999.ebuild 3428 BLAKE2B 9fac09906787ac8702282205b4a1ebea4bb08787993e065d3333968c4754e0de41366109fbe431ecb4ab64c325ca3f25151c7f3bc88381c746ba6496f6bdc974 SHA512 cfca4d6d34b67b2aa860ddd2a8c1eb6e6451fd3b24bff341332e18ab20da2e1b2f537b962fa739985d74b8c8a8d10bbd701fd09f1f3432c77a9b83ba2b9bff46
+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-9999.ebuild 3905 BLAKE2B 5df7ecdb49b73ebd5885fe959265306ae4c7cd3eca7c9002c373dba19dbd84bf483b13fcb9eb41e4f367f75492d26686d6d15faf18602bffe16f23a18ea62b58 SHA512 715d241d3fe38f88010c2604321dd7a77d920c1df9ff795ad0b6fca82b445c279a4585398fbe6913235ff18b9506bd7b8a868f02dc66a39102546cdbeb8942d2
 MISC metadata.xml 413 BLAKE2B 985f005fa338d566dddb20126e0a83cb8e9ec5aa4ac9ed2d5ec6a42743eeb92f521375b74f8caaa94500c42450d68d0a4bf5c036c9a2909e13c922f50896824a SHA512 e5c2a32f7495cfceffc8da8464131b918134b7255fbcde9a10175a24698f5a6aff17630436935c6cda7d8a3cd8b182c299845a24528f3a9c40dff1022dce4f71
diff --git a/media-libs/vigra/files/vigra-1.11.1-boost-python.patch b/media-libs/vigra/files/vigra-1.11.1-boost-python.patch
new file mode 100644
index 000000000000..ffa3334f873a
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.11.1-boost-python.patch
@@ -0,0 +1,22 @@
+From 32ce9bc334580de7df3a97b106189145744e3726 Mon Sep 17 00:00:00 2001
+From: Ullrich Koethe <ullrich.koethe@iwr.uni-heidelberg.de>
+Date: Tue, 16 Oct 2018 19:10:56 +0200
+Subject: [PATCH] cmake: add boost_python${MAJOR}${MINOR} (fixes #445)
+
+---
+ config/FindVIGRANUMPY_DEPENDENCIES.cmake | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/config/FindVIGRANUMPY_DEPENDENCIES.cmake b/config/FindVIGRANUMPY_DEPENDENCIES.cmake
+index f6f9d563b..47cf4237c 100644
+--- a/config/FindVIGRANUMPY_DEPENDENCIES.cmake
++++ b/config/FindVIGRANUMPY_DEPENDENCIES.cmake
+@@ -115,6 +115,8 @@ IF(PYTHONINTERP_FOUND)
+                 boost_python-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}
+                 # Mac with Python 3
+                 boost_python${PYTHON_VERSION_MAJOR}
++                # conda-forge
++                boost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}
+                 # default
+                 boost_python)
+ 
diff --git a/media-libs/vigra/files/vigra-1.11.1-cmake-module-dir.patch b/media-libs/vigra/files/vigra-1.11.1-cmake-module-dir.patch
new file mode 100644
index 000000000000..cfc56b34722f
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.11.1-cmake-module-dir.patch
@@ -0,0 +1,17 @@
+CMake modules must be in cmake subdir.
+
+--- a/CMakeLists.txt	2017-05-19 17:01:08.000000000 +0200
++++ b/CMakeLists.txt	2019-11-26 23:50:40.660462479 +0100
+@@ -368,10 +368,10 @@
+ 
+ # export targets:
+ INSTALL(EXPORT vigra-targets
+-        DESTINATION lib${LIB_SUFFIX}/vigra)
++        DESTINATION lib${LIB_SUFFIX}/cmake/vigra)
+ INSTALL(FILES ${PROJECT_BINARY_DIR}/lib/vigra/CMake/VigraConfig.cmake
+             ${PROJECT_BINARY_DIR}/lib/vigra/CMake/VigraConfigVersion.cmake
+-        DESTINATION lib${LIB_SUFFIX}/vigra)
++        DESTINATION lib${LIB_SUFFIX}/cmake/vigra)
+ EXPORT(TARGETS vigraimpex FILE vigra-targets.cmake)
+ 
+ ##################################################
diff --git a/media-libs/vigra/files/vigra-1.11.1-python3.7.patch b/media-libs/vigra/files/vigra-1.11.1-python3.7.patch
new file mode 100644
index 000000000000..2e6cd3469f8e
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.11.1-python3.7.patch
@@ -0,0 +1,30 @@
+From a6fa62663c6a6b752ed0707e95f643e25867a0f9 Mon Sep 17 00:00:00 2001
+From: John Kirkham <kirkhamj@janelia.hhmi.org>
+Date: Fri, 19 Oct 2018 11:32:42 -0400
+Subject: [PATCH] Receive `const char *` from `PyUnicode_AsUTF8`
+
+In Python 3.7, `PyUnicode_AsUTF8` was changed to return a `const char *`
+instead of a `char *`. This broke VIGRA as we were accepting a `char *`
+in this case instead. Fortunately we do not need it to be mutable for
+our use case. So just type the variable storing the result from
+`PyUnicode_AsUTF8` as a `const char *`. Should still work on older
+Python 3 versions that return `char *` as well.
+
+ref: https://bugs.python.org/issue28769
+---
+ vigranumpy/src/core/vigranumpycore.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/vigranumpy/src/core/vigranumpycore.cxx b/vigranumpy/src/core/vigranumpycore.cxx
+index ec38d3636..c81c6ae52 100644
+--- a/vigranumpy/src/core/vigranumpycore.cxx
++++ b/vigranumpy/src/core/vigranumpycore.cxx
+@@ -61,7 +61,7 @@ UInt32 pychecksum(python::str const & s)
+ 	return checksum(data, size);
+ #else
+ 	Py_ssize_t size = 0;
+-	char * data = PyUnicode_AsUTF8AndSize(s.ptr(), &size);
++	const char * data = PyUnicode_AsUTF8AndSize(s.ptr(), &size);
+ 	return checksum(data, size);
+ #endif
+ }
diff --git a/media-libs/vigra/files/vigra-1.11.1-sphinx.ext.pngmath.patch b/media-libs/vigra/files/vigra-1.11.1-sphinx.ext.pngmath.patch
new file mode 100644
index 000000000000..fc265763f6ad
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.11.1-sphinx.ext.pngmath.patch
@@ -0,0 +1,27 @@
+Description: Replace sphinx.ext.pngmath by sphinx.ext.imgmath to build with sphinx 1.8
+Bug-Debian: https://bugs.debian.org/923467
+Author: Andreas Tille <tille@debian.org>
+Last-Update: Fri, 08 Mar 2019 18:38:02 +0100
+
+--- a/vigranumpy/docsrc/conf.py.cmake2.in
++++ b/vigranumpy/docsrc/conf.py.cmake2.in
+@@ -59,7 +59,7 @@ os.environ['PATH'] = os.pathsep.join([vi
+ 
+ # Add any Sphinx extension module names here, as strings. They can be extensions
+ # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath']
++extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.imgmath']
+ 
+ # Add any paths that contain templates here, relative to this directory.
+ templates_path = ['_templates']
+--- a/vigranumpy/docsrc/conf.py.in
++++ b/vigranumpy/docsrc/conf.py.in
+@@ -58,7 +58,7 @@ os.environ['PATH'] = os.pathsep.join([vi
+ 
+ # Add any Sphinx extension module names here, as strings. They can be extensions
+ # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath']
++extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.imgmath']
+ 
+ # Add any paths that contain templates here, relative to this directory.
+ templates_path = ['_templates']
diff --git a/media-libs/vigra/vigra-1.11.1-r2.ebuild b/media-libs/vigra/vigra-1.11.1-r2.ebuild
index d959cda3ae24..757fe839d198 100644
--- a/media-libs/vigra/vigra-1.11.1-r2.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r2.ebuild
@@ -25,14 +25,14 @@ SLOT="0"
 IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind +zlib"
 
 REQUIRED_USE="
-	doc? ( hdf5 fftw )
+	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[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.3-r5
 	)
 	test? (
 		>=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}]
@@ -64,8 +64,12 @@ RDEPEND="${DEPEND}"
 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() {
@@ -97,6 +101,8 @@ src_prepare() {
 
 	# Don't use python_fix_shebang because we can't put this behind USE="python"
 	sed -i -e '/env/s:python:python2:' config/vigra-config.in || die
+
+	use test || cmake_comment_add_subdirectory test
 }
 
 src_configure() {
diff --git a/media-libs/vigra/vigra-1.11.1-r3.ebuild b/media-libs/vigra/vigra-1.11.1-r3.ebuild
new file mode 100644
index 000000000000..d38b643763a9
--- /dev/null
+++ b/media-libs/vigra/vigra-1.11.1-r3.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,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-${PV//\./-}/${P}-src.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="
+	python? ( hdf5 ${PYTHON_REQUIRED_USE} )
+	test? ( hdf5 python fftw )"
+
+BDEPEND="
+	test? (
+		>=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}]
+		valgrind? ( dev-util/valgrind )
+	)
+"
+# runtime dependency on python is required by the vigra-config script
+DEPEND="
+	fftw? ( sci-libs/fftw:3.0 )
+	hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] )
+	jpeg? ( virtual/jpeg:0 )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr:=
+	)
+	png? ( media-libs/libpng:0= )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/boost:=[python?,${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	tiff? ( media-libs/tiff:0= )
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${PYTHON_DEPS}
+	${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"
+	"${FILESDIR}/${P}-python3.7.patch" # bug 701208
+	# TODO: upstream
+	"${FILESDIR}/${P}-lib_suffix.patch"
+	"${FILESDIR}/${P}-cmake-module-dir.patch"
+	"${FILESDIR}/${P}-sphinx.ext.pngmath.patch" # thanks to Debian; bug 678308
+)
+
+pkg_setup() {
+	use python && python_setup
+}
+
+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
+
+	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:python3:' config/vigra-config.in || die
+
+	use doc || cmake_comment_add_subdirectory docsrc
+
+	if ! use test; then
+		cmake_comment_add_subdirectory test
+		sed -e "/ADD_SUBDIRECTORY.*test/s/^/#DONT /" -i vigranumpy/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	vigra_configure() {
+		local mycmakeargs=(
+			-DAUTOEXEC_TESTS=OFF
+			-DDOCINSTALL="share/doc/${PF}/html"
+			-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
+		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
+}
+
+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-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index fb010ab449ce..289fe0492523 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -3,10 +3,8 @@
 
 EAPI=7
 
-MY_P="${P}-src"
-MY_V="${PV//\./-}"
-PYTHON_COMPAT=( python2_7 python3_6 )
-PYTHON_REQ_USE="threads,xml"
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="threads(+),xml"
 inherit cmake-utils python-r1
 
 DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
@@ -16,7 +14,7 @@ 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"
+	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"
 fi
 
@@ -25,45 +23,51 @@ SLOT="0"
 IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind +zlib"
 
 REQUIRED_USE="
-	doc? ( hdf5 fftw )
+	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[${PYTHON_USEDEP}]
+		>=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
+# runtime dependency on python 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:=
+		media-libs/openexr:=
 	)
 	png? ( media-libs/libpng:0= )
 	python? (
+		${PYTHON_DEPS}
 		dev-libs/boost:=[python?,${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
 	)
 	tiff? ( media-libs/tiff:0= )
 	zlib? ( sys-libs/zlib )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${PYTHON_DEPS}
+	${DEPEND}
+"
 
 # Severely broken, also disabled in Fedora, bugs #390447, #653442
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}/${PN}-1.11.1-lib_suffix.patch" )
+PATCHES=(
+	# TODO: upstream
+	"${FILESDIR}/${PN}-1.11.1-lib_suffix.patch"
+	"${FILESDIR}/${PN}-1.11.1-cmake-module-dir.patch"
+	"${FILESDIR}/${PN}-1.11.1-sphinx.ext.pngmath.patch" # thanks to Debian; bug 678308
+)
 
 pkg_setup() {
 	if use python || use doc; then
@@ -91,6 +95,14 @@ src_prepare() {
 	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:python3:' config/vigra-config.in || die
+
+	if ! use test; then
+		cmake_comment_add_subdirectory test
+		sed -e "/ADD_SUBDIRECTORY.*test/s/^/#DONT /" -i vigranumpy/CMakeLists.txt || die
+	fi
 }
 
 src_configure() {
@@ -130,6 +142,7 @@ src_compile() {
 
 	if use doc; then
 		einfo "Generating Documentation"
+		doxygen -u ${VIGRA_BUILD_DIR}/docsrc/Doxyfile 2>/dev/null || die
 		# use build dir from last compile command
 		VARTEXFONTS="${T}/fonts" BUILD_DIR="${VIGRA_BUILD_DIR}" cmake-utils_src_make doc
 	fi
diff --git a/media-libs/virglrenderer/Manifest b/media-libs/virglrenderer/Manifest
index 6b28622f2dbd..fba707a26075 100644
--- a/media-libs/virglrenderer/Manifest
+++ b/media-libs/virglrenderer/Manifest
@@ -1,7 +1,7 @@
 AUX virglrenderer-0.6.0-libdrm.patch 391 BLAKE2B 471d68831129f1c01bdeddfb8748cb71fc30cced692f73493ed6ad07c519e15b8412a4dc4f533833181b8aa3a04566c160f7f08bccee7b1fb1adc4ee58c9a61c SHA512 935a3cd1aa7c947a472c8fe5f1880e1897311451f42da26ab941af91152c60e2b66930446b6ff370cc29831a345fa73f9374fc82ad22ced445e448f520b07853
 DIST virglrenderer-0.6.0.tar.xz 222536 BLAKE2B 2e359e88489458460a5fe1daa62913ed0159c10eee1e360fbf561221dc38aa27e3c6c402960eb1313e55dfcbdca3483a5672f5c68b7303783320b8beb330d987 SHA512 23d5f8c582f02303e3b4b59a6ca66e7859367a0bb931b884521f615bf9e25290f1ad2a32a92c127df1ec0f48503e20f557f6e910973ca2c7620b75801d5f3401
 DIST virglrenderer-0.7.0.tar.xz 258128 BLAKE2B 93d878caa635671b0cabb4726df6f3a75a3153e6a138beb6f7de0985abd3c3cc50618727573d5f6a887cec2e0cdba082327ec7c2f9e359e9bd1c0ea22785abba SHA512 b8ee9242ac4184e65ade700306827e4d3e345bf6d742970d4b1ac7a09d8883e4195c4c2e69b73a59a08a43b4d8ee078a16501fbafe927e59b0f7627470d04ba8
-EBUILD virglrenderer-0.6.0.ebuild 1028 BLAKE2B 42e5c4047e7b441c1dd7e087aafa6f4871b7a940085509cf310b311dcba87a83724e5721e394e76019c265050566cae8aa8e5edbee4a4623268b102aac041701 SHA512 b3c83ffcc486142b54c2d795ccca3b1b9c17b2f23855bd201b23bba2c8a232eea92cca2bf9131760d18276a86f66f23ec788a49cbe98d5385134e60583813162
-EBUILD virglrenderer-0.7.0.ebuild 1027 BLAKE2B 50cac0a6e9e4710f9bc7a766b71f15d0bf77b57837b98f97b6ca5d649e585d58e36fd02e595aac6ac95ec64ab5bd4075163e83b93ffc627f422717c35c9d45f9 SHA512 a5c2e948d61ab9b70faf89a78637bb5e34629298ed57b2f38f911e1357a2ea44bf6df02cadcc96851f5dea468b02e941c5799e03c6d5c2a55ca35fd2c18b7092
-EBUILD virglrenderer-9999.ebuild 945 BLAKE2B e60197cd251140f20ebbe0cddf8755e867df402159e6f599346995c60776760ccd073f50d104d2eb640f474c67443415c3384891c52378c4f18302f4e262424c SHA512 cb4c8e06b01cb2de59d6fd58588585158b152cd744d3b39e4da2390625e54d6964e065485083cdf7e22951cf00fdbe3a694dd56d5ac4340fcfcd65f634a9ee07
+EBUILD virglrenderer-0.6.0.ebuild 1052 BLAKE2B 9b73cf2f385a1b3097def7cb588afd3686690cee78b56aa9433bc29630b90720f29ffa5e59eb950bc46f376e7907b6cca3528f8cf4a61fcabc78cd1c5baa019d SHA512 a918e18f227e266815e099b4962ab887973d652dd3b2a30120f2c81a5dbb435cbfb9ca2662236854cffc0b3ced5bb66ca2dbb48aa7c96ddb49b2ba358e9a8b37
+EBUILD virglrenderer-0.7.0.ebuild 1054 BLAKE2B a9301454f8cf10279c8d6efe7a81c5f5cabcd0f2ac01f523370ce4f4a4d0e7de72281717bb16896267bc8c0dae395b045a975d78b9719e067711e3568d1fb52a SHA512 3c0a0ee38960d5d45c10e1d9e6c7147d935faca44b0704fec68356a4ab89674744cdadb5bdd44cf3d7707a8b6f22a736914393c2b0841306a79bc841ee564714
+EBUILD virglrenderer-9999.ebuild 969 BLAKE2B 9a7c19dc5ea4d0052af34cb4f314eaedc3eeb1328c3e414a67b892f40ba585fedb5e270063700b34d63ca829fe30dae48f2f192cee6f669089176127f72899bb SHA512 5b85d80161b771a832548569b09103fdf0b3ac7c489c77c8e59427f1e15c159c1edac8f94a337ce31930e8e1077269d7d39d81813a6b0bd7c538f7c9dade3817
 MISC metadata.xml 371 BLAKE2B 3e3bdb314577f4b67ad0b800c37da42bf1f94200938519c39a3fd4020154065a86925b9afe83aab994ef0cc9b3480005691fbbb7277c367fac72d6e4ce608510 SHA512 94fcfe4653d16579ae9fab9dede61165c0b45ef1f97b642b4d50f0933909fe6ba04e3aa0f0f0e3311d780f126b7860295746caadd1a0245cb950e1012784902d
diff --git a/media-libs/virglrenderer/virglrenderer-0.6.0.ebuild b/media-libs/virglrenderer/virglrenderer-0.6.0.ebuild
index af3aef6b8619..76de6a8b81b0 100644
--- a/media-libs/virglrenderer/virglrenderer-0.6.0.ebuild
+++ b/media-libs/virglrenderer/virglrenderer-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -19,6 +19,7 @@ HOMEPAGE="https://virgil3d.github.io/"
 LICENSE="MIT"
 SLOT="0"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=x11-libs/libdrm-2.4.50
 	media-libs/libepoxy"
diff --git a/media-libs/virglrenderer/virglrenderer-0.7.0.ebuild b/media-libs/virglrenderer/virglrenderer-0.7.0.ebuild
index c4890aad262b..f8b6f0251918 100644
--- a/media-libs/virglrenderer/virglrenderer-0.7.0.ebuild
+++ b/media-libs/virglrenderer/virglrenderer-0.7.0.ebuild
@@ -19,6 +19,7 @@ HOMEPAGE="https://virgil3d.github.io/"
 LICENSE="MIT"
 SLOT="0"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=x11-libs/libdrm-2.4.50
 	media-libs/libepoxy"
diff --git a/media-libs/virglrenderer/virglrenderer-9999.ebuild b/media-libs/virglrenderer/virglrenderer-9999.ebuild
index ec9ae2bd798a..bbd38bf8dbdf 100644
--- a/media-libs/virglrenderer/virglrenderer-9999.ebuild
+++ b/media-libs/virglrenderer/virglrenderer-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -19,6 +19,7 @@ HOMEPAGE="https://virgil3d.github.io/"
 LICENSE="MIT"
 SLOT="0"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=x11-libs/libdrm-2.4.50
 	media-libs/libepoxy"
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 657b063c9219..42a088adb108 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -2,5 +2,6 @@ DIST vulkan-layers-1.1.106.tar.gz 1151285 BLAKE2B 763654d76c0c9d139ab922b2319df8
 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-9999.ebuild 1406 BLAKE2B 6027b825492aca21c1262e040b0ea520816cb2de2dcaabb178c6dab2f8d73086e9838ae5d8a1e11618144588b1d5ad0c9ecf17c19ccaa9d9a62c572a9fc667a0 SHA512 9cf301d1901756c4d2c4e97978e87cc4a02df2fe23d464fb08b266596e72bb6f2c43ac0b59d5ff8471b7bc1ba54c7216616950384e0390e646460d97ab3d0224
+EBUILD vulkan-layers-1.1.125-r2.ebuild 1459 BLAKE2B 44c26bbbcfb7a3c1181ad3f32286a4d02b770e3d65dee7d95e70591f968b61faa75331181d05ed25c05cc6dad1291debca44715d3626d407cb72ec322074da64 SHA512 a42fa2ca984c93f4b1bfd872168e450e4043f008d8fbb854136985aac9550f237b4290b288678d2aa86d707e8baccac1eb0db2821b5e3dc06b4a0628fd147b56
+EBUILD vulkan-layers-9999.ebuild 1441 BLAKE2B cc94694493a6160c74d28641a78595bf88864ad76b2796160f34bd7d4666b4242dc5ce7da5cdad2f2896ff6ed74c466d21aa49a74a7fca250e563bc8573e07ab SHA512 4a03e5d2018273581f43f622d8fa8a6a0d598eac97e1a8c4023ff55f106c1a671a805ed0e264be6208545d3bc9b81b58c7ab21ef10b99be2b967683fb42146e9
 MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2
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
new file mode 100644
index 000000000000..90400f07498b
--- /dev/null
+++ b/media-libs/vulkan-layers/vulkan-layers-1.1.125-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	EGIT_COMMIT="237d818e81fbffa073d29d94f53a2cbac4f25b9f"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}"
+fi
+
+inherit python-any-r1 cmake-multilib
+
+DESCRIPTION="Vulkan Validation Layers"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="X wayland"
+
+DEPEND="${PYTHON_DEPS}
+		>=dev-util/glslang-7.12.3353_pre20191027-r1:=[${MULTILIB_USEDEP}]
+		~dev-util/spirv-tools-2019.10_pre20191027:=[${MULTILIB_USEDEP}]
+		>=dev-util/vulkan-headers-1.1.125
+		wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+		X? (
+		   x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		   x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+		   )"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=True
+		-DBUILD_LAYER_SUPPORT_FILES=True
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DBUILD_TESTS=False
+		-DGLSLANG_INSTALL_DIR="/usr"
+		-DCMAKE_INSTALL_INCLUDEDIR="/usr/include/vulkan/"
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index 787e1d87acf1..2b59cfc6220e 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -37,6 +37,7 @@ DEPEND="${PYTHON_DEPS}
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_SKIP_RPATH=True
+		-DBUILD_LAYER_SUPPORT_FILES=True
 		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
 		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
 		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index ab4f68bf8a0f..f62dc2d55409 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -9,11 +9,11 @@ DIST x265_3.0.tar.gz 1398519 BLAKE2B e3ac28b01e89ce8a428f294c759644a8177e1b79941
 DIST x265_3.1.2.tar.gz 1419864 BLAKE2B 1eeb210e58d6977f9a048b84e924d690868aa350b6e736f577b5c1a62b9c5b71cfb2b03f004f26839ea44b9db871313bc9888af95999a576dcc167e79d297c61 SHA512 00fc2d8460657c0d2edcc54fd8c4521785c632f8811b74d0cd0a3efa0f06f1fb8cdd6233ad4917c1f40b3c1f1660a6c97ad947e656b7c3e9a51f8ae84afef65a
 DIST x265_3.1.tar.gz 1419649 BLAKE2B b9151f136fdc6c0512f481af6c8d4d575ce4c75ef8891b42ca24ddfd1f4802bfe8cd47bb07dfc1834243560a8d36ddd5ca4d79d7b9f140fbd411b5b80ea6b8d4 SHA512 81905b6286a61fada7cb1632d7f8461295a28e8d53ccd53d3c26c60c7d8091df47a1b694de28caa721f632d66940f5ceeb44d3405dc3b079edd17d21c30e7a7d
 DIST x265_3.2.tar.gz 1425689 BLAKE2B 58da4aa52381ec89b0aea1dc896fef92d9ec9fc781fd279acd0a338cd872f52482c81c558dde749c1205dbc13341a9851c381d01e2f312f5e2b4712d2242b7d3 SHA512 08c779026fe4c03797efef9d6a898b16c308355311e167c81b976345eb78039725a31294c77a60b76b4ef648d8720e16b2d6524e7108755531a5375231f5313e
-EBUILD x265-2.8.ebuild 5680 BLAKE2B 0ee62251a5dc184a5cda01be4d0c779e5101b3f90f1d9a5921c5ba300798fac1acb298e7066d715d6923ce4505292ebafdf005b04745b1e3f615f0d8319fd3a3 SHA512 9e75cf8f636fa69550739f0fa56cb94b564a257d97f776df22e9c90a79adbf3ebcf86a0a62e3cec9e672caeb6798e1ffa639d15edd293b7f2e068fdfb3ac8d98
-EBUILD x265-2.9.ebuild 5699 BLAKE2B 7ee30b5f06d51afdebf6ee278eb0e7ca8908fc703e2fcdb80c0b7095d9ae9edd83393e61c699343a53bc0d0786f1e558431e826a281d8ebd943ae5825e6bfb20 SHA512 cf9da7ce4f15df6afd31915869f426bde0306a381d8a7f1fb05987ccf2a618123d361c553d24d28681382022223e8775342cb575e387df87c28a327c5237f0d6
-EBUILD x265-3.0.ebuild 5657 BLAKE2B eb173bf8779ed016deb3f86abdcf9c9aaa1b82e36676f82f730928f66dc0861ad6e2ada815b9269643ce8f3384429271ebe08bac82720b1cb06304de891c4fa6 SHA512 939fb4ec038b6ce4c226a0ca3e58650a9891d9b1a06f15b5276c649773454d1265c115816b3a98ab894a17363b107407e8fda71004e3f4f408e7a69062292c61
-EBUILD x265-3.1.2.ebuild 5658 BLAKE2B e5e0a591c1e9898bf5b63856b06b6d8798f48e9a8dda35d2d5c9765282496f423488277f6a7cb7daac0836a5ef89e5beb284dc3c793d76be9722bd6538207d34 SHA512 29ccdbc5900a9aede013a39c81f7c7f3a7ddcf7aa8ae619df08e69a112b4df93ae7682eeb39344751bc3504afe4f9a1a9c5934b689e3e736001cb8249d0d8bf8
-EBUILD x265-3.1.ebuild 5658 BLAKE2B e5e0a591c1e9898bf5b63856b06b6d8798f48e9a8dda35d2d5c9765282496f423488277f6a7cb7daac0836a5ef89e5beb284dc3c793d76be9722bd6538207d34 SHA512 29ccdbc5900a9aede013a39c81f7c7f3a7ddcf7aa8ae619df08e69a112b4df93ae7682eeb39344751bc3504afe4f9a1a9c5934b689e3e736001cb8249d0d8bf8
-EBUILD x265-3.2.ebuild 5658 BLAKE2B e18838812d2720a043e4135c4f44e00de1bac79b3dfe054013abef71faf0d3f4a8efafd8bcfb4e1422f33e96f1fd07c6c7a1e436e358d130d49edfa5efdcd752 SHA512 d1d8b7d5a12836127e5dd20162dfc3f670699c3908910f279eb2b04d329b6f423e5e4e2165ff6c9e322db372d2d9facb57cfdb4a0c86a78ba92d788a19607f38
-EBUILD x265-9999.ebuild 5658 BLAKE2B 1bb3d807485e16850eef4d58ad30a03d8ad0906f3e46c44b4ec7bad6e8bad16571a3dcf72924700982c504036e61698e84260a20176a2f5100184dfaad639e82 SHA512 d13f42256341a57e6a88301904df3d3bced65014f017d092a30689df2c24d200125d1c3d46e031c71dba29ee10ecf9daf84442d70335073d5a44f1b09dc98556
+EBUILD x265-2.8.ebuild 5707 BLAKE2B 063bf907cf1509c385af9420080406580ac978dcaac16b4b494c1c1f297821011c19eb3df90a635f43631fe3d18abbe62806a3d632f21741a070539415523c18 SHA512 269aa0776eb71f73f9b6323c084179f7b2d8c22be5fac6ce498a2a73340529e8a90246ddc78435e25287e12392d912a6c06cd38cfcc644250988c96f8ab3a2a9
+EBUILD x265-2.9.ebuild 5726 BLAKE2B 05f297461b0a065d623e0de43a28d7e8f016c93da9e16b2316ad9ac19ea0ead60eb0f88e0abfa4e753444983b2c52aad673bcb5d41d2703cdb4f06218b94aeae SHA512 153cf5598086e6ef642328133dd8c8ac3d8a157dab810b5a95641dc2dce04ceba3639b0895f06aad5fa03f40d69474bb442dbc46d26fe339209d1be36d72e86e
+EBUILD x265-3.0.ebuild 5684 BLAKE2B 5ac5d28a1de72646b53a556398f42f849c77d7df72dca297d6e692036988112bf25bb2d6e9a6176ff0937cfaa15be46cd9482f912da5e298eb413fcba4044b44 SHA512 3f40e68a5fc46542103d555d6277da304c3c443f546c64c77b24127e28bb1f05ad85d1deec143346f23a0ac91942328e676456058f1b2b7051c7bf13d6a4232f
+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
 MISC metadata.xml 703 BLAKE2B c71ecd74be6e4fcdf70dcdc197e6830875f6cae0b1ee4e96b0edc4b16db4e512b2b8e8962fa75c7f4f380d74ff713158fd6124d4a22229b3c213c197124a59c6 SHA512 b9f2ac6ed88fce31fa7459321cc7cc2114caee48066b0ae1773a8711f2d652370d154a6167d8c8eb0dc47f55ca211812b99d11c4a1941a3a2553c62a6f21abf6
diff --git a/media-libs/x265/x265-2.8.ebuild b/media-libs/x265/x265-2.8.ebuild
index c60b19162d5f..6bd37642a5be 100644
--- a/media-libs/x265/x265-2.8.ebuild
+++ b/media-libs/x265/x265-2.8.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=5
@@ -20,6 +20,7 @@ LICENSE="GPL-2"
 # subslot = libx265 soname
 SLOT="0/160"
 IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+RESTRICT="!test? ( test )"
 
 ASM_DEPEND=">=dev-lang/yasm-1.2.0"
 RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/x265/x265-2.9.ebuild b/media-libs/x265/x265-2.9.ebuild
index 38316ce55ea2..5f28b491babf 100644
--- a/media-libs/x265/x265-2.9.ebuild
+++ b/media-libs/x265/x265-2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,6 +20,7 @@ LICENSE="GPL-2"
 # subslot = libx265 soname
 SLOT="0/165"
 IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+RESTRICT="!test? ( test )"
 
 ASM_DEPEND=">=dev-lang/yasm-1.2.0"
 RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/x265/x265-3.0.ebuild b/media-libs/x265/x265-3.0.ebuild
index d2632fb2a57a..2d1942d399d2 100644
--- a/media-libs/x265/x265-3.0.ebuild
+++ b/media-libs/x265/x265-3.0.ebuild
@@ -20,6 +20,7 @@ LICENSE="GPL-2"
 # subslot = libx265 soname
 SLOT="0/169"
 IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+RESTRICT="!test? ( test )"
 
 ASM_DEPEND=">=dev-lang/yasm-1.2.0"
 RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/x265/x265-3.1.2.ebuild b/media-libs/x265/x265-3.1.2.ebuild
index 599c13412516..71303686d68a 100644
--- a/media-libs/x265/x265-3.1.2.ebuild
+++ b/media-libs/x265/x265-3.1.2.ebuild
@@ -20,6 +20,7 @@ LICENSE="GPL-2"
 # subslot = libx265 soname
 SLOT="0/176"
 IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+RESTRICT="!test? ( test )"
 
 ASM_DEPEND=">=dev-lang/yasm-1.2.0"
 RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/x265/x265-3.1.ebuild b/media-libs/x265/x265-3.1.ebuild
index 599c13412516..71303686d68a 100644
--- a/media-libs/x265/x265-3.1.ebuild
+++ b/media-libs/x265/x265-3.1.ebuild
@@ -20,6 +20,7 @@ LICENSE="GPL-2"
 # subslot = libx265 soname
 SLOT="0/176"
 IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+RESTRICT="!test? ( test )"
 
 ASM_DEPEND=">=dev-lang/yasm-1.2.0"
 RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/x265/x265-3.2.ebuild b/media-libs/x265/x265-3.2.ebuild
index a020423d9d59..b1d719a14b6c 100644
--- a/media-libs/x265/x265-3.2.ebuild
+++ b/media-libs/x265/x265-3.2.ebuild
@@ -20,6 +20,7 @@ LICENSE="GPL-2"
 # subslot = libx265 soname
 SLOT="0/179"
 IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+RESTRICT="!test? ( test )"
 
 ASM_DEPEND=">=dev-lang/yasm-1.2.0"
 RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index e946da2c3db5..d5d064525690 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -20,6 +20,7 @@ LICENSE="GPL-2"
 # subslot = libx265 soname
 SLOT="0/180"
 IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+RESTRICT="!test? ( test )"
 
 ASM_DEPEND=">=dev-lang/yasm-1.2.0"
 RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/zxing-cpp/Manifest b/media-libs/zxing-cpp/Manifest
index 4eaf8599225b..857b343a08ea 100644
--- a/media-libs/zxing-cpp/Manifest
+++ b/media-libs/zxing-cpp/Manifest
@@ -1,3 +1,3 @@
-DIST zxing-cpp-1.0.6.tar.gz 128813069 BLAKE2B c222dc2cc21b28e5333a2dcac47e1c13712851a0d8185bf410f455f4a9176c9c3795e242d71b89fb211e9f4da29cb8d3b7a7c380ea37d48f1710540316914a70 SHA512 fa773ba7dfca6325419118221cfe555810e793dbffe5cae1c62056479fdd6d6a60c81fb88e3bc3bb71bc369b6899a8db64f4b18eb7f4d13b8ea4cdd2d51fa9c6
-EBUILD zxing-cpp-1.0.6.ebuild 416 BLAKE2B f9d8777fd020cf30e42b770efeef8a6be278907bf8ccc6d799a07b5c37d4654d96d3061fe9a0c48a696fa614f8e12875ebb47d5a266348525dc6465a6e6f97d8 SHA512 889cd08b0832e500aeff31fc21d212cf01d0a2bb696e273ea61d43b132fa2119c96894e22e699ae265702a6bdef926e63a1a8efeaf12bce3e71a7f899dfd2679
+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
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/zxing-cpp/zxing-cpp-1.0.6.ebuild b/media-libs/zxing-cpp/zxing-cpp-1.0.7.ebuild
index e90efd377b2e..1632e5bcc706 100644
--- a/media-libs/zxing-cpp/zxing-cpp-1.0.6.ebuild
+++ b/media-libs/zxing-cpp/zxing-cpp-1.0.7.ebuild
@@ -7,11 +7,11 @@ inherit cmake-utils
 
 DESCRIPTION="C++ Multi-format 1D/2D barcode image processing library"
 HOMEPAGE="https://github.com/nu-book/zxing-cpp"
-SRC_URI="https://github.com/nu-book/zxing-cpp/archive/v1.0.6.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/nu-book/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND=""
author	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
commit	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree	4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /media-libs
parent	b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)