gentoo christmass resync : 25.12.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-12-25 23:06:25 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-12-25 23:06:25 +0000
commit: 441d1370330332b7d78f238d2f5e13f7aed5e4e0 (patch)
tree: 6a5171dd615dfeee62a45044144c66e864738fb0 /media-libs
parent: ab3da91fb6c91a9df52fff8f991570f456fd3c7a (diff)
76 files changed, 1240 insertions, 686 deletions
diff --git a/media-libs/Field3D/Field3D-1.7.2.ebuild b/media-libs/Field3D/Field3D-1.7.2.ebuild
index 4cbf036f9660..1e412e0a73c5 100644
--- a/media-libs/Field3D/Field3D-1.7.2.ebuild
+++ b/media-libs/Field3D/Field3D-1.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/imageworks/Field3D/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="mpi"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-libs/Field3D/Manifest b/media-libs/Field3D/Manifest
index 8877a52cb65a..2b71a7304ca0 100644
--- a/media-libs/Field3D/Manifest
+++ b/media-libs/Field3D/Manifest
@@ -1,4 +1,4 @@
 AUX Field3D-1.7.2-Use-PkgConfig-for-IlmBase.patch 5371 BLAKE2B c8a1360db04de4cfa18b739af024934469b9cf2a2314d3fb248ad2df371be902369989f120dc7c1adb86ea77cf01a7a5e0944b9a4a57e9a9e329a06c5d24c97d SHA512 167da6b57983e317266ccbb9670cc5ec03f041343e44af3cbedc14366e349edd1d5f2a0ac163fa919827b2dfdd9811525b81c446a0e32016b3bd51f84f202bcb
 DIST Field3D-1.7.2.tar.gz 502481 BLAKE2B 8d5fbac915b52b36e66250f8fcd2beb5fff9d2446696ad1829e3edf05c9810b5d54928c6ab4f5aa99c1338da24cea446134434a59aa1d053f3da3500c2800f59 SHA512 e4ea51310105980f759dce48830db8ae3592ce32a02b246214d8aed9df7a7f5c500314f2daf92196b7a76d648f2909b18112df4c5c3c8949c0676d710dfbf1f2
-EBUILD Field3D-1.7.2.ebuild 784 BLAKE2B aebb2cc4394c38a481546400063714a9ca8442fe20b08e7fc24360b468a3e6ff63b6f945cbbaf72d66099b7dc9054a1ad1b4786d99bdf8fdd862328929484e24 SHA512 24d49d5423c45b9438f743dd5f5770a2d5ed0ffddcb0765fbb5ae97dcb2c5a16f45e0d8ae9cfa7b62a97e395e9221d8fc8afc2343866448ea08e40de47500eee
+EBUILD Field3D-1.7.2.ebuild 791 BLAKE2B e6272d99776dd7906fdafcbd3ff1caca135f9e7093a76879ba857785f5a2515bae3097191e8a0f7d5618673450d687cdd7c05337ddfea43129622a5696c64b07 SHA512 ec54a40850812ce4108193f7f73d694fc939d7e2885d1dfdfc14a8a007e40f27afb7ed8b3740aa5e9b17dc040107f3c1df38cf339eef9850ebec4d6e67233b7a
 MISC metadata.xml 708 BLAKE2B b783e8e9cc226dbf51d9033659f49ad45587757791112f704a799a081b02d34f4ec772701f7b88c3bbe1c31a10a2b9bb80ddd51eb5d61376367bb99886c6dad8 SHA512 421af157753908d4743f552d65c649b8852ec4811a9b58eac99b63d377cf3bb289beccc5a6a8c6862884a48c8ebbc4aa9deb7f62fba4d329e17346712ab0f514
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index de8c71d8c5b0..58fe79bece7e 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index f08de51c2981..a970b54601e3 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -9,10 +9,8 @@ AUX allegro-4.4.2-underlink.patch 456 BLAKE2B ede5f9e5195b1c54460f584924afd9daa6
 AUX allegro-4.4.3.1-texinfo-encoding.patch 778 BLAKE2B 7bd9538fb2fbded6e425ef6bbc0aa009707e522e1dc3d09540bf1f9fa6350375f7acea942a986304a834964bb20849da4f08ff3f963b86f43c179a9fc2b012ff SHA512 d8960e21b713a24d415704d023443dc09d6a8909d65063a7b55da47228619485fc7e647c5c52e9a9459da027daaebdc19e6c3e56fe618ee5f553fd03c4716bcc
 DIST allegro-4.4.2.tar.gz 4674902 BLAKE2B 9f43fad416348425692481524f6c15808ee03946d93df4a072a46557817ccd5f6ae7eede908ca4a02a0a9e49f9a7c42909c48c14923b2155d3999ff370401006 SHA512 ad4bc1c15fc83bc8a019031fed82f37a793664bb6683cf023ec05fd9cd945f00f43764f3126892426036249c63afa5678fb4906407bb325ce5827b36aee0fa86
 DIST allegro-4.4.3.1.tar.gz 4663634 BLAKE2B 23fa8cd77858243bfa8191f6bca26f50d1621fa84616968595c1284c73a86160cdbad201eece5bd026bb7ac13753568b6915295646b86e536b5d26c0394e2d1f SHA512 c5a552ab710226493447eb2547b3d7559badb96f511fbefd315b665b7486013a6710c83b69363eb09f90f53ef4278fe7b90cfee88d90d88f0fe8dc7df7606729
-DIST allegro-5.2.5.0.tar.gz 7849326 BLAKE2B 8d8995b9ad252b81c534099ffd91d81bbdcf4a34f7ca7c4fb7dd97e5c075869c212fa68445a5fe479a675d755ad0414976c11cbc112ecdd61f1fa09704957b21 SHA512 c6341396ad7340233c1297ed122095e5c2d129a32da2350b4bb39c4b74f8d56d57ec4e608defec471d63fff51d786f0a9f3844be82f81cdb3d48d5bc49908b12
 DIST allegro-5.2.6.0.tar.gz 7867726 BLAKE2B 3f21372442e5b8c802ac179019a11648febdcecddfda864559e1e9621f99c9ff7584fb422594c6fd3a1c352c892533c825faef10e35ecbf97058396fbb46fc7d SHA512 a475de67b0e6c727295cc51e113859eb0c57825a240e70bc45cd3b000c40518932b89cecdd13ba957416136db4ee9a9363adb5d3bfa7c8acda04ee95de6ba721
 EBUILD allegro-4.4.2-r2.ebuild 2737 BLAKE2B 53d1da512860d07ae86685094c73795eff384dccac3bfdcaa14e766300043289163cf721ff53abcc826070182eb14bef098fcadb2cda4730cd6042ed76116d4c SHA512 947594d6b3dcc1df3cb7359d41ddac48b8095933aa82dc5e064c92534e94d380ff0b65896a5558b82c11b7149c5f4dd552017b247c35b233318a6e5b010cff0c
 EBUILD allegro-4.4.3.1.ebuild 2970 BLAKE2B 9286e322b7397b7ad99f42170b6e260d586e896af3396bb5e8d315d1a120ad0445dacf22825ea180264cec3236ffa967f5346695a13e2a934d70e63894619505 SHA512 caa42406b233bec316d1f57285cec04928f470cc4ac57c0a6b50a5ccf39816b43d4fc376bf06f46daa954af6795b06a811851a50124fc8259d2a93b293aaa594
-EBUILD allegro-5.2.5.0.ebuild 2824 BLAKE2B 53f03e63f58b50034696b81b90db488034c25907c2b30acb68432bcd1e8e1efb62dbb9133cdb5f368ddcb315475928b6c46232ac0a56a9a26b588f1e0f4ec189 SHA512 bef3abd2955fed7d934a0d7a674de507dd4072d0c85dd6e42564f079041acac54b3d6a5c72bc9572733137cadc827258beff93bccbbe744cc0a798540dba1bce
-EBUILD allegro-5.2.6.0.ebuild 2952 BLAKE2B 9d270d534e9305ee31b285d362b1492992bb929b76a5082d806f683324ca0f29138299dddd36de9269887d2d212d71942a4225cc08dce7d3b1d17b6d1dc8c2cb SHA512 70518f2d8cc59d5b4bd42810fc41236d6c1a13e34777f184bc184603a8a24994ef94a28522f85d6e41ee44601b1e339e687717c6b66f523152c65b4010ab0987
+EBUILD allegro-5.2.6.0.ebuild 2948 BLAKE2B 6a09a2460d6d002dc2760e1d9651ec610eb0b1cd3ff8de0dc4c0713fe86824f28ac1798e4b814352425468f9627a60292ff1cb76f8a3fa4ae835be7678910cf8 SHA512 1b17d768dc4797f36ff940d6e9f9f22b2a0ff5c716700fc903b2779f7e779a82cd13ae3e4ff4a1f46b5f55bb6cd88271f0d69a7fbf521c67cae7217bfc21281d
 MISC metadata.xml 1034 BLAKE2B c1cdd935feae4561903bde181428ef0d71743f85e7756f507087528641471b4af3d1339758c3d829f8244b5cec7cc74bb7563699b9e5b05146ae4c6abe8dd5af SHA512 21301cc66fe94a4d728900cd5856d3e0d27507b1d340e36246c183b13232cb7f9c9da9f8b20428bd387c7216a892dce169c2bc885caabacb08a32892faffc994
diff --git a/media-libs/allegro/allegro-5.2.5.0.ebuild b/media-libs/allegro/allegro-5.2.5.0.ebuild
deleted file mode 100644
index ad80a90f9971..000000000000
--- a/media-libs/allegro/allegro-5.2.5.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~arm64 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 )
-	|| ( alsa openal oss pulseaudio )"
-
-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}
-	x11-base/xorg-proto"
-BDEPEND="virtual/pkgconfig"
-
-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_IMAGE_WEBP=$(usex webp)
-		-DWANT_MODAUDIO=$(usex dumb)
-		-DWANT_NATIVE_DIALOG=$(usex gtk)
-		-DWANT_OGG_VIDEO=$(usex vorbis)
-		-DWANT_OPENAL=$(usex openal)
-		-DWANT_OPENGL=$(usex opengl)
-		-DWANT_OPUS=$(usex opus)
-		-DWANT_OSS=$(usex oss)
-		-DWANT_PHYSFS=$(usex physfs)
-		-DWANT_PRIMITIVES=$(usex opengl)
-		-DWANT_PULSEAUDIO=$(usex pulseaudio)
-		-DWANT_TESTS=$(usex test)
-		-DWANT_TTF=$(usex truetype)
-		-DWANT_VORBIS=$(usex vorbis)
-		-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 CHANGES-5.1.txt CHANGES-5.2.txt
-	doman docs/man/*.3
-}
diff --git a/media-libs/allegro/allegro-5.2.6.0.ebuild b/media-libs/allegro/allegro-5.2.6.0.ebuild
index 0b19c66b087c..f2bc18f1a0ba 100644
--- a/media-libs/allegro/allegro-5.2.6.0.ebuild
+++ b/media-libs/allegro/allegro-5.2.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/liballeg/allegro5/releases/download/${PV}/${P}.tar.g
 
 LICENSE="BSD ZLIB"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 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 )"
 
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 7ef7974ff3b3..f3966f1fe6ef 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -2,6 +2,6 @@ AUX freetype-2.10.3-sizeof-types.patch 1038 BLAKE2B bb49e7d4195346b67f37c16f9f31
 DIST freetype-2.10.4.tar.xz 2416620 BLAKE2B 9852378536e873514baae3c024b9b30dcd78a36c2189dcbdb0562c56ccf871a5795896950ea129f2e0f12181095c92715216747e8a8396d6d03efac82a5a10ea SHA512 827cda734aa6b537a8bcb247549b72bc1e082a5b32ab8d3cccb7cc26d5f6ee087c19ce34544fa388a1eb4ecaf97600dbabc3e10e950f2ba692617fee7081518f
 DIST freetype-doc-2.10.4.tar.xz 2079084 BLAKE2B a051c425250f8af1cd0e83b15d6e5692b1ee5ff00317467cef648dcc7ea1f88ad6cde0fe2d53e5c45220723bb935e6527dbba124ef8739e6ebe372bc06ec78b7 SHA512 171da6c6a172869e9bec0da67cb1abdb0fdb124870f13b751b4e9b1b5e342fb2af38cb606db1c3dcf18076a077e694b7b8dd055dd7f4ab49afe7e1d61b4f9ba8
 DIST ft2demos-2.10.4.tar.xz 236712 BLAKE2B 76883bfc09c42b6092b0b512aff66b4585ac83793da787e688ad8446fceac1ce315014bde03d4271fc5a1b7bd1d3250255f5faced92beade6e4ed78c896db80d SHA512 d2afc19e5fabbee5205fcc992f6c19bab03485b7af4f55bb2d2dd0a4a9492a3f593540862ca116b54cf161b240d7966cb31a9793578d164fc418449e339e2fa8
-EBUILD freetype-2.10.4.ebuild 6783 BLAKE2B 6fd724961b81c307b2adf945f4b18927c47cd04ecaa0f38b138a46b557dd81531e1c8f7074a030bacf99dbe1440aec5a10ced167801d45b4e965a62858fec30b SHA512 bdd92db7400516ee2622133d805c374c7668a583840c1a9c6a8c8de295ab75474bc288905fdfd97746cfe4cb36c70f56b1361150646c044125ae01c3d0f846e1
-EBUILD freetype-9999.ebuild 7177 BLAKE2B 33c6d729825e16d8e8a7c4d26ced8e4a8aba09bca94ebaae442145d6daceacba600163758f7f3f86e4963d773e0ecc66de2caff40c479b0ed6a86c490f22a35b SHA512 8941208273d13daccd040db533c26f1c9d41955a519f9b0e5d8f0e0bd22f4c0a136582ad1417d4ecea060713df8384c0eb0b19d17af1ab0a4911175edf0802f6
+EBUILD freetype-2.10.4.ebuild 6784 BLAKE2B c7dbb4aa208c41c59460d8285c6672db29f4e2f92034d4bbcc1f5764967970c92fa23f796d6ab01c3d71280defe1ef2cc52a5615bf87fc8fba39eb08af15e1d9 SHA512 b544411885b29a86d52b50c34dd31852fb77a0d45c9ffdabb01177adaeee900f0aba4d50925bd823f223613133b00d3b4534b4d256bce9d63d551bd32bbcf2e6
+EBUILD freetype-9999.ebuild 7178 BLAKE2B fd0e920976c8498d08b34ce23faa87583ea7a905220a509594ac1b537ff51562f92d656b2e1f315ccca468250013156605e4fc9ac089c44e2749a5c14a23056b SHA512 063f7cce33be577a7ae54c871c1ca2b05df4425b8f57346b90c600ec009f96c37550a5b4ad71bb0ff1d5999abae3116b360e3778f17eff4d5645cb0241b64ecb
 MISC metadata.xml 1459 BLAKE2B 0299ed3326810e7b5dd4138e887b5b7f285a50d7a12b05d5650d552d840b498525801c9f7deef59fdaf71fd3b3ed3dbdd2d736a80a118ef741c54d6946797d0e SHA512 9c8be8c3c6f712a475c41eedde85c001c6429e0a4ffb7b9a177ac777ce934096bb710ee00fc1fa857055cc4ace9a98168cc0dc248e4e4379c4849634011197a8
diff --git a/media-libs/freetype/freetype-2.10.4.ebuild b/media-libs/freetype/freetype-2.10.4.ebuild
index 1402927ebaa8..4ac276e1db9f 100644
--- a/media-libs/freetype/freetype-2.10.4.ebuild
+++ b/media-libs/freetype/freetype-2.10.4.ebuild
@@ -7,7 +7,7 @@ inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
 
 DESCRIPTION="A high-quality and portable font engine"
 HOMEPAGE="https://www.freetype.org/"
-IUSE="X +adobe-cff bindist brotli bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils"
+IUSE="X +adobe-cff bindist brotli bzip2 +cleartype_hinting debug fontforge harfbuzz infinality +png static-libs utils"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index a57a34037502..ea7f1fae817a 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -7,7 +7,7 @@ inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
 
 DESCRIPTION="A high-quality and portable font engine"
 HOMEPAGE="https://www.freetype.org/"
-IUSE="X +adobe-cff bindist brotli bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils"
+IUSE="X +adobe-cff bindist brotli bzip2 +cleartype_hinting debug fontforge harfbuzz infinality +png static-libs utils"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index eaa2750798ae..358e18e002a9 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,6 +1,6 @@
-DIST harfbuzz-2.6.7.tar.xz 9001936 BLAKE2B bd3a195506253a1446e877c35c067cc874826fc6fdae3bc3a9bfd2b7682ce12de7e6d7fd4ebe03b8178d8b678c06aa2d71715b27236347224a68e4d98a72039e SHA512 6fdd6e0952a73e1949349aa5416ef8fb3fc351b15c95be4fe1f341b111159fe58113b73a334db2697f4e3aaef5a761bd8f1d8964514406cad40f9862768d59de
 DIST harfbuzz-2.7.2.tar.gz 16605557 BLAKE2B 246ab64e29afcadc692b57bad84acdea1f9200a63f6f8b1519d12b8515ec65dc45e2edf3abdde473b71364427a689d92ce2ee25c514edf4b1e680dd423d774ee SHA512 2eeb198dab1ed1cc7d10c3890293ff40e9f37372413877a5bd44d66e88d8460a81f51cbe71c328b1300f542ca8de3269749d1d01d0c324c8b95a9c038fbe1521
-EBUILD harfbuzz-2.6.7.ebuild 3164 BLAKE2B 3898c5e563aa288fa02c933d8cec30f0eb010329345efd5fb6b13d99fe06b76d75a3b815f202a6a31729670b1f7f3f3500a783397d0a390147d4b836ce00ec47 SHA512 21869f25283685a9b56e625fe719c7922a9428c6db66181e977461f3292559796224d12708269964d5748981785dd5ce34adacfa5af12a4ec12d77b4f5b69c99
+DIST harfbuzz-2.7.3.tar.gz 16696840 BLAKE2B 95eb0fc86caf51f512520ba599e9be08b4a9f6565a3e52280f9454043b524e7b04194e506b5122db066966125fa4583b7be856005b53726a0192d3f08fb5cdcb SHA512 1fa1cfd7b55446309413deb6c139ff9015a013b480da422482e75fa11b130b7dcfaeabfffc513a2027732d0b58fbd39dede2f3eb516214d5efd901a2d1e6af8f
 EBUILD harfbuzz-2.7.2.ebuild 2674 BLAKE2B 72db7468c820529e8879777a4223fae0a67e6dc61a2bdaceccedd93123f11e07f7602c1271e6cab560ed533ac30fe8df34eed1176812a7c2881b1b6578f0de17 SHA512 488c4842618955b7e3d3c08f71701fffac5d043104f0a2c9efefd3f55869d5e257ce857f511ba4b36e7bf654d2c2dbd163898df3e929cd8732367480fcff70cc
+EBUILD harfbuzz-2.7.3.ebuild 2683 BLAKE2B 0d77179666616c88ab26ce02a7f3bc3da2da986ecc35896054072fac75cf3555dfe045290da40f383aace1493ddc1903442b1aa882b5357a167761b8a039ad68 SHA512 64b73de5828d32f3f413bfbe37e0cc129c5bc8077cc8062d0b6dbae40a0b89807d9896c4a9ce3949beb1505ef7e2a70ea860557b41f839705d98d4f98d506477
 EBUILD harfbuzz-9999.ebuild 2676 BLAKE2B 97f707097c94ce4a506aea6a65e9a855c471e4b03d8d8507068489f1e4a4d7b9469e6675a00773d856f63f18cdea77c7a16386d23b6120fc78439a6a9399c374 SHA512 0ac9dde94fff7fff9376fe73f9fd492d904506dce73b0221ac2448b754cb39bb3923c110ae553e460c44e661994c0d58b18e345b984a1b1a4d26ad8d954e0618
 MISC metadata.xml 739 BLAKE2B df7724d5cef26b569f76d41c808f99a1ecf44631f0bae96fbc2a9b4f5981061b55c60d69b1b64d966897f223a3d3b5cc4325a3ac780599ed76591fc2044b4988 SHA512 192f7abc191044f267bddb4db7d91f9b78926f4a361802f607bfe4635d7cf63398c289bc52009ad4d3bc6f92684cafd8b40e48f1e0f8cdaef9a4e27f538e7dbd
diff --git a/media-libs/harfbuzz/harfbuzz-2.6.7.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.7.ebuild
deleted file mode 100644
index 0e2f9fbf2501..000000000000
--- a/media-libs/harfbuzz/harfbuzz-2.6.7.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit autotools 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://github.com/harfbuzz/harfbuzz.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 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="
-	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
-
-	sed -i \
-		-e 's:tests/macos.tests::' \
-		test/shaping/data/in-house/Makefile.sources \
-		test/shaping/data/in-house/Makefile.in || die # bug 726120
-
-	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}" -type f -name "*.la" -delete || die
-}
diff --git a/media-libs/harfbuzz/harfbuzz-2.7.3.ebuild b/media-libs/harfbuzz/harfbuzz-2.7.3.ebuild
new file mode 100644
index 000000000000..89e06e272b90
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-2.7.3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit flag-o-matic meson 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://github.com/harfbuzz/harfbuzz.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~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 doc +glib +graphite icu +introspection static-libs test +truetype"
+RESTRICT="!test? ( test )"
+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}
+	>=dev-libs/gobject-introspection-common-1.34
+	test? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+	introspection? ( dev-util/glib-utils )
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	sed -i \
+		-e 's:tests/macos.tests::' \
+		test/shaping/data/in-house/Makefile.sources \
+		|| die # bug 726120
+
+	# bug 618772
+	append-cxxflags -std=c++14
+}
+
+meson_multilib_native_feature() {
+	if multilib_is_native_abi && use "$1" ; then
+		echo "enabled"
+	else
+		echo "disabled"
+	fi
+}
+
+multilib_src_configure() {
+	# harfbuzz-gobject only used for instrospection, bug #535852
+	local emesonargs=(
+		-Dcairo="$(meson_multilib_native_feature cairo)"
+		-Dcoretext="disabled"
+		-Ddocs="$(meson_multilib_native_feature doc)"
+		-Dfontconfig="disabled" #609300
+		-Dintrospection="$(meson_multilib_native_feature introspection)"
+		-Dstatic="$(usex static-libs true false)"
+		$(meson_feature glib)
+		$(meson_feature graphite)
+		$(meson_feature icu)
+		$(meson_feature introspection gobject)
+		$(meson_feature test tests)
+		$(meson_feature truetype freetype)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index 16bf2bac903c..ad78f3d333f0 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -4,5 +4,5 @@ AUX ilmbase-2.5.2-musl.patch 2134 BLAKE2B eb22304535301b717adf2397343b6f43bfcfb9
 DIST ilmbase-2.3.0.tar.gz 595490 BLAKE2B db956fe7dbabf94632eb98635f4ebda8e937f26e26ed69f33743069fa2bf6d5ed3711f00eb33377c98b4f8ea367bbfc51b11d4cb884ce02238b537857cc19a9c SHA512 db0804a7c37c2a97f9dbf81b20f40f7fdea73242baa2759d9dc3728e6849e7ecae0e178fa1c710add980d050499151650675e4b2cda6cbbaa61aca406a1f929a
 DIST ilmbase-2.5.2.tar.gz 27525326 BLAKE2B c48a61513457f2c04f3a512963ae27eaf154933ffe7c6ff3e2d71f27f246ae624a34dbe6f8ab500c51a56898ad0f61e6784f5cd3f9c3df591ce347b46ba4ac88 SHA512 62f98695cf56600303db9c2d13d34cacc1851a103d8ffb7e7ce8c6d9d14e6bf02804836c718ae03e8d685ef3dda0cf7b2130e2d363f8095b22a15bf30d706fab
 EBUILD ilmbase-2.3.0.ebuild 1046 BLAKE2B bc325b9ab9c6d00ba9602f376ddad08034e09124362fd2a2e24ff7aa9ebc3d826d2fd32408f36983696c8a2305def61667d928b9637229aa18ae65b1bc9bf19b SHA512 2b55b35fd05331d8847946b2253ef7467a1b8f1de06dc4966c1a8da02be05f7eb6e91ff6a651f0d28af74955793bd18ec692fd384b5869e7f752f55eede39290
-EBUILD ilmbase-2.5.2.ebuild 1326 BLAKE2B aecd01294500bf51078226682a6d2f25f99099619798839c90da9172f8bfd993279500a6117dcf96be42da539ba206c79626ab8b5ce569260a8ee56655975448 SHA512 ce7977a072e4dbcdf2f2d202185e96997f2cc90ffd78a36d79f820a7fb182aaad370561964eb52ab845d2ee3bc9b58f935f2d4a7bab35f039a3442e9ed43df8b
+EBUILD ilmbase-2.5.2.ebuild 1326 BLAKE2B f58d3ad532feb4f6b285b4ae66102aa7426b66c97c2d96f8adf594301df833e8d2e9877a35dae22b508ac3a3728030860e3df2e257b170fa1ba664fb7e515f3c SHA512 31b8c62f4c271c275a9e45b7852d75bb84035f82e9f43951f7f5ab34367783d7257f6148b1c593ab9ce51d565a240962d19df023a1ad30b93595813c7b991363
 MISC metadata.xml 653 BLAKE2B 355a987fbbb2073049234f241a5574b0f023b82c8b7597145bc4242eb084a7499fc13d5a4dff56cc5c608fc56d8d264affa2045bf8f35875a7dae54828a51143 SHA512 bde3f1221e1cde98af0137b166c41b39f0342875217ee002e0c754f66fbb921ab4fc9657befa62ddfc97ee07fd9b53fccc3c12fba2a5ab7788bdf0120109f9d2
diff --git a/media-libs/ilmbase/ilmbase-2.5.2.ebuild b/media-libs/ilmbase/ilmbase-2.5.2.ebuild
index 684157eee0df..f2e753877179 100644
--- a/media-libs/ilmbase/ilmbase-2.5.2.ebuild
+++ b/media-libs/ilmbase/ilmbase-2.5.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar
 
 LICENSE="BSD"
 SLOT="0/25" # based on SONAME
-KEYWORDS="amd64 -arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="large-stack static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/jbig2dec/Manifest b/media-libs/jbig2dec/Manifest
index b5200444239e..8d5679bf3d94 100644
--- a/media-libs/jbig2dec/Manifest
+++ b/media-libs/jbig2dec/Manifest
@@ -4,5 +4,5 @@ DIST jb2streams.zip 1285838 BLAKE2B 9a2b6047a7b970439693d6f5fdefb9488019a562e7f8
 DIST jbig2dec-0.18.tar.gz 148563 BLAKE2B a864fd5b00abca3ae0f847c1d8fd537d92d68a3c042c851b6bebd51bb674f5bc4a36811f2b4fd7753db4d3641e544e03ec184cb90d43da0247d8affd7cf62c11 SHA512 5931530ee3b811f9009c95d08ad65701564ef8ebf6511145acb969cc7c99dab5028daaee580dd83358b6bdc477cffe347712b9c9768c9b1a63395e366046267d
 DIST jbig2dec-0.19.tar.gz 149134 BLAKE2B 576f3a516499b6291d25dfdefe5af62899665167526dca11435bc07e04a3feb707f82d3a8bdda774f5cfe0d792c3147e77aa94fa57feac25ba1c0a7805c5fc58 SHA512 d5a27951cc9c06c184f454e258e81b6e4d5aa2742a4da821522b9a42ecc78e7e1b78058dabc23821618e62d62d8832011f16b5ef2d66beac463da6b809fd02af
 EBUILD jbig2dec-0.18.ebuild 1655 BLAKE2B d1039e26d0b0a7573b0a8c1c60b109a70d8d5e0d9aa2dd3918037405e6470ac3a6ff5d2b82fbb587526efd739bf55aad54a2c4314fb6a102a23537157b4452f1 SHA512 39af2ce59fe84344f6fc8a6b366af223a3c34d27e61e0bfa2b68081386c13fadc78311554a8ba404cab9ef0c16e4adf1ce56039c6e1bfe5e8c7d5de2e92215fc
-EBUILD jbig2dec-0.19.ebuild 1567 BLAKE2B 2accda29efb8b4e2da03f71a82e119dd55b6b9d42b3cbedecb0d122d2f0e9aebf785e5c5c291a6e005aca8493e6a9ab5be14d8e6feeb583d9587ba321db27d6d SHA512 6d825320657f11d93e37bb51091eec95c45a700dbab0658d13c77f0eb3546feb0701d763d6364e8d766f47e7bfd5eb2d9782129b374bd338deb69070ccaa449d
+EBUILD jbig2dec-0.19.ebuild 1562 BLAKE2B d60323071299652ff8679e8746f261818222e18a3b58b1e57db2ab87059fcd27fe2094f13d40bb1982549b4789d8fa559eb222d094214003ee622edfa6fb4275 SHA512 7bb1b7849245afec3d9e55e5f097a99333ed4a791874ddd17aaa806d72337b9efa689bbc3bb2d270ad8ade6e08084a214dafb2aec043e5739b551c9b79771e4a
 MISC metadata.xml 347 BLAKE2B 6c6d66bb933731270b688e7f0d9174f3cac5e697d30af47398425b7f3789e6960f87a67c192d931603c0120622839a92ad93bb6154c1ceecf07ba2827488f001 SHA512 7472b2c0abdc9db46fc886ba58d9c9daf16efc76d306087b4ccec7bffdb1ddf034f433ede85681a7bb2b87d7959f7eef557743c9fbde7891efd4e3c5058aeda7
diff --git a/media-libs/jbig2dec/jbig2dec-0.19.ebuild b/media-libs/jbig2dec/jbig2dec-0.19.ebuild
index 7abbf84c0c80..b68cc580ae51 100644
--- a/media-libs/jbig2dec/jbig2dec-0.19.ebuild
+++ b/media-libs/jbig2dec/jbig2dec-0.19.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ArtifexSoftware/${PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="AGPL-3"
 SLOT="0/$(ver_cut 1-2)" #698428
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 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 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 )"
 
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index 73ba50f858ed..a514fc15dc68 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -1,4 +1,6 @@
 DIST libepoxy-1.5.4.tar.gz 337615 BLAKE2B 2793fde6da59079dfadc653c9f0712b0bd2ca1455a8cda7982bce61c35a3629641a30a76db059af635c1fa0076b4e6c56874b199b41d548afbbad8f6e43384e3 SHA512 c8b03f0a39df320fdd163a34c35f9ffbed51bc0174fd89a7dc4b3ab2439413087e1e1a2fe57418520074abd435051cbf03eb2a7bf8897da1712bbbc69cf27cc5
+DIST libepoxy-1.5.5.tar.gz 332057 BLAKE2B bf9a1e089c620e710caa7d4b7d5d0ec0cef186c7881b1a61aa22f58d8e023706087c766ad970ea8950752d87d2f32d12e2ded3137502f35991afb5b4fb3648cd SHA512 9056840d887f06c6422f61e65ea02511ed37b866a234d49bf78dc5f2f46e8dd9f029405387da14dced639e6a5740b5c56ab6d88ca23ea3270fc6db6a570b0c45
 EBUILD libepoxy-1.5.4.ebuild 1142 BLAKE2B 5cfd33bbb2c87733e6bff7f9e25f16d482aaf201d0fd179dd5e6bdd496abe2b5e7c7ba277353012ad089f722d42d8c58c76e65b4515085f83965fc58766db438 SHA512 e78b8eccbf1aaeb930803bca1927ed12d9870fda9b67f44651c93f60cb019523239474b7631edf5c526da9ea7a4cdbd596737f79dd783efbd9ed9e0cc7f99c0c
-EBUILD libepoxy-9999.ebuild 1143 BLAKE2B dd8059028b7dc955f0ea6c1b4cc49b191f35b6805023d8db3b4af5104654781065021b5898bd9b1b64433103638b66591b8a64319d91f782936f6c6d7bafffc4 SHA512 314e349c2a6c6d4aeac04764bfe50708fc482c94e3818827196dc2b8d0d0bfb2d60387c3d346164fe860b75121614f484bde039f08eaf659acbea88506debb9b
+EBUILD libepoxy-1.5.5.ebuild 1158 BLAKE2B 68b5ac5939cbaab14250785f47614e01e695182b43130fa60cf24cc6b4cd065fa90293d55a879e670031f5c003bc8fe1ad82c20afd46202c1bab035ebcc0bcc4 SHA512 6e9b681b237afb62ec589302281a0e1e7a31a3eada3a6174cb6f13ea6342969b3eb5f07e2c6ffc0e3676e13826356f23ead3462b410d9e415285089f4c8af2a6
+EBUILD libepoxy-9999.ebuild 1158 BLAKE2B 68b5ac5939cbaab14250785f47614e01e695182b43130fa60cf24cc6b4cd065fa90293d55a879e670031f5c003bc8fe1ad82c20afd46202c1bab035ebcc0bcc4 SHA512 6e9b681b237afb62ec589302281a0e1e7a31a3eada3a6174cb6f13ea6342969b3eb5f07e2c6ffc0e3676e13826356f23ead3462b410d9e415285089f4c8af2a6
 MISC metadata.xml 375 BLAKE2B 09993b726e54558d32b0dfb2a221bdd8928b85f55bdaaeb2faf30a0711ed58b05022a9fb669ec43806aff223860e47db53226a0f8f34d7b35edf0a842ab45923 SHA512 fec0ce8c99534083afc197c156a7fbaf2e83b2e22887ef134984ea7a4e6226f2714db399a118cd96f22b20012e7b7572156fc13aa72516e2557880c716140ad6
diff --git a/media-libs/libepoxy/libepoxy-1.5.5.ebuild b/media-libs/libepoxy/libepoxy-1.5.5.ebuild
new file mode 100644
index 000000000000..ecd6c30c4964
--- /dev/null
+++ b/media-libs/libepoxy/libepoxy-1.5.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_REQ_USE='xml(+)'
+inherit meson multilib-minimal python-any-r1 virtualx
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/anholt/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Library for handling OpenGL function pointer management"
+HOMEPAGE="https://github.com/anholt/libepoxy"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+egl test +X"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )"
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig"
+
+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() {
+	virtx 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 329b128e948e..ecd6c30c4964 100644
--- a/media-libs/libepoxy/libepoxy-9999.ebuild
+++ b/media-libs/libepoxy/libepoxy-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE='xml(+)'
-inherit meson multilib-minimal python-any-r1
+inherit meson multilib-minimal python-any-r1 virtualx
 
 if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/anholt/${PN}.git"
@@ -46,7 +46,7 @@ multilib_src_compile() {
 }
 
 multilib_src_test() {
-	meson_src_test
+	virtx meson_src_test
 }
 
 multilib_src_install() {
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index 93710803dd2d..8c595cf688fc 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -2,5 +2,5 @@ AUX libexif-0.6.13-pkgconfig.patch 255 BLAKE2B 397c0e88f951628e697cdd749936b3e4e
 DIST libexif-0.6.22.tar.gz 2741296 BLAKE2B df57aa0ff7d20faa47ea34f4d8164c33b113887bc2179405481b2c12c0d0336dc9e5321a260ffda64d974bfa9ac6af55c0cfb4cc9a57a941c17944a3d049befd SHA512 e399804c9d67072861988638349115c585546be20f15c4d26bb6f411ff4ee5bce979c1a41305c1456ecc2f830837349f93cfa4136b7a864e0486cecd3607b469
 DIST libexif-0.6.22_p20201105.tar.gz 1111695 BLAKE2B d4eb856ad950f8ae068a27088e54311789c7b8b646dd1c4851ef637b626015119b3b5ac9cbac58f9c79c37c07ba7d3e9a9a67dc52715187495aa824846ec2335 SHA512 5472bf2531d9147be5c6e681d0257325f6609d6aa3935243f887df0ab32e51242ff9d853fc2c183cf5c2709c89d5c52d8fecb9144343d6f959f4bed1062098ab
 EBUILD libexif-0.6.22.ebuild 1285 BLAKE2B 94bc4fad00f8c4ee923b70e18a875c1b061ead7b067572cadb36f2e7acf6664ce9149161bef4a4a24dad99558c76bc50e6b3e12dc082b5f9ca8ae8eea340d178 SHA512 4b4dd8ff2e2bf256b7791509217ca4c9011ca583668227d5176ca285ec11caaba0febd87234ac0fc5dbf297346d128798b4e7c331ab4e3a6edbe345d1efa1397
-EBUILD libexif-0.6.22_p20201105.ebuild 1483 BLAKE2B 456b435a9c77f6d4f24584c08e70e2fc89a3680d3e158a12cec1996269fdf81ac2cfab17e5597f55e0d87594c215c22c96a6aae4d8bf36d500cfe8e1ff303d99 SHA512 9e43f2b8d42c4104437c9a5b1232ccc60eca16a52f490a2a29e4b3157b5b2df4c05fa46356ae6fcaba30847d2382b4fc07f7edaa560ac14c82a29e914ab17caf
+EBUILD libexif-0.6.22_p20201105.ebuild 1482 BLAKE2B baaa877a0a09a2b918bb10c436d2ad4f5e60377cae2a43691c9012ec8d787e4c91c11705153627c4a1615c1491c6af04b1d2f08bbdcf6845e54aaf2c7a50ef57 SHA512 0c63015b81f2dafb0f0604712d2affca333822d5526adc978fe400be939c7798db39e5c4b18a39fb800505bdfceccdd06be9abc7f69657eb6a3d20bca5199715
 MISC metadata.xml 311 BLAKE2B 0109881067d004082c81401909d6605a6bc792700cabf760db3e62bda628664915647427a3034dbfb52e3f047ce692ec6f279df06dbe76be014c1b676cf796ac SHA512 3b3e7a9c989e72b817e59c9c35ca6cb81dcd00eb27001095f139b1a297f7f1e80d32eee11573344d42881641920aa6a1a2bffc85892f92b347f0d8326d97f7a0
diff --git a/media-libs/libexif/libexif-0.6.22_p20201105.ebuild b/media-libs/libexif/libexif-0.6.22_p20201105.ebuild
index 1c4bfaf15476..de9a5e1eb9c7 100644
--- a/media-libs/libexif/libexif-0.6.22_p20201105.ebuild
+++ b/media-libs/libexif/libexif-0.6.22_p20201105.ebuild
@@ -44,7 +44,7 @@ multilib_src_configure() {
 }
 
 multilib_src_install() {
-	emake DESTDIR="${ED}" install
+	emake DESTDIR="${D}" install
 }
 
 multilib_src_install_all() {
diff --git a/media-libs/libopenshot/Manifest b/media-libs/libopenshot/Manifest
index 2f9d470dbecc..5e4bd0ba138d 100644
--- a/media-libs/libopenshot/Manifest
+++ b/media-libs/libopenshot/Manifest
@@ -1,9 +1,10 @@
 AUX libopenshot-0.2.2-imagemagick7.patch 3545 BLAKE2B e2fe6ae205459c69ff288f14ba2d0a2b461b761e7ff6e9e66e11e4895b10661d5fc2ab9e2011899ca983399af685a0d411aa4820c02d02b4600617bd314d7670 SHA512 06622c81253fd15440e1cf0256a0beb21e2039a5a98a8c889828898b137a9a6efeb6fb295a0646dc5aa12da9805ff73b62c29272b0037cb1ea2454de7571f59b
 AUX libopenshot-0.2.5-gcc10.patch 2605 BLAKE2B 34967db6b59816738e7895f8c608603eab656ae90878fbaa146231ac14370fb11da0be616d5df9bf9c750c73a93d01643543abe81cf9228078060fa1b31d3b70 SHA512 29c974bbb896417b27c70eb9238038f05a4d2d1267f17b4e4f935696cc706fff4c3e0124c369bd24a8128dfd8bddc57bb4e7a740a9c0203b07fc40979875b999
+AUX libopenshot-0.2.5-no-hwaccel-testfix.patch 1691 BLAKE2B a587449964691bfd2940507f4a1d0b74342c0225bbe7b0a7620044603e0baffde73e7d71f6ca2ffa1ae7748e461ce661a86f11dd0b347a8c55eb07d19d7db75b SHA512 807c77c87a011e12e0a3c8696cbe83b4a6aea9c0770c5ac5194b4c3a6457e772795ca6ae309fdbbb458fefaaa03c7b930084e686e680b23e881f56a21493f85d
 DIST libopenshot-0.2.4.tar.gz 10295888 BLAKE2B 2967f1faa56090355255e24c0367a4171af7433c53eab303c9d88432174d03879ae9fd2e6904e614ea6ba210e0c72c401cab95a1d2aa93ddd2cea2b861e985ce SHA512 6824ad22e81814b6427a4cb6489e5b893be264b5afa6e54287cd649f244f86b938c1b1d56280c1f49af65fa118d056d204bd39bc5b2ccdc10376d2df2f33a352
 DIST libopenshot-0.2.4_pre20190609.tar.gz 10268173 BLAKE2B 01e07c0a7c051b5804f24fab1bfb920862a165ef14d3fdd020430b9e3a47858842c8cab3408ba0d161cb15cc6e90531a3b5df9ad327a01f414ff2e7e392fc243 SHA512 bf8c06aba6a899cb1ca6fbe9ac89fc859083b03175338c04af8dce68698f4ac78eac0b5b594e2b02390cd5e64576445b1c95324b254a267506353bed97ca16d1
 DIST libopenshot-0.2.5.tar.gz 10295768 BLAKE2B 19205c4f02d8b863b48e920164302853c7a505893783161e6a146e7a9728cefa19d4e48bc82b862e920967f110988ac28f5f495912efabbbacc98f55ebb51856 SHA512 b7cdf72897e6edaa8cc00e17dbe30f5b22a6b5d69aab64ddafb184458b41ef0332db1f3e2c6f039492bf7adb521d9758834d0bf6c24e6421a55970d8cf8caba7
 EBUILD libopenshot-0.2.4.ebuild 2258 BLAKE2B 1c18783cc8c33d985ee21044d3561eaae01c26a38df21b65f0c5ef18a783fa646fe453f91eb80fe328ff248f05bb51333d4cc5da03a49b28286be38a9928bf85 SHA512 1671c4ab1ba07e01f4c5e517ff4960ea641b24fe0cfb7b82edd174592c03820aacbc39140ac7591d983ec8dd39209a1fc2c7714137d529ce858f079c2106e056
 EBUILD libopenshot-0.2.4_pre20190609.ebuild 2415 BLAKE2B c890e1777e9fa8f01412bd50dffd1ff455c786805cde1717420fdaa846b2451ec0396dc2203a75baf969329525b75c5179830f145176dc3385a1496fd79da2bc SHA512 676bbbdc2958a228a0907e260a2a421f753283893415f393ebd3ba66379cc4910e3fc0b64dd7f87534db7e76d2ff6eb8f78bb22725ab4e095c9c969065410fab
-EBUILD libopenshot-0.2.5.ebuild 2314 BLAKE2B 57f5e2664972250a5077a8dfbab5770e38eecfb6f88b57cb27d1029f3a45347d1bff0b50cfb9cbfd31f4358ee18bddd944797a158e8a9a5507117e5c24007a26 SHA512 a4795ea55196d630cc7c871cb2a6d6c752e6444d943b58c2e79811271ec79cc7477abc3d33f3057dbf1204fb38e33aad17d2c0e66eff03a568ea3e88ce963b51
+EBUILD libopenshot-0.2.5.ebuild 2355 BLAKE2B 2b7225b9b3bad2843595c4c6657392ef4f77722929c2de868222cb619354d05ad4f4e1886fb63b4208835b27396a6db57b24d337f77a7e89043c17589f1bced4 SHA512 5b0c6e16eb01ad7b5858397b6e803b83d32d7c03e5bdb7b66c1d733f37136da930976b8f17e8bd540f4c9078f1b365e4d01d8ab7b00423420fc4eac45b5c3c0a
 MISC metadata.xml 520 BLAKE2B d4eba07a3598f2fd073fb11a885ccb303a30624ea396fe43799348bc7284375d7223f0553cb01b582d5ceb7daa402878c89290eb27a7e6797d366c5bc1146e91 SHA512 19cdd8b9200c01945b48efbd52b78a45ee681244076bde7045d8d737d00fc7fe41cce6845459cccc2e4ff7b4be1e42eb3c6b14f43165435a9122ff266bbf0b15
diff --git a/media-libs/libopenshot/files/libopenshot-0.2.5-no-hwaccel-testfix.patch b/media-libs/libopenshot/files/libopenshot-0.2.5-no-hwaccel-testfix.patch
new file mode 100644
index 000000000000..a079d9746c0e
--- /dev/null
+++ b/media-libs/libopenshot/files/libopenshot-0.2.5-no-hwaccel-testfix.patch
@@ -0,0 +1,45 @@
+From f71051e8f1add0b893ffaa9a799625017978e7f8 Mon Sep 17 00:00:00 2001
+From: Frank Dana <ferdnyc@gmail.com>
+Date: Thu, 20 Aug 2020 21:13:42 -0400
+Subject: [PATCH] Tests: Don't enable HW accel as side-effect (#557)
+
+The Settings test attempts to test the class by changing settings
+variables and reading them back again. Problem is, that affects
+the REST of the unit tests. So instead of enabling HW accel and
+causing crashes, we'll diddle something innocuous, like OMP_THREADS.
+---
+ tests/Settings_Tests.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tests/Settings_Tests.cpp b/tests/Settings_Tests.cpp
+index b63b56a8..65bd66a6 100644
+--- a/tests/Settings_Tests.cpp
++++ b/tests/Settings_Tests.cpp
+@@ -41,7 +41,7 @@ TEST(Settings_Default_Constructor)
+ 	// Create an empty color
+ 	Settings *s = Settings::Instance();
+ 
+-	CHECK_EQUAL(0, s->HARDWARE_DECODER);
++	CHECK_EQUAL(12, s->OMP_THREADS);
+ 	CHECK_EQUAL(false, s->HIGH_QUALITY_SCALING);
+ 	CHECK_EQUAL(false, s->WAIT_FOR_VIDEO_PROCESSING_TASK);
+ }
+@@ -50,15 +50,15 @@ TEST(Settings_Change_Settings)
+ {
+ 	// Create an empty color
+ 	Settings *s = Settings::Instance();
+-	s->HARDWARE_DECODER = 1;
++	s->OMP_THREADS = 8;
+ 	s->HIGH_QUALITY_SCALING = true;
+ 	s->WAIT_FOR_VIDEO_PROCESSING_TASK = true;
+ 
+-	CHECK_EQUAL(1, s->HARDWARE_DECODER);
++	CHECK_EQUAL(8, s->OMP_THREADS);
+ 	CHECK_EQUAL(true, s->HIGH_QUALITY_SCALING);
+ 	CHECK_EQUAL(true, s->WAIT_FOR_VIDEO_PROCESSING_TASK);
+ 
+-	CHECK_EQUAL(1, s->HARDWARE_DECODER);
++	CHECK_EQUAL(8, Settings::Instance()->OMP_THREADS);
+ 	CHECK_EQUAL(true, Settings::Instance()->HIGH_QUALITY_SCALING);
+ 	CHECK_EQUAL(true, Settings::Instance()->WAIT_FOR_VIDEO_PROCESSING_TASK);
+ }
diff --git a/media-libs/libopenshot/libopenshot-0.2.5.ebuild b/media-libs/libopenshot/libopenshot-0.2.5.ebuild
index fdfa393fcfc9..37973900308f 100644
--- a/media-libs/libopenshot/libopenshot-0.2.5.ebuild
+++ b/media-libs/libopenshot/libopenshot-0.2.5.ebuild
@@ -38,7 +38,10 @@ BDEPEND="
 	test? ( dev-libs/unittest++ )
 "
 
-PATCHES=( ${FILESDIR}/${PN}-0.2.5-gcc10.patch )
+PATCHES=(
+	"${FILESDIR}/${P}-gcc10.patch"
+	"${FILESDIR}/${P}-no-hwaccel-testfix.patch"
+)
 
 check_compiler() {
 	if [[ ${MERGE_TYPE} != binary ]] && ! tc-has-openmp; then
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 3364ad2be392..3a64cc02be10 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -1,7 +1,11 @@
 AUX libsdl2-2.0.12-egl-detection.patch 744 BLAKE2B cfcb6db61505e7f8dbd327c73098c2df88860c336438af531905aba5f8de1f696b41cbbab7a09a6a1fc067a39c3178aebbc2e86146f45e2d3ddac8ab1e6bb892 SHA512 1640c71d5a5c86e99d60123b3c5c8e60a9e1bcdf886662d9d2c8f2fda994cba873c5ac515cdf41e5e81663a895e6e2db08ea5e180999a5cebac8e08d2438d59b
 AUX libsdl2-2.0.12-static-libs.patch 2510 BLAKE2B 2c93b5a9ba38d797281d2d3b13eeb1848b46835e99dec20a325fd6e4e30ff44ae1966292f8b0cf95e3356e6a6d2787e90ea51c47fd92948cba2943c6ecbfb8c3 SHA512 d0f6a3f8282275f9ae63bfb363a357deb804d079be6feeaa0d8c749b79df1ad195da59b0da22f1eae4f527eecd63ceef210f52c1f303229a7aa13b71c3d711b0
 AUX libsdl2-2.0.12-vulkan-headers.patch 536 BLAKE2B 5bc6f494aa3afb6c1176055193505bc091569925f2f31f6e623254fa19df3eeb3fe477b97b4eef1973a3f9961d8f5159cf62aae39b8ab84d178ca5f8cf8346fd SHA512 20a6f433c973bb521d4db19c682b1a063b314405a0f2b68ed88a68030ef2a4ba71a8b84c45c0980c6218f2b9f332cc3cfd1354aebcd0932584169161638e011e
+AUX libsdl2-2.0.14-static-libs.patch 1820 BLAKE2B 54a6e92a2fd52c54ae25a1b859502cc403fa9bfcb6e2f3b83ca90fa125ff98c5ed0478cf786d6f1142968187230efbc994a57f706ae1a90bd1fe21eeada1673a SHA512 cf3762b03600c80f26e72f8828b4c0d6ac3c32ae00e1e0f5c9ab46fb4de178f4b045dcfd68f5d371c835235c96c5f1762e5966377d2a95874a012008eb2b13b9
+AUX libsdl2-2.0.14-vulkan.patch 554 BLAKE2B 654415d20fc1782ee8d3a979355dcb743537cad60bebf4edf5299feec821cacbd75c45247820d1c41cb4c706b3bbf58fd2e33ed38b1150a50b0be0aab9d3f536 SHA512 d379da36a27c82c8e178f05ba572022119c012b304ffa672529d652c41d00ee7ad00ce715892306c7e6e914a3071d2879c67f37198139d5a786ce4da442309c0
 DIST SDL2-2.0.12.tar.gz 5720162 BLAKE2B 1e50d2d3060c38faadfc6610e3af7b0e54ce880101f8ca441b84431fb5f683cc6353402025be2eecbb8b9f85bb3982c9aea36e96067a97d079d39f9cd44964a0 SHA512 3f1f04af0f3d9dda9c84a2e9274ae8d83ea0da3fc367970a820036cc4dc1dbf990cfc37e4975ae05f0b45a4ffa739c6c19e470c00bf3f2bce9b8b63717b8b317
+DIST SDL2-2.0.14.tar.gz 6089974 BLAKE2B 5982c66430f8ae62094dbc216781efafd3a07c50efd16bc8307d5048227011d4710d5af1b15be01a55fa6f3ae41eedf9c2df67bafd98042e3b2978a05e7ffd27 SHA512 ebc482585bd565bf3003fbcedd91058b2183e333b9ea566d2f386da0298ff970645d9d25c1aa4459c7c96e9ea839fd1c5f2da0242a56892865b2e456cdd027ee
 EBUILD libsdl2-2.0.12-r1.ebuild 5507 BLAKE2B 90e85b193d881a8c5e6309a21e0e49c63d747f1b1c961625f58d760b8170dee0107a6896b64b3ba47788128feaa0c669e5b325445f0bf2f7dfbb0d6a3293c649 SHA512 478a84f6c427a2dba3e97cf1932e004e6933d9e87fc0c902729381572ab1b97de0a8824bd1ea9a2bf8714165478a3030fff834ded36f6d565cc2114dc2fd4cdd
 EBUILD libsdl2-2.0.12-r2.ebuild 5895 BLAKE2B 8b5485517c3222740bc97a2a71430d6724e61fdfeaa96145b9b1ae734a5fea662855aaa9fc1cda568a1bc85dc9d442cff2d925a0a1966c10de7da2d8100a61ed SHA512 1461736190d0e6271d73074448193139d47c3ebf0f9ae9d302e781bab200b91835ac09647b45182d7d865d36bf562396035e650851d934d49dd18ff767ab6493
+EBUILD libsdl2-2.0.14.ebuild 5934 BLAKE2B b7fcd558236452186bad549772be1b46e9291637024bcfb484fb0d3e16abacabae634e7713db2d149fdc236cb3922739b4ad27a236366b08422fd59de2da1ba6 SHA512 1d376fa674a998be10673400d0ffe65c8a0cc9387f3c412c5f57129285b7f737cd189403b05fc245050fe1abeaec5184a7aeec90bcaff1dbb2fb83c3ffdc3928
 MISC metadata.xml 1805 BLAKE2B 16d4961cf6d0c9997fe706dd5deb51b98f153135cb4f0bedbc29e842d485ba2f4493003830385957b7ac92fd9f6d31bcf4319d800a7f2bd46a9a1772b86f3e5a SHA512 37e976d6a469c6e17e3efb178a189903c3ac2baf99d0e3aa7fb80bfc6d297e52c910ae6361e119fe1173d6d8a9d2aef47172bb4a1185ef4f99f36c75d1f8c19f
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch
new file mode 100644
index 000000000000..01b9c5134379
--- /dev/null
+++ b/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch
@@ -0,0 +1,34 @@
+Fix --disable-static.
+
+Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=1431
+
+--- SDL2-2.0.14/configure.ac
++++ SDL2-2.0.14/configure.ac
+@@ -3863,7 +3863,7 @@
+         if test -f /lib/w32api/libuuid.a; then
+             LIBUUID=/lib/w32api/libuuid.a
+         else
+-            LIBUUID=-luuid
++            LIBUUID=-Wl,-luuid
+         fi
+         EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion $LIBUUID -static-libgcc"
+         # The Windows platform requires special setup
+--- SDL2-2.0.14/Makefile.in
++++ SDL2-2.0.14/Makefile.in
+@@ -151,13 +151,13 @@
+ .PHONY: all update-revision install install-bin install-hdrs install-lib install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data clean distclean dist $(OBJECTS:.lo=.d)
+ 
+ $(objects)/$(TARGET): $(GEN_HEADERS) $(GEN_OBJECTS) $(OBJECTS) $(VERSION_OBJECTS)
+-	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $(OBJECTS) $(GEN_OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
++	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
+ 
+ $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
+-	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLMAIN_OBJECTS) -rpath $(libdir)
++	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
+ 
+ $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS)
+-	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLTEST_OBJECTS) -rpath $(libdir)
++	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
+ 
+ install: all install-bin install-hdrs install-lib install-data
+ install-bin:
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.14-vulkan.patch b/media-libs/libsdl2/files/libsdl2-2.0.14-vulkan.patch
new file mode 100644
index 000000000000..948f68fe2340
--- /dev/null
+++ b/media-libs/libsdl2/files/libsdl2-2.0.14-vulkan.patch
@@ -0,0 +1,13 @@
+--- SDL2-2.0.14/src/video/SDL_vulkan_utils.c
++++ SDL2-2.0.14/src/video/SDL_vulkan_utils.c
+@@ -91,8 +91,10 @@
+         return "VK_ERROR_VALIDATION_FAILED_EXT";
+     case VK_ERROR_INVALID_SHADER_NV:
+         return "VK_ERROR_INVALID_SHADER_NV";
++#if VK_HEADER_VERSION < 162
+     case VK_ERROR_INCOMPATIBLE_VERSION_KHR:
+         return "VK_ERROR_INCOMPATIBLE_VERSION_KHR";
++#endif
+     case VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT:
+         return "VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT";
+     case VK_ERROR_NOT_PERMITTED_EXT:
diff --git a/media-libs/libsdl2/libsdl2-2.0.14.ebuild b/media-libs/libsdl2/libsdl2-2.0.14.ebuild
new file mode 100644
index 000000000000..4002370c79ee
--- /dev/null
+++ b/media-libs/libsdl2/libsdl2-2.0.14.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic toolchain-funcs multilib-minimal
+
+MY_P="SDL2-${PV}"
+DESCRIPTION="Simple Direct Media Layer"
+HOMEPAGE="https://www.libsdl.org/"
+SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus fcitx4 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pulseaudio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
+REQUIRED_USE="
+	alsa? ( sound )
+	fcitx4? ( dbus )
+	gles2? ( video )
+	ibus? ( dbus )
+	jack? ( sound )
+	nas? ( sound )
+	opengl? ( video )
+	pulseaudio? ( sound )
+	vulkan? ( video )
+	wayland? ( gles2 )
+	xinerama? ( X )
+	xscreensaver? ( X )"
+
+CDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+	fcitx4? ( app-i18n/fcitx:4 )
+	gles2? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] )
+	ibus? ( app-i18n/ibus )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	kms? (
+		>=x11-libs/libdrm-2.4.82[${MULTILIB_USEDEP}]
+		>=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm]
+	)
+	libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
+	nas? (
+		>=media-libs/nas-1.9.4[${MULTILIB_USEDEP}]
+		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+	)
+	opengl? (
+		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+	)
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}]
+		>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl,gles2,wayland]
+		>=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}]
+	)
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXcursor-1.1.14[${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}]
+		xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
+		xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
+	)"
+RDEPEND="${CDEPEND}
+	vulkan? ( media-libs/vulkan-loader )"
+DEPEND="${CDEPEND}
+	ibus? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+	vulkan? ( dev-util/vulkan-headers )
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/SDL2/SDL_config.h
+	/usr/include/SDL2/SDL_platform.h
+	/usr/include/SDL2/begin_code.h
+	/usr/include/SDL2/close_code.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.14-static-libs.patch
+	"${FILESDIR}"/${PN}-2.0.14-vulkan.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Unbundle some headers.
+	rm -r src/video/khronos || die
+	ln -s "${ESYSROOT}/usr/include" src/video/khronos || die
+
+	AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf
+
+	# libsdl2-2.0.14 build regression. Please check if still needed
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	use custom-cflags || strip-flags
+
+	# libsdl2-2.0.14 build regression. Please check if still needed
+	append-flags -D__LINUX__
+
+	if use ibus; then
+		local -x IBUS_CFLAGS="-I${ESYSROOT}/usr/include/ibus-1.0 -I${ESYSROOT}/usr/include/glib-2.0 -I${ESYSROOT}/usr/$(get_libdir)/glib-2.0/include"
+	fi
+
+	# sorted by `./configure --help`
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		--enable-atomic
+		$(use_enable sound audio)
+		$(use_enable video)
+		--enable-render
+		--enable-events
+		$(use_enable joystick)
+		$(use_enable haptic)
+		--enable-power
+		--enable-filesystem
+		$(use_enable threads)
+		--enable-timers
+		--enable-file
+		--enable-loadso
+		--enable-cpuinfo
+		--enable-assembly
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_x86_sse ssemath)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_3dnow 3dnow)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable oss)
+		$(use_enable alsa)
+		--disable-alsa-shared
+		$(use_enable jack)
+		--disable-jack-shared
+		--disable-esd
+		$(use_enable pulseaudio)
+		--disable-pulseaudio-shared
+		--disable-arts
+		$(use_enable libsamplerate)
+		$(use_enable nas)
+		--disable-nas-shared
+		--disable-sndio
+		--disable-sndio-shared
+		$(use_enable sound diskaudio)
+		$(use_enable sound dummyaudio)
+		$(use_enable wayland video-wayland)
+		--disable-wayland-shared
+		$(use_enable video_cards_vc4 video-rpi)
+		$(use_enable X video-x11)
+		--disable-x11-shared
+		$(use_enable X video-x11-xcursor)
+		$(use_enable X video-x11-xdbe)
+		$(use_enable xinerama video-x11-xinerama)
+		$(use_enable X video-x11-xinput)
+		$(use_enable X video-x11-xrandr)
+		$(use_enable xscreensaver video-x11-scrnsaver)
+		$(use_enable X video-x11-xshape)
+		$(use_enable X video-x11-vm)
+		$(use_enable aqua video-cocoa)
+		--disable-video-directfb
+		--disable-fusionsound
+		--disable-fusionsound-shared
+		$(use_enable kms video-kmsdrm)
+		--disable-kmsdrm-shared
+		$(use_enable video video-dummy)
+		$(use_enable opengl video-opengl)
+		--disable-video-opengles1
+		$(use_enable gles2 video-opengles2)
+		$(use_enable vulkan video-vulkan)
+		$(use_enable udev libudev)
+		$(use_enable dbus)
+		$(use_enable fcitx4 fcitx)
+		$(use_enable ibus)
+		--disable-directx
+		--disable-rpath
+		--disable-render-d3d
+		$(use_with X x)
+	)
+
+	#ECONF_SOURCE="${S}" 
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake V=1
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	# Do not delete the static .a libraries here as some are
+	# mandatory. They may be needed even when linking dynamically.
+	find "${ED}" -type f -name "*.la" -delete || die
+	dodoc {BUGS,CREDITS,README,README-SDL,TODO,WhatsNew}.txt docs/README*.md
+}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 595d4269c2d8..1aacb666a845 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -3,8 +3,8 @@ DIST mesa-20.2.4.tar.xz 13869928 BLAKE2B 078dc88be08d3b41d5144c4d72b0044512dc77c
 DIST mesa-20.2.6.tar.xz 13886924 BLAKE2B 2bc5d680979b58a77105a8058da5dfea81afe05166a44d08cf243e5760b8c66e418fd78046a2c88243f56aa85a610d052f3aaf259938668cd0f4a184e9edca46 SHA512 347b275d88c0d14cacef570ed736cac07f2e607bc4c89a16b915ec01ac57dbbe698ddf9a0ad70f034e00318403351e3c728e74c72c653acf1fc99720887fa888
 DIST mesa-20.3.1.tar.xz 14176916 BLAKE2B a557949f5cddedee1ee157d982ff74330984c8e1f3a60731397234a2154ee908d1fd38b6f436ea139ba28ba7b45b597bfcd99d1cebd1a0a84bce4c071e591fd6 SHA512 06638b8d2d866b5e27024c58a2ca03a73869221a7d536f7a8f1679d73708e5c1713446c8fedc594844b95596ae817bfceb88ace6b42423328189778e5036edf6
 EBUILD mesa-20.1.10.ebuild 14439 BLAKE2B 44180101e4e4c6692661cae16822ed29e292e86821df1361e733839bceeb8353883e5aff3893a91f5e09936aa8e5c0d2d14f8871f558c24590e61b78c6e8716a SHA512 d4474ce10d3cab18cc75ff5c0b9cfe2d05e0987e9c20a2a01ce2cf9873fac0b8e259fad1196327cf3426406e0a338ed326ff9309439af93403f458b104f0fde7
-EBUILD mesa-20.2.4.ebuild 14790 BLAKE2B 9ca2d00b39d3bb307ac2cc68ac3b531c2413e44dd902a6510c2b8dacbf8da09765129519e2d36e8e5972315b4b2c740402a5558775d8d22b7af63710fc54b0ac SHA512 f0852f53d8810d89ad2f84d4f6d49a749305a8ae120c9d06fa4cf7258dbf0630d74fd60074f53ec871bb658ba5d78ebcd90006c72be5706a7c156a2a1a13555b
+EBUILD mesa-20.2.4.ebuild 14787 BLAKE2B 3fcf8c3aaf4a1604f5f9740e86209bd39afb5ac75d3a235e158f69018992d1a5d9615cbfa7dc60c3ec2ed8056d8fb6a233137f827c034d706979960f339091e0 SHA512 b538f732c70f7ba100b3b2938e7071b34d98ad5c2db4b46395005daae744165602d6cf4cc2a1778b8adeb236c3f86b285c2927677304b55ca9458874ea6177be
 EBUILD mesa-20.2.6.ebuild 14794 BLAKE2B ab5f4a04e055c761db7bd0757b62d5e75d87288972780d5d24fed1d6da6cd17ae79f1427c2190a629b8c6b78471991f5d43dfe88a159416a6788b97ea33db11e SHA512 02e10dbb2a6e0e4542771ef543fd04cbca5d0bb6394382db6aced502e34955556ae00df2b62a8a0bc437f64668ab1f099fd71243c26f965a7e734d5b49ad1b95
 EBUILD mesa-20.3.1.ebuild 14877 BLAKE2B daf969be2dc77ab4d88c1656d01ce244b326aa4462836e3b8ab1402febb677100850ddec1b89c0e025cf3b0af582bf220b4f5f3cc7212fbf38677e2a79440435 SHA512 45e9652f9c8965f35bab368d2332a5aae72b93d5ceb44425bbc0b6781bc1f622f5f8bc79914170869490f896746dabf079a099feade2343928abfd6a6104bfe0
-EBUILD mesa-9999.ebuild 14818 BLAKE2B d196d517ea52bc878e43e96efb814f8a03a3b69746b4a6b134933c0efb5dc047909975f7bfc90882ba3b0148d09526e0992d56b8fde1dfbbab551c883dda730a SHA512 6008aac202f6b54914b637be9f6c4d25203579beb5f947b63fbd96c5b216eec58d9bd69343f913368dbe19193f2a7d0a99a4fd7d68e511f1cf096f89eeb08396
+EBUILD mesa-9999.ebuild 14825 BLAKE2B 9e2c13ca384c3cad4dfe19309bb4699c5795f2936e9b7c9e7645827bbaf71703c0db0db6bd6d7899546ae38f341739590a2071c193f981d58e16615de0ee46d1 SHA512 4260da1939ecb2492cf444911181ba423f5420ee02e91f74aba972a7e52793df43debe41cec89bd279b59a67d686b97152a4199c8ec1f2d39df813809c4af1c5
 MISC metadata.xml 1895 BLAKE2B abf62dda9b9eba657e310c68fdd86aaa49c550dc34ef624e8feb038e0412f0da786e1120dc16631399cb2c83961b88e78571347c3e6d464c2cf3a343bc0f1483 SHA512 7758641386100e07c1112afe04a8613de8ae1e35a8e940f0eefcfc7daa829789c42b903320339b04b44c2400f0857c180740407abd171e9773a9f51e3dd9468a
diff --git a/media-libs/mesa/mesa-20.2.4.ebuild b/media-libs/mesa/mesa-20.2.4.ebuild
index 9c506a4c2497..ca0dfceda9d0 100644
--- a/media-libs/mesa/mesa-20.2.4.ebuild
+++ b/media-libs/mesa/mesa-20.2.4.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 5c410fcd9811..a83701ae097f 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index d5cbb9f8d7b4..bdbedd4dd366 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,5 +1,7 @@
 AUX mlt-6.10.0-swig-underlinking.patch 596 BLAKE2B b51670d051ae2bd016da65f560ed861518845d11e46aa5b4971a68f196452b86af3e00cb9af02bf23b32028731eb5352214aa63a047ebe12386c9f749df1236c SHA512 95cf9339b88979eb19cda3698474fc386c0c2d01333435e95b5a7662dbc5c359f5c78e05a0d78836023191c07a97e0dbf20c354e10cf6d1ad59d64fa9a203160
 AUX mlt-6.22.1-fix-regression-w-multiple-affine-filters.patch 1093 BLAKE2B 12bf9abd2053868945df5e185a2a111118bfe886d3987070f75683be2f5c00bb5b6325119a99c2ed9f20e8f91b9dda8e90a712e05170c435bfc04cfa02d12306 SHA512 4869580800b3de0e68669d3ad6c4d7ae1c994d2cef7de444a130625c3ec806d9691973b0bc921a52c39361e35f11d319377a3330fbbecc7cf51afb62f1fcd99b
+AUX mlt-6.22.1-no_lua_bdepend.patch 153 BLAKE2B 3ea31c570e7bef81bda0905549baedee8b9eed2bc14c535abff02985d573e4606f4f8f42213bcbc86fa68af905ba6c39dddcbf63efa20172c608659153d79073 SHA512 b382ee68f2815b4aa62ce7708a7452536f2bc0287dc4d59f557c08fbf51d6bef7607f63e11e991b4f52eb7e06afbde06d53aac3d42b4a0c96f59332ec17d48cd
 DIST mlt-6.22.1.tar.gz 1343746 BLAKE2B 3178f9af8ee2695df3343d333d03a5e87a22d226915a19c90dd78bbe66684984d37549ef53e6583152b5f44267d0e908e6f887f18fb02289cc31e8c8b1520ddb SHA512 c620b68d35c90eab650c70768a4ae631dec83ece6dd3fd8e09f9300d837d8e0f3da1b098786188f9c1216800f848dd5db7c9e5fa03e816fba3fbcf3c63324c74
 EBUILD mlt-6.22.1-r1.ebuild 4814 BLAKE2B 7750e214aa0052178da1defe96742d7a67092c45d01a565ab0d049e625ca7d31fe9c8a5be7cc985d00565cd407937f6c8754380f618c1a14aba75a0b61cde912 SHA512 2d2a6e0d0e126a281b3ad07b9ae6df2feb8958e9e548bab4b83c5b8e5ddd477362369b61479381eae631432671f0513e145c0f42eb23fbd747c67d8a4ee27ab4
+EBUILD mlt-6.22.1-r100.ebuild 5411 BLAKE2B 1e2d57368378f4be08bc460f1a6ae40c03b5ca4dab0204f9047fc92da5faea7697ec8b5ae4d9b61eaacfdf3a5ffc6264074078497b643df11bdbd98d9bf15038 SHA512 b7accc9d4c753c94aa579815985fecb54eebcff50bdde2ac05df3b73dfbc02899ebba253a0b8e6a0745e3b798bfe860ea65d4e0975504ee12cf9060c24355a7b
 MISC metadata.xml 1539 BLAKE2B ce738031471a08f5d3969af421d214c79b8c8581daa3a40cd6bc0d04d5884d7c5c64551e18f3262ca0539663d63ea1a35e85e57bd5861816eea5c295c2430517 SHA512 2b9b1cdc067811cee0bb3a242fe3985217e223d8d2defeae9161fb187e50934e765c03d6899f121ad4a6fa86fcbdd01392ae875b65331efe2ab64f0c4f1ced61
diff --git a/media-libs/mlt/files/mlt-6.22.1-no_lua_bdepend.patch b/media-libs/mlt/files/mlt-6.22.1-no_lua_bdepend.patch
new file mode 100644
index 000000000000..2b441a2df72e
--- /dev/null
+++ b/media-libs/mlt/files/mlt-6.22.1-no_lua_bdepend.patch
@@ -0,0 +1,11 @@
+--- a/src/swig/lua/build
++++ b/src/swig/lua/build
+@@ -8,7 +8,7 @@
+ 	exit 0
+ fi
+ 
+-path=`which lua 2> /dev/null`
++path=`/bin/true`
+ 
+ if [ $? = 0 ]
+ then
diff --git a/media-libs/mlt/mlt-6.22.1-r100.ebuild b/media-libs/mlt/mlt-6.22.1-r100.ebuild
new file mode 100644
index 000000000000..1645da008141
--- /dev/null
+++ b/media-libs/mlt/mlt-6.22.1-r100.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit lua python-single-r1 qmake-utils toolchain-funcs
+
+DESCRIPTION="Open source multimedia framework for television broadcasting"
+HOMEPAGE="https://www.mltframework.org/"
+SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg
+fftw frei0r gtk jack kdenlive kernel_linux libsamplerate lua melt opencv opengl python
+qt5 rtaudio sdl vdpau vidstab xine xml"
+# java perl php tcl
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+SWIG_DEPEND=">=dev-lang/swig-2.0"
+#	java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 )
+#	perl? ( ${SWIG_DEPEND} )
+#	php? ( ${SWIG_DEPEND} )
+#	tcl? ( ${SWIG_DEPEND} )
+#	ruby? ( ${SWIG_DEPEND} )
+BDEPEND="
+	virtual/pkgconfig
+	compressed-lumas? ( virtual/imagemagick-tools[png] )
+	lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
+	python? ( ${SWIG_DEPEND} )
+"
+#rtaudio will use OSS on non linux OSes
+DEPEND="
+	>=media-libs/libebur128-1.2.2:=
+	ffmpeg? ( media-video/ffmpeg:0=[vdpau?,-flite] )
+	fftw? ( sci-libs/fftw:3.0= )
+	frei0r? ( media-plugins/frei0r-plugins )
+	gtk? (
+		media-libs/libexif
+		x11-libs/pango
+	)
+	jack? (
+		>=dev-libs/libxml2-2.5
+		media-libs/ladspa-sdk
+		virtual/jack
+	)
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
+	lua? ( ${LUA_DEPS} )
+	opencv? ( >=media-libs/opencv-3.2.0:= )
+	opengl? ( media-video/movit )
+	python? ( ${PYTHON_DEPS} )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		media-libs/libexif
+		x11-libs/libX11
+	)
+	rtaudio? (
+		>=media-libs/rtaudio-4.1.2
+		kernel_linux? ( media-libs/alsa-lib )
+	)
+	sdl? (
+		media-libs/libsdl2[X,opengl,video]
+		media-libs/sdl2-image
+	)
+	vidstab? ( media-libs/vidstab )
+	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
+	xml? ( >=dev-libs/libxml2-2.5 )"
+#	java? ( >=virtual/jre-1.5 )
+#	perl? ( dev-lang/perl )
+#	php? ( dev-lang/php )
+#	ruby? ( ${RUBY_DEPS} )
+#	sox? ( media-sound/sox )
+#	tcl? ( dev-lang/tcl:0= )
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS NEWS README docs/{framework,melt,mlt{++,-xml}}.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch
+	"${FILESDIR}"/${PN}-6.22.1-no_lua_bdepend.patch
+	"${FILESDIR}"/${P}-fix-regression-w-multiple-affine-filters.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
+	for x in python lua; do
+		sed -i "/mlt.so/s/ -lmlt++ /& ${CFLAGS} ${LDFLAGS} /" src/swig/$x/build || die
+	done
+
+	use python && python_fix_shebang src/swig/python
+}
+
+src_configure() {
+	tc-export CC CXX
+
+	local myconf=(
+		--enable-gpl
+		--enable-gpl3
+		--enable-motion-est
+		--target-arch=$(tc-arch)
+		--disable-gtk2
+		--disable-kde
+		--disable-sdl
+		--disable-swfdec
+		$(use_enable debug)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable ffmpeg avformat)
+		$(use_enable fftw plus)
+		$(use_enable frei0r)
+		$(use_enable gtk gdk)
+		$(use_enable jack jackrack)
+		$(use_enable kdenlive)
+		$(use_enable libsamplerate resample)
+		$(use_enable melt)
+		$(use_enable opencv)
+		$(use_enable opengl)
+		$(use_enable qt5 qt)
+		$(use_enable rtaudio)
+		$(use_enable sdl sdl2)
+		$(use_enable vidstab vid.stab )
+		$(use_enable xine)
+		$(use_enable xml)
+		--disable-sox
+	)
+		#$(use_enable sox) FIXME
+
+	use compressed-lumas && myconf+=( --luma-compress )
+	use ffmpeg && myconf+=( --avformat-swscale )
+	use vdpau && myconf+=( --avformat-vdpau )
+
+	if use qt5 ; then
+		myconf+=(
+			--qt-includedir=$(qt5_get_headerdir)
+			--qt-libdir=$(qt5_get_libdir)
+		)
+	fi
+
+	if use amd64 || use x86 ; then
+		myconf+=( $(use_enable cpu_flags_x86_mmx mmx) )
+	else
+		myconf+=( --disable-mmx )
+	fi
+
+	if ! use melt ; then
+		sed -i -e "s;src/melt;;" Makefile || die
+	fi
+
+	# TODO: add swig language bindings
+	# see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
+
+	local swig_lang=()
+	# not done: java perl php ruby tcl
+	# handled separately: lua
+	for i in python; do
+		use $i && swig_lang+=( $i )
+	done
+	[[ -z "${swig_lang}" ]] && swig_lang=( none )
+
+	econf "${myconf[@]}" --swig-languages="${swig_lang[*]}"
+
+	sed -i -e s/^OPT/#OPT/ config.mak || die
+}
+
+src_compile() {
+	default
+
+	if use lua; then
+		# Only copy sources now to avoid unnecessary rebuilds
+		lua_copy_sources
+
+		lua_compile() {
+			pushd "${BUILD_DIR}"/src/swig/lua > /dev/null || die
+
+			sed -i -e "s| mlt_wrap.cxx| $(lua_get_CFLAGS) mlt_wrap.cxx|" build || die
+			./build
+
+			popd > /dev/null || die
+		}
+		lua_foreach_impl lua_compile
+	fi
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/${PN}
+	doins -r demo
+
+	#
+	# Install SWIG bindings
+	#
+
+	docinto swig
+
+	if use lua; then
+		lua_install() {
+			pushd "${BUILD_DIR}"/src/swig/lua > /dev/null || die
+
+			exeinto "$(lua_get_cmod_dir)"
+			doexe mlt.so
+
+			popd > /dev/null || die
+		}
+		lua_foreach_impl lua_install
+
+		dodoc "${S}"/src/swig/lua/play.lua
+	fi
+
+	if use python; then
+		cd "${S}"/src/swig/python || die
+		python_domodule mlt.py _mlt.so
+		chmod +x "${D}$(python_get_sitedir)/_mlt.so" || die
+		dodoc play.py
+		python_optimize
+	fi
+
+	# not done: java perl php ruby tcl
+}
diff --git a/media-libs/mutagen/Manifest b/media-libs/mutagen/Manifest
index 377076b49051..45832e704371 100644
--- a/media-libs/mutagen/Manifest
+++ b/media-libs/mutagen/Manifest
@@ -1,7 +1,3 @@
-DIST mutagen-1.43.0.tar.gz 1143839 BLAKE2B 044906b730763e001fa2cb863c8bb1fec45713aca57b6311f783f66218e4f3410987d04d56a1e4fbf41a229860bbb574b4077401e1f2384e70d80fdc9f3b23ad SHA512 66df63705a43befa9cf6688bc8b3acc4fd1559eb28920c105b47a97c35422b5e19527051445daa7aed66facc2e4c14d71058f8560bbd564fecbe56a076491e3f
-DIST mutagen-1.44.0.tar.gz 1143320 BLAKE2B 9e4ad11b7ee560a4940e3eaaecdb8b0fad4db54fd1fa9e4f925d84e55c217eb002e07602817fa92f6db9fdd6b6b339d5e147874bf587604c18b665d980d6604a SHA512 88c8c181b1333989451533951727b7c43e4a012defd3fd1f7ddd970d083f938783d61f98970e74c677ee9725dac92c47ee37af4bd7a474e85c7a56793c6063a8
 DIST mutagen-1.45.1.tar.gz 1285455 BLAKE2B a1e29698d96b4c98f16e18dd8b3f902e41dcc4409d01da861a726a6a9fbd7f116e07b4e1872b8b3857f0eec080d18bac736de741635746f5c71416a3a8ef6e78 SHA512 c5244efa01b9de5ec22ceca39e55f34b933ca4a5bec0f2088fd3adca657f0230cbe85cd5e156db1d90fb44d9339bc94dc3bdcd3e49f1b0d46bc3d71ece6b45d8
-EBUILD mutagen-1.43.0-r1.ebuild 1108 BLAKE2B 57ec9398443730e0a05709495e5ded6a45a233f9affab6f49b55a63fe83a974b384e52633be49a51848f69a6d2064ef1a4bc84de246725837630aedf79932166 SHA512 c1cab0c5cf6847c8805dbc0135cf2df99d68cd110f325ab51ac4523c9874e72a59ece6647971c730375511fc8a2e72cda0b10bbff9ca3b5f26d81e3a1e24a22a
-EBUILD mutagen-1.44.0.ebuild 1096 BLAKE2B d96516ecfd8ea138290bc98ad66e957b846319b4714684fed1f1dd95e22debabcb2faead58b044fc5ec2bfeaeced58c24936eeb56a639f9b0f9873951f68c014 SHA512 baf6b117a14474225b40a8081a23a8092a6db34b3ef62d6eb315054e0fabc021a1122692806731926d7dc21f4c37297bf9f99801c83b7f75c4122ff97379d795
-EBUILD mutagen-1.45.1.ebuild 1132 BLAKE2B 3e779f9b289a20df4f75df290190d7e3ff291c6245fc81b1cfb6efd055f4a22b7d6653b554771cde1e3c37cac1791ca865a5b79ffc95bdaf03a7b4dc3e189aa6 SHA512 2a0b01963446fd8e175129160b7d1c121ef2d492c94e7b578288e0892f69c315cac5c4cc01a6072d38800821d3025718efc21358a6256deff6e07e829a8e84e0
+EBUILD mutagen-1.45.1.ebuild 1131 BLAKE2B 9524e21df5286697d1649c8b57590fa1817aea3c859fb1ed90e95903b03b983164fbf0152ae17669a866b0261d171c4861c048b7da3290b89e91840ce7db7a90 SHA512 bb07aa47ea85d76be1315a46be0a46e8aa0598881b1137d10714f2f0720d8dfc782d0f8b7ec8f55d06bc5972390fbc0878a1e0c49b3cdfe005944bd161337713
 MISC metadata.xml 380 BLAKE2B 9fd70ca6ca6e8d17b66ea703f65885b87714ed0560ffe7502d85da3ee8fdf1d62545c1166b64d99f2bd2bfa6105f8f8865bc28769069c1ae3da4b1c3c174fd69 SHA512 87ce1f85bd6aff7c159fd22a412eb9ea95ac4f58fb2cc70fd4c4f470bfe9f6366b906bc9cef833ae5c10b7a3601c15edab9e8418cf78d7d9e993191873f41d59
diff --git a/media-libs/mutagen/mutagen-1.43.0-r1.ebuild b/media-libs/mutagen/mutagen-1.43.0-r1.ebuild
deleted file mode 100644
index cd4960aed424..000000000000
--- a/media-libs/mutagen/mutagen-1.43.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-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="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 )
-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
-}
-
-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.44.0.ebuild b/media-libs/mutagen/mutagen-1.44.0.ebuild
deleted file mode 100644
index f7b63e447466..000000000000
--- a/media-libs/mutagen/mutagen-1.44.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-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="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 )
-BDEPEND="
-	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
-}
-
-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.45.1.ebuild b/media-libs/mutagen/mutagen-1.45.1.ebuild
index 6ed3bcbd025f..73e064946280 100644
--- a/media-libs/mutagen/mutagen-1.45.1.ebuild
+++ b/media-libs/mutagen/mutagen-1.45.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 # TODO: Missing support for >=dev-python/eyeD3-0.7 API
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index e9bbb716cdd4..8a310655a635 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -5,8 +5,6 @@ AUX opencolorio-1.1.0-use-GNUInstallDirs-and-fix-cmake-install-location.patch 40
 AUX opencolorio-1.1.0-yaml-cpp-0.6.patch 2315 BLAKE2B eaaa69e7bd76a1c40ad823eb1be9cec93d69c0b024521e31d17aa6f5b2c1e29607cf3d238cac1aba19cec3149450b1ab15d1236332ff807bdb872db62f00b3b7 SHA512 2436a404581b26db6416b013ce9de8302c20878d1c956f5ddb40c2d590c0df7a2a8c3108590330598441db51f4aae9b6d485af8b7034b22316fa42ccdc801fa5
 AUX opencolorio-1.1.1-fix-self-assign-clang.patch 493 BLAKE2B fbe85fc4385556deacd173ab44f5a5cbe32c2cd5b4541f1aaf20037840d5d8c7a61d5c314176cde7d0f08c80b6436b0b937c9fef10c3841948b6881601073df5 SHA512 8132a8352a36994550dd089a4858e11459fcbe0495bd07b6bc599a4b8bb7191da8ca6ae061cd1c04f52f586ac993e3656e8c03c6665f7160fa50b4a117f0cb22
 AUX opencolorio-1.1.1-yaml-cpp-boost-check.patch 1891 BLAKE2B 01331aeef0cde9cf4420f13dc1a2ec2bddf46e519e736a6fb653792074b412ab5d6cca364e4e4619b7b868891eee0786bc0c75df748eb8ac724410e61aa6c52a SHA512 4ddb466a56a27db82f5b83dbb96e42f6b6cf0749168459dd32e922345d6011f09961592f7d5611253cbad5d78952d52f1cdabfed011b4c376faafc0becc7422b
-DIST opencolorio-1.1.0.tar.gz 13826812 BLAKE2B 555a5ac393170503c944c3471ea482b1a22be7c98ee7b81af37f52db185c8b61c5318102c139a8711f4828d306b6c4322f5d839c4df08ce41ebbb9dcb2bda152 SHA512 909874a9f91a8d229622810fc70233680c6e75203bd8555179322de2873da00bf302432e19f189b787ffcda3157ddec1e4601c97f75a36e16f644fe7d42f6998
 DIST opencolorio-1.1.1.tar.gz 13828483 BLAKE2B f5642f08db84f2b8da44d0dbf58313c78263496fc6f1f209b93fd303bbf9477033317b44eb8bb2b13a70afa19422f4fa312d52a3fa6598031a2aa50b33bbfccf SHA512 bed722f9ddce1887d28aacef2882debccd7c3f3c0c708d2723fea58a097de9f02721af9e85453e089ffda5406aef593ab6536c6886307823c132aa787e492e33
-EBUILD opencolorio-1.1.0-r4.ebuild 2327 BLAKE2B b3064acecd3582ee6aa687e0bb4a56a68e598002194d96227705e0b9b3bc77d907600478181876684d33efbf9e1339a3ddfc43c1102cdbbae377c44a8eaf516d SHA512 9ce4183f83ae5a3d9d1a33d811ad89a4f5d92613e8b83b337fb83e943125ef976fb483cf13057598a7c5a91f0c18ce229da7f8869f238501ae1989979373589d
-EBUILD opencolorio-1.1.1.ebuild 2398 BLAKE2B d4a1bdf1551818847622d2f3ad21886056e6edd7edc6da36eba5477441a970fe9d5bd6094afce2cd38f4b3560ba09403809d893af3eeaf3db50992ba1d01f0fb SHA512 60012a9caa19a3a0682e32af0354ef416afa9fdab3c79f3dc9c0f88f7b6cf8b3a9bdda62bc144861fd3b3c23c0463199bb360726cb13f22a1aca401770b1c513
+EBUILD opencolorio-1.1.1.ebuild 2405 BLAKE2B 5b0eff3645458b7ef4962525ec5e1d5643cb82172cc84f6d5c4cbf53c32d9c0da8e0f8e573d715a2cd634cf704fea026d68283576b2d5c28da08b95fc2e02b81 SHA512 ab8aecdea51f007e59ba6cb4c4d81f236a00fe7899872710ba7eb505048c01d13bfef3a124a2ad646ce4a5d85f05bcfe7a36ba56f6817b66cb73c0bce88f06c8
 MISC metadata.xml 459 BLAKE2B bc35128a9a20ab016e973d569c001276541d90d4a1872e6cf27877847d8b7e66c28439afcc220dc9bbf31aeae64a14e6f31b8a3683bc0fdee88d4b03781fc537 SHA512 2dda915dd0266e50dc8308eeef37e84287f9caa9d34c4027fe15793f788d1dc354e79e3f46514f15dfd89c40da40da0424af6fec22bce07b638add76ef61b5c9
diff --git a/media-libs/opencolorio/opencolorio-1.1.0-r4.ebuild b/media-libs/opencolorio/opencolorio-1.1.0-r4.ebuild
deleted file mode 100644
index 1bb1af8e32cb..000000000000
--- a/media-libs/opencolorio/opencolorio-1.1.0-r4.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit cmake flag-o-matic python-single-r1
-
-DESCRIPTION="A color management framework for visual effects and animation"
-HOMEPAGE="https://opencolorio.org/"
-
-SRC_URI="https://github.com/imageworks/OpenColorIO/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
-REQUIRED_USE="
-	doc? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	opengl? (
-		media-libs/lcms:2
-		media-libs/openimageio
-		media-libs/glew:=
-		media-libs/freeglut
-		virtual/opengl
-	)
-	python? ( ${PYTHON_DEPS} )
-	>=dev-cpp/yaml-cpp-0.5
-	dev-libs/tinyxml
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-
-# Restricting tests, bugs #439790 and #447908
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-compile-error-with-Lut1DOp.cpp.patch"
-	"${FILESDIR}/${P}-use-GNUInstallDirs-and-fix-cmake-install-location.patch"
-	"${FILESDIR}/${P}-remove-building-of-bundled-programs.patch"
-	"${FILESDIR}/${P}-yaml-cpp-0.6.patch"
-	"${FILESDIR}/${P}-remove-Werror.patch"
-)
-
-S="${WORKDIR}/OpenColorIO-${PV}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	use python && python_fix_shebang .
-}
-
-src_configure() {
-	# Missing features:
-	# - Truelight and Nuke are not in portage for now, so their support are disabled
-	# - Java bindings was not tested, so disabled
-	# Notes:
-	# - OpenImageIO is required for building ociodisplay and ocioconvert (USE opengl)
-	# - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl)
-	local mycmakeargs=(
-		-DOCIO_BUILD_JNIGLUE=OFF
-		-DOCIO_BUILD_NUKE=OFF
-		-DOCIO_BUILD_SHARED=ON
-		-DOCIO_BUILD_STATIC=$(usex static-libs)
-		-DOCIO_STATIC_JNIGLUE=OFF
-		-DOCIO_BUILD_TRUELIGHT=OFF
-		-DUSE_EXTERNAL_LCMS=ON
-		-DUSE_EXTERNAL_TINYXML=ON
-		-DUSE_EXTERNAL_YAML=ON
-		-DOCIO_BUILD_DOCS=$(usex doc)
-		-DOCIO_BUILD_APPS=$(usex opengl)
-		-DOCIO_BUILD_PYGLUE=$(usex python)
-		-DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
-		-DOCIO_BUILD_TESTS=$(usex test)
-	)
-	use doc && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=ON ) # broken
-	cmake_src_configure
-}
diff --git a/media-libs/opencolorio/opencolorio-1.1.1.ebuild b/media-libs/opencolorio/opencolorio-1.1.1.ebuild
index f5179fea4002..3808ce8a9b1c 100644
--- a/media-libs/opencolorio/opencolorio-1.1.1.ebuild
+++ b/media-libs/opencolorio/opencolorio-1.1.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/OpenColorIO-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
 REQUIRED_USE="
 	doc? ( python )
diff --git a/media-libs/opencore-amr/Manifest b/media-libs/opencore-amr/Manifest
index 77c3821c794b..f5702a101d13 100644
--- a/media-libs/opencore-amr/Manifest
+++ b/media-libs/opencore-amr/Manifest
@@ -1,5 +1,5 @@
 DIST opencore-amr-0.1.3.tar.gz 881105 BLAKE2B e9e1d40b90aa819d1b4fce328ae8ff199c7656f3326199c005e8f0a47e4e3282ae02f93826e923c5128c4ec4cebc3f35b6f5ca9f3f49c7dd15d541fb77383d28 SHA512 f67e84604fe3fbb87d608343e595503e2057272fa0b3bf9158a176e88a96d272c35149483c3ee47ba2b064bd6b17cdb315888a5285aa82edc0401f17d2ae761b
 DIST opencore-amr-0.1.5.tar.gz 929581 BLAKE2B 4943a27f0df3d874720c87f48c523d9aa4cce849dd0a3c9183466416a0629aa02dac8f01646e469e8c45438bf3c57047eb11e69f3f1b261449a0989a36639e59 SHA512 c324db9dcac5a31bfac633153bc054bfe42d5ff98202c4adb3c75a3fae9792f07f60d48cd659acf106dacd307174a62b2aeee22a4af53caa20d2bfba46488faf
 EBUILD opencore-amr-0.1.3-r1.ebuild 536 BLAKE2B 5600304d99b7209fa6d66edff43388ae077ebe58ab0aba308c9691df44e9921b2158d810db29ed78bd0807c6254d28959d614c1853a4d10c12b57243022705d5 SHA512 c5bf27226f0eb55a0e703170575b4eee0bd6c3cee981a5e3dc039e5feb146e9efb3b8c81374b67378cd98b499da4cc1b875b87ff0c4a7c58e900143142e430b3
-EBUILD opencore-amr-0.1.5.ebuild 545 BLAKE2B 1cefaf3cd50e6a185f4e5e0059e3d89396e514c0ebcf73c1e395f33cddf0584b48bae2fc15bc21f338a2c6c97a74acb037f697d95150da1606ab2861928489b9 SHA512 a35cde60fb74ac2a94d61a561203deb47fc7c8ef14dd93c4279271ef53efcd8c8693eaba9c3417b739dc83a53917b8d08a1fb6de25ea28131c1295e8c6f84b2c
+EBUILD opencore-amr-0.1.5.ebuild 542 BLAKE2B bf8b4f3d6c4e2caa304141c15eef6c435f8c8cfeb2af8302ed9689242f3c588613a558497afbf4b8550b0d1350367796efa773647c3921f55ea95d1ae0256212 SHA512 255b8a0f793af921ad6b80d45388a08d964288d294a0b52b9496c1beb2b333b564b43e4e1854376e1f5c31cb19c500f1f4443a52de36bb2ebf2e7f847943d0b5
 MISC metadata.xml 335 BLAKE2B 62ac5499e6bf0ca4ebb5cef78982a734cbc068fad39764b545089233f2c611937c4d8cddfa7f042705c7f7849a44f1e971431667eae02e7622d45f5b5ccdfb14 SHA512 25f894f204476ffe7bf81e7e81b16f569b34ac57572cba903bf447a53699f0e4cf5448fa27689b4baf60753e7f605f47c4a7d60f19616446b0c1f871d9b866e3
diff --git a/media-libs/opencore-amr/opencore-amr-0.1.5.ebuild b/media-libs/opencore-amr/opencore-amr-0.1.5.ebuild
index d08d3e451123..be5c14df63c2 100644
--- a/media-libs/opencore-amr/opencore-amr-0.1.5.ebuild
+++ b/media-libs/opencore-amr/opencore-amr-0.1.5.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
diff --git a/media-libs/openctm/Manifest b/media-libs/openctm/Manifest
index 384c0d890465..3ce828d71d5e 100644
--- a/media-libs/openctm/Manifest
+++ b/media-libs/openctm/Manifest
@@ -1,5 +1,17 @@
+AUX openctm-1.0.3-create-lib-with-correct-soname-and-symlinks.patch 722 BLAKE2B 09a4cbfb50cfbadd4367e6f944169cb10b59a11b060c76422f3d2147ca8e1ac233b1d0c41dcef4c155ac04f9bcb13b84227dab19c776e89fb20a10bb849d29ac SHA512 86a2232fbb58d1d4d262512963016ed3e9372c22f5f7f85560f47b05332e6f3c10c3029f16318c79bea9dc5968089dace880afaa4e325ffe9e09fcb635099a17
+AUX openctm-1.0.3-do-not-set-rpath.patch 895 BLAKE2B 8cda8a3c13d5bb2db05bfca4b17b1f2405c33f137720b4a5dc7944e8857ffb7eddfd6a2566cd5e4facd0e39b18f0f6f9cd6a8701e75a12ad617874415168545e SHA512 e3a0fe886cdabd2f7fa52f2c1fc268d94230cd101838a3d4260054b412d70e58e1c195837cd8a01895d05c97da171a86919205ad3fd05757818c9b342b431bce
+AUX openctm-1.0.3-escape-hyphens-in-ctmconv-man-page.patch 305 BLAKE2B f5ca2982837b86e25c87aaec43f50cd45d5037228c846f5b35acf0b214b6b34f8528297213303374cd2e77c347cdb443659b820d891f1b2ce9f68e5237727615 SHA512 40469f718f28db9caad6fcaa2728c7a3c56d5ad60c0d39929e871d9348801ad2aef2cbe5112cb785f9d2b794209bfd2bbe9d5d583ad77567a632c8e21efbfab1
+AUX openctm-1.0.3-fix-install-paths.patch 838 BLAKE2B 4849dc0ecc20f9b3a8bdbe1a033696b4755c6254e6e5b55838b5e60999cda52466d8f34e8444ec5666f19254a285e7fd2cb5cf344af2377c7a09ed1dfdf867dd SHA512 d1c47b171636cfdeebeb310c7553e9fba18e7b36a66e2659a32a5ea878ee3f17f842ac4fcba34e965dbc1865f17f4883f569763ca3ec12adfc55d944997b8e53
+AUX openctm-1.0.3-link-ctmviewer-only-with-necessary-gtk-libs.patch 559 BLAKE2B e0a09ed99bc50957051f7867183c95ec7df43cbf17e4285ebb0cc43414eb7289260dd4288afe3a8355c18c7d20df4cdeb88b63cf8ef9f726943a1cba56756600 SHA512 4d0d6a0f64c9095a38874471d638c31657c8df5f53a803b43ee1e2e8794ecf519075de95dcfaff3bfa62af14a7c534b4abac9869188a368e4b3bc2c5eafd679b
+AUX openctm-1.0.3-link-ctmviewer-with-libGL.patch 349 BLAKE2B d1d8571b867c735df8418d119b50327d6899509e9bf4bd19abd25272797e5c794671c0af67ed693d33a30c666eafb03b2fe460015a154e4b99fff8846022ff8e SHA512 a1c00ae7a8f77b0bc6fc1a437352726cb42fdacb98bb17c4d4bd1f1ca2d92c552c5805ff7115f00d64610e10ad397bfdd26c0c7937eb0a74805a8f9e631257d4
+AUX openctm-1.0.3-link-ctmviewer-with-libGLU.patch 747 BLAKE2B 9f2599e9cbe0dc8fd0ed6b801ce2afa82fd216caa218e28d264aa64a33d1a1eb24e0080bf20bfc7231244253b7e654121def33df7ce8e9735d89c1c04861efb7 SHA512 71a6a4ce3bc352f376f83d7bb26167159bb3aa8f45d3e1134cb703a16a847453eb60de2b50c2aa470e77b837d260375832d5a3941de54891063ab0c169a38d98
+AUX openctm-1.0.3-no-strip.patch 1272 BLAKE2B 78cceaee9185d913d06bcd4ca61447c45cab782388401ff71842fe093bc1f0ef76ec90d0e27a752d3a78f2782ef6cf7b8fdbd773016e465acff6aaf4430ec69d SHA512 a808a499b5a3162831d7b7d67433ef71f1f31e634e2f5057f4f19b59ee962e0379eadad57342a3a24f9891809c2b24adc83abcc311fef990d97446d4baa318cb
+AUX openctm-1.0.3-respect-flags.patch 2931 BLAKE2B fa6b99c7fa46ce5a0f1790cbf89ac45ac19ea939ff165cece87e419f1c902de8d3528c82ad800da079aa07b4f03fd33df47eed07bb61cb60d3326146f91e6153 SHA512 a6d6efa9df63835cb0990906a5755cc6d673a48377af1f28b880384051e4cb2380deae13eff864c179e7e98b3e0319e993c639609bc8b482e3ea37fbf4cb21cd
+AUX openctm-1.0.3-use-system-libs.patch 3289 BLAKE2B d0402954c36ea42372fd65858ef1166fd519e133b3f2f4e5770fd5a76f9f8dc31354749df7af97b7bf050b47c6327f7aa6253eeb7cd4225c55c1dc6e1ac3aebd SHA512 a12e45f703373749e1c71ddfb11576d056b2970de32800bf6fa46332cb23c8e6c5e3e741bc30468599b7a66918e9bd1140e50d5963fba5c71dfaa6649d64a66a
 AUX openctm-fix-makefiles.patch 6672 BLAKE2B 5cc7ad6b882bd4bb3cb05d112dd953807c029b39524bcb17c0f054b99fdf4bd3363d1807d0979c55cc6c746020236f99e48db2cf59b9ff62684e4e7963eb0681 SHA512 96cbe3775632d5b86ba5bb08b283707b5e89ffb0b837b2366f88955eb35341e02ea33de1b2562f87692b359d1b28a96833a163ec1d29f6f266cd641de972a527
 AUX openctm-no-strip.patch 1654 BLAKE2B e284556eb0d7866e527002bdbf291701654dd99a8353592c1dd5f93f6f74bbe4797da4bbc7960d4d7b875734fa4edbff68032c6835cbb26c0bb6f9cf0a471df3 SHA512 a38c4647a0113892d2294efec96efb073cec4d5771c383cd7454422195f230b0326610905534e758fb1f1bf36a6dca1810005f603f70d73584093b8895a99ec0
+DIST openctm-1.0.3-src.tar.bz2 1507603 BLAKE2B 379dad88ef3b069ee4167bdee8c1e86c6f1250c0db7bb108d12b6005f0cd19a4cafcaae51a8e1eddde7566fc9c8e361472268edb1806a5383f536d070ea4354a SHA512 fdfa08d19ecbfea99ba01aa2032e941ed6313394a96bd69f8984c2d2d079d836c616471d2bdf6f40175e75659f3ad0ba41502bc3d8224091472f40893ea8746e
 DIST openctm_1.0.3+dfsg1.orig.tar.bz2 179792 BLAKE2B 446fedc14e646b7cfc0aaac2d4f9b224482d74bf4faadd866b7121392e3863e3e42fe57f35654d4e9d7c056b3b8069dfb4668660d97ce7266d7850026654a88c SHA512 4ea8c9230e01b57fce4d741df77713df8fb0493fbb20c8d4b183e3e8cec16f97e8003d2569b1c7cac07a17d334711673c0fed0c6c050bbdb901028ee9f6c32f6
+EBUILD openctm-1.0.3-r1.ebuild 1415 BLAKE2B bf2c58839ee94c3e2a7f9265a2f9031bc27a494f4bb9977e317fc99fd98b1712bbab90372dcda5a77483cc6dac67a60725a885896b7b67f8c5185fcea6ebada8 SHA512 9e25921489dd8476d8418dc8c62684de641d7c21fde7aa3a7d89103d1e62c680d9919c7fe81524f305a6b0ae763cbd127ba08a9063d6e5287580ba509a8b22d8
 EBUILD openctm-1.0.3.ebuild 924 BLAKE2B 1cb9e32be2a294baa203a10675fa9b33321625a7c5129af388f906a96e3de4762d83146197b835032f9d78a511cd42f0920d27e5b7ecb4f035a934863d8cf6c5 SHA512 a75a3bb34941102b35be2c17023c5af6dba7851b322969bfa3fdf698fd20c6b4b632cd1c7e4c761046f4744616163ffbea45be80f71eee9bbe3c988d3ee92f0a
-MISC metadata.xml 595 BLAKE2B 143f65cc923e4de9305139118c3ca3166c2efcb5b50c9420c0045566384bae0163fc600d2a1d6206afc0abb440e24e7edfc9d5bc6a5e6b080242357440edd3b8 SHA512 04911c1a3a676469a111a02a2a04c3a988e9f9a738f1b3933b5c4c7917f7e65d558d1fd714122127f791bb5998390e2f85794f673f257ed96a37b4d017662c5b
+MISC metadata.xml 665 BLAKE2B 04fec51f9d81997088613e4ca3b4d1d12643e597bbd91896d78a06c90886abaa857785895e8b29b8284afb975594a68c0a046b050360ad971bf964e596398bbe SHA512 79591a66512551c42e4d28d9abaccd3a564b0fb89fb12b52bba9b130704bc6f04d13565f7b0ec41f7b7b79454d49c2002e0aebf48e7e71665c78f8de2f9cb201
diff --git a/media-libs/openctm/files/openctm-1.0.3-create-lib-with-correct-soname-and-symlinks.patch b/media-libs/openctm/files/openctm-1.0.3-create-lib-with-correct-soname-and-symlinks.patch
new file mode 100644
index 000000000000..6b91f43aff7b
--- /dev/null
+++ b/media-libs/openctm/files/openctm-1.0.3-create-lib-with-correct-soname-and-symlinks.patch
@@ -0,0 +1,30 @@
+--- a/lib/Makefile.linux
++++ b/lib/Makefile.linux
+@@ -33,7 +33,11 @@
+ RM = rm -f
+ DEPEND = $(CPP) -MM
+
+-DYNAMICLIB = libopenctm.so
++VERSION = 1.0.3
++SOVERSION = 1
++LIBNAME = libopenctm.so
++SONAME = $(LIBNAME).$(SOVERSION)
++DYNAMICLIB = $(LIBNAME).$(VERSION)
+
+ OBJS = openctm.o \
+        stream.o \
+@@ -64,10 +68,12 @@
+ all: $(DYNAMICLIB)
+
+ clean:
+-	$(RM) $(DYNAMICLIB) $(OBJS) $(LZMA_OBJS)
++	$(RM) $(DYNAMICLIB) $(SONAME) $(LIBNAME) $(OBJS) $(LZMA_OBJS)
+
+ $(DYNAMICLIB): $(OBJS) $(LZMA_OBJS)
+-	gcc -shared -s -Wl,-soname,$@ -o $@ $(OBJS) $(LZMA_OBJS) -lm
++	gcc -shared -s -Wl,-soname,$(SONAME) -o $@ $(OBJS) $(LZMA_OBJS) -lm
++	ln -s $(DYNAMICLIB) $(SONAME)
++	ln -s $(DYNAMICLIB) $(LIBNAME)
+
+ %.o: %.c
+ 	$(CC) $(CFLAGS) $<
diff --git a/media-libs/openctm/files/openctm-1.0.3-do-not-set-rpath.patch b/media-libs/openctm/files/openctm-1.0.3-do-not-set-rpath.patch
new file mode 100644
index 000000000000..e80e5cf34b4c
--- /dev/null
+++ b/media-libs/openctm/files/openctm-1.0.3-do-not-set-rpath.patch
@@ -0,0 +1,19 @@
+--- a/tools/Makefile.linux
++++ b/tools/Makefile.linux
+@@ -43,13 +43,13 @@
+ 	rm -f ctmconv ctmviewer ctmbench $(CTMCONVOBJS) $(CTMVIEWEROBJS) $(CTMBENCHOBJS) bin2c phong_frag.h phong_vert.h
+
+ ctmconv: $(CTMCONVOBJS)
+-	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMCONVOBJS) -Wl,-rpath,. -lopenctm -ltinyxml
++	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMCONVOBJS) -lopenctm -ltinyxml
+
+ ctmviewer: $(CTMVIEWEROBJS)
+-	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -Wl,-rpath,. -lopenctm -ltinyxml -ljpeg -lpnglite -lz -lglut -lGLU -lGLEW `pkg-config --libs gtk+-2.0`
++	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm -ltinyxml -ljpeg -lpnglite -lz -lglut -lGLU -lGLEW `pkg-config --libs gtk+-2.0`
+
+ ctmbench: $(CTMBENCHOBJS)
+-	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMBENCHOBJS) -Wl,-rpath,. -lopenctm
++	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMBENCHOBJS) -lopenctm
+
+ %.o: %.cpp
+ 	$(CPP) $(CPPFLAGS) -o $@ $<
diff --git a/media-libs/openctm/files/openctm-1.0.3-escape-hyphens-in-ctmconv-man-page.patch b/media-libs/openctm/files/openctm-1.0.3-escape-hyphens-in-ctmconv-man-page.patch
new file mode 100644
index 000000000000..4f0a5d598898
--- /dev/null
+++ b/media-libs/openctm/files/openctm-1.0.3-escape-hyphens-in-ctmconv-man-page.patch
@@ -0,0 +1,11 @@
+--- a/doc/ctmconv.1
++++ b/doc/ctmconv.1
+@@ -24,7 +24,7 @@
+ Scale the mesh by a scalar factor.
+ .TP
+ .B --upaxis arg
+-Set up axis (X, Y, Z, -X, -Y, -Z). If != Z, the mesh will be flipped.
++Set up axis (X, Y, Z, \-X, \-Y, \-Z). If != Z, the mesh will be flipped.
+ .TP
+ .B --flip
+ Flip triangle orientation.
diff --git a/media-libs/openctm/files/openctm-1.0.3-fix-install-paths.patch b/media-libs/openctm/files/openctm-1.0.3-fix-install-paths.patch
new file mode 100644
index 000000000000..dd2e0c425f7b
--- /dev/null
+++ b/media-libs/openctm/files/openctm-1.0.3-fix-install-paths.patch
@@ -0,0 +1,32 @@
+--- a/Makefile.linux
++++ b/Makefile.linux
+@@ -47,19 +47,21 @@
+
+
+ # Installation settings
+-LIBDIR  = /usr/lib/
+-INCDIR  = /usr/local/include/
+-BINDIR  = /usr/local/bin/
+-MAN1DIR = /usr/local/share/man/man1/
+-CP = cp
++LIBDIR  = $(DESTDIR)/usr/$GENTOO_LIBDIR@/$(DEB_HOST_MULTIARCH)
++INCDIR  = $(DESTDIR)/usr/include/
++BINDIR  = $(DESTDIR)/usr/bin/
++MAN1DIR = $(DESTDIR)/usr/share/man/man1/
++CP = cp -P
+ MKDIR = mkdir -p
+
+-install:
+-	$(CP) lib/libopenctm.so $(LIBDIR)
++$(LIBDIR) $(INCDIR) $(BINDIR) $(MAN1DIR):
++	$(MKDIR) -p "$@"
++
++install: $(LIBDIR) $(INCDIR) $(BINDIR) $(MAN1DIR)
++	$(CP) lib/libopenctm.so* $(LIBDIR)
+ 	$(CP) lib/openctm.h $(INCDIR)
+ 	$(CP) lib/openctmpp.h $(INCDIR)
+ 	$(CP) tools/ctmconv $(BINDIR)
+ 	$(CP) tools/ctmviewer $(BINDIR)
+-	$(MKDIR) $(MAN1DIR)
+ 	$(CP) doc/ctmconv.1 $(MAN1DIR)
+ 	$(CP) doc/ctmviewer.1 $(MAN1DIR)
diff --git a/media-libs/openctm/files/openctm-1.0.3-link-ctmviewer-only-with-necessary-gtk-libs.patch b/media-libs/openctm/files/openctm-1.0.3-link-ctmviewer-only-with-necessary-gtk-libs.patch
new file mode 100644
index 000000000000..370960721b5c
--- /dev/null
+++ b/media-libs/openctm/files/openctm-1.0.3-link-ctmviewer-only-with-necessary-gtk-libs.patch
@@ -0,0 +1,13 @@
+--- a/tools/Makefile.linux
++++ b/tools/Makefile.linux
+@@ -46,7 +46,9 @@
+ 	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMCONVOBJS) -lopenctm -ltinyxml
+
+ ctmviewer: $(CTMVIEWEROBJS)
+-	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm -ltinyxml -ljpeg -lpnglite -lz -lglut -lGLU -lGLEW `pkg-config --libs gtk+-2.0`
++	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm \
++	-ltinyxml -ljpeg -lpnglite -lz -lglut -lGLU -lGLEW \
++	-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0
+
+ ctmbench: $(CTMBENCHOBJS)
+ 	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMBENCHOBJS) -lopenctm
diff --git a/media-libs/openctm/files/openctm-1.0.3-link-ctmviewer-with-libGL.patch b/media-libs/openctm/files/openctm-1.0.3-link-ctmviewer-with-libGL.patch
new file mode 100644
index 000000000000..b8409d4423d4
--- /dev/null
+++ b/media-libs/openctm/files/openctm-1.0.3-link-ctmviewer-with-libGL.patch
@@ -0,0 +1,11 @@
+--- a/tools/Makefile.linux
++++ b/tools/Makefile.linux
+@@ -47,7 +47,7 @@
+
+ ctmviewer: $(CTMVIEWEROBJS)
+ 	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm \
+-	-ltinyxml -ljpeg -lpnglite -lz -lglut -lGLU -lGLEW \
++	-ltinyxml -ljpeg -lpnglite -lz -lGL -lglut -lGLU -lGLEW \
+ 	-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0
+
+ ctmbench: $(CTMBENCHOBJS)
diff --git a/media-libs/openctm/files/openctm-1.0.3-link-ctmviewer-with-libGLU.patch b/media-libs/openctm/files/openctm-1.0.3-link-ctmviewer-with-libGLU.patch
new file mode 100644
index 000000000000..1bf5d03e02d0
--- /dev/null
+++ b/media-libs/openctm/files/openctm-1.0.3-link-ctmviewer-with-libGLU.patch
@@ -0,0 +1,11 @@
+--- a/tools/Makefile.linux
++++ b/tools/Makefile.linux
+@@ -56,7 +56,7 @@
+ 	$(CPP) -s -o $@ -L$(OPENCTMDIR) -L$(TINYXMLDIR) $(CTMCONVOBJS) -Wl,-rpath,. -lopenctm -ltinyxml
+
+ ctmviewer: $(CTMVIEWEROBJS) $(JPEGDIR)/libjpeg.a $(TINYXMLDIR)/libtinyxml.a $(ZLIBDIR)/libz.a libopenctm.so
+-	$(CPP) -s -o $@ -L$(OPENCTMDIR) -L$(TINYXMLDIR) -L$(JPEGDIR) -L$(ZLIBDIR) $(CTMVIEWEROBJS) -Wl,-rpath,. -lopenctm -ltinyxml -ljpeg -lz -lglut `pkg-config --libs gtk+-2.0`
++	$(CPP) -s -o $@ -L$(OPENCTMDIR) -L$(TINYXMLDIR) -L$(JPEGDIR) -L$(ZLIBDIR) $(CTMVIEWEROBJS) -Wl,-rpath,. -lopenctm -ltinyxml -ljpeg -lz -lglut -lGLU `pkg-config --libs gtk+-2.0`
+
+ ctmbench: $(CTMBENCHOBJS) libopenctm.so
+ 	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMBENCHOBJS) -Wl,-rpath,. -lopenctm
diff --git a/media-libs/openctm/files/openctm-1.0.3-no-strip.patch b/media-libs/openctm/files/openctm-1.0.3-no-strip.patch
new file mode 100644
index 000000000000..e42165c520bb
--- /dev/null
+++ b/media-libs/openctm/files/openctm-1.0.3-no-strip.patch
@@ -0,0 +1,32 @@
+--- a/lib/Makefile.linux
++++ b/lib/Makefile.linux
+@@ -71,7 +71,7 @@
+ 	$(RM) $(DYNAMICLIB) $(SONAME) $(LIBNAME) $(OBJS) $(LZMA_OBJS)
+
+ $(DYNAMICLIB): $(OBJS) $(LZMA_OBJS)
+-	$(CC) $(LDFLAGS) -shared -s -Wl,-soname,$(SONAME) -o $@ $(OBJS) $(LZMA_OBJS) -lm
++	$(CC) $(LDFLAGS) -shared -Wl,-soname,$(SONAME) -o $@ $(OBJS) $(LZMA_OBJS) -lm
+ 	ln -s $(DYNAMICLIB) $(SONAME)
+ 	ln -s $(DYNAMICLIB) $(LIBNAME)
+
+--- a/tools/Makefile.linux
++++ b/tools/Makefile.linux
+@@ -42,15 +42,15 @@
+ 	rm -f ctmconv ctmviewer ctmbench $(CTMCONVOBJS) $(CTMVIEWEROBJS) $(CTMBENCHOBJS) bin2c phong_frag.h phong_vert.h
+
+ ctmconv: $(CTMCONVOBJS)
+-	$(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMCONVOBJS) -lopenctm -ltinyxml
++	$(CXX) $(LDFLAGS) -o $@ -L$(OPENCTMDIR) $(CTMCONVOBJS) -lopenctm -ltinyxml
+
+ ctmviewer: $(CTMVIEWEROBJS)
+-	$(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm \
++	$(CXX) $(LDFLAGS) -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm \
+ 	-ltinyxml -ljpeg -lpnglite -lz -lGL -lglut -lGLU -lGLEW \
+ 	-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0
+
+ ctmbench: $(CTMBENCHOBJS)
+-	$(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMBENCHOBJS) -lopenctm
++	$(CXX) $(LDFLAGS) -o $@ -L$(OPENCTMDIR) $(CTMBENCHOBJS) -lopenctm
+
+ %.o: %.cpp
+ 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
diff --git a/media-libs/openctm/files/openctm-1.0.3-respect-flags.patch b/media-libs/openctm/files/openctm-1.0.3-respect-flags.patch
new file mode 100644
index 000000000000..4a406d0caf88
--- /dev/null
+++ b/media-libs/openctm/files/openctm-1.0.3-respect-flags.patch
@@ -0,0 +1,79 @@
+--- a/lib/Makefile.linux
++++ b/lib/Makefile.linux
+@@ -27,9 +27,9 @@
+ ###############################################################################
+
+ LZMADIR = liblzma
+-CC = gcc
+-CFLAGS = -O3 -W -Wall -c -fPIC -DOPENCTM_BUILD -I$(LZMADIR) -DLZMA_PREFIX_CTM -std=c99 -pedantic
+-CFLAGS_LZMA = -O3 -W -Wall -c -fPIC -DLZMA_PREFIX_CTM -std=c99 -pedantic
++CFLAGS += -W -Wall -c -fPIC -std=c99 -pedantic
++INCDEF = -DOPENCTM_BUILD -I$(LZMADIR) -DLZMA_PREFIX_CTM
++INCDEF_LZMA = -DLZMA_PREFIX_CTM
+ RM = rm -f
+ DEPEND = $(CPP) -MM
+
+@@ -71,15 +71,15 @@
+ 	$(RM) $(DYNAMICLIB) $(SONAME) $(LIBNAME) $(OBJS) $(LZMA_OBJS)
+
+ $(DYNAMICLIB): $(OBJS) $(LZMA_OBJS)
+-	gcc -shared -s -Wl,-soname,$(SONAME) -o $@ $(OBJS) $(LZMA_OBJS) -lm
++	$(CC) $(LDFLAGS) -shared -s -Wl,-soname,$(SONAME) -o $@ $(OBJS) $(LZMA_OBJS) -lm
+ 	ln -s $(DYNAMICLIB) $(SONAME)
+ 	ln -s $(DYNAMICLIB) $(LIBNAME)
+
+ %.o: %.c
+-	$(CC) $(CFLAGS) $<
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(INCDEF) $<
+
+ %.o: $(LZMADIR)/%.c
+-	$(CC) $(CFLAGS_LZMA) $<
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(INCDEF_LZMA) $<
+
+ depend:
+ 	$(DEPEND) $(SRCS) $(LZMA_SRCS) > make.depend
+--- a/tools/Makefile.linux
++++ b/tools/Makefile.linux
+@@ -29,8 +29,7 @@
+ GLEWDIR = /usr/include/GL
+ RPLYDIR = rply
+
+-CPP = g++
+-CPPFLAGS = -c -O3 -W -Wall `pkg-config --cflags gtk+-2.0` -I$(OPENCTMDIR) -I$(RPLYDIR) -I$(GLEWDIR)
++CXXFLAGS += -W -Wall `pkg-config --cflags gtk+-2.0` -I$(OPENCTMDIR) -I$(RPLYDIR) -I$(GLEWDIR)
+
+ MESHOBJS = mesh.o meshio.o ctm.o ply.o rply.o stl.o 3ds.o dae.o obj.o lwo.o off.o wrl.o
+ CTMCONVOBJS = ctmconv.o common.o systimer.o convoptions.o $(MESHOBJS)
+@@ -43,18 +42,18 @@
+ 	rm -f ctmconv ctmviewer ctmbench $(CTMCONVOBJS) $(CTMVIEWEROBJS) $(CTMBENCHOBJS) bin2c phong_frag.h phong_vert.h
+
+ ctmconv: $(CTMCONVOBJS)
+-	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMCONVOBJS) -lopenctm -ltinyxml
++	$(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMCONVOBJS) -lopenctm -ltinyxml
+
+ ctmviewer: $(CTMVIEWEROBJS)
+-	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm \
++	$(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm \
+ 	-ltinyxml -ljpeg -lpnglite -lz -lGL -lglut -lGLU -lGLEW \
+ 	-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0
+
+ ctmbench: $(CTMBENCHOBJS)
+-	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMBENCHOBJS) -lopenctm
++	$(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMBENCHOBJS) -lopenctm
+
+ %.o: %.cpp
+-	$(CPP) $(CPPFLAGS) -o $@ $<
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
+
+ ctmconv.o: ctmconv.cpp systimer.h convoptions.h mesh.h meshio.h
+ ctmviewer.o: ctmviewer.cpp common.h image.h systimer.h sysdialog.h mesh.h meshio.h phong_vert.h phong_frag.h icons/icon_open.h icons/icon_save.h icons/icon_help.h
+@@ -83,7 +82,7 @@
+ 	./bin2c phong.frag phongFragSrc > $@
+
+ bin2c: bin2c.cpp
+-	$(CPP) -Os -W -Wall -o $@ $<
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -Os -W -Wall -o $@ $<
+
+ rply.o: $(RPLYDIR)/rply.c
+-	gcc -c -O2 -W -I$(RPLYDIR) -o $@ $<
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c -O2 -W -I$(RPLYDIR) -o $@ $<
diff --git a/media-libs/openctm/files/openctm-1.0.3-use-system-libs.patch b/media-libs/openctm/files/openctm-1.0.3-use-system-libs.patch
new file mode 100644
index 000000000000..e6d158c6c3b1
--- /dev/null
+++ b/media-libs/openctm/files/openctm-1.0.3-use-system-libs.patch
@@ -0,0 +1,81 @@
+--- a/tools/Makefile.linux
++++ b/tools/Makefile.linux
+@@ -26,39 +26,29 @@
+ ###############################################################################
+
+ OPENCTMDIR = ../lib
+-GLEWDIR = glew
+-JPEGDIR = jpeg
++GLEWDIR = /usr/include/GL
+ RPLYDIR = rply
+-TINYXMLDIR = tinyxml
+-ZLIBDIR = zlib
+-PNGLITEDIR = pnglite
+
+ CPP = g++
+-CPPFLAGS = -c -O3 -W -Wall `pkg-config --cflags gtk+-2.0` -I$(OPENCTMDIR) -I$(RPLYDIR) -I$(JPEGDIR) -I$(TINYXMLDIR) -I$(GLEWDIR) -I$(ZLIBDIR) -I$(PNGLITEDIR)
++CPPFLAGS = -c -O3 -W -Wall `pkg-config --cflags gtk+-2.0` -I$(OPENCTMDIR) -I$(RPLYDIR) -I$(GLEWDIR)
+
+ MESHOBJS = mesh.o meshio.o ctm.o ply.o rply.o stl.o 3ds.o dae.o obj.o lwo.o off.o wrl.o
+ CTMCONVOBJS = ctmconv.o common.o systimer.o convoptions.o $(MESHOBJS)
+-CTMVIEWEROBJS = ctmviewer.o common.o image.o systimer.o sysdialog_gtk.o convoptions.o glew.o pnglite.o $(MESHOBJS)
+-CTMBENCHOBJS = ctmbench.o systimer.o
++CTMVIEWEROBJS = ctmviewer.o common.o image.o systimer.o sysdialog_gtk.o convoptions.o $(MESHOBJS)
++	CTMBENCHOBJS = ctmbench.o systimer.o
+
+ all: ctmconv ctmviewer ctmbench
+
+ clean:
+ 	rm -f ctmconv ctmviewer ctmbench $(CTMCONVOBJS) $(CTMVIEWEROBJS) $(CTMBENCHOBJS) bin2c phong_frag.h phong_vert.h
+-	cd $(JPEGDIR) && $(MAKE) -f makefile.linux clean
+-	cd $(TINYXMLDIR) && $(MAKE) -f Makefile.linux clean
+-	cd $(ZLIBDIR) && $(MAKE) -f Makefile.linux clean
+
+-libopenctm.so: $(OPENCTMDIR)/libopenctm.so
+-	cp $< $@
++ctmconv: $(CTMCONVOBJS)
++	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMCONVOBJS) -Wl,-rpath,. -lopenctm -ltinyxml
+
+-ctmconv: $(CTMCONVOBJS) $(TINYXMLDIR)/libtinyxml.a libopenctm.so
+-	$(CPP) -s -o $@ -L$(OPENCTMDIR) -L$(TINYXMLDIR) $(CTMCONVOBJS) -Wl,-rpath,. -lopenctm -ltinyxml
++ctmviewer: $(CTMVIEWEROBJS)
++	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -Wl,-rpath,. -lopenctm -ltinyxml -ljpeg -lpnglite -lz -lglut -lGLU -lGLEW `pkg-config --libs gtk+-2.0`
+
+-ctmviewer: $(CTMVIEWEROBJS) $(JPEGDIR)/libjpeg.a $(TINYXMLDIR)/libtinyxml.a $(ZLIBDIR)/libz.a libopenctm.so
+-	$(CPP) -s -o $@ -L$(OPENCTMDIR) -L$(TINYXMLDIR) -L$(JPEGDIR) -L$(ZLIBDIR) $(CTMVIEWEROBJS) -Wl,-rpath,. -lopenctm -ltinyxml -ljpeg -lz -lglut -lGLU `pkg-config --libs gtk+-2.0`
+-
+-ctmbench: $(CTMBENCHOBJS) libopenctm.so
++ctmbench: $(CTMBENCHOBJS)
+ 	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMBENCHOBJS) -Wl,-rpath,. -lopenctm
+
+ %.o: %.cpp
+@@ -68,7 +58,7 @@
+ ctmviewer.o: ctmviewer.cpp common.h image.h systimer.h sysdialog.h mesh.h meshio.h phong_vert.h phong_frag.h icons/icon_open.h icons/icon_save.h icons/icon_help.h
+ ctmbench.o: ctmbench.cpp systimer.h
+ common.o: common.cpp common.h
+-image.o: image.cpp image.h common.h $(JPEGDIR)/libjpeg.a
++image.o: image.cpp image.h common.h
+ systimer.o: systimer.cpp systimer.h
+ sysdialog_gtk.o: sysdialog_gtk.cpp sysdialog.h
+ convoptions.o: convoptions.cpp convoptions.h
+@@ -93,20 +83,5 @@
+ bin2c: bin2c.cpp
+ 	$(CPP) -Os -W -Wall -o $@ $<
+
+-$(JPEGDIR)/libjpeg.a:
+-	cd $(JPEGDIR) && $(MAKE) -f makefile.linux libjpeg.a
+-
+-$(ZLIBDIR)/libz.a:
+-	cd $(ZLIBDIR) && $(MAKE) -f Makefile.linux
+-
+-glew.o: $(GLEWDIR)/glew.c
+-	gcc -c -Os -W -I$(GLEWDIR) -o $@ $<
+-
+ rply.o: $(RPLYDIR)/rply.c
+ 	gcc -c -O2 -W -I$(RPLYDIR) -o $@ $<
+-
+-pnglite.o: $(PNGLITEDIR)/pnglite.c
+-	gcc -c -O2 -W -I$(PNGLITEDIR) -o $@ $<
+-
+-$(TINYXMLDIR)/libtinyxml.a:
+-	cd $(TINYXMLDIR) && $(MAKE) -f Makefile.linux
diff --git a/media-libs/openctm/metadata.xml b/media-libs/openctm/metadata.xml
index 2dcfe570b108..770fe31ee810 100644
--- a/media-libs/openctm/metadata.xml
+++ b/media-libs/openctm/metadata.xml
@@ -8,6 +8,9 @@
 		<email>3dprint@gentoo.org</email>
 		<name>Gentoo 3D print</name>
 	</maintainer>
+	<slots>
+		<subslots>soname major version number</subslots>
+	</slots>
 	<longdescription>
 		OpenCTM - the Open Compressed Triangle Mesh file format - is a file format, a software library and a tool set for compression of 3D triangle meshes.
 	</longdescription>
diff --git a/media-libs/openctm/openctm-1.0.3-r1.ebuild b/media-libs/openctm/openctm-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..60585930f8ea
--- /dev/null
+++ b/media-libs/openctm/openctm-1.0.3-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils multilib flag-o-matic toolchain-funcs
+
+MY_P=OpenCTM-${PV}
+
+DESCRIPTION="OpenCTM - the Open Compressed Triangle Mesh."
+HOMEPAGE="http://openctm.sourceforge.net"
+SRC_URI="https://downloads.sourceforge.net/project/openctm/${MY_P}/${MY_P}-src.tar.bz2 -> ${P}-src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+DEPEND="
+	dev-libs/tinyxml
+	media-libs/glew:0=
+	media-libs/pnglite
+	sys-libs/zlib
+	virtual/jpeg:0
+	media-libs/freeglut
+	virtual/opengl
+	x11-libs/gtk+:2"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-escape-hyphens-in-ctmconv-man-page.patch"
+	"${FILESDIR}/${P}-link-ctmviewer-with-libGLU.patch"
+	"${FILESDIR}/${P}-use-system-libs.patch"
+	"${FILESDIR}/${P}-do-not-set-rpath.patch"
+	"${FILESDIR}/${P}-link-ctmviewer-only-with-necessary-gtk-libs.patch"
+	"${FILESDIR}/${P}-link-ctmviewer-with-libGL.patch"
+	"${FILESDIR}/${P}-create-lib-with-correct-soname-and-symlinks.patch"
+	"${FILESDIR}/${P}-fix-install-paths.patch"
+	"${FILESDIR}/${P}-respect-flags.patch"
+	"${FILESDIR}/${P}-no-strip.patch"
+)
+
+src_prepare() {
+	edos2unix lib/Makefile.linux
+
+	default
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) CXX="$(tc-getCXX)" -f Makefile.linux
+}
+
+src_install() {
+  emake DESTDIR="${ED}" LIBDIR="${ED}/usr/$(get_libdir)" -f Makefile.linux install
+}
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 6331a56a45cb..b43af04ac0c3 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -12,5 +12,5 @@ AUX openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch 1357 BLAKE2B f236
 DIST openexr-2.3.0.tar.gz 18412067 BLAKE2B c73c4db4e414010ed8cc9f9631f3e8b17f47edf89b4ecb459aa00ff54a316b3bb1489e332bc029e0917ac4ffe7e152082244102029fd375f183da6741788dab7 SHA512 003f5bb3bd010be1ad9ff1798643ef711c683c8191625fe9b59070c9cb0c649c277cd506d890c6b239d9cbab80e83e16f1c1d1d74117c916ee3a80e061953123
 DIST openexr-2.5.2.tar.gz 27525326 BLAKE2B c48a61513457f2c04f3a512963ae27eaf154933ffe7c6ff3e2d71f27f246ae624a34dbe6f8ab500c51a56898ad0f61e6784f5cd3f9c3df591ce347b46ba4ac88 SHA512 62f98695cf56600303db9c2d13d34cacc1851a103d8ffb7e7ce8c6d9d14e6bf02804836c718ae03e8d685ef3dda0cf7b2130e2d363f8095b22a15bf30d706fab
 EBUILD openexr-2.3.0.ebuild 2234 BLAKE2B 864ae2338edbf3b058bf5053598b93a251a87a97d351c6fbed658508e9136a965bcae2598182f509ff65b56d6975bb72be3d9286d92b101a7164cabbd42f023b SHA512 f0b6c1c79ea7b49cc6f5157d20bd7001d225bef2729bcef23badbd3e72c8ec4f7b0d2cd2329682f5914ca40ffbc31bfb5715e7f6615988a467e26d23e2b56382
-EBUILD openexr-2.5.2-r1.ebuild 1673 BLAKE2B 3f2a16ce4851e58e74641e617eeb4c7399f9901f8d3e4b283f2611b21bf918723b7509b13706cdbd52d5f62ebcddd2402de17145c79ff5eaed9109dabda5a2a1 SHA512 24bf09e27d774868612f08fa2f50e44f91e3717a85cae5afba47f1e5c2e8931c84cf42879fbe1573a6d2bcf98cd39d1f2659c095e7bd49e6c9f978b869453a6c
+EBUILD openexr-2.5.2-r1.ebuild 1673 BLAKE2B 6cb66a92a938e9e6878fa2550a9dba69afe2dd70853ca1fd1e0278c8dfdc774b4f164bb8c61b578210fe9183bb37fda5803e6b36c31d1a4f44f6492328a98bd5 SHA512 6731b8406a8b454366e96774003a1da4640fb6261c665d8327a4bbc83ab3fd8f59c1dc2b3d9ec3d3e148f4162de46c7a44ef034b073d55e3c472809ae570b18e
 MISC metadata.xml 666 BLAKE2B 0faed6c1a1dfecdea8436ef7890af82b565dc9dd1bcc93b5e961ab53939cf6b62d6903e7f9a15ed6e8891de8e6f429cf5811cd2a2126105d71c9fbcc4fdadb2c SHA512 f81d6266a7af651a1e76aa60e3d40107b940548f6a34f4a47b08bc32e37aad32cff31a85d7c58c414b01d54835d224c2ca387f9a0dd1025e1bd5ddc7207281f2
diff --git a/media-libs/openexr/openexr-2.5.2-r1.ebuild b/media-libs/openexr/openexr-2.5.2-r1.ebuild
index 63da2483c2cb..cd30b0dee54a 100644
--- a/media-libs/openexr/openexr-2.5.2-r1.ebuild
+++ b/media-libs/openexr/openexr-2.5.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar
 
 LICENSE="BSD"
 SLOT="0/25" # based on SONAME
-KEYWORDS="amd64 -arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 2d492880078e..1ae8199db3de 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -3,5 +3,5 @@ AUX openimageio-2.2.6.1-pugixml.patch 919 BLAKE2B 3f10cf27a3a521fed3b95183119da6
 DIST openimageio-2.2.8.0.tar.gz 29201949 BLAKE2B b77e42dddfaa6a8dff174b89e43c7de158efcae0e851037a97f1f46127f5cda458bdc7b64172c1fe64236d5ace351c9a432c2e857467c7f83b59dc9f6670fbeb SHA512 7bb94832734b4354d961003ec7f85fa30e4a69d7f825c5668a0230d857f8c137dd522730ec5089db012f0d843fc67368c731458a3d6de9ae41dabfb4cc30592e
 DIST openimageio-2.2.9.0.tar.gz 29216767 BLAKE2B 92c17de4687d3d7390602a02dedc5afc1258018cef98e671977fb706c3fe1e80c30416fff89ff1b9936f0f1426eab0136e130efb4a41d7378d3f1eb77eab193a SHA512 d03500c5a9f4f1417c5629098254d1bbf032a17228898e5f087e4a5d0988f806537d3ab538366e64c51172568c3688389ab29b641fdaaf7208bf939cb859e06d
 EBUILD openimageio-2.2.8.0-r1.ebuild 3679 BLAKE2B 0d6b91115cefd79251cf73688fa76f0498074c5588604eaa02473730ea63bf69e54e498368847d7ef4cee2fc4325fc96ecdc0735a50de752e3ed48dd2a97022c SHA512 19406ec491d915c8f1385681ac1f06fe38dea58f075ef3de06f5e6ee0f3a65ecc834db3bfb2e8fe43db1d79df7fe14c185f28f4722d320876c6d6c1412e2a6b7
-EBUILD openimageio-2.2.9.0-r1.ebuild 3681 BLAKE2B fb434110b41fb72cef3ca045de9f2ca901f22c5360443de23096e2bdb6bbebf4a5ab992ebaa94f880405927a5cec73077c88f46c3bcdbea08e7a25fab6350c96 SHA512 d640bc9d6480a417c4c0192d2ffa745b306d3099488bc74522485ad09acc4fa2a5aabbc7d22a0feac3c8717ccafbb39cc60625a8d5f9f38153a3bd41c4653760
+EBUILD openimageio-2.2.9.0-r1.ebuild 3688 BLAKE2B 649081db83330abd7e0b3cdcc8832f5d505d1d472c5cc6c597d96ad5093c9d8a52ec6006121cfa7dee593bd486a1dd3c466426d07ff4fbe75364831c3c8e6376 SHA512 6ff1a5b43cdfba2b3278ff973389005161048c77398bf435e12f8f798a5a1822eb076f65ea8c3a4263a498c432503e334d01f40a5771bcaa8e675f0a7c70dd31
 MISC metadata.xml 922 BLAKE2B 4b63768455a06ac25a2845a1c4510ca33bd0eef4b2d4ddbb002fa2fc3c28fef6e1179d930281b8e3db91945e07e5df1b58677263cc500afa424778386ff5d095 SHA512 0ea0311d739c06c7d82b9e97deabcf9fd6330beebde039a9afbfeb742a7ff189bc498a7c77086bbc8c7be849037512bf98694537a8af98232b2eb3ee3a24ce9e
diff --git a/media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild b/media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild
index cdd096fdaca6..3e0eafee8bf5 100644
--- a/media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild
+++ b/media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oiio-Release-${PV}"
 
 LICENSE="BSD"
 SLOT="0/2.2"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 X86_CPU_FEATURES=(
 	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
diff --git a/media-libs/ptex/Manifest b/media-libs/ptex/Manifest
index a2294f9a1a85..0e226fe5759a 100644
--- a/media-libs/ptex/Manifest
+++ b/media-libs/ptex/Manifest
@@ -1,4 +1,4 @@
 AUX ptex-2.3.2-cxx11.patch 828 BLAKE2B e445858c625de0c924a412690cbf2f1bed6ee4fd7efafd60765a4f43fa204ba474cdf2944acf3eb94b061df6c39cd9016413e6c5d73da3813144fa289746ceb4 SHA512 53d6e66dd4a35dc2e16e5f227a24ec90d3f7667c5f80dc3d7321086b4efb4d63451783450a02a389c09a3faa6808cd90e89e2097390ef9881ffe313fbfd8c6d1
 DIST ptex-2.3.2.tar.gz 308550 BLAKE2B 7b3145dbf9d2c13140c3f20ed606ee911deed3c38fd30adfbb01b58c3af5794dbd4e0fa1fbab6e8ae83556a0ffec725bf077271abf752f1271ed721ca200a1ff SHA512 dbc557dc5e1761204ee3483af9bf4ff1504cbd7955e0405dc27a51f7182e2445e41db086b2792c2491aa2cbaddc74e523170a4b3d25e44d332123d5b7081f4b9
-EBUILD ptex-2.3.2.ebuild 773 BLAKE2B 9eb6b631020ba8a9e6b9aa5f969948bd2b58567f3a8088f5f33b9e3ed1dc5f794ecac9e2be92aca418cd7d711cf8cacca429441ef46a505ff2d839caf1998e58 SHA512 e811c246db191f2bb4f48995c7039f01858e66ef0e7dec0c33a1a8bab452ec592a46401a811f333dd67af58ccbb15ea4bc2d6dcd5a0c6f7c246efe2a21d38c71
+EBUILD ptex-2.3.2.ebuild 780 BLAKE2B 43fb9c46ca0a132145cc96a3a6ca92abddc172e9597ed4c7e784c8e0161778819941cfd40d7a94c2ad1d8d37c5c41e20c8c48a7c2e7e61bde1ed42e4921604df SHA512 7db656cf4c8f13175a3dd9678060628a67314919f5cc2ba5b6fd31a5f0e306439901f3e4936cebac29b4f95b97652726acec036ac41321203b0ba2a2a2851f73
 MISC metadata.xml 442 BLAKE2B c2d8c5008567c10224514df3263df6ce9a3b5ab1fb764ae62c08b0aff8cf8bfc9152d86364b9a2dc5e5cd92b8ea9dce9609db65645908cfb137a6543e8e23aab SHA512 029c88e1a08bdda8d6518b6f2a1050e52ac121154550807ad52a34252b526216e52783477561567cc49d213c50d23c296f90e8f3d6da1e03dc6a6e2bc18e14ef
diff --git a/media-libs/ptex/ptex-2.3.2.ebuild b/media-libs/ptex/ptex-2.3.2.ebuild
index 20e552cd3441..7087ff9171c6 100644
--- a/media-libs/ptex/ptex-2.3.2.ebuild
+++ b/media-libs/ptex/ptex-2.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wdas/ptex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="static-libs"
 
 BDEPEND="app-doc/doxygen"
diff --git a/media-libs/sdl2-mixer/Manifest b/media-libs/sdl2-mixer/Manifest
index b0a3e030ce5c..097b2fc96a45 100644
--- a/media-libs/sdl2-mixer/Manifest
+++ b/media-libs/sdl2-mixer/Manifest
@@ -1,6 +1,6 @@
 AUX sdl2-mixer-2.0.2-smpeg.patch 698 BLAKE2B 04f58b64a190c22636c8d0f8218e3070707d9ce75e3be7846baafcbcc36223784c367da111f481377a319562c622d27a3b67b27a32bffc515a32c4e119e65f79 SHA512 78c02a15384e98f846ff9448205da3a43c1e1e39ae9ae33c14651076d5659a83ccd840d67b1044dc19a0da66a07fb98793a78044ae0afa089a26cfbf8951db82
 DIST SDL2_mixer-2.0.2.tar.gz 9620763 BLAKE2B 9257f7f3dc3453b600075011f1879391c4a4def2c67709a883a8803f752928d3883fbe11371609cd5e690647a33b43bfd38f152aa620f63af12e1b7b72fa0ec4 SHA512 c40b5ac93933df1cc932e7afe796ad6765aafb24077601a23f98ac625a83341079ad903c164eafd022aff6011872e7a7956eebd8e3d3edad1bf5dc7eb9c306b7
 DIST SDL2_mixer-2.0.4.tar.gz 11125077 BLAKE2B ccb55020e360fa000e82807b8c4e2371228291943d2dc7371606834ca0f781d4e82581b5427e9902156bf3072208db4ec07e95a06f206e40ff530f432dd9e491 SHA512 98c56069640668aaececa63748de21fc8f243c7d06386c45c43d0ee472bbb2595ccda644d9886ce5b95c3a3dee3c0a96903cf9a89ddc18d38f041133470699a3
-EBUILD sdl2-mixer-2.0.2-r1.ebuild 3252 BLAKE2B 1f894bcdb4436283dfc19a83ad70e057c7537f5240682973e24b564a1fed2b129a9a26a46c584a60de2cf1dbca0c2df0d36a0013d62dba171939ccf1d91306a1 SHA512 55a79b5c7eaca6b86017df5df83a4c9300800ee5553167fb250dac171658ec781bff5c621347e92507037139bb15e70f8ef90791ec2ef77435f34b0e1c550881
+EBUILD sdl2-mixer-2.0.2-r1.ebuild 3249 BLAKE2B ff30f57b11499173c22b57a1b7319b17d9f64e7a3b282baed32ab9865fd5a078cea091fadfc21e56c4c9a70f30e85e6236f36aee4d27312dc434bc711a5a0b25 SHA512 6d99441d992531f4e75b11b9e3021a8991ced88809ac6181fd89eb2fbb61823ddffd1b95db41dfbb993b204d433620670abd3a73cc39a1b7509eb7cf2ef07630
 EBUILD sdl2-mixer-2.0.4.ebuild 3271 BLAKE2B 24d03746b5995df9a03daf1ffc137fea289775a849af5fe6209b309d6b72b8b46c1f21eb7a74a2d647ac0e61f086e99e705fef20a7e4b1ec87380d46dee54cc9 SHA512 ee857d55b233a8af78240c6a90da53b9e4a0dd7e005cadd4bbf886f4785aa7272f1977328e408fb7dc1e8cb5c3b3286f33cbf2f6984459e85757b602e15dd4c3
 MISC metadata.xml 751 BLAKE2B 7bc41a1afbb031953f9621d7f9059fc27bb588fc813c4dc68fbc760824a0a1c301997803712b6bc96d9814439fd8274ad388d18d54c2b125b71002247253ea7e SHA512 2376560d848b86e6d3b1728f581cd43bd812b8bfa4e89eb839f2505dfd3f75cfbc3c82bd9a91e571f6021e6ce7ea39df99d964fd29d0159f241539e86d65ce4b
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.2-r1.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.2-r1.ebuild
index b29cb197cdc9..9c910178b0a3 100644
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.2-r1.ebuild
+++ b/media-libs/sdl2-mixer/sdl2-mixer-2.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest
index 956ed4f7b141..f9dcabe965aa 100644
--- a/media-libs/simage/Manifest
+++ b/media-libs/simage/Manifest
@@ -3,6 +3,6 @@ AUX simage-1.7.1-disable-examples.patch 1803 BLAKE2B 93c4ef68fa3e2e1db406c7fd3fe
 AUX simage-1.7.1-disable-gif-quantize-buffer.patch 1054 BLAKE2B 15c0cf6c1ca78798e3c93034e7e4d17e1bf5ba5f9921f307e52b87f9d3e02babfac83e40eed401f98db8a225f404fa248957f41b03e360541e46bc62c893d099 SHA512 4a25f0f54a609c613e4f7baaf87a694e246b0c283cf85195e6d272826deb95dda9106125925188e785a2c64c2ed9633465ceb76b2b816e463cfa063ec16dffdc
 AUX simage-1.7.1-tests-conditional.patch 1757 BLAKE2B 59bb06980457f85c68670d02efdb3ddf149576d9f8728a33e7a0e97e736454b3858ba3eb123e6239f89006c836cb640b49238ffa733fe97ea65a5ca871712005 SHA512 3063e47ac6a7e90ce27f93d8046d897d203756b52008ed867061260378858b2b0c6b0cf6cb87a846f2f98cf2e595f2e4b4a468a32e34e9676d16848c387cd46e
 AUX simage-1.8.0-0001-CMakeLists.txt-comment-cpack.d-inclusion.patch 790 BLAKE2B 117b907b783404e4e8d03d09ca66496e0fede9bac5ea056ca4489140e9b0532ba585ebb4e75aec47a85e16b88a027fc7ec95297df4fed44a880ad4f0855b17a8 SHA512 692d3741b059148ce1190425319862fdc4299d7efc3a392aee91b60b5575f4702c5f72a066a70984afb14d68fd561f03c76f3ff76894aae36036579272f0f9e8
-DIST simage-1.8.0.tar.gz 791151 BLAKE2B 0a5720c06501c8212b5a148ad790ff60d6d9fc507868a66d40dbe3b6b089e47dca21828fee96ef708a03651d02843c9e6b6db7856088ddf7e487b4b5eeafbccd SHA512 7070c845fc72094a97b1253d23a5f60f90e71dc6ed968c9c7da67e05660b05245a807fbdf0f592a1d459c7c3b725783c55f59f867182b11cb9ec40741d7ad58c
-EBUILD simage-1.8.0.ebuild 2228 BLAKE2B e6c6e060d3f0856f857c9a0742ab68ecfb8d78d8da2151386cf76798d9ec36587acf9f13b399f1715b95582f6570108032caf9c1029c7d652a463ef521cc791a SHA512 cea88cc357960cd26ce2d44ff46ad2b5116b04122f132bc671d61ff7847b6ead3065b8cbba06896b4e4fdb3c87dd30b12d9d6494c6af654e6f2015eef3affa66
+DIST simage-1.8.0-src.tar.gz 797069 BLAKE2B 6f9e3512c9815974b1b2799306c6567f6b5aec6771fe31e0a5fa47a827819df02e80e976063ddbae3e3aa3a4d33da68a23c9067e7b91f82c28592f83d0e782cc SHA512 fb4943c38f418461b087d5d013c2054f25d553a872fc80f9445a5e907901eb40265d838c5cc1031032dd84885f066f1c640a1949bc450591fb0ea88c05d1e38f
+EBUILD simage-1.8.0-r1.ebuild 2239 BLAKE2B a9a205e8eab2e7593e81f5cea619764fa92e5ea6ee6003f39ec02bda59c84a9082c59ced21464d7a9484f11b3c522da4472f2fe275d18178d48af468d62d32da SHA512 5c890d96f4507fc924d0967b42327bcf099c75eafa8f748eae08e93836a6f88f87ced49f602371f447717f415e61ede23ef5ae78b63105ffba437bb9ad5dc885
 MISC metadata.xml 298 BLAKE2B 312f7a48552438ce1231a58486f19aca02bbb281b72733645ffad42a3f82df778145bfc66a61c1216e47bd68e54668725fe08274482be7fb3997c99bf3089fdc SHA512 b72572413e5e40d55658049b4624de687dd1011553fc384deb0c837830b6f82d060b6356ad25e803f27d3be697b07a8c3fbc45932d20d89e4d9918ed6fecd84a
diff --git a/media-libs/simage/simage-1.8.0.ebuild b/media-libs/simage/simage-1.8.0-r1.ebuild
index 53eb51da0470..1b1b448073e4 100644
--- a/media-libs/simage/simage-1.8.0.ebuild
+++ b/media-libs/simage/simage-1.8.0-r1.ebuild
@@ -7,7 +7,7 @@ inherit cmake flag-o-matic
 
 DESCRIPTION="Image and video texturing library"
 HOMEPAGE="https://github.com/coin3d/simage/"
-SRC_URI="https://github.com/coin3d/simage/archive/${P}.tar.gz"
+SRC_URI="https://github.com/coin3d/simage/releases/download/${P}/${P}-src.tar.gz"
 
 LICENSE="BSD-1"
 KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
@@ -36,7 +36,7 @@ DEPEND="
 	test? ( media-libs/libsndfile )
 "
 
-S="${WORKDIR}/${PN}-${P}"
+S="${WORKDIR}/${PN}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.7.1-cmake-automagic-deps.patch"
@@ -63,13 +63,13 @@ src_configure() {
 		-DSIMAGE_GIF_SUPPORT=$(usex gif)
 		-DSIMAGE_JASPER_SUPPORT=OFF
 		-DSIMAGE_JPEG_SUPPORT=$(usex jpeg)
-		-DSIMAGE_LIBSNDFILE_SUPPORT=$(usex sndfile)
 		-DSIMAGE_MPEG2ENC_SUPPORT=ON
 		-DSIMAGE_OGGVORBIS_SUPPORT=$(usex vorbis)
 		-DSIMAGE_PIC_SUPPORT=ON
 		-DSIMAGE_PNG_SUPPORT=$(usex png)
 		-DSIMAGE_QIMAGE_SUPPORT=$(usex qt5)
 		-DSIMAGE_QUICKTIME_SUPPORT=OFF # OS X only
+		-DSIMAGE_SNDFILE_SUPPORT=$(usex sndfile)
 		-DSIMAGE_TIFF_SUPPORT=$(usex tiff)
 		-DSIMAGE_USE_QT5=ON
 		-DSIMAGE_RGB_SUPPORT=ON
diff --git a/media-libs/speex/Manifest b/media-libs/speex/Manifest
index 65e335c218d2..205af35e75ea 100644
--- a/media-libs/speex/Manifest
+++ b/media-libs/speex/Manifest
@@ -1,5 +1,5 @@
 AUX speex-1.2.0-configure.patch 920 BLAKE2B 57b43aee0c57d6f0bf29202573d8f5caa65d41823ca073fb6b8edc1d35dee7b90ec79d52ef08affb0a1cb88b577e0fa3bc62844ded3c4e3235c268e31a0121a6 SHA512 71e6934f104d12bfb7bfb19812ff868dc22a323e2fbd7a480c270650a14842dd03e53e11853e7ddaa9469239a538d0bf09469770fd30f23601406011fe626ffd
 DIST speex-1.2.0.tar.gz 1047080 BLAKE2B 928e044e1195d4d977497cd1275a07323df233ee85e3ec188f362720f96303c2fc2002c1147c2ac93ca03570ff98428d983eb7d00439c9cdbe131041d9aa2697 SHA512 7fe10838c7d1bafcbe42295b82b79262420dba793b8a4388e2f73a3007850b5572face1b5308d9f4e8d7dfc9cb1c016cbad88cd65b2892667986107ed946836b
 EBUILD speex-1.2.0-r1.ebuild 1641 BLAKE2B 5aa08d9dc5a676c1887d2e062f2c0f679fd89fad5f9360a2c2e0acc77c19622717f652c5793b2f0f1fbeaf514941240974490f661e5fc70e8e8fae66f7996f5f SHA512 298c786b759025d3752338bd8b115d3508febf0bcb0ace2daeae6a27bfc8998445e1355dbc7513a5989c44dccc849506ab2c56db5f7c151a1b083c0ede74138d
-EBUILD speex-1.2.0-r2.ebuild 1654 BLAKE2B 102f56c3b8f176914d55d48c6392077f6ffdcc5afeda4b9ac866a5c43dc895ba69c41aad6aab23b18b395c621e1de01708cd1e897f8bafa66a4d3142c9ea34ea SHA512 e2a87b73f1216d3d6a48c19e356a2b9d4d9453676acc4d4d08e7304b5116a3d454bc971c7476e4ea38551880105b766813c3d9738dedb7031629415743b2331e
+EBUILD speex-1.2.0-r2.ebuild 1653 BLAKE2B 49c6edfbd5a26681f534804659d295f3a4bd407dd05b893c34841e4b1e21f80f6ad92aac4c158c7aaf6ef9156821e73dd829c412f7a5085c0233693dd8acabd5 SHA512 403e997aa639b8143572aa27fe5ac14c4c16c062588c06ca71933f222bc5b38b90a6275b95065130c036197752c37a393a0d91bf409020ba491764294d748ff9
 MISC metadata.xml 495 BLAKE2B a93e81b5e5b7c39cd680dbd8294451e3b034f1506e0c48d36d2a6e7525638bfc7dee964541b0e03847e43a344689d97de94e245dc4bc8099674a24b12a0a4115 SHA512 6b6a16e69139c71477c76a96c2aec025992a28079a15db234bc624619dc6ee5b3d20025418a49a0119d75b9964dd91fb38459c642c53a98b6bb444c6698beeb8
diff --git a/media-libs/speex/speex-1.2.0-r2.ebuild b/media-libs/speex/speex-1.2.0-r2.ebuild
index c6d40ee3ccb8..4a46ec58cd0c 100644
--- a/media-libs/speex/speex-1.2.0-r2.ebuild
+++ b/media-libs/speex/speex-1.2.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_arm_v4 cpu_flags_arm_v5 cpu_flags_arm_v6 cpu_flags_x86_sse utils +vbr"
 
 RDEPEND="
diff --git a/media-libs/speexdsp/Manifest b/media-libs/speexdsp/Manifest
index 42e8d8d964c7..38c53cec9cc7 100644
--- a/media-libs/speexdsp/Manifest
+++ b/media-libs/speexdsp/Manifest
@@ -3,5 +3,5 @@ AUX speexdsp-1.2_rc3-configure.patch 1506 BLAKE2B 76276ba7cc0c7143da55d90be9a60e
 AUX speexdsp-1.2_rc3-overflow.patch 2211 BLAKE2B 36a5aaedd730d8847046ce8cb9453678cf7aa503e060b25fb24e57516bbaaa7b987d3abb93fab741933c3fd43c490a090ac9fd64a6fbb2496f3a0364029c6b50 SHA512 f948be7513ed33a133a19bf571b8b1395f37b86715e2426a59105494d16c269c54c3a32c916f89af7e5b4b1d4aff90839e2b1ed2b13de482e54ac05bef449b31
 DIST speexdsp-1.2rc3.tar.gz 901771 BLAKE2B 85d047df82fc06906598da39ae653aa245c246bfea75c02d25f7811983babdab6a8499c9b563e0d7d2145fa490674df2cf0a05989884ffb3c2c2a183415ce841 SHA512 29dfa8345df025eeb076561648a9b5c0485692be699b6da3c2a3734b4329187a1c2eb181252f4df12b21f1309ecdf59797437dfb123d160fd723491ab216e858
 EBUILD speexdsp-1.2_rc3-r2.ebuild 1464 BLAKE2B 9746d51418ef2f7043c14e8a9e7c2e278806deb2a69e4a23af0d1ffb35c1756748fb8beb57cea176b0334977d0d778eea2eec2291706dbe824f10335dc278e5b SHA512 aa31f8b6965be744dc03017b4df4ef8feec264a59e01f883ac8935df7f14765b74730b6cd719e16e73e994b2192748deff66ec51b69a91996eaabce51ace2488
-EBUILD speexdsp-1.2_rc3-r3.ebuild 1463 BLAKE2B 457eabce7049a8df49aada2424b3dfb492d02ccb4c2096e1b857693a227dfa45ab530902d69b5847433e63fd1d96d1253ff9b1dea736468de1d545c018484ce2 SHA512 ef11f99e2d007e0ef992db48f77fd5f2d192b9b519ca387c554a17a242e70af422c1e21caab5e984dbd1579c0515d3c308934cda73751f41c41639368d086d58
+EBUILD speexdsp-1.2_rc3-r3.ebuild 1462 BLAKE2B e5327ecbe9baea69d8659d4a0f291329d10a9bf8c79876cc199d57fb6be28dbef3cc49be1253daef36bcb86493b3a46df2de8dfb42ea63a1e8baf2465d316feb SHA512 73a7665281e8d5c6b92f3da2642c8e31d879d165a13f5f0a3db73732684ba0c9e1add7919a5d3fe4c91d2a1abd2873118b94512148f186a350d364dddffd012d
 MISC metadata.xml 342 BLAKE2B 5b793ea5060e3e8359d6b50ebd5211471de0d72608086d1d0a67c655cc30c15e0b0db4545a578882144f9f1f4913779037ff76aeeb94002db2b162db78a6364e SHA512 32081e424d3f4ad3fd0ef4979c339d1139cb2298e6703210ff741b77a8b3bf2e1d4b550b0d76a1bd0c4dc5ac465b3ebdd1fe86da45d46586cd3560261f73c457
diff --git a/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild b/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild
index c529f672be52..abc7431a1101 100644
--- a/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild
+++ b/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_arm_neon"
 
 RDEPEND="!<media-libs/speex-1.2.0"
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 9aa6f6cd35b0..b1e7e50893bc 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -1,3 +1,5 @@
 DIST tiff-4.1.0.tar.gz 2421581 BLAKE2B 1f9b92d08dc95633bb005a635bbcecd8fa5e4f30c14f059b42aafbb4a52b4fb1b84b1e97cea33f3102f5808cb28f93bc8fcbae2b041c6227c97f90b4f9b8e631 SHA512 fd541dcb11e3d5afaa1ec2f073c9497099727a52f626b338ef87dc93ca2e23ca5f47634015a4beac616d4e8f05acf7b7cd5797fb218758cc2ad31b390491c5a6
+DIST tiff-4.2.0.tar.gz 2809373 BLAKE2B 62178da595e7ff4041f33643a87698580cd3a32d4536b5c60c414c9497616258686cf61514e1d4e0f062cb1333190c39ce86896bf07c01532c07454745d89cd9 SHA512 d7d42e6e6dbda9604c638f28e6cfa4705191a4e8ea276d18031d50dbab0931ac91141e57a2cf294124487f1a2e6dfcb9be62431c1b69de5acf4d0e632f3322e5
 EBUILD tiff-4.1.0.ebuild 2078 BLAKE2B d2e050f9cd2d476534d583b920405d64bdaf0ed8dbca65f34cbcbee76f4a402ffe70bb10683bd2e26381d6d42e88e606bc80a285a25e71491e74bf45eda28019 SHA512 e87617f33a745bc88675157a77622525a7c78c7527d6e67744217320a3111eaf1dd3b37f2d2125b5de9f9416703621d8a690368fe7f9c7ef02a6568d07bc8d68
+EBUILD tiff-4.2.0.ebuild 2087 BLAKE2B cc81205d05fcb47145c1132e6b9ac2a1d8e2bfb6f7cb1a7f538cef67df5b35db2d5a0547b186d89d9a90e685532dc9029b0da8dc7b359673893c009d7e0a18b8 SHA512 cd25c17e934bb0a4155424a7f88d1db2ca1bf5d5bac5b678d90d307776474e4c0451fe3607602a06e0200ad0e779b01f81b223a2501a76d846ec7a8c0af5ae8e
 MISC metadata.xml 473 BLAKE2B 1e6cf7ddd4b5f23d1f11e098c81805c11db03233e32e870634184f7635e19455cf978e6f4fa032952210c83bb18c96af57b64c0b73507dce95f70f876e4651fb SHA512 ed81ec631fb4f136d6ed8da3f8159c11760150314e2b8150aa7d087ad865b4e6eb823708cd37de3423597e5bef023e464ead76e7f56a33432d87956e1cb11016
diff --git a/media-libs/tiff/tiff-4.2.0.ebuild b/media-libs/tiff/tiff-4.2.0.ebuild
new file mode 100644
index 000000000000..0b3eac297a91
--- /dev/null
+++ b/media-libs/tiff/tiff-4.2.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools libtool multilib-minimal
+
+DESCRIPTION="Tag Image File Format (TIFF) library"
+HOMEPAGE="http://libtiff.maptools.org"
+SRC_URI="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 ~sparc ~x86 ~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}] )
+	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	zstd? ( >=app-arch/zstd-1.3.7-r1:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="test? ( jpeg )" #483132
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/tiffconf.h
+)
+
+src_prepare() {
+	default
+
+	# tiffcp-thumbnail.sh fails as thumbnail binary doesn't get built anymore since tiff-4.0.7
+	sed '/tiffcp-thumbnail\.sh/d' -i test/Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--without-x
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable cxx)
+		$(use_enable jbig)
+		$(use_enable jpeg)
+		$(use_enable lzma)
+		$(use_enable static-libs static)
+		$(use_enable webp)
+		$(use_enable zlib)
+		$(use_enable zstd)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	# remove useless subdirs
+	if ! multilib_is_native_abi ; then
+		sed -i \
+			-e 's/ tools//' \
+			-e 's/ contrib//' \
+			-e 's/ man//' \
+			-e 's/ html//' \
+			Makefile || die
+	fi
+}
+
+multilib_src_test() {
+	if ! multilib_is_native_abi ; then
+		emake -C tools
+	fi
+	emake check
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+	rm "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION} || die
+}
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index e32b3e6f0ea4..439148d9a97b 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,9 +1,6 @@
-AUX xine-lib-1.2.6-imagemagick7.patch 384 BLAKE2B 876c66e9e06b8f2437b1ec9945d4f1cf09efe1e57774280af501abf1a4214785dc875d6ca68515d48ebad37a90184b2db922034705df83592e1479741f15e726 SHA512 13badc72163f41a14fa85d84cbc835a396ab2bc195125025962257de4a41925e29c74159c3941472334f9eb10feee4278ea96288201689d5fcc48c494940ceb9
 DIST xine-lib-1.2.10.tar.xz 5226116 BLAKE2B e1bc088814c951ff56e55b626fe1f6f34c3da744e716de369a68e6c82a5adc414b452675ad19a5f82500bade6795b54efd503de8ffe4f1e65b534317ca0a26af SHA512 1cbe033da606d67a0a59f19968b2fe1cb46eaeb32c4b4aca7b91125b7230e15bd36d1e3e39e48e6eda56e556018f9f9bf84acb0012d3dd634306e7110fdc4c5f
 DIST xine-lib-1.2.11.tar.xz 5282204 BLAKE2B c61bec690f662e01372b1c068b0681ac4435925ca90a767c590d5d3b968163280c11210dc9e3aeb4cc6bb6b3520349ba22e18b17f34bd9139af02280d3a37ee3 SHA512 8208e4699819465ec9e820530f27b6129ee954ea17ab474eb9eda12137af1417ed5260830c1006ce32266a3913d22ba9957689bb5552464908038a1b8a8efbcf
-DIST xine-lib-1.2.9.tar.xz 5180452 BLAKE2B 43d977d31bf2fcabd896c806e56d5cd12cf579951a4e0df5451df7323fb43cff2770fb2bf1b65b9041e761ec9e9e68d55f761e18522c787aa643f71bb73bd0b7 SHA512 bc672b32d6d72e6fa5641319e0bd15d721ea4b65e6d025e3cdbf6ba3655a7b2c714809d919a53fca8a908a7ce37541a341c13dd8a336799c2e942d5f86b84d3c
-EBUILD xine-lib-1.2.10.ebuild 5030 BLAKE2B 8a04851fb7e758e5f1e912548a46b15a667304df2818a77ce710972e1f4afea01b3c3bb141ec3a66236cb76847049693b043f2a8669efb1481cad703fd251f51 SHA512 46ac0af7e5b51f33e661c7a6ed3fc9982e0e2c840db68b6e3081f84d4125eaaa238d0c235bbd3c883f86b37de3d08989c13ee4acc2d8ade61732e9fea975c341
+EBUILD xine-lib-1.2.10.ebuild 5029 BLAKE2B afe0f697c63d796399b38efa40c8a9ad3a6122f35481a3d2afd69cdbe2705e7157cba5929f70cf74726028b819f287ac402e791266342453a7989081c14f625e SHA512 94118d72ecdd8bd3ac0287f0da165d6c4a5f6923c8be63840edccfeb9e2c239595dd2e4d27e0721b92de4b88193781f5a83fb68049faed6dd97acd695591ffe8
 EBUILD xine-lib-1.2.11.ebuild 5044 BLAKE2B 907e269875cd3c06fef299e09701790c9aa14bcd1ed4b26919bdf1ecf7bb8bca66bc508f8a381b1d04755b649bf6807893f1a1a871c076dac78a2d3a84e3231a SHA512 aa8c17aaf9d1c3f2f8684ed2b930a50cb672b53f33c29aac72e6f0e9fc1a80fe2a72b0f75930312183316f60748681617524d3713f7a1fa52ef907137c4caa6c
-EBUILD xine-lib-1.2.9-r2.ebuild 5145 BLAKE2B 6fc935a7fe217bafcb1f9e9c02559da8ac2df0b56bc1200b7b29cd78445385a54f1ad463b9dbfa34c205486c23e8f2fa22c05aa34e52e226e8027988d940d261 SHA512 e98a1cb2efc4552e8b8d31c4b0a364e1ce97d9cfd8468abc7d76a741fef4a395f42510e6a63b2816a2afc2167219e825c44a9f182bb1562c6258512459bb73c7
 EBUILD xine-lib-1.2.9999.ebuild 5044 BLAKE2B 907e269875cd3c06fef299e09701790c9aa14bcd1ed4b26919bdf1ecf7bb8bca66bc508f8a381b1d04755b649bf6807893f1a1a871c076dac78a2d3a84e3231a SHA512 aa8c17aaf9d1c3f2f8684ed2b930a50cb672b53f33c29aac72e6f0e9fc1a80fe2a72b0f75930312183316f60748681617524d3713f7a1fa52ef907137c4caa6c
 MISC metadata.xml 2498 BLAKE2B 949a34fcf5204424c2a565ce2329b3f878e4ef817882839bbec09a6d721a8756be6dc37eff2a0bb7e007d333e2bc4896ac6c853f7fe5b1f9c8f4ed3a66ada640 SHA512 f975a8763a3f31a27a769e4649cd7c6ecd113cb4fcd36556f5f7830b9de989be219a0c9f90db4a4df87e9ffd584d4c2e86346da084c95d32dc17adcc30f98c28
diff --git a/media-libs/xine-lib/files/xine-lib-1.2.6-imagemagick7.patch b/media-libs/xine-lib/files/xine-lib-1.2.6-imagemagick7.patch
deleted file mode 100644
index 34062222e32c..000000000000
--- a/media-libs/xine-lib/files/xine-lib-1.2.6-imagemagick7.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://git.pld-linux.org/?p=packages/xine-lib.git;a=blob;f=imagemagick7.patch;h=d050323cdf509c9bb5f8edbad90084e8ce5c1b38;hb=HEAD
-
---- xine-lib-1.2.6/src/video_dec/image.c
-+++ xine-lib-1.2.6/src/video_dec/image.c
-@@ -39,7 +39,7 @@
- #define LOG
- */
- 
--#include <wand/magick_wand.h>
-+#include <MagickWand/MagickWand.h>
- #ifdef PACKAGE_NAME
- #undef PACKAGE_BUGREPORT
- #undef PACKAGE_NAME
diff --git a/media-libs/xine-lib/xine-lib-1.2.10.ebuild b/media-libs/xine-lib/xine-lib-1.2.10.ebuild
index a8fa37374f1f..49cb170173da 100644
--- a/media-libs/xine-lib/xine-lib-1.2.10.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.10.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	NLS_DEPEND="sys-devel/gettext"
 	NLS_RDEPEND="virtual/libintl"
 else
-	KEYWORDS="amd64 arm64 ~hppa ppc ppc64 ~x86"
+	KEYWORDS="amd64 arm64 ~hppa ppc ppc64 x86"
 	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
 	NLS_IUSE="nls"
 	NLS_DEPEND="nls? ( sys-devel/gettext )"
diff --git a/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild b/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild
deleted file mode 100644
index f1ccbed79848..000000000000
--- a/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic libtool
-
-if [[ ${PV} == *9999* ]]; then
-	EHG_REPO_URI="http://hg.code.sf.net/p/xine/xine-lib-1.2"
-	inherit autotools mercurial
-	unset NLS_IUSE
-	NLS_DEPEND="sys-devel/gettext"
-	NLS_RDEPEND="virtual/libintl"
-else
-	KEYWORDS="amd64 arm64 ~hppa ppc ppc64 x86"
-	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
-	NLS_IUSE="nls"
-	NLS_DEPEND="nls? ( sys-devel/gettext )"
-	NLS_RDEPEND="nls? ( virtual/libintl )"
-fi
-
-DESCRIPTION="Core libraries for Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X xinerama +xv xvmc ${NLS_IUSE}"
-
-RDEPEND="${NLS_RDEPEND}
-	dev-libs/libxdg-basedir
-	media-libs/libdvdnav
-	media-video/ffmpeg:0=
-	sys-libs/zlib:=
-	virtual/libiconv
-	a52? ( media-libs/a52dec )
-	aac? ( media-libs/faad2 )
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	bluray? ( >=media-libs/libbluray-0.2.1:= )
-	css? ( >=media-libs/libdvdcss-1.2.10 )
-	dts? ( media-libs/libdca )
-	dxr3? ( media-libs/libfame )
-	flac? ( media-libs/flac )
-	gtk? ( x11-libs/gdk-pixbuf:2 )
-	imagemagick? ( virtual/imagemagick-tools )
-	jack? ( virtual/jack )
-	jpeg? ( virtual/jpeg:0 )
-	libcaca? ( media-libs/libcaca )
-	mad? ( media-libs/libmad )
-	mng? ( media-libs/libmng:= )
-	modplug? ( >=media-libs/libmodplug-0.8.8.1 )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( net-fs/samba )
-	sdl? ( media-libs/libsdl )
-	speex? (
-		media-libs/libogg
-		media-libs/speex
-	)
-	theora? (
-		media-libs/libogg
-		media-libs/libtheora
-	)
-	truetype? (
-		media-libs/fontconfig
-		media-libs/freetype:2
-	)
-	v4l? ( media-libs/libv4l )
-	vaapi? ( x11-libs/libva:0=[X,opengl] )
-	vcd? (
-		>=media-video/vcdimager-0.7.23
-		dev-libs/libcdio:0=[-minimal]
-	)
-	vdpau? ( x11-libs/libvdpau )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	vpx? ( media-libs/libvpx:0= )
-	wavpack? ( media-sound/wavpack )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libxcb
-	)
-	xinerama? ( x11-libs/libXinerama )
-	xv? ( x11-libs/libXv )
-	xvmc? ( x11-libs/libXvMC )
-"
-DEPEND="${RDEPEND}
-	${NLS_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/libtool-2.2.6b
-	virtual/pkgconfig
-	oss? ( virtual/os-headers )
-	v4l? ( virtual/os-headers )
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libXt
-	)
-	xv? ( x11-base/xorg-proto )
-	xvmc? ( x11-base/xorg-proto )
-	xinerama? ( x11-base/xorg-proto )
-"
-REQUIRED_USE="
-	vidix? ( || ( X fbcon ) )
-	xv? ( X )
-	xinerama? ( X )
-"
-
-src_prepare() {
-	default
-
-	if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
-		eapply "${FILESDIR}/${PN}-1.2.6-imagemagick7.patch"
-	fi
-
-	sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die
-
-	if [[ "${PV}" = *9999* ]] ; then
-		eautoreconf
-	else
-		elibtoolize
-	fi
-
-	local x
-	for x in 0 1 2 3; do
-		sed -i -e "/^O${x}_CFLAGS=\"-O${x}\"/d" configure || die
-	done
-}
-
-src_configure() {
-	[[ ${CHOST} == i?86-* ]] && append-flags -fomit-frame-pointer #422519
-
-	local win32dir #197236
-	if has_multilib_profile; then
-		win32dir=/usr/$(ABI="x86" get_libdir)/win32
-	else
-		win32dir=/usr/$(get_libdir)/win32
-	fi
-
-	local myconf=(
-		--disable-directfb
-		--disable-gnomevfs
-		--disable-optimizations
-		--disable-real-codecs
-		--disable-v4l
-		--disable-w32dll
-		--enable-avformat
-		--with-external-dvdnav
-		--with-real-codecs-path=/usr/$(get_libdir)/codecs
-		--with-w32-path=${win32dir}
-		--with-xv-path=/usr/$(get_libdir)
-		--without-esound
-		--without-fusionsound
-		$(use_enable a52 a52dec)
-		$(use_enable aac faad)
-		$(use_enable aalib)
-		$(use_enable altivec)
-		$(use_enable bluray)
-		$(use_enable dts)
-		$(use_enable dvb)
-		$(use_enable dxr3)
-		$(use_enable fbcon fb)
-		$(use_enable gtk gdkpixbuf)
-		$(use_enable ipv6)
-		$(use_enable jpeg libjpeg)
-		$(use_enable mad)
-		$(use_enable mmap)
-		$(use_enable mng)
-		$(use_enable modplug)
-		$(use_enable musepack)
-		$(use_enable opengl)
-		$(use_enable opengl glu)
-		$(use_enable oss)
-		$(use_enable samba)
-		$(use_enable v4l libv4l)
-		$(use_enable v4l v4l2)
-		$(use_enable vaapi)
-		$(use_enable vdpau)
-		$(use_enable vis)
-		$(use_enable vidix)
-		$(use_enable xinerama)
-		$(use_enable xvmc)
-		$(use_enable vcd)
-		$(use_enable vdr)
-		$(use_enable vpx)
-		$(use_with alsa)
-		$(use_with flac libflac)
-		$(use_with imagemagick)
-		$(use_with jack)
-		$(use_with libcaca caca)
-		$(use_with pulseaudio)
-		$(use_with sdl)
-		$(use_with speex)
-		$(use_with theora)
-		$(use_with truetype fontconfig)
-		$(use_with truetype freetype)
-		$(use_with vorbis)
-		$(use_with wavpack)
-		$(use_with X x)
-		$(use_with X xcb)
-	)
-	[[ ${PV} == *9999* ]] || myconf+=( $(use_enable nls) )
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	# enable verbose building, bug #448140
-	emake V=1
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	rm -f "${ED}"usr/share/doc/${PF}/COPYING || die
-}
author	V3n3RiX <venerix@redcorelinux.org>	2020-12-25 23:06:25 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-12-25 23:06:25 +0000
commit	441d1370330332b7d78f238d2f5e13f7aed5e4e0 (patch)
tree	6a5171dd615dfeee62a45044144c66e864738fb0 /media-libs
parent	ab3da91fb6c91a9df52fff8f991570f456fd3c7a (diff)