gentoo resync : 25.08.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
commit: 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree: c513fe68548b40365c1c2ebfe35c58ad431cdd77 /media-libs
parent: 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
412 files changed, 5479 insertions, 6091 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 04c731d0ac01..8ca872d66907 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index 4981e02a301e..b3721058a319 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -12,5 +12,5 @@ DIST allegro-4.4.3.1.tar.gz 4663634 BLAKE2B 23fa8cd77858243bfa8191f6bca26f50d162
 DIST allegro-5.2.5.0.tar.gz 7849326 BLAKE2B 8d8995b9ad252b81c534099ffd91d81bbdcf4a34f7ca7c4fb7dd97e5c075869c212fa68445a5fe479a675d755ad0414976c11cbc112ecdd61f1fa09704957b21 SHA512 c6341396ad7340233c1297ed122095e5c2d129a32da2350b4bb39c4b74f8d56d57ec4e608defec471d63fff51d786f0a9f3844be82f81cdb3d48d5bc49908b12
 EBUILD allegro-4.4.2-r2.ebuild 2737 BLAKE2B 53d1da512860d07ae86685094c73795eff384dccac3bfdcaa14e766300043289163cf721ff53abcc826070182eb14bef098fcadb2cda4730cd6042ed76116d4c SHA512 947594d6b3dcc1df3cb7359d41ddac48b8095933aa82dc5e064c92534e94d380ff0b65896a5558b82c11b7149c5f4dd552017b247c35b233318a6e5b010cff0c
 EBUILD allegro-4.4.3.1.ebuild 2974 BLAKE2B 528154f76a3881238dc604cddfa85c308d5b03333be69ff946083abb26aa589e44a85b684b4913638f2ca70b6dabd84df392d07bfd806f204c61d61af31263d5 SHA512 45f1829f0cc3cdd3a15f7ff92c6712c4c871e61cacf92ba8be1b0394f20b1649532e0e5a7bda3407218d0203788217383d8c788a72145d7a02965eeacdd8cb3f
-EBUILD allegro-5.2.5.0.ebuild 2817 BLAKE2B 26bc7d624366d775aca8b8d05978c6cbdcabcd40ee68c233d7b8f41c35aa9f1200d3114ea9674bec81f9fa34b6da877caa727c00809e8fb71f51f54c645cd66a SHA512 c4332466c54a64179b190bd2ca18c4db52ecbb2b5b2208257392de89e0987284c66cfa8aeedf8fa5a9eb7e87c23e223919cec83067400116f697036f5454e4d3
+EBUILD allegro-5.2.5.0.ebuild 2824 BLAKE2B 53f03e63f58b50034696b81b90db488034c25907c2b30acb68432bcd1e8e1efb62dbb9133cdb5f368ddcb315475928b6c46232ac0a56a9a26b588f1e0f4ec189 SHA512 bef3abd2955fed7d934a0d7a674de507dd4072d0c85dd6e42564f079041acac54b3d6a5c72bc9572733137cadc827258beff93bccbbe744cc0a798540dba1bce
 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
index f461da80f02d..ad80a90f9971 100644
--- a/media-libs/allegro/allegro-5.2.5.0.ebuild
+++ b/media-libs/allegro/allegro-5.2.5.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 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/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 0da0dabadcdc..21a056664db4 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -3,6 +3,8 @@ AUX alsa-lib-1.2.2-change-order-of-pcm-devices.patch 2198 BLAKE2B 21db0baeb6bb13
 AUX alsa-lib-1.2.2-namehint-add-omit_noargs.patch 3450 BLAKE2B f5fc66626a8f99d018bf476ec327c5734e96adf9f5dfdf97212cb220837f42c93879ef7641d3775c8238fc5fe27a5fc85959d4fca7e0fcd62b69009d895bdd1c SHA512 6f71ab0b4424b684dbd6ba0b2a3ce0de05ec3124ec1c3223ccb35afaff02dfed834af2d42d8d1cb8bb7f2e96051277bbf18ba5687e94f15d753cf1b86cdd33f8
 DIST alsa-lib-1.2.2.tar.bz2 1030747 BLAKE2B 176054c7783452fcd0b30482f4d85fb88a1364a97f79830f2c22cd578275280fa64537d00a08f3e3b1420e4aeb4e4269c7523cb4296db3ed095bcf078b452726 SHA512 d21adb3ff998918c7d1820f9ce2aaf4202dd45ccb87cb092d49da8b2402b6ddaad06325be0fd59f17393a5d9958e3743bfccb4b14bdb947a42e7d791d73c7033
 DIST alsa-lib-1.2.3.1.tar.bz2 1037942 BLAKE2B 0460ec9449e3936582b29af6ef019ddbe9875090ba722e00074d3d3dfe6214f40c1d96cec8827bb724a52b06abbff1d80dc5fed46f5bb1f03bc5c46a765756fd SHA512 ed0a81371117a91a5024f3bef5a881ffa9521399eab5e016924669a3f1eba2d6a02efa284b160089bc581717d39d15325ebb2faf162e4d3dabe4c29785a5fb58
-EBUILD alsa-lib-1.2.2-r1.ebuild 2177 BLAKE2B 263db5805070d0c436255435b0ad6d8788f30b01b62dba79adf8705d5736760d9be0bf3f821f212406c9b353416a7125a687ef27a97b44e99fc50b6aa3a57365 SHA512 0f79c21aa74feb187d563c472d95628f7558cd2e80778a861fc220282e7ab2c1949e003a50722af9dbac5798572da2afa70da859e7bf082b7ece76672d91af01
-EBUILD alsa-lib-1.2.3.1.ebuild 2064 BLAKE2B 4454afdd4a63fa500fa00afb7b54ec4d08ee62e7481d4ee90491e1f118cb49fa0da5a0311a108854dd712b0f8589f739153e5196f1113ddf2f6611c2ae31ad8c SHA512 f416a0ab5aa031ed0cc5bf19c648318af59b47a367d3586877cabad2bfb2cdbcb904cf85d7c12358d8d68727dd506b9f4eb07cf06f7e85196cd3b7d4e0c5cb84
+DIST alsa-lib-1.2.3.2.tar.bz2 1038591 BLAKE2B 70ba972953f71fc6ac20f6f3e91361b5aed72c8c7887252331a01334ec4cc154c1bfea02dfaf0f76f8244b8cf73426d83577dcf55aa0033f80ee303d23386df6 SHA512 1fbc6360fda841bd9ca488739bdc9f4142c1b4a07ff767f48f1e160e3d4dff914aed422c97088e238b5e77d7e30aa79ff72569c3348a4cf4a412e1e4bce0bf2a
+EBUILD alsa-lib-1.2.2-r1.ebuild 2167 BLAKE2B a8be7297ee529e0d99df9086bf54f1f357faaf6fb69fb1217511fba8c10128f6e20fd66ea46959eb1ab2d55c6b0b24a8baabd33f255ca80ea4efdf35dce3b921 SHA512 c90194937d98a4e740aef62d79b38f75ca9b606e37809040f9dfc410c29aa2bef2a8f52decc4510fb7ad5f40a5fc3829087cddc2237e44bbcd48a879f05e3c4c
+EBUILD alsa-lib-1.2.3.1.ebuild 2054 BLAKE2B 0ae472259dea51bc27b4cba0fe780e6df27dba7e81587f0a7d7d59d29505268140f2eb5b0c18689ff8bc5977ff0589128df7e2b20f8f17cff44ae6fdbe90bfce SHA512 0dec2b408fb7ad655bc6cce5ceef2e3f165a36d710c750d16de1f1e88a64463ab07eabad75872acb5f52b4fd6887995e042470cd76e381f7c0da9f7ffa71d000
+EBUILD alsa-lib-1.2.3.2.ebuild 2054 BLAKE2B 0ae472259dea51bc27b4cba0fe780e6df27dba7e81587f0a7d7d59d29505268140f2eb5b0c18689ff8bc5977ff0589128df7e2b20f8f17cff44ae6fdbe90bfce SHA512 0dec2b408fb7ad655bc6cce5ceef2e3f165a36d710c750d16de1f1e88a64463ab07eabad75872acb5f52b4fd6887995e042470cd76e381f7c0da9f7ffa71d000
 MISC metadata.xml 502 BLAKE2B 06ee247fafa9de0b13dc4723279d82367bf580e8ad5216b301e23e1abf2a4ea464febaf456c31a91d223bec81603c1b65c2de0fb5fe491d464cfae754ecc6ad5 SHA512 0ca6ff20c3eda2f898d20df9e8a572b9a8d0504bf3a79bc1ef14026ea8b72e13638cbd3ef63ce2bf19efea80729ca25c27ca131d965edad4a4d3d23ac1352085
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
index 4f118f5082fc..5ba025398039 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit autotools multilib-minimal python-single-r1
 
 DESCRIPTION="Advanced Linux Sound Architecture Library"
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.3.1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.3.1.ebuild
index e11bdf33b0aa..4b268d8fb2c6 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.3.1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit autotools multilib-minimal python-single-r1
 
 DESCRIPTION="Advanced Linux Sound Architecture Library"
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.3.2.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.3.2.ebuild
new file mode 100644
index 000000000000..4b268d8fb2c6
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.2.3.2.ebuild
@@ -0,0 +1,81 @@
+# 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 multilib-minimal python-single-r1
+
+DESCRIPTION="Advanced Linux Sound Architecture Library"
+HOMEPAGE="https://alsa-project.org/"
+SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="alisp debug doc elibc_uclibc python +thread-safety"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" #652422
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
+	# https://bugs.gentoo.org/509886
+	if use elibc_uclibc ; then
+		sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die
+	fi
+	# https://bugs.gentoo.org/545950
+	sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-maintainer-mode
+		--disable-resmgr
+		--enable-aload
+		--enable-rawmidi
+		--enable-seq
+		--enable-shared
+		# enable Python only on final ABI
+		$(multilib_native_use_enable python)
+		$(use_enable alisp)
+		$(use_enable thread-safety)
+		$(use_with debug)
+		$(usex elibc_uclibc --without-versioned '')
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake
+
+	if multilib_is_native_abi && use doc; then
+		emake doc
+		grep -FZrl "${S}" doc/doxygen/html | \
+			xargs -0 sed -i -e "s:${S}::" || die
+	fi
+}
+
+multilib_src_install() {
+	multilib_is_native_abi && use doc && local HTML_DOCS=( doc/doxygen/html/. )
+	default
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f \( -name '*.a' -o -name '*.la' \) -delete || die
+	dodoc ChangeLog doc/asoundrc.txt NOTES TODO
+}
diff --git a/media-libs/aubio/Manifest b/media-libs/aubio/Manifest
index aab597d65415..7688a9066426 100644
--- a/media-libs/aubio/Manifest
+++ b/media-libs/aubio/Manifest
@@ -1,9 +1,4 @@
-AUX aubio-0.4.8-docdir.patch 1022 BLAKE2B 23c1a5060dcfd3e98d5464e50a4828807c482004dbc907fe708748f126b6b0341d98188d3d56dba6fdf800da548af5cb0d770ce8fb3e0fad5f1fb789523fed63 SHA512 1ab8b18daba024e2a2f7e605409176d1380bc3d4b6117ede7b9f480bf7bffa20d79fb2b160c976d9536ff5f57c3026c85a0228e7df63ac3a9b60135e855f045c
 AUX aubio-0.4.9-docdir.patch 1192 BLAKE2B 617f5a63d51440eba157687b752822b3e14316781d3534c63194c9bef214574f195d3dfb949fc357862c7ddab01e0f9bb58ea54a75dac4c90f27a24f0c1cf477 SHA512 dffe872bd5c63eb874f00b1303e63f241d9b349d5f32fbf34b659b6211cc9cc828784bb3f5ddd2210c9e6b8459a73e842988bad4474b19e319145971de138526
-DIST aubio-0.4.7.tar.bz2 372173 BLAKE2B 544239b215dd87d4cf4a6ed6b5dd856411d0a3f1c3242e3e1077fa0780160785a9934884a1f0d0dc80fe21b1d417bc3800db59842ec300a4c29d75b7942cba05 SHA512 30c614f2b502b993df28d4746a99421fe0aada33c98c42ea19c271554b29b360cb4d4f6650c1b1da508da4bc341348c5944cb452f69b2bf354ca6348f84de260
-DIST aubio-0.4.8.tar.bz2 387933 BLAKE2B e30d0ce97360376edf8eba895dc3040157a139c843ef9d6bf0483ffb750916eaccf9e28b8d80dcc0034572cca4f08479e4db44468c96206ce7b60a2fa9600634 SHA512 e58b32beda36865a5243ec7ed4647cf96e3652a25fd319fc697c08f93487f895070dc66b830700b40b879220c2e3a53b8cdc255ce2e34770ba5e34b36a4f51b4
 DIST aubio-0.4.9.tar.bz2 397604 BLAKE2B b849d92678ea8fb20e17921b1a61fdc85a84d4a528acfefa3278169ab5f7fe935217ec37dd9f931202f0f0a1fd3a9518372afbce34cc2dd3ca30c6b4e5d9a301 SHA512 0cb81bb4b15051db3f3f4d160d500af56fdfb237e0a74e3f366f53c2870030aa0a7cee8469a611a9694c36b8866d3d42ffb48241c999de08f3fee43e6d903130
-EBUILD aubio-0.4.7-r1.ebuild 2476 BLAKE2B bbb66cc2cdecae57c6ffd93e92199f06ac35c8b77c52a656e435956b1391a83d4ac117a471532fb99d713516254a8a6c27bf65653528dcd7493d7e1ba0901163 SHA512 d0c1d1ec2f24963f74748d83f490b7100f02682e2f15897686b0acef265175b2b821623d7a10b9f208c2b5007145022c191a764777a57c14ddc2904ae899421e
-EBUILD aubio-0.4.8.ebuild 2480 BLAKE2B 019e89355725965392524f13f48e85f346ba4c563e6c8d075428ac08dc2317f7b32001533c8d5ea9d0c0e391c1eedba989ce9e34f092cadccd39809480f558aa SHA512 644fbed7d586997c01c6a696f4329709115ed5860c0c9ab4e694004f44c22b9095e7b87a109bf908b115931c0d56aa54d41c46c929b60a35975be0247c685ac7
 EBUILD aubio-0.4.9.ebuild 2837 BLAKE2B 4eb54f407991fb579ef4f23bde7dac337443d15c0c8f9daa357c395ee21f2fb8205fb5fd47f07828cf5f02f6147b44ca9edc00d1ac778905406a5aac105fbbb6 SHA512 e26ccf065778e2d11b17c41764dda9ba14caad4e5abffe43a1817422d302efc3cab35e8e9fc4f2276a1dd89ff916270d2d690de60304eb974d09d265dbe53405
 MISC metadata.xml 346 BLAKE2B 00429033f506bf3818f26f13062d21d0d04d8fc84185244615a09d008c5da6e350df5f32bdcba2c07103039ed64f802cc563a0ca8cd79e117741b947e421142d SHA512 ff3830c2d2322fabdb34458fd27c3e05ad825b1d707eee6150417e4c21480bdffbe4e639ff33a9914cc28189b91e970719326f065746f4241e186f7b27b168d1
diff --git a/media-libs/aubio/aubio-0.4.7-r1.ebuild b/media-libs/aubio/aubio-0.4.7-r1.ebuild
deleted file mode 100644
index 977ee51acd4e..000000000000
--- a/media-libs/aubio/aubio-0.4.7-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-inherit distutils-r1 waf-utils
-
-DESCRIPTION="Library for audio labelling"
-HOMEPAGE="https://aubio.org/"
-SRC_URI="https://aubio.org/pub/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0/5"
-KEYWORDS="amd64 ~ppc ppc64 sparc x86"
-IUSE="doc double-precision examples ffmpeg fftw jack libsamplerate sndfile python test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	ffmpeg? ( >=media-video/ffmpeg-2.6:0= )
-	fftw? ( sci-libs/fftw:3.0= )
-	jack? ( virtual/jack )
-	libsamplerate? ( media-libs/libsamplerate )
-	python? (
-		${PYTHON_DEPS}
-		|| (
-			dev-python/numpy-python2[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-		)
-	)
-	sndfile? ( media-libs/libsndfile )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-text/txt2man
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( double-precision libsamplerate )
-"
-
-DOCS=( AUTHORS ChangeLog README.md )
-PYTHON_SRC_DIR="${S}"
-
-src_prepare() {
-	default
-	sed -e "s:doxygen:doxygen_disabled:" -i wscript || die
-
-	if ! use test; then
-		sed -e "/bld.*tests/d" -i wscript || die
-	fi
-}
-
-src_configure() {
-	python_setup
-	local mywafconfargs=(
-		--enable-complex
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable double-precision double)
-		$(use_enable fftw fftw3)
-		$(use_enable ffmpeg avcodec)
-		$(use_enable jack)
-		$(use_enable libsamplerate samplerate)
-		$(use_enable sndfile)
-	)
-	use double-precision || mywafconfargs+=( $(use_enable fftw fftw3f) )
-
-	waf-utils_src_configure "${mywafconfargs[@]}"
-
-	if use python ; then
-		cd "${PYTHON_SRC_DIR}" || die
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	waf-utils_src_compile --notests
-
-	if use doc; then
-		cd "${S}"/doc || die
-		emake dirhtml
-	fi
-
-	if use python ; then
-		cd "${PYTHON_SRC_DIR}" || die
-		distutils-r1_src_compile
-	fi
-}
-
-src_test() {
-	waf-utils_src_compile --alltests
-
-	if use python ; then
-		cd "${PYTHON_SRC_DIR}" || die
-		distutils-r1_src_test
-	fi
-}
-
-src_install() {
-	waf-utils_src_install
-
-	if use examples; then
-		# install dist_noinst_SCRIPTS from Makefile.am
-		dodoc -r examples
-	fi
-
-	if use python ; then
-		cd "${PYTHON_SRC_DIR}" || die
-		DOCS="" distutils-r1_src_install
-		newdoc python/README.md README.python
-	fi
-
-	if use doc; then
-		dodoc doc/*.txt
-		docinto html
-		dodoc -r doc/_build/dirhtml/.
-	fi
-
-	find "${ED}" -name "*.a" -delete || die
-}
diff --git a/media-libs/aubio/aubio-0.4.8.ebuild b/media-libs/aubio/aubio-0.4.8.ebuild
deleted file mode 100644
index cb37129ec5ca..000000000000
--- a/media-libs/aubio/aubio-0.4.8.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE='threads(+)'
-inherit distutils-r1 waf-utils
-
-DESCRIPTION="Library for audio labelling"
-HOMEPAGE="https://aubio.org/"
-SRC_URI="https://aubio.org/pub/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0/5"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc double-precision examples ffmpeg fftw jack libsamplerate sndfile python test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	ffmpeg? (  >=media-video/ffmpeg-2.6:0= )
-	fftw? ( sci-libs/fftw:3.0= )
-	jack? ( virtual/jack )
-	libsamplerate? ( media-libs/libsamplerate )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	sndfile? ( media-libs/libsndfile )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-text/txt2man
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( double-precision libsamplerate )
-"
-
-DOCS=( AUTHORS ChangeLog README.md )
-PYTHON_SRC_DIR="${S}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.8-docdir.patch
-)
-
-src_prepare() {
-	default
-	sed -e "s:doxygen:doxygen_disabled:" -i wscript || die
-
-	if ! use test; then
-		sed -e "/bld.*tests/d" -i wscript || die
-	fi
-}
-
-src_configure() {
-	python_setup
-	local mywafconfargs=(
-		--enable-complex
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable double-precision double)
-		$(use_enable fftw fftw3)
-		$(use_enable ffmpeg avcodec)
-		$(use_enable jack)
-		$(use_enable libsamplerate samplerate)
-		$(use_enable sndfile)
-	)
-	use double-precision || mywafconfargs+=( $(use_enable fftw fftw3f) )
-
-	waf-utils_src_configure "${mywafconfargs[@]}"
-
-	if use python ; then
-		cd "${PYTHON_SRC_DIR}" || die
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	waf-utils_src_compile --notests
-
-	if use doc; then
-		cd "${S}"/doc || die
-		emake dirhtml
-	fi
-
-	if use python ; then
-		cd "${PYTHON_SRC_DIR}" || die
-		distutils-r1_src_compile
-	fi
-}
-
-src_test() {
-	waf-utils_src_compile --alltests
-
-	if use python ; then
-		cd "${PYTHON_SRC_DIR}" || die
-		distutils-r1_src_test
-	fi
-}
-
-src_install() {
-	waf-utils_src_install
-
-	if use examples; then
-		# install dist_noinst_SCRIPTS from Makefile.am
-		dodoc -r examples
-	fi
-
-	if use python ; then
-		cd "${PYTHON_SRC_DIR}" || die
-		DOCS="" distutils-r1_src_install
-		newdoc python/README.md README.python
-	fi
-
-	if use doc; then
-		dodoc doc/*.txt
-		docinto html
-		dodoc -r doc/_build/dirhtml/.
-	fi
-
-	find "${ED}" -name "*.a" -delete || die
-}
diff --git a/media-libs/aubio/files/aubio-0.4.8-docdir.patch b/media-libs/aubio/files/aubio-0.4.8-docdir.patch
deleted file mode 100644
index 58797995e3a6..000000000000
--- a/media-libs/aubio/files/aubio-0.4.8-docdir.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- aubio-0.4.8/wscript
-+++ aubio-0.4.8/wscript
-@@ -548,7 +548,7 @@
-                 source = 'doc/web.cfg',
-                 target = '../doc/web/html/index.html',
-                 cwd = 'doc')
--        bld.install_files( '${DATAROOTDIR}' + '/doc/libaubio-doc',
-+        bld.install_files( '${DATAROOTDIR}' + '/doc/' + os.environ['PF'] + '/libaubio-doc',
-                 bld.path.ant_glob('doc/web/html/**'),
-                 cwd = bld.path.find_dir ('doc/web'),
-                 relative_trick = True)
-@@ -564,7 +564,7 @@
-                         ' `dirname ${SRC}` `dirname ${TGT}`',
-                 source = 'doc/conf.py',
-                 target = '../doc/_build/html/index.html')
--        bld.install_files( '${DATAROOTDIR}' + '/doc/libaubio-doc/sphinx',
-+        bld.install_files( '${DATAROOTDIR}' + '/doc/' + os.environ['PF'] + '/libaubio-doc/sphinx',
-                 bld.path.ant_glob('doc/_build/html/**'),
-                 cwd = bld.path.find_dir('doc/_build/html'),
-                 relative_trick = True)
diff --git a/media-libs/audiofile/Manifest b/media-libs/audiofile/Manifest
index debb236f7eb9..9a5fb34ec2ea 100644
--- a/media-libs/audiofile/Manifest
+++ b/media-libs/audiofile/Manifest
@@ -1,7 +1,8 @@
 AUX audiofile-0.3.6-CVE-2015-7747.patch 4286 BLAKE2B 407ed02b63a8164324bbf2bcecc3533b711ebc3ffd44896f26a286496d01490b35efe8a4ea9b00eed69a484deb2516157bb23de94eb00e19f79cb8782f5ba33b SHA512 5def88fec10355224716783c84933c2b3adfc7608635b8d352c0728bf0e7765d146addaecf13a4f650a95f6aeb8f528ee1e8cfa785c1cdae3f6d75552e46faba
+AUX audiofile-0.3.6-CVE-2017-68xx.patch 12634 BLAKE2B d66ef71b5ce0d8b7356c856eb9496443918892c638213b836dbf83f79e5689e4e8b66533eeb65ad0e9b4668a745ae0a2b89a6f627a90311671e349a5ebc3aee8 SHA512 11259f5cf2de2b13836696cd045e78ad4a2a0c4ecf24d59152b99f01fdead97b1b7877728868538355440f4460e9b0f8a9399fe4ac348de658cbc2fb9f5ace52
+AUX audiofile-0.3.6-CVE-2018-13440-CVE-2018-17095.patch 2702 BLAKE2B f56d2bd5651193984e00904ff916c4d1658d49da4db531d8cfa43b936857dc4ed142e83114890dc59f1c7a1b8d5cdf07127465ec9851323e50c37bd6045a7c07 SHA512 0fc8252ddab1430e960551093de1f4d5dc281440b0a583dde8ecf7ef3e6bad78667c049957cac24a2ff8731a22090d998406a6e4e84d80a9e2d5580663cd1f67
 AUX audiofile-0.3.6-gcc6-build-fixes.patch 3785 BLAKE2B 7f016bfa9af8a440e31bcc395c654c9bb25a1d914a6b57bc191ad36e55ca191f924d57d48834a05ea30913ddd744056e244654a96529b1c3632ef5b162252c76 SHA512 60837bcc9aa53d546708210e87a4f24db56c8a4b0c6896c8e39e0d213aafa15f59a65a60726e6abbf16681fc1fa6ca59cf1748a63caf5ff2652d55f10f62a976
 AUX audiofile-0.3.6-mingw32.patch 687 BLAKE2B dec0680a401890f64a659a7303b089d03a40001d2b73da66c174663f818e5e72b7b8985e8fa220c15685b4cd857ba24cefb341c95059a4d9e10ae81a580a8f50 SHA512 b568b189f7316a41c724b02ee881adcdcb0e01fe22d4d6adc82fefef3296c34822943ec1cb299169dfd8fcdac9c260e1dd69fc9b5b6b4058382cc2f246c382f8
-AUX audiofile-0.3.6-system-gtest.patch 5209 BLAKE2B fa4a40165b37a6d33b929efbd79e20a1a7b953ee6d826dfbe88907255f217dcad1f9f4b14b910abe0d60a5c6b3956c92b3a7d6df76d1a47b7e5853bd7bc1d3a9 SHA512 ae821f7e4ea1684651e430007b2b52b369769d8b60cc7180aee3c80c55c7d01ad9e97792099d2d6694eec2f090552355688e2ee3cc527d7a8989e717d3de5b5d
 DIST audiofile-0.3.6.tar.xz 530760 BLAKE2B 5263e66b92471c8b7e8ad73a5065966fc93fd92d70481df804451353bafe44d670ec48b183bc19a7ac60025ea73b234d6aef1017fb220c16d14c68a27db027e4 SHA512 f3b58210a4ef3ac8e08a368a78e0f4b8345456d084bdebfd20d1631fa75e562aa58d31863a502b6ff18178327aa5b87403566bd34566fa52bdfc8e01de400bcb
-EBUILD audiofile-0.3.6-r3.ebuild 1259 BLAKE2B e64cdd7527b1e723884068f5cbc80b45977250910ba208b37e41142202bd04f57bbd9dc331c36cc587d577bf6c17c8ce6cb1663d956926010971d307c050ea97 SHA512 7e0bb29365a0f361f3c05ecea52fc720f41b15ce1aba6f4b5551d3013ed8516b5489865b1638a3ee86d319676c048f7fd5db1f176287329119a31b23e691e9ee
+EBUILD audiofile-0.3.6-r4.ebuild 1409 BLAKE2B 25674b0fd7d69d3fe1d44cc698d36218279156060941bdb580c59e41a08eed2a64501cc4735144a1b4649a8a06af089690c519ec97242474d312d1aa18e7c53e SHA512 6aa3b80fb36556a4ddf44415cd4d51efb5e9df639e9d140484b41a4599a9ee4309a1c763ba988e8dc96cdb0ffb87e79349d2c425b84f30fbfe86db89bd6d37b6
 MISC metadata.xml 359 BLAKE2B 3a6913b1f6e97d45f7d1c415879d82fec86642dc2a187907d1893ff9b81cf7781a5485e5140a901482913713ab4f7a5a8ce62df872fc75bf2f34f80d0dbeef9c SHA512 2f2ae33ca88cb3246c8419b88a800ba405123263a6cf2f94c9478d8303bf036ece9a6781a1fe83d8b1f329071623e76f6e909c0207289d6dad8166b163c3b897
diff --git a/media-libs/audiofile/audiofile-0.3.6-r3.ebuild b/media-libs/audiofile/audiofile-0.3.6-r4.ebuild
index 5742a016cb12..99fb3b6f6e83 100644
--- a/media-libs/audiofile/audiofile-0.3.6-r3.ebuild
+++ b/media-libs/audiofile/audiofile-0.3.6-r4.ebuild
@@ -11,19 +11,18 @@ HOMEPAGE="http://www.68k.org/~michael/audiofile/"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1" # subslot = soname major version
 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="flac static-libs test"
-RESTRICT="!test? ( test )"
+IUSE="flac"
 
 RDEPEND="flac? ( >=media-libs/flac-1.2.1[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
+	virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.3.6-gcc6-build-fixes.patch
-	"${FILESDIR}"/${PN}-0.3.6-system-gtest.patch
 	"${FILESDIR}"/${PN}-0.3.6-CVE-2015-7747.patch
 	"${FILESDIR}"/${PN}-0.3.6-mingw32.patch
+	"${FILESDIR}"/${PN}-0.3.6-CVE-2017-68xx.patch
+	"${FILESDIR}"/${PN}-0.3.6-CVE-2018-13440-CVE-2018-17095.patch
 )
 
 src_prepare() {
@@ -32,19 +31,25 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# Tests depend on statically compiled binaries to work, so we'll have to
+	# delete them later rather than not compile them at all
 	local myconf=(
 		--enable-largefile
 		--disable-werror
 		--disable-examples
 		$(use_enable flac)
-		$(use_enable static-libs static)
 	)
 	ECONF_SOURCE="${S}" econf "${myconf[@]}"
 }
 
+multilib_src_test() {
+	emake check
+}
+
 multilib_src_install_all() {
 	einstalldocs
 
 	# package provides .pc file
 	find "${ED}" -name '*.la' -delete || die
+	find "${ED}" -name '*.a' -delete || die
 }
diff --git a/media-libs/audiofile/files/audiofile-0.3.6-CVE-2017-68xx.patch b/media-libs/audiofile/files/audiofile-0.3.6-CVE-2017-68xx.patch
new file mode 100644
index 000000000000..99473d7e22ed
--- /dev/null
+++ b/media-libs/audiofile/files/audiofile-0.3.6-CVE-2017-68xx.patch
@@ -0,0 +1,379 @@
+Debian patchset for CVE-2017-68{29..38} and two other vulnerabilities:
+
+https://salsa.debian.org/multimedia-team/audiofile/commit/242f019#a064ca928f514268d4bae308e2e3990138341b76:
+
+* Address several vulnerabilities (Closes: #857651)
+  - Always check the number of coefficients (CVE-2017-6827 CVE-2017-6828
+    CVE-2017-6832 CVE-2017-6833 CVE-2017-6835 CVE-2017-6837)
+  - clamp index values to fix index overflow in IMA.cpp (CVE-2017-6829)
+  - Check for multiplication overflow in sfconvert (CVE-2017-6830
+    CVE-2017-6834 CVE-2017-6836 CVE-2017-6838)
+  - Actually fail when error occurs in parseFormat (CVE-2017-6831)
+  - Check for multiplication overflow in MSADPCM decodeSample
+    (CVE-2017-6839)
+* Fix signature of multiplyCheckOverflow. It returns a bool, not an int
+* Check for division by zero in BlockCodec::runPull
+
+
+From a2e9eab8ea87c4ffc494d839ebb4ea145eb9f2e6 Mon Sep 17 00:00:00 2001
+From: Antonio Larrosa <larrosa@kde.org>
+Date: Mon, 6 Mar 2017 18:59:26 +0100
+Subject: [PATCH] Actually fail when error occurs in parseFormat
+
+When there's an unsupported number of bits per sample or an invalid
+number of samples per block, don't only print an error message using
+the error handler, but actually stop parsing the file.
+
+This fixes #35 (also reported at
+https://bugzilla.opensuse.org/show_bug.cgi?id=1026983 and
+https://blogs.gentoo.org/ago/2017/02/20/audiofile-heap-based-buffer-overflow-in-imadecodeblockwave-ima-cpp/
+)
+---
+ libaudiofile/WAVE.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libaudiofile/WAVE.cpp b/libaudiofile/WAVE.cpp
+index 0e81cf7..d762249 100644
+--- a/libaudiofile/WAVE.cpp
++++ b/libaudiofile/WAVE.cpp
+@@ -326,6 +326,7 @@ status WAVEFile::parseFormat(const Tag &id, uint32_t size)
+ 			{
+ 				_af_error(AF_BAD_NOT_IMPLEMENTED,
+ 					"IMA ADPCM compression supports only 4 bits per sample");
++				return AF_FAIL;
+ 			}
+ 
+ 			int bytesPerBlock = (samplesPerBlock + 14) / 8 * 4 * channelCount;
+@@ -333,6 +334,7 @@ status WAVEFile::parseFormat(const Tag &id, uint32_t size)
+ 			{
+ 				_af_error(AF_BAD_CODEC_CONFIG,
+ 					"Invalid samples per block for IMA ADPCM compression");
++				return AF_FAIL;
+ 			}
+ 
+ 			track->f.sampleWidth = 16;
+-- 
+2.11.0
+
+From c48e4c6503f7dabd41f11d4c9c7b7f8960e7f2c0 Mon Sep 17 00:00:00 2001
+From: Antonio Larrosa <larrosa@kde.org>
+Date: Mon, 6 Mar 2017 12:51:22 +0100
+Subject: [PATCH] Always check the number of coefficients
+
+When building the library with NDEBUG, asserts are eliminated
+so it's better to always check that the number of coefficients
+is inside the array range.
+
+This fixes the 00191-audiofile-indexoob issue in #41
+---
+ libaudiofile/WAVE.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/libaudiofile/WAVE.cpp b/libaudiofile/WAVE.cpp
+index 0e81cf7..61f9541 100644
+--- a/libaudiofile/WAVE.cpp
++++ b/libaudiofile/WAVE.cpp
+@@ -281,6 +281,12 @@ status WAVEFile::parseFormat(const Tag &id, uint32_t size)
+ 
+ 			/* numCoefficients should be at least 7. */
+ 			assert(numCoefficients >= 7 && numCoefficients <= 255);
++			if (numCoefficients < 7 || numCoefficients > 255)
++			{
++				_af_error(AF_BAD_HEADER,
++						"Bad number of coefficients");
++				return AF_FAIL;
++			}
+ 
+ 			m_msadpcmNumCoefficients = numCoefficients;
+ 
+-- 
+2.11.0
+
+From: Antonio Larrosa <larrosa@kde.org>
+Date: Thu, 9 Mar 2017 10:21:18 +0100
+Subject: Check for division by zero in BlockCodec::runPull
+
+---
+ libaudiofile/modules/BlockCodec.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libaudiofile/modules/BlockCodec.cpp b/libaudiofile/modules/BlockCodec.cpp
+index 4731be1..eb2fb4d 100644
+--- a/libaudiofile/modules/BlockCodec.cpp
++++ b/libaudiofile/modules/BlockCodec.cpp
+@@ -47,7 +47,7 @@ void BlockCodec::runPull()
+ 
+ 	// Read the compressed data.
+ 	ssize_t bytesRead = read(m_inChunk->buffer, m_bytesPerPacket * blockCount);
+-	int blocksRead = bytesRead >= 0 ? bytesRead / m_bytesPerPacket : 0;
++	int blocksRead = (bytesRead >= 0 && m_bytesPerPacket > 0) ? bytesRead / m_bytesPerPacket : 0;
+ 
+ 	// Decompress into m_outChunk.
+ 	for (int i=0; i<blocksRead; i++)
+From beacc44eb8cdf6d58717ec1a5103c5141f1b37f9 Mon Sep 17 00:00:00 2001
+From: Antonio Larrosa <larrosa@kde.org>
+Date: Mon, 6 Mar 2017 13:43:53 +0100
+Subject: [PATCH] Check for multiplication overflow in MSADPCM decodeSample
+
+Check for multiplication overflow (using __builtin_mul_overflow
+if available) in MSADPCM.cpp decodeSample and return an empty
+decoded block if an error occurs.
+
+This fixes the 00193-audiofile-signintoverflow-MSADPCM case of #41
+---
+ libaudiofile/modules/BlockCodec.cpp |  5 ++--
+ libaudiofile/modules/MSADPCM.cpp    | 47 +++++++++++++++++++++++++++++++++----
+ 2 files changed, 46 insertions(+), 6 deletions(-)
+
+diff --git a/libaudiofile/modules/BlockCodec.cpp b/libaudiofile/modules/BlockCodec.cpp
+index 45925e8..4731be1 100644
+--- a/libaudiofile/modules/BlockCodec.cpp
++++ b/libaudiofile/modules/BlockCodec.cpp
+@@ -52,8 +52,9 @@ void BlockCodec::runPull()
+ 	// Decompress into m_outChunk.
+ 	for (int i=0; i<blocksRead; i++)
+ 	{
+-		decodeBlock(static_cast<const uint8_t *>(m_inChunk->buffer) + i * m_bytesPerPacket,
+-			static_cast<int16_t *>(m_outChunk->buffer) + i * m_framesPerPacket * m_track->f.channelCount);
++		if (decodeBlock(static_cast<const uint8_t *>(m_inChunk->buffer) + i * m_bytesPerPacket,
++			static_cast<int16_t *>(m_outChunk->buffer) + i * m_framesPerPacket * m_track->f.channelCount)==0)
++			break;
+ 
+ 		framesRead += m_framesPerPacket;
+ 	}
+diff --git a/libaudiofile/modules/MSADPCM.cpp b/libaudiofile/modules/MSADPCM.cpp
+index 8ea3c85..ef9c38c 100644
+--- a/libaudiofile/modules/MSADPCM.cpp
++++ b/libaudiofile/modules/MSADPCM.cpp
+@@ -101,24 +101,60 @@ static const int16_t adaptationTable[] =
+ 	768, 614, 512, 409, 307, 230, 230, 230
+ };
+ 
++int firstBitSet(int x)
++{
++        int position=0;
++        while (x!=0)
++        {
++                x>>=1;
++                ++position;
++        }
++        return position;
++}
++
++#ifndef __has_builtin
++#define __has_builtin(x) 0
++#endif
++
++int multiplyCheckOverflow(int a, int b, int *result)
++{
++#if (defined __GNUC__ && __GNUC__ >= 5) || ( __clang__ && __has_builtin(__builtin_mul_overflow))
++	return __builtin_mul_overflow(a, b, result);
++#else
++	if (firstBitSet(a)+firstBitSet(b)>31) // int is signed, so we can't use 32 bits
++		return true;
++	*result = a * b;
++	return false;
++#endif
++}
++
++
+ // Compute a linear PCM value from the given differential coded value.
+ static int16_t decodeSample(ms_adpcm_state &state,
+-	uint8_t code, const int16_t *coefficient)
++	uint8_t code, const int16_t *coefficient, bool *ok=NULL)
+ {
+ 	int linearSample = (state.sample1 * coefficient[0] +
+ 		state.sample2 * coefficient[1]) >> 8;
++	int delta;
+ 
+ 	linearSample += ((code & 0x08) ? (code - 0x10) : code) * state.delta;
+ 
+ 	linearSample = clamp(linearSample, MIN_INT16, MAX_INT16);
+ 
+-	int delta = (state.delta * adaptationTable[code]) >> 8;
++	if (multiplyCheckOverflow(state.delta, adaptationTable[code], &delta))
++	{
++                if (ok) *ok=false;
++		_af_error(AF_BAD_COMPRESSION, "Error decoding sample");
++		return 0;
++	}
++	delta >>= 8;
+ 	if (delta < 16)
+ 		delta = 16;
+ 
+ 	state.delta = delta;
+ 	state.sample2 = state.sample1;
+ 	state.sample1 = linearSample;
++	if (ok) *ok=true;
+ 
+ 	return static_cast<int16_t>(linearSample);
+ }
+@@ -212,13 +248,16 @@ int MSADPCM::decodeBlock(const uint8_t *encoded, int16_t *decoded)
+ 	{
+ 		uint8_t code;
+ 		int16_t newSample;
++		bool ok;
+ 
+ 		code = *encoded >> 4;
+-		newSample = decodeSample(*state[0], code, coefficient[0]);
++		newSample = decodeSample(*state[0], code, coefficient[0], &ok);
++		if (!ok) return 0;
+ 		*decoded++ = newSample;
+ 
+ 		code = *encoded & 0x0f;
+-		newSample = decodeSample(*state[1], code, coefficient[1]);
++		newSample = decodeSample(*state[1], code, coefficient[1], &ok);
++		if (!ok) return 0;
+ 		*decoded++ = newSample;
+ 
+ 		encoded++;
+-- 
+2.11.0
+
+From 7d65f89defb092b63bcbc5d98349fb222ca73b3c Mon Sep 17 00:00:00 2001
+From: Antonio Larrosa <larrosa@kde.org>
+Date: Mon, 6 Mar 2017 13:54:52 +0100
+Subject: [PATCH] Check for multiplication overflow in sfconvert
+
+Checks that a multiplication doesn't overflow when
+calculating the buffer size, and if it overflows,
+reduce the buffer size instead of failing.
+
+This fixes the 00192-audiofile-signintoverflow-sfconvert case
+in #41
+---
+ sfcommands/sfconvert.c | 34 ++++++++++++++++++++++++++++++++--
+ 1 file changed, 32 insertions(+), 2 deletions(-)
+
+diff --git a/sfcommands/sfconvert.c b/sfcommands/sfconvert.c
+index 80a1bc4..970a3e4 100644
+--- a/sfcommands/sfconvert.c
++++ b/sfcommands/sfconvert.c
+@@ -45,6 +45,33 @@ void printusage (void);
+ void usageerror (void);
+ bool copyaudiodata (AFfilehandle infile, AFfilehandle outfile, int trackid);
+ 
++int firstBitSet(int x)
++{
++        int position=0;
++        while (x!=0)
++        {
++                x>>=1;
++                ++position;
++        }
++        return position;
++}
++
++#ifndef __has_builtin
++#define __has_builtin(x) 0
++#endif
++
++int multiplyCheckOverflow(int a, int b, int *result)
++{
++#if (defined __GNUC__ && __GNUC__ >= 5) || ( __clang__ && __has_builtin(__builtin_mul_overflow))
++	return __builtin_mul_overflow(a, b, result);
++#else
++	if (firstBitSet(a)+firstBitSet(b)>31) // int is signed, so we can't use 32 bits
++		return true;
++	*result = a * b;
++	return false;
++#endif
++}
++
+ int main (int argc, char **argv)
+ {
+ 	if (argc == 2)
+@@ -323,8 +350,11 @@ bool copyaudiodata (AFfilehandle infile, AFfilehandle outfile, int trackid)
+ {
+ 	int frameSize = afGetVirtualFrameSize(infile, trackid, 1);
+ 
+-	const int kBufferFrameCount = 65536;
+-	void *buffer = malloc(kBufferFrameCount * frameSize);
++	int kBufferFrameCount = 65536;
++	int bufferSize;
++	while (multiplyCheckOverflow(kBufferFrameCount, frameSize, &bufferSize))
++		kBufferFrameCount /= 2;
++	void *buffer = malloc(bufferSize);
+ 
+ 	AFframecount totalFrames = afGetFrameCount(infile, AF_DEFAULT_TRACK);
+ 	AFframecount totalFramesWritten = 0;
+-- 
+2.11.0
+
+From 25eb00ce913452c2e614548d7df93070bf0d066f Mon Sep 17 00:00:00 2001
+From: Antonio Larrosa <larrosa@kde.org>
+Date: Mon, 6 Mar 2017 18:02:31 +0100
+Subject: [PATCH] clamp index values to fix index overflow in IMA.cpp
+
+This fixes #33
+(also reported at https://bugzilla.opensuse.org/show_bug.cgi?id=1026981
+and https://blogs.gentoo.org/ago/2017/02/20/audiofile-global-buffer-overflow-in-decodesample-ima-cpp/)
+---
+ libaudiofile/modules/IMA.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libaudiofile/modules/IMA.cpp b/libaudiofile/modules/IMA.cpp
+index 7476d44..df4aad6 100644
+--- a/libaudiofile/modules/IMA.cpp
++++ b/libaudiofile/modules/IMA.cpp
+@@ -169,7 +169,7 @@ int IMA::decodeBlockWAVE(const uint8_t *encoded, int16_t *decoded)
+ 		if (encoded[1] & 0x80)
+ 			m_adpcmState[c].previousValue -= 0x10000;
+ 
+-		m_adpcmState[c].index = encoded[2];
++		m_adpcmState[c].index = clamp(encoded[2], 0, 88);
+ 
+ 		*decoded++ = m_adpcmState[c].previousValue;
+ 
+@@ -210,7 +210,7 @@ int IMA::decodeBlockQT(const uint8_t *encoded, int16_t *decoded)
+ 			predictor -= 0x10000;
+ 
+ 		state.previousValue = clamp(predictor, MIN_INT16, MAX_INT16);
+-		state.index = encoded[1] & 0x7f;
++		state.index = clamp(encoded[1] & 0x7f, 0, 88);
+ 		encoded += 2;
+ 
+ 		for (int n=0; n<m_framesPerPacket; n+=2)
+-- 
+2.11.0
+
+From ce536d707b8e2a26baca77320398c45238224ca7 Mon Sep 17 00:00:00 2001
+From: Antonio Larrosa <larrosa@kde.org>
+Date: Fri, 10 Mar 2017 15:40:02 +0100
+Subject: [PATCH] Fix signature of multiplyCheckOverflow. It returns a bool,
+ not an int
+
+---
+ libaudiofile/modules/MSADPCM.cpp | 2 +-
+ sfcommands/sfconvert.c           | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libaudiofile/modules/MSADPCM.cpp b/libaudiofile/modules/MSADPCM.cpp
+index ef9c38c..d8c9553 100644
+--- a/libaudiofile/modules/MSADPCM.cpp
++++ b/libaudiofile/modules/MSADPCM.cpp
+@@ -116,7 +116,7 @@ int firstBitSet(int x)
+ #define __has_builtin(x) 0
+ #endif
+ 
+-int multiplyCheckOverflow(int a, int b, int *result)
++bool multiplyCheckOverflow(int a, int b, int *result)
+ {
+ #if (defined __GNUC__ && __GNUC__ >= 5) || ( __clang__ && __has_builtin(__builtin_mul_overflow))
+ 	return __builtin_mul_overflow(a, b, result);
+diff --git a/sfcommands/sfconvert.c b/sfcommands/sfconvert.c
+index 970a3e4..367f7a5 100644
+--- a/sfcommands/sfconvert.c
++++ b/sfcommands/sfconvert.c
+@@ -60,7 +60,7 @@ int firstBitSet(int x)
+ #define __has_builtin(x) 0
+ #endif
+ 
+-int multiplyCheckOverflow(int a, int b, int *result)
++bool multiplyCheckOverflow(int a, int b, int *result)
+ {
+ #if (defined __GNUC__ && __GNUC__ >= 5) || ( __clang__ && __has_builtin(__builtin_mul_overflow))
+ 	return __builtin_mul_overflow(a, b, result);
+-- 
+2.11.0
+
diff --git a/media-libs/audiofile/files/audiofile-0.3.6-CVE-2018-13440-CVE-2018-17095.patch b/media-libs/audiofile/files/audiofile-0.3.6-CVE-2018-13440-CVE-2018-17095.patch
new file mode 100644
index 000000000000..0d356fb072a2
--- /dev/null
+++ b/media-libs/audiofile/files/audiofile-0.3.6-CVE-2018-13440-CVE-2018-17095.patch
@@ -0,0 +1,82 @@
+Fixes for CVE-2018-13440 and CVE-2018-17095 from here:
+https://github.com/mpruett/audiofile/pull/52
+
+These are the same used in Fedora.
+
+From fde6d79fb8363c4a329a184ef0b107156602b225 Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Thu, 27 Sep 2018 10:48:45 +0200
+Subject: [PATCH 1/3] ModuleState: handle compress/decompress init failure
+
+When the unit initcompress or initdecompress function fails,
+m_fileModule is NULL. Return AF_FAIL in that case instead of
+causing NULL pointer dereferences later.
+
+Fixes #49
+---
+ libaudiofile/modules/ModuleState.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/libaudiofile/modules/ModuleState.cpp b/libaudiofile/modules/ModuleState.cpp
+index 0c29d7a..070fd9b 100644
+--- a/libaudiofile/modules/ModuleState.cpp
++++ b/libaudiofile/modules/ModuleState.cpp
+@@ -75,6 +75,9 @@ status ModuleState::initFileModule(AFfilehandle file, Track *track)
+ 		m_fileModule = unit->initcompress(track, file->m_fh, file->m_seekok,
+ 			file->m_fileFormat == AF_FILE_RAWDATA, &chunkFrames);
+ 
++	if (!m_fileModule)
++		return AF_FAIL;
++
+ 	if (unit->needsRebuffer)
+ 	{
+ 		assert(unit->nativeSampleFormat == AF_SAMPFMT_TWOSCOMP);
+
+From 941774c8c0e79007196d7f1e7afdc97689f869b3 Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Thu, 27 Sep 2018 12:09:45 +0200
+Subject: [PATCH 2/3] ALAC: set chunk frameCount to 0 on short read
+
+---
+ libaudiofile/modules/ALAC.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libaudiofile/modules/ALAC.cpp b/libaudiofile/modules/ALAC.cpp
+index 7593c11..478e2af 100644
+--- a/libaudiofile/modules/ALAC.cpp
++++ b/libaudiofile/modules/ALAC.cpp
+@@ -240,6 +240,7 @@ void ALAC::runPull()
+ 	if (read(m_inChunk->buffer, bytesPerPacket) < bytesPerPacket)
+ 	{
+ 		reportReadError(0, m_track->f.framesPerPacket);
++		m_outChunk->frameCount = 0;
+ 		return;
+ 	}
+ 
+
+From 822b732fd31ffcb78f6920001e9b1fbd815fa712 Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Thu, 27 Sep 2018 12:11:12 +0200
+Subject: [PATCH 3/3] SimpleModule: set output chunk framecount after pull
+
+After pulling the data, set the output chunk to the amount of
+frames we pulled so that the next module in the chain has the correct
+frame count.
+
+Fixes #50 and #51
+---
+ libaudiofile/modules/SimpleModule.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libaudiofile/modules/SimpleModule.cpp b/libaudiofile/modules/SimpleModule.cpp
+index 2bae1eb..e87932c 100644
+--- a/libaudiofile/modules/SimpleModule.cpp
++++ b/libaudiofile/modules/SimpleModule.cpp
+@@ -26,6 +26,7 @@
+ void SimpleModule::runPull()
+ {
+ 	pull(m_outChunk->frameCount);
++	m_outChunk->frameCount = m_inChunk->frameCount;
+ 	run(*m_inChunk, *m_outChunk);
+ }
+ 
diff --git a/media-libs/audiofile/files/audiofile-0.3.6-system-gtest.patch b/media-libs/audiofile/files/audiofile-0.3.6-system-gtest.patch
deleted file mode 100644
index f2421bdfcac3..000000000000
--- a/media-libs/audiofile/files/audiofile-0.3.6-system-gtest.patch
+++ /dev/null
@@ -1,141 +0,0 @@
---- audiofile-0.3.6/configure.ac
-+++ audiofile-0.3.6/configure.ac
-@@ -160,7 +160,6 @@
- 	audiofile-uninstalled.pc
- 	sfcommands/Makefile
- 	test/Makefile
--	gtest/Makefile
- 	examples/Makefile
- 	libaudiofile/Makefile
- 	libaudiofile/alac/Makefile
---- audiofile-0.3.6/libaudiofile/Makefile.am
-+++ audiofile-0.3.6/libaudiofile/Makefile.am
-@@ -108,10 +108,9 @@
- TESTS_ENVIRONMENT = $(top_builddir)/libtool --mode=execute $(VALGRIND) $(VALGRIND_FLAGS)
- endif
- 
--LIBGTEST = ../gtest/libgtest.la
- 
--UnitTests_SOURCES = modules/UT_RebufferModule.cpp
--UnitTests_LDADD = libaudiofile.la $(LIBGTEST)
-+UnitTests_SOURCES = modules/UT_RebufferModule.cpp $(libaudiofile_la_SOURCES)
-+UnitTests_LDADD = $(libaudiofile_la_LIBADD) -lgtest
- UnitTests_CPPFLAGS = -I$(top_srcdir)
- UnitTests_CXXFLAGS = -fno-rtti -fno-exceptions -DGTEST_HAS_RTTI=0 -DGTEST_HAS_EXCEPTIONS=0
- UnitTests_LDFLAGS = -static
---- audiofile-0.3.6/Makefile.am
-+++ audiofile-0.3.6/Makefile.am
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- 
--SUBDIRS = gtest libaudiofile sfcommands test examples docs
-+SUBDIRS =  libaudiofile sfcommands test examples docs
- 
- EXTRA_DIST = \
- 	ACKNOWLEDGEMENTS \
---- audiofile-0.3.6/test/Makefile.am
-+++ audiofile-0.3.6/test/Makefile.am
-@@ -59,79 +59,77 @@
- 
- DEPENDENCIES = $(LIBAUDIOFILE)
- 
--LIBGTEST = ../gtest/libgtest.la
--
- ADPCM_SOURCES = ADPCM.cpp TestUtilities.cpp TestUtilities.h
--ADPCM_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
-+ADPCM_LDADD = -lgtest $(LIBAUDIOFILE)
- 
- AES_SOURCES = AES.cpp TestUtilities.cpp TestUtilities.h
--AES_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
-+AES_LDADD = -lgtest $(LIBAUDIOFILE)
- 
- ALAC_SOURCES = ALAC.cpp Lossless.h TestUtilities.cpp TestUtilities.h
--ALAC_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
-+ALAC_LDADD = -lgtest $(LIBAUDIOFILE)
- 
- ChannelMatrix_SOURCES = ChannelMatrix.cpp TestUtilities.cpp TestUtilities.h
--ChannelMatrix_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
-+ChannelMatrix_LDADD = -lgtest $(LIBAUDIOFILE)
- 
- Error_SOURCES = Error.cpp TestUtilities.cpp TestUtilities.h
--Error_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
-+Error_LDADD = -lgtest $(LIBAUDIOFILE)
- 
- FLAC_SOURCES = FLAC.cpp Lossless.h TestUtilities.cpp TestUtilities.h
--FLAC_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
-+FLAC_LDADD = -lgtest $(LIBAUDIOFILE)
- 
- FloatToInt_SOURCES = FloatToInt.cpp TestUtilities.cpp TestUtilities.h
--FloatToInt_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
-+FloatToInt_LDADD = -lgtest $(LIBAUDIOFILE)
- 
- Instrument_SOURCES = Instrument.cpp TestUtilities.cpp TestUtilities.h
--Instrument_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
-+Instrument_LDADD = -lgtest $(LIBAUDIOFILE)
- 
- IntToFloat_SOURCES = IntToFloat.cpp TestUtilities.cpp TestUtilities.h
--IntToFloat_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
-+IntToFloat_LDADD = -lgtest $(LIBAUDIOFILE)
- 
- InvalidCompressionFormat_SOURCES = InvalidCompressionFormat.cpp TestUtilities.cpp TestUtilities.h
--InvalidCompressionFormat_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
-+InvalidCompressionFormat_LDADD = -lgtest $(LIBAUDIOFILE)
- 
- InvalidSampleFormat_SOURCES = InvalidSampleFormat.cpp TestUtilities.cpp TestUtilities.h
--InvalidSampleFormat_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
-+InvalidSampleFormat_LDADD = -lgtest $(LIBAUDIOFILE)
- 
- Large_SOURCES = Large.cpp TestUtilities.cpp TestUtilities.h
--Large_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
-+Large_LDADD = -lgtest $(LIBAUDIOFILE)
- 
- Loop_SOURCES = Loop.cpp TestUtilities.cpp TestUtilities.h
--Loop_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
-+Loop_LDADD = -lgtest $(LIBAUDIOFILE)
- 
- Marker_SOURCES = Marker.cpp TestUtilities.cpp TestUtilities.h
--Marker_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
-+Marker_LDADD = -lgtest $(LIBAUDIOFILE)
- 
- Miscellaneous_SOURCES = Miscellaneous.cpp TestUtilities.cpp TestUtilities.h
--Miscellaneous_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
-+Miscellaneous_LDADD = -lgtest $(LIBAUDIOFILE)
- 
- NeXT_SOURCES = NeXT.cpp TestUtilities.cpp TestUtilities.h
--NeXT_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
-+NeXT_LDADD = -lgtest $(LIBAUDIOFILE)
- 
- PCMData_SOURCES = PCMData.cpp TestUtilities.cpp TestUtilities.h
--PCMData_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
-+PCMData_LDADD = -lgtest $(LIBAUDIOFILE)
- 
- PCMMapping_SOURCES = PCMMapping.cpp TestUtilities.cpp TestUtilities.h
--PCMMapping_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
-+PCMMapping_LDADD = -lgtest $(LIBAUDIOFILE)
- 
- Pipe_SOURCES = Pipe.cpp TestUtilities.cpp TestUtilities.h
--Pipe_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
-+Pipe_LDADD = -lgtest $(LIBAUDIOFILE)
- 
- Query_SOURCES = Query.cpp TestUtilities.cpp TestUtilities.h
--Query_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
-+Query_LDADD = -lgtest $(LIBAUDIOFILE)
- 
- SampleFormat_SOURCES = SampleFormat.cpp TestUtilities.cpp TestUtilities.h
--SampleFormat_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
-+SampleFormat_LDADD = -lgtest $(LIBAUDIOFILE)
- 
- Seek_SOURCES = Seek.cpp TestUtilities.cpp TestUtilities.h
--Seek_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
-+Seek_LDADD = -lgtest $(LIBAUDIOFILE)
- 
- Sign_SOURCES = Sign.cpp TestUtilities.cpp TestUtilities.h
--Sign_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
-+Sign_LDADD = -lgtest $(LIBAUDIOFILE)
- 
- VirtualFile_SOURCES = VirtualFile.cpp TestUtilities.cpp TestUtilities.h
--VirtualFile_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
-+VirtualFile_LDADD = -lgtest $(LIBAUDIOFILE)
- 
- floatto24_SOURCES = floatto24.c TestUtilities.cpp TestUtilities.h
- 
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index 0cd58db5ad44..24c1f5e05a3f 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1,6 +1,6 @@
-AUX avidemux-core-2.7.3-permissions.patch 1079 BLAKE2B 64e4b1718ef91051253b0d09a69acbd11fb2467d48a62443b4ccd2ca89feee454d1ed35542c49fbf94c217397bd363e6aefc6a3bf13498af9a57eb6fdf32b5ba SHA512 d9c316b76cedd2119a3fdae1810846358f7addf21258021ba896f0e1dd7d68d27db5f7e97b53e284806482334ccd016833a2f8b24f50cddd28ac6cfdf28dfce3
-DIST avidemux-2.7.3.tar.gz 23772654 BLAKE2B f946c267140bc8aebda2ce027ed8cb7c84a98a401255d3e0cdaf7498680e8bd9c78a33c122cb177d397ed2dd6bc3c29d7508578028c2964c2897279bf860b62d SHA512 d7761de1c40de1b824efbcf24173ea738a2e0ba7fa41cefa09e7bac3ec97f3af4b04201e36f9de50ade2b09e394aa99ed1d4907f90bb132f9896e8f1b5e82d7a
+AUX avidemux-core-2.7.6-ffmpeg-flags.patch 303 BLAKE2B 9b8a1f14bb7ce12c48f96f732228fb97783e8dd79a9e7f8fa4913a1536f93f0eb384c92946816e78f65ba5cb31a062de95992069d43bc5f28468d017d39a2bcb SHA512 25d41f677c71a76528f2b09ff06643a38cf04de6c32c8c4f272ace7043d373670abbf85cf7219a2a3f65d23f9eba314fdecf1938b9550f6b916b25711a95aea2
 DIST avidemux-2.7.4.tar.gz 23815808 BLAKE2B 3a7206f04f568f28dd4d5116c580dd780b057a59e94dd61a2abe5dadfa557291a0c50f917ad1926f9f9a82d01af065c06138f954320e2d9c174fda7583a6b265 SHA512 36d857837cd6a74039a414df16367cd8cbf615173bcc531e57dc0dbfc2e002b1c0c4a80cef73a0d8f25d305deca809af0b5cbcdbad8c311324fa2e64381fd10b
-EBUILD avidemux-core-2.7.3-r1.ebuild 2265 BLAKE2B 6d1b909ce168db29a92bb68939afa888dda302be61202cfcd2041fd43754b6f4769cb22634aa25ef8dd9bcebf90b1931462bdf10bd10095c081fbe4d2193fd38 SHA512 3a94343262b771030e57447ffb16abd849b4d48beda52d646cddc1a1ce5efa8e4e8644a1d2d7cdb78da23298cb8525ff8ea2bc51f8f21ff75bd692efddb74902
+DIST avidemux-2.7.6.tar.gz 21963753 BLAKE2B 6ca343f90c37844ebfd61123badccefb7327cbf500723c031257cf26500a5b6d98955568c2a9c0d182af68f162e878459a51e6049485937f9b01b4439b32e5e0 SHA512 bc60c733168d40d5b39cc7dd1f74b3f1315e9727302478ef1621e18748bad3400bcfd4d5199862c3093ad9df51385b6b2a96f0f8fedf9bf1c00060327545fb0f
 EBUILD avidemux-core-2.7.4-r1.ebuild 2202 BLAKE2B d045271402de0011830182fa76a50d8b58f35d4857391d6d7c7168ea0d3452e922876a991852713e2e79ce8f85d5a60bf52d2cea82f72ba3306b13597ececfc2 SHA512 af39b9372a05c1785f2badc702cc1d4487eb8d9db597745c0f84f1cf86ba3986d63f929d175e74018221e2a13da028bb26fa7edcf3146be24638f5c4e5aeccf9
+EBUILD avidemux-core-2.7.6.ebuild 2568 BLAKE2B 6f0109c9a19488d145ed383304a1a83a5a53fd5db64e94f221fd4e843a1c9fdc4321e65aef3755a91b7beeb549017424b5d1ffd580dc7c9b22cb5cc176f3faf5 SHA512 4a63d66563f311cceb314353d265013b6dfac33cf6db2e1196b48644ba784354bed8a62cc291780ffa4d12d67bb5af780aa7741af1c23f7020616e3ae2c3f8b0
 MISC metadata.xml 569 BLAKE2B 19e9f892bf6e5c63f2054dfd44beef6b394fcdeecbb2e91edf01e7e9370b7a32c21529ad566921d46992f14d00943ac69e5f0f55cff8406d48ee84dc6515619c SHA512 58e100ccdc3e1145703d4feef2776bdf4ccfcc44dc9e04f1e79f5ea1b89f6ae59c386794028328f27d8715cd00abb410cb6970f1b72c1646750babf742fe3270
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.3-r1.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild
index 1b987f4d1e1d..ac6eace06eb4 100644
--- a/media-libs/avidemux-core/avidemux-core-2.7.3-r1.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks"
 HOMEPAGE="http://fixounet.free.fr/avidemux"
@@ -36,11 +36,11 @@ BDEPEND="virtual/pkgconfig
 	!system-ffmpeg? ( dev-lang/yasm[nls=] )
 "
 
+PATCHES=( "${FILESDIR}"/avidemux-core-2.7.6-ffmpeg-flags.patch )
+
 S="${WORKDIR}/avidemux2-${PV}"
 CMAKE_USE_DIR="${S}/${PN/-/_}"
 
-PATCHES=( "${FILESDIR}"/${P}-permissions.patch )
-
 src_prepare() {
 	cmake_src_prepare
 
@@ -55,6 +55,20 @@ src_prepare() {
 			-i avidemux/commonCmakeApplication.cmake || die "${error}"
 		sed -e 's/include(admFFmpegBuild)//g' \
 			-i avidemux_core/CMakeLists.txt || die "${error}"
+	else
+		local ffmpeg_args=(
+			--cc=$(tc-getCC)
+			--cxx=$(tc-getCXX)
+			--ar=$(tc-getAR)
+			--nm=$(tc-getNM)
+			--ranlib=$(tc-getRANLIB)
+			"--optflags='${CFLAGS}'"
+		)
+
+		sed -i \
+			-e "s/@@GENTOO_FFMPEG_FLAGS@@/${ffmpeg_args[*]}/" \
+			cmake/ffmpeg_configure.sh.cmake \
+			|| die
 	fi
 }
 
@@ -72,9 +86,7 @@ src_configure() {
 		-DXVIDEO="$(usex xv)"
 	)
 
-	if use debug ; then
-		mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
-	fi
+	use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
 
 	cmake_src_configure
 }
diff --git a/media-libs/avidemux-core/files/avidemux-core-2.7.3-permissions.patch b/media-libs/avidemux-core/files/avidemux-core-2.7.3-permissions.patch
deleted file mode 100644
index 0f8ee21632e5..000000000000
--- a/media-libs/avidemux-core/files/avidemux-core-2.7.3-permissions.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 7c5c267987b90cf0b61ca98e9f8b6db2c0cdb84f Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 14 Aug 2019 03:35:01 +0300
-Subject: [PATCH] [cmake] Fix library permissions
-
-Upstream-Status: Submitted
-[https://github.com/mean00/avidemux2/pull/179]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- cmake/admInstallDir.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/admInstallDir.cmake b/cmake/admInstallDir.cmake
-index ab16f283d..5af762626 100644
---- a/cmake/admInstallDir.cmake
-+++ b/cmake/admInstallDir.cmake
-@@ -55,7 +55,7 @@ ENDMACRO(ADM_INSTALL_LIB )
- MACRO (ADM_INSTALL_LIB_FILES files)
-         INSTALL(FILES ${files} 
-                         DESTINATION ${AVIDEMUX_LIB_DIR}
--                        PERMISSIONS WORLD_READ WORLD_EXECUTE OWNER_WRITE OWNER_READ OWNER_EXECUTE
-+                        PERMISSIONS WORLD_READ WORLD_EXECUTE GROUP_READ GROUP_EXECUTE OWNER_WRITE OWNER_READ OWNER_EXECUTE
-                         COMPONENT  runtime
-                 )
- ENDMACRO (ADM_INSTALL_LIB_FILES)
--- 
-2.22.0
-
diff --git a/media-libs/avidemux-core/files/avidemux-core-2.7.6-ffmpeg-flags.patch b/media-libs/avidemux-core/files/avidemux-core-2.7.6-ffmpeg-flags.patch
new file mode 100644
index 000000000000..48e58be6d28f
--- /dev/null
+++ b/media-libs/avidemux-core/files/avidemux-core-2.7.6-ffmpeg-flags.patch
@@ -0,0 +1,8 @@
+--- a/cmake/ffmpeg_configure.sh.cmake
++++ b/cmake/ffmpeg_configure.sh.cmake
+@@ -1,2 +1,2 @@
+ export PATH=${FF_ENV_PATH}:$PATH
+-${FFMPEG_SOURCE_DIR}/configure ${FFMPEG_FLAGS}
+\ No newline at end of file
++${FFMPEG_SOURCE_DIR}/configure ${FFMPEG_FLAGS} @@GENTOO_FFMPEG_FLAGS@@
+\ No newline at end of file
diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index 586f457fa5a8..7fce101dbe49 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1,6 +1,6 @@
 AUX avidemux-plugins-2.6.20-optional-pulse.patch 743 BLAKE2B e60a7433e539d49d5bff7dea62bfda984866dd72b93158827ee5ed785d77174db3fbde9e67c9c3fdc8d652485d8e704c075811c65848ef48f78490c6a3061b7f SHA512 dcec29c63aa7eb828fc1aaf4b54edb76290e3c7655b00002efa8036f0572b1c0111c30e873b925bb606e8e672e177ba8d103100b1fb55dcc830b83e4a5556710
-DIST avidemux-2.7.3.tar.gz 23772654 BLAKE2B f946c267140bc8aebda2ce027ed8cb7c84a98a401255d3e0cdaf7498680e8bd9c78a33c122cb177d397ed2dd6bc3c29d7508578028c2964c2897279bf860b62d SHA512 d7761de1c40de1b824efbcf24173ea738a2e0ba7fa41cefa09e7bac3ec97f3af4b04201e36f9de50ade2b09e394aa99ed1d4907f90bb132f9896e8f1b5e82d7a
 DIST avidemux-2.7.4.tar.gz 23815808 BLAKE2B 3a7206f04f568f28dd4d5116c580dd780b057a59e94dd61a2abe5dadfa557291a0c50f917ad1926f9f9a82d01af065c06138f954320e2d9c174fda7583a6b265 SHA512 36d857837cd6a74039a414df16367cd8cbf615173bcc531e57dc0dbfc2e002b1c0c4a80cef73a0d8f25d305deca809af0b5cbcdbad8c311324fa2e64381fd10b
-EBUILD avidemux-plugins-2.7.3.ebuild 4309 BLAKE2B 221f078e8a553d581c267fa8b70722d4c8bc7e3fdaeefc84d06adc832c0fb315ff396e35ac82757f0152102aa3ba09fd97b4592c9a6e5c12511cc376368274e4 SHA512 e3792244f82bef40c043258bbfc7fb0c9bc77e4aff1966926a76ab7f0693fb8c3c116f6f1fa330ea4eb4c3e45ea77295f5332b250ecedb17bec37c6edc363ff2
-EBUILD avidemux-plugins-2.7.4.ebuild 4225 BLAKE2B a4766dc2b32439917adec4a430736bbfaef169d95eec990d4769159822627cf68e852cb67e57e96b7793c3b47433da667b59287c13a4ebc7b6139d36bb36e0a2 SHA512 dc9d91e0ac345c1ea19a4f25b32b2d4012853ca22dd1cb8790a3258af6bc3926c7bad0dd81c2a474a1876e1c3148f7d1b23d8ab62ffae5615dc550f139547a0c
+DIST avidemux-2.7.6.tar.gz 21963753 BLAKE2B 6ca343f90c37844ebfd61123badccefb7327cbf500723c031257cf26500a5b6d98955568c2a9c0d182af68f162e878459a51e6049485937f9b01b4439b32e5e0 SHA512 bc60c733168d40d5b39cc7dd1f74b3f1315e9727302478ef1621e18748bad3400bcfd4d5199862c3093ad9df51385b6b2a96f0f8fedf9bf1c00060327545fb0f
+EBUILD avidemux-plugins-2.7.4-r1.ebuild 4200 BLAKE2B ed5da75507e8fdbaaa792cff634ac0240a17b2fa0530e69d301184f5ca19acefb4918d870e44e912bb6e426f57fb13c54ad5237e551a2c87b61d3e386d0f1342 SHA512 86c6fedfaa7e3d0f0ea1bdac952faa3e9b84b332370d07dfc7dc550df42be2e4f2881ad5cd81ffa9ad4db5a6664f281557c685f7a30e57bb554ad90b8c5fc3f2
+EBUILD avidemux-plugins-2.7.6.ebuild 4208 BLAKE2B 5578b715fb2b2a1e4516df3f2cf2128ffa94f91f3f97c1cc5a2292e22e124347381c0ae8992bec35758bab25d45cf78a23d8b0f93598d442c337ed50b689556d SHA512 31f128df8a15326db2042e4268db6222fb10579fa4b990466b6a7437cde407b492c4b53d2cfa29926afeb3a0be9da52077c3f4c0d88f176d4f9b6fd42804e088
 MISC metadata.xml 1313 BLAKE2B 931af633c34ab1bf1f45705ac5b6e2fd6ea3b3fa86dc870c404d29e7fbdb723f1f3d1bf60f051fd9ab30ac8ee83142c1082d0ca3994019d527c3b2f66884ed20 SHA512 26aa4c4bb69ea3d2b41c2f6b8147019b79d8b740690ac7381f28abbc51232e9340b007a53562e4b74ff8a46cbbdb6d9091b2d1981720f4bfe89656cbde28fb3d
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.4.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.4-r1.ebuild
index 9648ec0e7afe..ed880a38ba5f 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.7.4.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.7.4-r1.ebuild
@@ -44,7 +44,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	fontconfig? ( media-libs/fontconfig:1.0 )
 	fribidi? ( dev-libs/fribidi )
 	jack? (
-		media-sound/jack-audio-connection-kit
+		virtual/jack
 		libsamplerate? ( media-libs/libsamplerate )
 	)
 	lame? ( media-sound/lame )
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.3.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.6.ebuild
index be42b085469d..566c3a042992 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.7.3.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.7.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit cmake python-single-r1
 
@@ -23,54 +23,54 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 COMMON_DEPEND="${PYTHON_DEPS}
 	~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?]
 	~media-video/avidemux-${PV}:${SLOT}[opengl?,qt5?]
-	>=dev-lang/spidermonkey-1.5-r2:0=
+	dev-lang/spidermonkey:0=
 	dev-libs/libxml2:2
-	media-libs/a52dec:0
+	media-libs/a52dec
 	media-libs/libass:0=
-	media-libs/libmad:0
-	media-libs/libmp4v2:0
+	media-libs/libmad
+	media-libs/libmp4v2
 	media-libs/libpng:0=
-	virtual/libiconv:0
+	virtual/libiconv
 	aac? (
-		>=media-libs/faac-1.29.9.2:0
-		media-libs/faad2:0
+		media-libs/faac
+		media-libs/faad2
 	)
-	aften? ( media-libs/aften:0 )
-	alsa? ( >=media-libs/alsa-lib-1.0.3b-r2:0 )
-	amr? ( media-libs/opencore-amr:0 )
-	dcaenc? ( media-sound/dcaenc:0 )
-	dts? ( media-libs/libdca:0 )
+	aften? ( media-libs/aften )
+	alsa? ( media-libs/alsa-lib )
+	amr? ( media-libs/opencore-amr )
+	dcaenc? ( media-sound/dcaenc )
+	dts? ( media-libs/libdca )
 	fdk? ( media-libs/fdk-aac:0= )
 	fontconfig? ( media-libs/fontconfig:1.0 )
-	fribidi? ( dev-libs/fribidi:0 )
+	fribidi? ( dev-libs/fribidi )
 	jack? (
-		media-sound/jack-audio-connection-kit:0
-		libsamplerate? ( media-libs/libsamplerate:0 )
+		virtual/jack
+		libsamplerate? ( media-libs/libsamplerate )
 	)
-	lame? ( media-sound/lame:0 )
-	nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
-	opus? ( media-libs/opus:0 )
-	pulseaudio? ( media-sound/pulseaudio:0 )
+	lame? ( media-sound/lame )
+	nvenc? ( amd64? ( media-video/nvidia_video_sdk ) )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
 		dev-qt/qtwidgets:5
 	)
 	truetype? ( media-libs/freetype:2 )
-	twolame? ( media-sound/twolame:0 )
-	vorbis? ( media-libs/libvorbis:0 )
+	twolame? ( media-sound/twolame )
+	vorbis? ( media-libs/libvorbis )
 	vpx? ( media-libs/libvpx:0= )
 	x264? ( media-libs/x264:0= )
 	x265? ( media-libs/x265:0= )
 	xv? (
-		x11-libs/libX11:0
-		x11-libs/libXext:0
-		x11-libs/libXv:0
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXv
 	)
-	xvid? ( media-libs/xvid:0 )
+	xvid? ( media-libs/xvid )
 "
 DEPEND="${COMMON_DEPEND}
-	oss? ( virtual/os-headers:0 )
+	oss? ( virtual/os-headers )
 "
 RDEPEND="${COMMON_DEPEND}
 	!<media-libs/avidemux-plugins-${PV}
@@ -118,6 +118,7 @@ src_configure() {
 			-DJACK="$(usex jack)"
 			-DLAME="$(usex lame)"
 			-DNVENC="$(usex nvenc)"
+			-DOPENGL="$(usex opengl)"
 			-DOPUS="$(usex opus)"
 			-DOSS="$(usex oss)"
 			-DPULSEAUDIOSIMPLE="$(usex pulseaudio)"
@@ -138,13 +139,8 @@ src_configure() {
 			-DUSE_EXTERNAL_LIBMP4V2=yes
 		)
 
-		if use qt5 ; then
-			mycmakeargs+=( -DENABLE_QT5=True )
-		fi
-
-		if use debug ; then
-			mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
-		fi
+		use qt5 && mycmakeargs+=( -DENABLE_QT5=True )
+		use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
 
 		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake_src_configure
 	done
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index b14912c97d64..2589761fa7ca 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -1,8 +1,7 @@
-DIST babl-0.1.66.tar.bz2 706100 BLAKE2B 0de443dd4ea32cd025c8b121f042c24528677f32a6c201f3abedd13fb3a2ce2636d03f4b45eefce2c9f7a86426355af9b584602ca9ebb1a2140ee88f500c2843 SHA512 41534eea6cad21eae704af3fdce4857e9dc2b0efa48a7cfd7f98b23428198e95fc9ca2f30e522abf2fa06e907eaf4f7bbafc048b356cb5890fabcb9be21001b3
 DIST babl-0.1.74.tar.xz 294156 BLAKE2B bb5df4db706f817d9cf8674caed9b758fc1380b9dd33a26b24990eae07543f097c5e5fb68788c02cb2a2c0e68e917bb7a1c68aa0d2f9871dfd3267934291d474 SHA512 97b4a5aad76b7d6dee1835774cee48f866a9513c6454d74c3378068a60359704c1ba106a7542b9ac6a7968b3cf632ed2626b835ec9c7f3fcc6e29968c1e39396
-EBUILD babl-0.1.66-r1.ebuild 1575 BLAKE2B c45a13adf99809857f345b0f0a3ef510c0a7b8d0b6f9407eba9e5c64c2a60498d5e211f6cd0feb4d7eeb053f4534e2be8ce03bacd281f402c1a20d49d4f5a58e SHA512 10137ee08bc7449f692885f661358c0c81e4065521aa3f64534c0ad0b9f5c572b983714ac214821df0204df41cca302a3dd1c65362527cab17886c1b30e5c601
-EBUILD babl-0.1.66.ebuild 1526 BLAKE2B fd0b0a8d90ecd659174bbbea81a30815bf6ba733a549bb9bec26122447c77095f4c40a76e4dc650cbeceab7c2f2cece0ca4f830a05acfa164a5fa64cc14c0abb SHA512 2ce3d9e86d9bee1423c9f9bab80b6c5b385f9be7fa6a0c0fb25c5cfeca46e64708c630c1fda4ce600c3cb61b1a47df3cc4bbcf8637d3fe15b46c95b1c4bcce70
+DIST babl-0.1.78.tar.xz 298920 BLAKE2B 654baf0ed09fbbad54578bf8bba60f45152e446d8b3d3ee49ca57084f220d22ed9478bc95851c5c1b17deeacdacfc14a39ab4d6e3f0448012eb212eef8b357b2 SHA512 d40f68cbd3d7703066a8985958b6cc49eaefe842c0fb3b7bbf6a5d6e6198642b55c4f95bdbf0d25a29d24a975c9b94acfd084792c60b18ec5f66260dfe54893b
 EBUILD babl-0.1.74-r1.ebuild 1604 BLAKE2B 75805349e710fcd3255f904c6ec4931f850ced00946d65827433e88115e13bcb686b1e020525cdb4a65ffb94b41a4b8ea2799a08662309064926aaf95c6cd35c SHA512 42102ff0ca81ea4a05eac5be4f9c4eae08ca738e352cc014da0f6c0b6aeed54b595ea386ddfeffe9bba1bfc0b5354233ae9333da466811b09ab41d2461839e09
 EBUILD babl-0.1.74.ebuild 1531 BLAKE2B 96d7fdedcedd21ca6a29d2431353cdbcc8ca192f0002565a2371c31eb54a5a4ab2eefdb2494b2eed4492dd16a9dafbb207a2f14be1b58abfdfa33b4985eed73d SHA512 b80760c10d05f679ea6511ee395dc595f14666bcbf6ef9a85733b56ece74592b91d914432eaed23f83ec960bb1fd81d93843386b4d429032a7035e7feab6ef7c
+EBUILD babl-0.1.78.ebuild 1836 BLAKE2B 44380d3a91670a7a56e6e604cc912e3dccff04d8826272f006aeb9951a1140cbe0acfe0f412f26a7fab9d08bbbebcbd302d779f437b6a84fc01e6d4896faffc1 SHA512 7a469576467529eb1c2b3f388f67822c551d554a9013f3cc35e695e1e0d880f9baa31c37f7442d743a53313aad36484a20488ade7280b02d339ab837dd058865
 EBUILD babl-9999.ebuild 1836 BLAKE2B 44380d3a91670a7a56e6e604cc912e3dccff04d8826272f006aeb9951a1140cbe0acfe0f412f26a7fab9d08bbbebcbd302d779f437b6a84fc01e6d4896faffc1 SHA512 7a469576467529eb1c2b3f388f67822c551d554a9013f3cc35e695e1e0d880f9baa31c37f7442d743a53313aad36484a20488ade7280b02d339ab837dd058865
 MISC metadata.xml 370 BLAKE2B 18f0dfd3b6fb8f284f888dbcd30d3d4ddce8753e58ef3e92ba0803bd6dadd36962f2f6e57dcd6ccebc547bf43b8972bdaf27e5817c77307172fdb835fe2d9c9e SHA512 9ad9dbdfc25d5a59c0129f1f83615d73bcb9026cc0411a71e9987bca46389fa5f3905a72d22ddac319b1838b770cc5755a2ec312a05db1752e10be5cca08ea38
diff --git a/media-libs/babl/babl-0.1.66-r1.ebuild b/media-libs/babl/babl-0.1.66-r1.ebuild
deleted file mode 100644
index 5f6ba2b9f668..000000000000
--- a/media-libs/babl/babl-0.1.66-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git"
-	SRC_URI=""
-else
-	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A dynamic, any to any, pixel format conversion library"
-HOMEPAGE="http://www.gegl.org/babl/"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="altivec lcms cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c"
-
-RDEPEND="lcms? ( >=media-libs/lcms-2.8:2 )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	[[ ${PV} == *9999* ]] && eautoreconf
-}
-
-src_configure() {
-	# Automagic rsvg support is just for website generation we do not call,
-	#     so we don't need to fix it
-	# w3m is used for dist target thus no issue for us that it is automagically
-	#     detected
-	econf \
-		--disable-docs \
-		--disable-static \
-		--disable-maintainer-mode \
-		$(use_enable altivec) \
-		$(use_enable cpu_flags_x86_f16c f16c) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable cpu_flags_x86_sse3 sse3) \
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1) \
-		$(use_with lcms)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/media-libs/babl/babl-0.1.66.ebuild b/media-libs/babl/babl-0.1.66.ebuild
deleted file mode 100644
index 8a25c0287680..000000000000
--- a/media-libs/babl/babl-0.1.66.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git"
-	SRC_URI=""
-else
-	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A dynamic, any to any, pixel format conversion library"
-HOMEPAGE="http://www.gegl.org/babl/"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.2
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	[[ ${PV} == *9999* ]] && eautoreconf
-}
-
-src_configure() {
-	# Automagic rsvg support is just for website generation we do not call,
-	#     so we don't need to fix it
-	# w3m is used for dist target thus no issue for us that it is automagically
-	#     detected
-	econf \
-		--disable-docs \
-		--disable-static \
-		--disable-maintainer-mode \
-		$(use_enable altivec) \
-		$(use_enable cpu_flags_x86_f16c f16c) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable cpu_flags_x86_sse3 sse3) \
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/media-libs/babl/babl-0.1.78.ebuild b/media-libs/babl/babl-0.1.78.ebuild
new file mode 100644
index 000000000000..be6f45add6b0
--- /dev/null
+++ b/media-libs/babl/babl-0.1.78.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VALA_USE_DEPEND=vapigen
+
+inherit meson gnome2-utils vala
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git"
+	SRC_URI=""
+else
+	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A dynamic, any to any, pixel format conversion library"
+HOMEPAGE="http://www.gegl.org/babl/"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="introspection lcms vala cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1"
+REQUIRED_USE="vala? ( introspection )"
+
+BDEPEND="
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+RDEPEND="
+	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+	lcms? ( >=media-libs/lcms-2.8:2 )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	gnome2_environment_reset
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	# Automagic rsvg support is just for website generation we do not call,
+	#     so we don't need to fix it
+	# w3m is used for dist target thus no issue for us that it is automagically
+	#     detected
+	local emesonargs=(
+		-Dwith-docs=false
+		$(meson_use introspection enable-gir)
+		$(meson_use lcms with-lcms)
+		$(meson_use vala enable-vapi)
+		$(meson_use cpu_flags_x86_avx2 enable-avx2)
+		$(meson_use cpu_flags_x86_f16c enable-f16c)
+		$(meson_use cpu_flags_x86_mmx enable-mmx)
+		$(meson_use cpu_flags_x86_sse enable-sse)
+		$(meson_use cpu_flags_x86_sse2 enable-sse2)
+		$(meson_use cpu_flags_x86_sse3 enable-sse3)
+		$(meson_use cpu_flags_x86_sse4_1 enable-sse4_1)
+	)
+	meson_src_configure
+}
diff --git a/media-libs/bcg729/Manifest b/media-libs/bcg729/Manifest
index 801095346719..d27bb719dd77 100644
--- a/media-libs/bcg729/Manifest
+++ b/media-libs/bcg729/Manifest
@@ -1,6 +1,6 @@
 AUX bcg729-4.3.0_beta-cmake-build.patch 135 BLAKE2B c3379f4327ab4f1d2a12ec31f3f0c0a3a15b0c2945da0d707d2d1b308c1860d52914b875504c0967c4b75ae42a4f7766611563c150cd0afb0acfe1369cc72116 SHA512 97fa2a52456809b2c4bac66c4c309b0d95a7a12d43eb102857339e729ede84f9a2cef9050a7232090e7b4e2f3817890d94e565051553f4cec3b7e83e69b2481c
 DIST bcg729-1.0.4.tar.gz 115641 BLAKE2B 5240fc10f8c4c32d9c9a6fc527a198fc896a8ff5ea12aa8a692808877582ac25b3fee122799cb7f6cea58db2f07cc07348da36d9f526e62f0bf62d61ef33bcfa SHA512 fdbbd2c9a807ed832ac3976301843bae854368ab281d16f792550bbda921d226fc6003c0a499561529f22eae08bc0d78b8826c2d06c859ab706d999a96967ffb
-EBUILD bcg729-1.0.4-r1.ebuild 766 BLAKE2B 6e3b1e2620e6e9e1e2c06cd8180fca64105fd25fb963dfc942aa2fdaebe07f2b9177db67d6bde5a117589bd6c8e8c96882e6348a8aab17eb2b0d3384c3923095 SHA512 cb7e64fa01684d97db56ba1e83f595f5610f5a6893b57f5226659e4807afe8bae80e7124226e906c38441e036c855f2aa02560b893f5bd4d27da8e1d25c341cd
+EBUILD bcg729-1.0.4-r1.ebuild 778 BLAKE2B c7e00edba1061875922a7123ba168a81292fad35ef84dd4a0d5a38b955675646bab11c1beeebb95103cec1a42fe924de936e7794fdb17b280f2625634a9b1f17 SHA512 e5a22040055627394970e8366f6b2c26b48da1f9641ec8f4a348b03fc059abe68bfc82183f021302c858c77351cff28413fb5cd36e09cc275420d05b7c968b01
 EBUILD bcg729-1.0.4.ebuild 665 BLAKE2B 61e259c0e136f52ca45d6676e3c13acfb34d27028140ed2e4a487b8fa589985101679df5f5de4664d565fef354f09a1a66d5ce32ee693a817adedbfa48bb7c03 SHA512 cab46d07da0a5c27c2e3d1362701835b9cc970d01b6a069ca908d6194999706d1e04a44775a1468558d3a3dc3534f26ac63290fa39258e474b86de527676a1eb
 EBUILD bcg729-999999.ebuild 722 BLAKE2B b25c170cab5975861a9b8caae9922efda53869c39a74094a5092be074db3c5b4da37f0fcedeb776ed34a154c5e9dbf74cd796d1eb7fb83ca8eec358fc86d97a7 SHA512 9f3d10de5a4010848e067fc21fcabe64fa0de7797e61521be5c8779e55ae676f7d7fc7c72d54d3d134eb978adeb2fc23b95b7129324bbd77f0a8bc196eab84a9
 MISC metadata.xml 214 BLAKE2B 4446a18615c9ae6446000d6d87c369372cf676ce6d21f6ac5e11932fc97833478c6d42f7469ac5a0cccb3aecbda03850590c3fed13b1395c9272d366e13e08c1 SHA512 7a44c566c4d93dfca459487b5ccf51b49f02d11f56e766442953c12db49cf45fdf6aa12089e0a52b6942ea7adadcc90fc7814fc02f6ada5a0e91831e1a44149e
diff --git a/media-libs/bcg729/bcg729-1.0.4-r1.ebuild b/media-libs/bcg729/bcg729-1.0.4-r1.ebuild
index 3664c1d80e52..81359d7dde91 100644
--- a/media-libs/bcg729/bcg729-1.0.4-r1.ebuild
+++ b/media-libs/bcg729/bcg729-1.0.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/BelledonneCommunications/bcg729/archive/${PV/_/-}.ta
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/media-libs/codec2/Manifest b/media-libs/codec2/Manifest
index 390e16ef6a38..946fb4097476 100644
--- a/media-libs/codec2/Manifest
+++ b/media-libs/codec2/Manifest
@@ -1,4 +1,7 @@
+AUX codec2-0.8.1-fno-common.patch 269 BLAKE2B 181d25b915a6dfc21450004e0da53a41888a04210dc944ec58adf8bab40b0216bb8a98c56f8cfcb74c88d91b18916ac05886c3471da92525d6c4bdba3789e55c SHA512 c3d691159dda7d9d398e182dc233302adddc3c21f2a2d1a92934c660021357d5378c7e17c4cae48573fc94f180d9ce5732b36e76363a74f738c9916d12b7f1b8
 AUX codec2-0.8.1-unused-deps.patch 2966 BLAKE2B 886ea88d068b8c6058468c0dffa1071443ab993ff169a9b38b628767ebb866e0e05feba2fdb1a5f108dab15d2f4a06acc228d4fbee7b005ada1185e48ae26f94 SHA512 89c75477ce2ebed216c2239b237c5c9a502753ac55d73808702230b89f81e6a2ce176b0613f258655e6a83e85b5943ccbd7bccecf650117ff61e7d49e386be06
 DIST codec2-0.8.1.tar.xz 8868212 BLAKE2B 2c0ba40df02cc6791386243e75f97ce17026842b13384e4a330cf22ea4bef5db75ddbc764dd4045027a6e2bf2eeba9b509b372aeaef81bb235e3d6c2930b01fe SHA512 4f2633d510ab68102b77b15492d87d25fe5fa96d90dc1ca6b3bf7deea04a3765382bfbbde981c9cac70d3e9d091c56b2099544b09b36a84ed62cb9087c9bb819
-EBUILD codec2-0.8.1.ebuild 673 BLAKE2B 4aebb70a4a15f5c2e31bf06f298cf1f69780c7193b3042caae9ebacfdbb9d7565dab63344d1f617339f055d45028009783b0efbfd87442a6df1f3f21c0a528d9 SHA512 4b8f3bc89e84adf872eed73850faa8db3d6df32bdc457306d1c3df8a3cc3679fb8ffaa2624b1318e8249114b4098a7c7397411b6011a0e409ef2ce425de924aa
-MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
+DIST codec2-0.9.2.tar.gz 12244006 BLAKE2B b7fdff34e41f93f237235db5cf1352e7165565ae13bc88cfe41bc6eb280e16f49c71f6b9947ced81612b0fa6b2630a9f2f75fe257ff09bae5eef1a0b6b39c95b SHA512 30a2eb95f7b0f47f0c0c7f08c9118f089acc32adf8b27f5b4354c89139efe80607d6d0ca5e0a9eefddf3640f02c483b9c804ad52c5dec6295968b7267f3a716c
+EBUILD codec2-0.8.1.ebuild 711 BLAKE2B 0543fbc52ec2fe37b522de9941a6c29096b957dc0b306920c5d295f63f61b63bfd26b94bff62ee3ba916a2a97f3b01eba2e3f8a380a576e70b9f16cd61aae221 SHA512 20c3c9279ab95fade8ee985530a1ad5c6d82afdda375e02f4641cdf89cd810c34cfe45aa42bfd6bc85d54ff9d04ffacc35dcd3a5c243be7cfad69213ab868e66
+EBUILD codec2-0.9.2.ebuild 592 BLAKE2B c44ddecf5520c55cd79d0c9bd805d305774d7f967cc5c850cdb11bfbd79bb49c4e83c6b11146de9e44b732b20271ac99fdefb6fb575860374444accfaf84c1c3 SHA512 71118b635fcab2c31f99659cfc1b251f605da240502f25618a812f30b5bd81791e6c3c47c0af5da107547770a772a0abb1d87fb15854d729e60a1a894fc38d7c
+MISC metadata.xml 325 BLAKE2B 8895125c208d04f4583087f7d5d6bcf5fb84db2800feb33ec8f0370ea2eabd36bbbf4914df33bb7d580fb966af35873bb39633d7248d9d69d48b8968a8f7776c SHA512 427760a65fe9d84a527287e815ff6e4f783bbb5ebf28fd52c225721c649eaab738edf090a6af72547b57e2c1a80fd616d8af1a2af931398819de748c4306c0b7
diff --git a/media-libs/codec2/codec2-0.8.1.ebuild b/media-libs/codec2/codec2-0.8.1.ebuild
index 50150b2cb65a..8dbf9acea974 100644
--- a/media-libs/codec2/codec2-0.8.1.ebuild
+++ b/media-libs/codec2/codec2-0.8.1.ebuild
@@ -15,7 +15,10 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="examples"
 
-PATCHES=( "${FILESDIR}/${P}-unused-deps.patch" )
+PATCHES=(
+	"${FILESDIR}"/${P}-unused-deps.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
 multilib_src_configure() {
 	local mycmakeargs=( -DUNITTEST=OFF )
diff --git a/media-libs/codec2/codec2-0.9.2.ebuild b/media-libs/codec2/codec2-0.9.2.ebuild
new file mode 100644
index 000000000000..f48bd59ad5dd
--- /dev/null
+++ b/media-libs/codec2/codec2-0.9.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="Low bit rate speech codec"
+HOMEPAGE="https://freedv.org/ http://www.rowetel.com/?page_id=452"
+SRC_URI="https://github.com/drowe67/codec2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DUNITTEST=OFF
+		-DINSTALL_EXAMPLES=$(usex examples)
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/codec2/files/codec2-0.8.1-fno-common.patch b/media-libs/codec2/files/codec2-0.8.1-fno-common.patch
new file mode 100644
index 000000000000..d5818a01f5c5
--- /dev/null
+++ b/media-libs/codec2/files/codec2-0.8.1-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/src/codec2_ofdm.h
++++ b/src/codec2_ofdm.h
+@@ -51,7 +51,7 @@
+ struct OFDM;
+ 
+ /* Default configuration for '700D' mode */
+-const struct OFDM_CONFIG * OFDM_CONFIG_700D;
++extern const struct OFDM_CONFIG * OFDM_CONFIG_700D;
+ 
+ /* create and destroy modem states */
+ 
diff --git a/media-libs/codec2/metadata.xml b/media-libs/codec2/metadata.xml
index c870d0eef0ab..ee8bcd430a6d 100644
--- a/media-libs/codec2/metadata.xml
+++ b/media-libs/codec2/metadata.xml
@@ -5,4 +5,7 @@
 	<email>sound@gentoo.org</email>
 	<name>Gentoo Sound project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">drowe67/codec2</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest
index fcc5d9f9b288..3310b8f1b3d2 100644
--- a/media-libs/cogl/Manifest
+++ b/media-libs/cogl/Manifest
@@ -1,4 +1,6 @@
 AUX cogl-eglmesaext-include.patch 2204 BLAKE2B 307a473a606129fe7e08e65915dbe985d3765c2745ec444b41592f8c36ab5b6ad0d43bbc35a93f01666d8cff81111e0c211bddfbf5d89f48591c8bf5377cb471 SHA512 41e475d73e12e4ab517c49ae1a70d1dd71e9f8a618eb28cd7b81430bf3acec84bbdf8a31ec4e02fd87734fe402e523cda5c14c4a4c5d63928b9de930bcf23e10
 DIST cogl-1.22.6.tar.xz 1744240 BLAKE2B d3483c972705ec72d2ccbd06106bdd37ea23a7940c7d5f5d8c45da43a8e5ed7bc2fb5f07838b5a0cfe9b54d3681120008c03945ee8bac39042a9c263e84d3549 SHA512 b3475fa4fff3b6725f643b0d17d2de242fce1503cd83bd18031d98495501917bf5173152fb1aba7f2614fcf6553029fbb6f26bda5a497f5f12e2849ed301a483
+DIST cogl-1.22.8.tar.xz 1742632 BLAKE2B c6230a2223928c5d4e5d87fa6b039c96000fac546e3e57e04e528b571500d350013a4b6e0a2ab6b2133672fec992fff6f9486ab8c83a01cf9790bc94266c75d4 SHA512 702d5b1b22dc34bffaa82c9c57021caf036ee3a13fa7ca24a90cca1ebc0f8b7a86070cc1fe5125757132b02774fa874bb55675c96d1ccbc233fac0e6132da65f
 EBUILD cogl-1.22.6.ebuild 3384 BLAKE2B c591d4942a45b55cd9bceb0dd8e438c15a2a4a8b6dc2e2ca1f56dde8e3f113c8d4b6543f5d34b065f2690dcda4553b4a32ea5a21a03ebca8e982a809f1f03920 SHA512 3aabd0e305a5391109755f90f022487aebcaf46482094d0f8894d3c94565ceb661b63ac0bc5e4b22d122d6f16d00df9009f86541970ee28e470349e64c4caaec
+EBUILD cogl-1.22.8.ebuild 3274 BLAKE2B f332391ea88386192cbd95c9684bddc4a8320fdc8cc96c89060779c4e1df1170d73c4d9b3097e89e745d806b0036cd297c75b75a64958492937cd0d407330ee1 SHA512 105a2a3921018594c9c6864053cb4c028f7b286f07988454387c821bea1a6ded73d821b4d8f381eafcbd2f56dc53d7e0b498923970bfe0697e29772551d4700c
 MISC metadata.xml 457 BLAKE2B 79c55fb3e5a1e5772c7b26cea5b54b15d683772204ec2ff2229481085130f4945b877a4608f01308a297571c01fa0da50220cd44b6a333eb34d2aae71c3a9157 SHA512 e0e4be51119ec98c906ca2f5df69c9024d77855fafa53ec00bc30b481f33dfd98708c2c9021737f84a46121788079fdc1d9ecffc2693a3257819f05879318a44
diff --git a/media-libs/cogl/cogl-1.22.8.ebuild b/media-libs/cogl/cogl-1.22.8.ebuild
new file mode 100644
index 000000000000..0582d681b12b
--- /dev/null
+++ b/media-libs/cogl/cogl-1.22.8.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2 multilib
+
+DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
+HOMEPAGE="https://www.cogl3d.org/"
+
+LICENSE="MIT BSD"
+SLOT="1.0/20" # subslot = .so version
+
+# doc and profile disable for now due to bugs #484750 and #483332
+IUSE="debug examples gles2 gstreamer +introspection +kms +opengl +pango wayland" # doc profile
+REQUIRED_USE="
+	wayland? ( gles2 )
+	|| ( gles2 opengl )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.32:2
+	x11-libs/cairo:=
+	>=x11-libs/gdk-pixbuf-2:2
+	x11-libs/libX11
+	>=x11-libs/libXcomposite-0.4
+	x11-libs/libXdamage
+	x11-libs/libXext
+	>=x11-libs/libXfixes-3
+	>=x11-libs/libXrandr-1.2
+	virtual/opengl
+	gles2? ( media-libs/mesa[gles2] )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.34.2:= )
+	kms? (
+		media-libs/mesa[egl,gbm]
+		x11-libs/libdrm:= )
+	pango? ( >=x11-libs/pango-1.20.0[introspection?] )
+	wayland? (
+		>=dev-libs/wayland-1.1.90
+		media-libs/mesa[egl,wayland] )
+"
+# before clutter-1.7, cogl was part of clutter
+RDEPEND="${COMMON_DEPEND}
+	!<media-libs/clutter-1.7
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19
+	virtual/pkgconfig
+"
+
+# Need classic mesa swrast for tests, llvmpipe causes a test failure
+# For some reason GL3 conformance test all fails again...
+RESTRICT="test"
+
+src_prepare() {
+	# Do not build examples
+	sed -e "s/^\(SUBDIRS +=.*\)examples\(.*\)$/\1\2/" \
+		-i Makefile.am Makefile.in || die
+
+	#if ! use test ; then
+	# For some reason the configure switch will not completely disable
+	# tests being built
+	sed -e "s/^\(SUBDIRS =.*\)test-fixtures\(.*\)$/\1\2/" \
+		-e "s/^\(SUBDIRS +=.*\)tests\(.*\)$/\1\2/" \
+		-e "s/^\(.*am__append.* \)tests\(.*\)$/\1\2/" \
+		-i Makefile.am Makefile.in || die
+	#fi
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# TODO: think about quartz, sdl
+	# Prefer gl over gles2 if both are selected
+	# Profiling needs uprof, which is not available in portage yet, bug #484750
+	# FIXME: Doesn't provide prebuilt docs, but they can neither be rebuilt, bug #483332
+	gnome2_src_configure \
+		--disable-examples-install \
+		--disable-maintainer-flags \
+		--enable-cairo             \
+		--enable-deprecated        \
+		--enable-gdk-pixbuf        \
+		--enable-glib              \
+		$(use_enable debug)        \
+		$(use_enable opengl glx)   \
+		$(use_enable opengl gl)    \
+		$(use_enable gles2)        \
+		$(use_enable gles2 cogl-gles2) \
+		$(use_enable gles2 xlib-egl-platform) \
+		$(usex gles2 --with-default-driver=$(usex opengl gl gles2)) \
+		$(use_enable gstreamer cogl-gst)    \
+		$(use_enable introspection) \
+		$(use_enable kms kms-egl-platform) \
+		$(use_enable pango cogl-pango) \
+		--disable-unit-tests \
+		$(use_enable wayland wayland-egl-platform) \
+		$(use_enable wayland wayland-egl-server) \
+		--disable-profile
+#		$(use_enable profile)
+}
+
+src_install() {
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/{*.c,*.jpg}
+	fi
+
+	gnome2_src_install
+
+	# Remove silly examples-data directory
+	rm -rvf "${ED}/usr/share/cogl/examples-data/" || die
+}
diff --git a/media-libs/coin/Manifest b/media-libs/coin/Manifest
index 0386f664dc41..836581e0f568 100644
--- a/media-libs/coin/Manifest
+++ b/media-libs/coin/Manifest
@@ -4,9 +4,14 @@ AUX coin-3.1.3-gcc-4.7.patch 347 BLAKE2B 4129b651164fd35e18469143c0728e67456ecdc
 AUX coin-3.1.3-gcc-7.patch 575 BLAKE2B 5bdb1d8c2b6c63cba4224506199e26bb91d47feda853903a8461929e12ef32b13395cb78926ddac86bf25ca740ab67ac66f37a085e041272a8e520916c21b8da SHA512 c4ea88ce111dd7dba1d8b1dd30cf325e91d5617540c5cbcdbe2be95e892641015071dc61830307188cfc16ecbdf58e89129b93621e0dd43ae05f7ad754df7b53
 AUX coin-3.1.3-memhandler-initialization.patch 906 BLAKE2B 421dea48d77870d324fa333bac19c6e00ad7ca576929bf029bd9b0be193462adb23cbadaf71d96fd30025db3780408a294db2d9ae3a52232798b677dd8e62c46 SHA512 f67c7179b1a023a938a55d82cfb1c18ffabc7586211e8e89a4fb4f8a4925f9c98240fffaa9c8dc46febd528e0d0b91607a417f290c0e0c06adbafb171ba1bf6b
 AUX coin-3.1.3-pkgconfig-partial.patch 431 BLAKE2B af57c0a4ec1985351db67f8f8f1d978c9ec3765e5d0d6e304e479314be3cc5cd48212094f87d8126ce84143a671fc7e000081cd0b38d149633515f121ce5f16d SHA512 6747ed14dca25017b6126ee2e542bec8cdf36cc634a8f0df059715f022a5f6c6f7126b9ea3c01e099a5564c634921fdc829c7561754df8c2dbf915659c7edb53
-AUX coin-4.0.0a-cmake.patch 2747 BLAKE2B c120bc01ccaffe28d6bacc9135349cd532c708b4d5bca8219768188c86384c9431ad036b42106c03418744b941d6944472e0b134aae564fe4553428f534bbaab SHA512 f4f9246ceb853c9cf63bdb851b354195c2fddef7fc914ceb7b693f36cfb0ce9e6230cf6284fb987185f26f2f46076bc44ea2bb6bb8c40053fa2992cf85831553
+AUX coin-4.0.0-0001-updated-to-cmake-3.14.patch 626 BLAKE2B e6cd00a2f848f9d43d57e615d5c08e273b82e49f26b5a977457305fb254ce00a1b052e29ffed5656861ecec2581da306b66ff5727bf70cb46c63ff1baf1c8e6c SHA512 214be84a016c2625ab43b1948efee36986bf9186b69ec3bec014280a009ff22742b627f8a041b9293d3d7bdacf7b7070b3c5f0742f9739c19b193d0ea6b837d9
+AUX coin-4.0.0-0002-cpack.d-is-now-optional.patch 1388 BLAKE2B 8a9665f3719e7bb4072d75b54e5aa119bdf2ae12c0ca814213fc1ee1364bf2cca0658ef19ff0f22b2661cda4286a251384c559b945613b29ae6ce41b2706929b SHA512 e1655f5d8a0d07c5b91c2c7404834295b40a12c176bea1a386e00a8dea7d1170507f9c209231023c87d560688e4ac8ccd1ee7bf8ea1a80ebbd881f2c88efb1e7
+AUX coin-4.0.0-0003-Partially-incorporating-coin4.0.0a-patch-from-gentoo.patch 3695 BLAKE2B e83118489349d7bbd0048fbbb2515be1b5ffdd8556bb951f44f2689c4616c12991efd6fba230c4372bf634f58d6e2c9e91e3794a2e4f2abff54eb3ddd1841551 SHA512 eccb82613f5801025ee7c63e3482ee5cf90fe3bfebf8b3481e423e22c8a8f3a121f0f4c679127e2ad40cb657d62c857c9956d4175c02a401a58cd3fb42789ee8
+AUX coin-4.0.0-0004-Added-coin-default.cfg.patch 2531 BLAKE2B a0682e9dfaa36412109fe12a8a81381915e71da73582c397b7eb2795ddad6fe706a3c0f2e5e4d02114adbf8d31bac88b6509bcdc96423b59c8d4e5168c158814 SHA512 ed9543421f62f0ebe53ffe819cc7381316215231ab9675f7867f633ed79c47df4d37d4ba35283b55fc6d621f6c65040e9eee0cb19e7708d0653b0e56e4bede55
+AUX coin-4.0.0-0005-Slightly-fix-coin.cfg.cmake.in.patch 1394 BLAKE2B 40b43a0cce0ab3e3e40723e1ac2c68185b4f10c38a3514e02d18c6ee1232b3116e1b89e6ff2cda3aa5f14eefcbc636f4b83c84d896fa485c416362e72e793bc4 SHA512 0cc392f908b044639bef3fcb960fe398ae045aba72c670b22ca48cba9c754c4a35746888fc7ee2938bb5e0309fc0104e8fe1379175886e438b00410c8f5c3a16
+AUX coin-4.0.0-0006-Fix-underlinking-against-X11.patch 827 BLAKE2B 33aaa8281fc260bb382875a0b41eac83d8099e52709e93a523ba4b048e1f9ab92c1a17cb09e1c5dd091c90878c373ef973c380211f856b32581f97992a8cc83e SHA512 37709b1a853287245b0778297154a8ea15ed86d60558af541ccd60fb0ee369c296947964080bff790595030c8e41964e008b0983bcbf5146d3c5ac81756ff622
 DIST Coin-3.1.3.tar.gz 5981534 BLAKE2B 33f88149cf0bf7daeb32226e2deb29f9f36f2a29ca9fcf025f39bb50d3eb0bfc85113a1e96cf980c97d037419c3a263bcf6eccaeb2f289517304c59d4c9de919 SHA512 d6fd47ecc74e96fc4de46e3a683f038f1907b96db2bbe935fb49f2d59190bd18f3f439dc0e4cb435360e74e1d65994a32b21f670d5a76394692616625cb14394
-DIST Coin3D-coin-a4ce638f43bd.tar.bz2 4942450 BLAKE2B b974b8a39d8ef07a2b3465e131bb5ca08d249a99a9ccdd7f9a87bd26c8c901c7042211edf7acf097e56afc0ba80bf156c6864a831fbed4cac18c7ac7495601ff SHA512 90b7697649e18af77805d9aae918ba77958952839375812272d796c4cda4d887465fb9bb94f215509ae969cddf54fb92f38deb961cdd24e24c67b20ffc0f1adf
+DIST coin-4.0.0-src.tar.gz 6824162 BLAKE2B 9dee9397bb63c0da02214d33f2661051a3fd99689956a6de5c2cf806dd05944038b87b690f954f35711ee5e4ab07f04685681b822d0bbab0d7941bef551202dc SHA512 e036276a243bfe252569cee1b67d38b8633fcf35bdf4e366a92ca67e23799d54d91fe272c23b383c451d330cee284809f28f237857493948149e0da1ebd64fae
 EBUILD coin-3.1.3-r2.ebuild 2518 BLAKE2B 9652bab68031e7b0311861812b6cdf47eab72173971963f1e9b15613b1f9df0a55a2f3e8c262106e9d8fdbe87d893d6cb86e065b290d00cfed0f827905795724 SHA512 56a8baace6f1ce77bd17e1da422f096ad968a78827bd0c5c7ec3ad711a000ffe5a91192ebcdc639e3517ff5c0993c3a252d8e15455ba6f163bf33f6a4f428cea
-EBUILD coin-4.0.0a_pre20191109.ebuild 2446 BLAKE2B 303703fe72bb2d0244784894f077af1ce849868b323eceef27c6347c0d8f20f03e21974a5ba02a7b8d5c2cdb39710018ed069b25a6be0bbb946a05ef08bcd26b SHA512 5ab3137cd754272d4323c967b7f25d281f3f2ee3e75b7ab24ca7056553644b1d5042993ac417d0f067c825c9d095b2ea9a2937c8acf7e42c64f024b125b7f781
+EBUILD coin-4.0.0.ebuild 2767 BLAKE2B 5d9edb1e24187d734e861b5a1ec300d268ec2daf0daa696c9e4028c5c75d052de64db5c72e0dd479b01c02d0cfd23bcd5825b1cb81af7cb4bd7c7e319265611f SHA512 120cea13580b7e3bc54e65cbffef911761ff55ba1e4e2974a073d83584825ea06c2c75e19ecbdeeb53c794a1b5ae1e00068112b74449c3bac304662371996ff8
 MISC metadata.xml 602 BLAKE2B e4f425e15a7cf6879fc709f5cf27abddcc195b824e1158297e529a2fdb2080ff555a90832b5b287c43d73aa038d0d89c62c9f8df2a3e0ebce3c2024f2e5c3126 SHA512 d551b68c2b3f192475ee7fa187e9ab6f6bca52ec3b8c1b58901ea49a61d51ef5680d3b29d784e4c43a8b5fabeb904bdd8582ce32a0055b2420aa9c994299c142
diff --git a/media-libs/coin/coin-4.0.0a_pre20191109.ebuild b/media-libs/coin/coin-4.0.0.ebuild
index 0397a3a736d5..3a0b364937cc 100644
--- a/media-libs/coin/coin-4.0.0a_pre20191109.ebuild
+++ b/media-libs/coin/coin-4.0.0.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils flag-o-matic
+inherit cmake flag-o-matic
 
-MY_P=Coin3D-coin-a4ce638f43bd
+MY_P=${P/coin/Coin}
 
 DESCRIPTION="A high-level 3D graphics toolkit, fully compatible with SGI Open Inventor 2.1"
-HOMEPAGE="https://bitbucket.org/Coin3D/coin/wiki/Home"
-SRC_URI="https://dev.gentoo.org/~reavertm/${MY_P}.tar.bz2"
+HOMEPAGE="https://github.com/coin3d/coin/wiki"
+SRC_URI="https://github.com/coin3d/coin/releases/download/${MY_P}/${P}-src.tar.gz"
 
 LICENSE="|| ( GPL-2 PEL )"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
@@ -47,10 +47,15 @@ DEPEND="${RDEPEND}
 	)
 "
 
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/${PN}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.0a-cmake.patch
+	"${FILESDIR}"/${P}-0001-updated-to-cmake-3.14.patch
+	"${FILESDIR}"/${P}-0002-cpack.d-is-now-optional.patch
+	"${FILESDIR}"/${P}-0003-Partially-incorporating-coin4.0.0a-patch-from-gentoo.patch
+	"${FILESDIR}"/${P}-0004-Added-coin-default.cfg.patch
+	"${FILESDIR}"/${P}-0005-Slightly-fix-coin.cfg.cmake.in.patch
+	"${FILESDIR}"/${P}-0006-Fix-underlinking-against-X11.patch
 )
 
 DOCS=(
@@ -94,12 +99,12 @@ src_configure() {
 		-DSPIDERMONKEY_RUNTIME_LINKING=ON
 
 		-DCOIN_VERBOSE=$(usex debug)
-		-DHAVE_MULTIPLE_VERSION=ON
+		-DHAVE_MULTIPLE_VERSION=OFF
 
 		-DCOIN_BUILD_SINGLE_LIB=ON
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/media-libs/coin/files/coin-4.0.0-0001-updated-to-cmake-3.14.patch b/media-libs/coin/files/coin-4.0.0-0001-updated-to-cmake-3.14.patch
new file mode 100644
index 000000000000..c33cf4e2b8b1
--- /dev/null
+++ b/media-libs/coin/files/coin-4.0.0-0001-updated-to-cmake-3.14.patch
@@ -0,0 +1,25 @@
+From 962e613609ba93301999f83e283b7f489dfac503 Mon Sep 17 00:00:00 2001
+From: Giampiero Gabbiani <giampiero@gabbiani.org>
+Date: Fri, 10 Jan 2020 14:47:38 +0100
+Subject: [PATCH] updated to cmake 3.14
+
+---
+ CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f32f6ffe3..3ce3a0d3a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,3 +1,8 @@
++if (POLICY  CMP0054)
++  # CMake version 3.14.5 warns when the policy is not set and uses OLD behaviour
++  cmake_policy(SET CMP0054 NEW)
++endif()
++
+ cmake_minimum_required(VERSION 3.0)
+ 
+ set(COIN_MAJOR_VERSION 4)
+-- 
+2.26.2
+
diff --git a/media-libs/coin/files/coin-4.0.0-0002-cpack.d-is-now-optional.patch b/media-libs/coin/files/coin-4.0.0-0002-cpack.d-is-now-optional.patch
new file mode 100644
index 000000000000..82fceadbd886
--- /dev/null
+++ b/media-libs/coin/files/coin-4.0.0-0002-cpack.d-is-now-optional.patch
@@ -0,0 +1,32 @@
+From be8e3d57aeb5b4df6abb52c5fa88666d48e7d7a0 Mon Sep 17 00:00:00 2001
+From: Giampiero Gabbiani <giampiero@gabbiani.org>
+Date: Tue, 14 Jan 2020 22:03:51 +0100
+Subject: [PATCH] cpack.d is now optional
+
+---
+ CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3ce3a0d3a..755bd9d59 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -95,6 +95,7 @@ option(SPIDERMONKEY_RUNTIME_LINKING "Enable SpiderMonkey runtime linking when ON
+ 
+ option(COIN_VERBOSE "Add verbose debugging information during the configure process." OFF)
+ option(HAVE_MULTIPLE_VERSION "Forces versioned paths for includes and documentation when ON, usual behaviour otherwise." OFF)
++option(COIN_USE_CPACK "If enabled the cpack subrepo is mandatory" OFF)
+ 
+ cmake_dependent_option(COIN_BUILD_MAC_FRAMEWORK "Build framework instead of dylib on Mac OS X when ON. Only valid if COIN_BUILD_SHARED_LIBS is ON." OFF "APPLE;NOT IOS;COIN_BUILD_SHARED_LIBS" OFF)
+ cmake_dependent_option(COIN_BUILD_MAC_X11 "Build for X11 on Mac OS X when ON. Default is OFF." OFF "APPLE" OFF)
+@@ -820,4 +821,6 @@ endif()
+ 
+ # ############################################################################
+ # New CPACK section, please see the README file inside cpack.d directory.
+-add_subdirectory(cpack.d)
++if (COIN_USE_CPACK)
++  add_subdirectory(cpack.d)
++endif()
+-- 
+2.26.2
+
diff --git a/media-libs/coin/files/coin-4.0.0-0003-Partially-incorporating-coin4.0.0a-patch-from-gentoo.patch b/media-libs/coin/files/coin-4.0.0-0003-Partially-incorporating-coin4.0.0a-patch-from-gentoo.patch
new file mode 100644
index 000000000000..fb1c0d25a814
--- /dev/null
+++ b/media-libs/coin/files/coin-4.0.0-0003-Partially-incorporating-coin4.0.0a-patch-from-gentoo.patch
@@ -0,0 +1,123 @@
+From 9a36b15d66c5e340cd8695415ce5867ad07ee2bb Mon Sep 17 00:00:00 2001
+From: Volker Enderlein <volkerenderlein@hotmail.com>
+Date: Sun, 8 Mar 2020 14:24:29 +0100
+Subject: [PATCH] Partially incorporating coin4.0.0a-patch from gentoo
+
+---
+ CMakeLists.txt | 63 ++++++++++++++++++++++++++------------------------
+ 1 file changed, 33 insertions(+), 30 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 755bd9d59..d23f5bc0e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,8 +1,3 @@
+-if (POLICY  CMP0054)
+-  # CMake version 3.14.5 warns when the policy is not set and uses OLD behaviour
+-  cmake_policy(SET CMP0054 NEW)
+-endif()
+-
+ cmake_minimum_required(VERSION 3.0)
+ 
+ set(COIN_MAJOR_VERSION 4)
+@@ -22,6 +17,11 @@ math(EXPR COIN_SO_VERSION ${PROJECT_VERSION_MAJOR}*20)
+ set(PROJECT_DESCRIPTION   "A high-level 3D visualization library with Open Inventor 2.1 API")
+ # ############################################################################
+ 
++if(POLICY CMP0054)
++  # CMake version 3.14.5 warns when the policy is not set and uses OLD behaviour
++  cmake_policy(SET CMP0054 NEW)
++endif()
++
+ if(POLICY CMP0072)
+   # get rid of OpenGL GLVND warning from CMake 3.11
+   cmake_policy(SET CMP0072 NEW)
+@@ -103,8 +103,8 @@ cmake_dependent_option(COIN_BUILD_MAC_AGL "Build for AGL on Mac OS X when ON. De
+ 
+ report_prepare(
+   COIN_BUILD_SHARED_LIBS
+-  COIN_BUILD_TESTS 
+-  COIN_BUILD_DOCUMENTATION 
++  COIN_BUILD_TESTS
++  COIN_BUILD_DOCUMENTATION
+   COIN_BUILD_INTERNAL_DOCUMENTATION
+   COIN_BUILD_DOCUMENTATION_MAN
+   COIN_BUILD_DOCUMENTATION_QTHELP
+@@ -113,29 +113,29 @@ report_prepare(
+   HAVE_VRML97
+   COIN_HAVE_JAVASCRIPT
+   HAVE_NODEKITS
+-  HAVE_DRAGGERS 
+-  HAVE_MANIPULATORS 
+-  HAVE_SOUND 
++  HAVE_DRAGGERS
++  HAVE_MANIPULATORS
++  HAVE_SOUND
+   HAVE_3DS_IMPORT_CAPABILITIES
+   USE_EXTERNAL_EXPAT
+-  USE_EXCEPTIONS 
+-  USE_SUPERGLU 
+-  FONTCONFIG_RUNTIME_LINKING   
+-  FREETYPE_RUNTIME_LINKING     
+-  LIBBZIP2_RUNTIME_LINKING     
+-  OPENAL_RUNTIME_LINKING       
+-  SIMAGE_RUNTIME_LINKING       
+-  ZLIB_RUNTIME_LINKING         
+-  GLU_RUNTIME_LINKING          
+-  SPIDERMONKEY_RUNTIME_LINKING 
+-  HAVE_MULTIPLE_VERSION 
++  USE_EXCEPTIONS
++  USE_SUPERGLU
++  FONTCONFIG_RUNTIME_LINKING
++  FREETYPE_RUNTIME_LINKING
++  LIBBZIP2_RUNTIME_LINKING
++  OPENAL_RUNTIME_LINKING
++  SIMAGE_RUNTIME_LINKING
++  ZLIB_RUNTIME_LINKING
++  GLU_RUNTIME_LINKING
++  SPIDERMONKEY_RUNTIME_LINKING
++  HAVE_MULTIPLE_VERSION
+   IF_APPLE
+-    COIN_BUILD_MAC_FRAMEWORK 
+-    COIN_BUILD_MAC_X11 
+-    COIN_BUILD_MAC_AGL 
++    COIN_BUILD_MAC_FRAMEWORK
++    COIN_BUILD_MAC_X11
++    COIN_BUILD_MAC_AGL
+   IF_MSVC
+     COIN_BUILD_MSVC_STATIC_RUNTIME
+-    COIN_BUILD_SINGLE_LIB 
++    COIN_BUILD_SINGLE_LIB
+     MSVC_VERSION
+     COIN_BUILD_MSVC_MP
+ )
+@@ -147,8 +147,8 @@ if(HAVE_MULTIPLE_VERSION)
+     CMAKE_INSTALL_DATADIR
+     CMAKE_INSTALL_FULL_DATADIR
+     CMAKE_INSTALL_INCLUDEDIR
+-    CMAKE_INSTALL_FULL_INCLUDEDIR 
+-    CMAKE_INSTALL_DOCDIR 
++    CMAKE_INSTALL_FULL_INCLUDEDIR
++    CMAKE_INSTALL_DOCDIR
+     CMAKE_INSTALL_FULL_DOCDIR
+   )
+ else()
+@@ -534,9 +534,12 @@ else()
+   if(HAVE_MACH_O_DYLD_H)
+     check_symbol_exists(NSLookupAndBindSymbol mach-o/dyld.h HAVE_DYLD_RUNTIME_BINDING)
+   endif()
+-  check_library_exists(dl dlopen "" HAVE_DL_LIB)
+-  if(HAVE_DL_LIB)
+-    check_include_file(dlfcn.h HAVE_DLFCN_H)
++  # On FreeBSD, NetBSD and OpenBSD there is no libdl, as the required
++  # functionality is already built into libc. So use ${CMAKE_DL_LIBS} instead.
++  check_include_file(dlfcn.h HAVE_DLFCN_H)
++  if(HAVE_DLFCN_H)
++    set(HAVE_DL_LIB 1)
++    list(APPEND COIN_TARGET_LINK_LIBRARIES ${CMAKE_DL_LIBS})
+   endif()
+   check_library_exists(dld shl_load "" HAVE_DLD_LIB)
+ endif()
+-- 
+2.26.2
+
diff --git a/media-libs/coin/files/coin-4.0.0-0004-Added-coin-default.cfg.patch b/media-libs/coin/files/coin-4.0.0-0004-Added-coin-default.cfg.patch
new file mode 100644
index 000000000000..d57f8f3b945e
--- /dev/null
+++ b/media-libs/coin/files/coin-4.0.0-0004-Added-coin-default.cfg.patch
@@ -0,0 +1,63 @@
+From fd8057eb54fee8aa457cc47abb0004f2b71d1e63 Mon Sep 17 00:00:00 2001
+From: Volker Enderlein <volkerenderlein@hotmail.com>
+Date: Sun, 10 May 2020 15:24:20 +0200
+Subject: [PATCH] Added coin-default.cfg.
+
+---
+ coin.cfg.cmake.in  | 24 ++++++++++++++++++++++++
+ src/CMakeLists.txt |  8 +++++---
+ 2 files changed, 29 insertions(+), 3 deletions(-)
+ create mode 100644 coin.cfg.cmake.in
+
+diff --git a/coin.cfg.cmake.in b/coin.cfg.cmake.in
+new file mode 100644
+index 000000000..6f41c61c7
+--- /dev/null
++++ b/coin.cfg.cmake.in
+@@ -0,0 +1,24 @@
++# prefix is determined in coin-config, making the package "movable"
++# prefix="@prefix@"
++host="@host@"
++exec_prefix="@exec_prefix@"
++version="@COIN_VERSION@"
++cflags="@COIN_EXTRA_CFLAGS@"
++cppflags="@COIN_EXTRA_CPPFLAGS@"
++cxxflags="@COIN_EXTRA_CXXFLAGS@"
++ldflags="@COIN_EXTRA_LDFLAGS@"
++libs="@COIN_EXTRA_LIBS@"
++msvcrt="@COIN_MSVC_LIBC@"
++datadir="@datarootdir@"
++includedir="@includedir@"
++frameworkdir="@frameworkdir@"
++htmldir="@htmldir@"
++compiler="@COIN_COMPILER@"
++objext="@OBJEXT@"
++have_3ds_import=@HAVE_3DS_IMPORT_CAPABILITIES@
++have_vrml97=@HAVE_VRML97@
++have_sound=@HAVE_SOUND@
++have_superglu=@HAVE_SUPERGLU@
++have_threads=@HAVE_THREADS@
++have_threadsafe=@HAVE_THREADSAFE@
++compiler_is_gcc=@ac_compiler_gnu@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 4ddc1ecd4..6132335b3 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -388,9 +388,11 @@ else()
+   set(COIN_CONFIG_PACKAGE_LOCATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${PROJECT_VERSION})
+   string(TOLOWER ${PROJECT_NAME} COIN_CONFIG_PACKAGE_BASENAME)
+   if(UNIX OR MINGW)
+-    configure_file(${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.pc.cmake.in ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc @ONLY)
+-    install(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+-    install(FILES ${CMAKE_SOURCE_DIR}/bin/coin-config DESTINATION ${CMAKE_INSTALL_BINDIR})
++    configure_file("${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.pc.cmake.in" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc" @ONLY)
++    install(FILES "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
++    install(PROGRAMS "${CMAKE_SOURCE_DIR}/bin/coin-config" DESTINATION ${CMAKE_INSTALL_BINDIR})
++    configure_file("${CMAKE_SOURCE_DIR}/coin.cfg.cmake.in" "${CMAKE_BINARY_DIR}/${PROJECT_NAME_LOWER}-default.cfg" @ONLY)
++    install(FILES "${CMAKE_BINARY_DIR}/${PROJECT_NAME_LOWER}-default.cfg" DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Coin/conf)
+   endif()
+ endif()
+ 
+-- 
+2.26.2
+
diff --git a/media-libs/coin/files/coin-4.0.0-0005-Slightly-fix-coin.cfg.cmake.in.patch b/media-libs/coin/files/coin-4.0.0-0005-Slightly-fix-coin.cfg.cmake.in.patch
new file mode 100644
index 000000000000..ae218124618a
--- /dev/null
+++ b/media-libs/coin/files/coin-4.0.0-0005-Slightly-fix-coin.cfg.cmake.in.patch
@@ -0,0 +1,45 @@
+From d36ee28712eae2f94998845926c6880d6e5a990c Mon Sep 17 00:00:00 2001
+From: Maciej Mrozowski <reavertm@gmail.com>
+Date: Wed, 5 Aug 2020 02:03:52 +0200
+Subject: [PATCH] Slightly fix coin.cfg.cmake.in
+
+---
+ coin.cfg.cmake.in | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/coin.cfg.cmake.in b/coin.cfg.cmake.in
+index 6f41c61c7..6ed041ef4 100644
+--- a/coin.cfg.cmake.in
++++ b/coin.cfg.cmake.in
+@@ -7,18 +7,18 @@ cflags="@COIN_EXTRA_CFLAGS@"
+ cppflags="@COIN_EXTRA_CPPFLAGS@"
+ cxxflags="@COIN_EXTRA_CXXFLAGS@"
+ ldflags="@COIN_EXTRA_LDFLAGS@"
+-libs="@COIN_EXTRA_LIBS@"
++libs="@CMAKE_INSTALL_FULL_LIBDIR@"
+ msvcrt="@COIN_MSVC_LIBC@"
+-datadir="@datarootdir@"
+-includedir="@includedir@"
++datadir="@CMAKE_INSTALL_FULL_DATADIR@"
++includedir="@CMAKE_INSTALL_FULL_INCLUDEDIR@"
+ frameworkdir="@frameworkdir@"
+-htmldir="@htmldir@"
++htmldir="@CMAKE_INSTALL_FULL_DOCDIR@"
+ compiler="@COIN_COMPILER@"
+ objext="@OBJEXT@"
+-have_3ds_import=@HAVE_3DS_IMPORT_CAPABILITIES@
+-have_vrml97=@HAVE_VRML97@
+-have_sound=@HAVE_SOUND@
+-have_superglu=@HAVE_SUPERGLU@
+-have_threads=@HAVE_THREADS@
+-have_threadsafe=@HAVE_THREADSAFE@
++have_3ds_import=@FEAT_HAVE_3DS@
++have_vrml97=@FEAT_HAVE_VRML97@
++have_sound=@FEAT_HAVE_SOUND@
++have_superglu=@FEAT_HAVE_SUPERGLU@
++have_threads=@FEAT_HAVE_THREADS@
++have_threadsafe=@FEAT_HAVE_SAFETHREAD@
+ compiler_is_gcc=@ac_compiler_gnu@
+-- 
+2.26.2
+
diff --git a/media-libs/coin/files/coin-4.0.0-0006-Fix-underlinking-against-X11.patch b/media-libs/coin/files/coin-4.0.0-0006-Fix-underlinking-against-X11.patch
new file mode 100644
index 000000000000..3a81b380dc79
--- /dev/null
+++ b/media-libs/coin/files/coin-4.0.0-0006-Fix-underlinking-against-X11.patch
@@ -0,0 +1,28 @@
+From 58a1b4c3e968f96d3a2091fa5cb625f360ce6811 Mon Sep 17 00:00:00 2001
+From: Maciej Mrozowski <reavertm@gmail.com>
+Date: Wed, 5 Aug 2020 02:57:28 +0200
+Subject: [PATCH] Fix underlinking against X11
+
+---
+ CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3818da7ff..eda2cd2c0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -195,6 +195,11 @@ if(COIN_BUILD_MAC_X11)
+     list(APPEND COIN_TARGET_LINK_LIBRARIES ${X11_LIBRARIES} ${X11_GL_LIB} ${X11_GLU_LIB})
+   endif()
+ else()
++  if(UNIX AND NOT APPLE)
++    find_package(X11 REQUIRED)
++    list(APPEND COIN_TARGET_INCLUDE_DIRECTORIES ${X11_INCLUDE_DIR})
++    list(APPEND COIN_TARGET_LINK_LIBRARIES ${X11_LIBRARIES})
++  endif()
+   find_package(OpenGL REQUIRED)
+   if(OPENGL_FOUND)
+     set(HAVE_OPENGL 1)
+-- 
+2.26.2
+
diff --git a/media-libs/coin/files/coin-4.0.0a-cmake.patch b/media-libs/coin/files/coin-4.0.0a-cmake.patch
deleted file mode 100644
index f47bf9bfb844..000000000000
--- a/media-libs/coin/files/coin-4.0.0a-cmake.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -ruN Coin3D-coin-a4ce638f43bd/CMakeLists.txt my/CMakeLists.txt
---- Coin3D-coin-a4ce638f43bd/CMakeLists.txt	2019-11-09 14:39:34.000000000 +0100
-+++ my/CMakeLists.txt	2019-11-21 00:19:43.563521948 +0100
-@@ -97,8 +97,8 @@
- 
- report_prepare(
-   COIN_BUILD_SHARED_LIBS
--  COIN_BUILD_TESTS 
--  COIN_BUILD_DOCUMENTATION 
-+  COIN_BUILD_TESTS
-+  COIN_BUILD_DOCUMENTATION
-   COIN_BUILD_INTERNAL_DOCUMENTATION
-   COIN_BUILD_DOCUMENTATION_MAN
-   COIN_BUILD_DOCUMENTATION_QTHELP
-@@ -107,29 +107,29 @@
-   HAVE_VRML97
-   COIN_HAVE_JAVASCRIPT
-   HAVE_NODEKITS
--  HAVE_DRAGGERS 
--  HAVE_MANIPULATORS 
--  HAVE_SOUND 
-+  HAVE_DRAGGERS
-+  HAVE_MANIPULATORS
-+  HAVE_SOUND
-   HAVE_3DS_IMPORT_CAPABILITIES
-   USE_EXTERNAL_EXPAT
--  USE_EXCEPTIONS 
--  USE_SUPERGLU 
--  FONTCONFIG_RUNTIME_LINKING   
--  FREETYPE_RUNTIME_LINKING     
--  LIBBZIP2_RUNTIME_LINKING     
--  OPENAL_RUNTIME_LINKING       
--  SIMAGE_RUNTIME_LINKING       
--  ZLIB_RUNTIME_LINKING         
--  GLU_RUNTIME_LINKING          
--  SPIDERMONKEY_RUNTIME_LINKING 
--  HAVE_MULTIPLE_VERSION 
-+  USE_EXCEPTIONS
-+  USE_SUPERGLU
-+  FONTCONFIG_RUNTIME_LINKING
-+  FREETYPE_RUNTIME_LINKING
-+  LIBBZIP2_RUNTIME_LINKING
-+  OPENAL_RUNTIME_LINKING
-+  SIMAGE_RUNTIME_LINKING
-+  ZLIB_RUNTIME_LINKING
-+  GLU_RUNTIME_LINKING
-+  SPIDERMONKEY_RUNTIME_LINKING
-+  HAVE_MULTIPLE_VERSION
-   IF_APPLE
--    COIN_BUILD_MAC_FRAMEWORK 
--    COIN_BUILD_MAC_X11 
--    COIN_BUILD_MAC_AGL 
-+    COIN_BUILD_MAC_FRAMEWORK
-+    COIN_BUILD_MAC_X11
-+    COIN_BUILD_MAC_AGL
-   IF_MSVC
-     COIN_BUILD_MSVC_STATIC_RUNTIME
--    COIN_BUILD_SINGLE_LIB 
-+    COIN_BUILD_SINGLE_LIB
-     MSVC_VERSION
-     COIN_BUILD_MSVC_MP
- )
-@@ -141,8 +141,8 @@
-     CMAKE_INSTALL_DATADIR
-     CMAKE_INSTALL_FULL_DATADIR
-     CMAKE_INSTALL_INCLUDEDIR
--    CMAKE_INSTALL_FULL_INCLUDEDIR 
--    CMAKE_INSTALL_DOCDIR 
-+    CMAKE_INSTALL_FULL_INCLUDEDIR
-+    CMAKE_INSTALL_DOCDIR
-     CMAKE_INSTALL_FULL_DOCDIR
-   )
- else()
-@@ -165,7 +165,7 @@
-   list(APPEND COIN_TARGET_LINK_LIBRARIES Boost::boost)
- endif()
- 
--if(COIN_BUILD_MAC_X11)
-+if(COIN_BUILD_MAC_X11 OR UNIX)
-   find_package(X11 REQUIRED)
-   # On Mac OS X, GLX is provided as a separate OpenGL implementation, different
-   # from the standard OpenGL framework which provides support for GLUT and native
-@@ -530,6 +530,7 @@
-   endif()
-   check_library_exists(dl dlopen "" HAVE_DL_LIB)
-   if(HAVE_DL_LIB)
-+    list(APPEND COIN_TARGET_LINK_LIBRARIES dl)
-     check_include_file(dlfcn.h HAVE_DLFCN_H)
-   endif()
-   check_library_exists(dld shl_load "" HAVE_DLD_LIB)
-@@ -815,4 +816,4 @@
- 
- # ############################################################################
- # New CPACK section, please see the README file inside cpack.d directory.
--add_subdirectory(cpack.d)
-+# not needed add_subdirectory(cpack.d)
diff --git a/media-libs/dumb/Manifest b/media-libs/dumb/Manifest
index 301b24a87307..0b29173113cf 100644
--- a/media-libs/dumb/Manifest
+++ b/media-libs/dumb/Manifest
@@ -4,5 +4,5 @@ AUX dumb-2.0.3-pkg-config.patch 667 BLAKE2B 1607438fc49682500cdbeb4af8aa2eca5b4a
 DIST dumb-0.9.3.tar.gz 167379 BLAKE2B 1a9f62b784f8e8ba5b30b892bc9588bbebca7d5270b5d1161230c1c538d1aed8c6d2f2afa6a9087858ad45dccee9c640498548a845b2f046a0c390e7a84525cc SHA512 9ecdea460858b7e6ad7ca2534ecb3581397e6c1fa904459affe19ce49f528e580e143b42b13413b292ae7b57901a8008e6a9ee3821824f6ff7914b136f75c658
 DIST dumb-2.0.3.tar.gz 186576 BLAKE2B 0bd2e512b88260e67b11856630aecfdda2f11a8c5f931c1da3451dbfc15cd5e7e38e718d12b99e0598d9522cf259317a98c5d3088dd979c487a8971fd562ee3f SHA512 18b10a507d69a754cdf97fbeae41c17f211a6ba1f166a822276bdb6769d3edc326919067a3f4d1247d6715d7a5a8276669d83b9427e7336c6d111593fb7e36cf
 EBUILD dumb-0.9.3-r3.ebuild 1946 BLAKE2B 9cf6f12f20dfafa9bea7bdd7d1075ea9b78a38ff4c3835f0b11f929da962b80f633a8dff3c924eab60de00f59fcc3feb0b7f5e966a42f8faa4849e001e37ea96 SHA512 7b53f9a0b2e4169672542b2acdfe5b348907d89d1789d12daf12997d2052ccd27bbd292523d5fb52a04ea1e15a1adf31184303a489b49bceaf76f097b96a0998
-EBUILD dumb-2.0.3.ebuild 996 BLAKE2B 7bd9136e66ff8a45d8b85e3a41b6bea19afeba36ef5ee9fc6146e0d957a1690c982156998101205feb05b6af6a196e24b019cec4f2565812fb231ae931376609 SHA512 8cca80a77c1ea2dbbc474a6bbd86c99ed5f1f5794e1a893b6b60258cefb58e19bca7fb6212d4ee3369a4b69d8f88e16ec4673527672d47137cd6012c626cb3b4
+EBUILD dumb-2.0.3.ebuild 1003 BLAKE2B 0c32918861f4423087bc1d88dca6359df5ed921f56699f08992b565c23f426a8df85c99b8418319540680a00c8ad8154365caac20f060409de2383ed3f840377 SHA512 89edb432c9c2c8021ec29407356c4ee968dba4f347eb69bb6cec6a5790e5272f0856cdb5533fca1b47e1af9a78083e045cdeb15ebddd31783f3736e6ff1c0660
 MISC metadata.xml 449 BLAKE2B 559267d1804b59df90c5215e6a188c3140673a3727c092fdcce9dafc10b016e22d7a13abd0b174cff1c29b90e9778909e49df70ff84643045c71dcc730e883c8 SHA512 dfb5c4d19a6406fd6dec98b07ca901c22a1690137e308b27e4c64973ff2bcd2cb042ce5f1b062fc619e5739da7ecc67d50923baf527c0b9116e5a196351de543
diff --git a/media-libs/dumb/dumb-2.0.3.ebuild b/media-libs/dumb/dumb-2.0.3.ebuild
index 7c509445721b..7d3dde441790 100644
--- a/media-libs/dumb/dumb-2.0.3.ebuild
+++ b/media-libs/dumb/dumb-2.0.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/kode54/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="DUMB-0.9.3"
 SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="allegro cpu_flags_x86_sse examples"
 
 RDEPEND="
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index 506905cd298b..1fef82bc59d1 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -1,3 +1,3 @@
 DIST flac-1.3.3.tar.xz 1044472 BLAKE2B 14acf10e5bce54767a8e3c9bfd0b80c388011e35c7e6a814672f8048d5350b4e6f54c6df4f704e611fa4a796fcfcb6aca1ed798f542cd6abe181210f9f6e33f6 SHA512 d6417e14fab0c41b2df369e5e39ce62a5f588e491af4d465b0162f74e171e5549b2f061867f344bfbf8aaccd246bf5f2acd697e532a2c7901c920c69429b1a28
-EBUILD flac-1.3.3.ebuild 1594 BLAKE2B 84f48c685442bc114adce1e5c72abbf0289401c47e6b5611a5e624430f9eae9e34dab89c009e6866ad95d7375da70ad8251e3bd6e54ba2648da9579af012d953 SHA512 c82e62c9ea93054a1e79781b03688d9d1282e9c1087fdc8e3df444faa214803bfb614d2e03ad40cfaf417ad9a21d216242931fd221762b27a1fc82244a191775
+EBUILD flac-1.3.3.ebuild 1583 BLAKE2B d5017a48bf262cc777aeb691f4b4006af17628f6b5de4fb891724b288103d523e74dc9dc015e8e76e14ad6fd1fa08bdd3e7dfee556c121301b8faed8bce764b9 SHA512 4272970d89cd6518bbb92868c37e38de6212207fa1528efe7ca1b0d9136997a85459aa1324a94a4cced19345345e5eecb65c23ff8885f3ea8091fa5e246c78e2
 MISC metadata.xml 327 BLAKE2B dee4aea4020b899879f83487d34853963264b68e7a7e8c509571bc353a5b20fde4d7f78899b900bf4214f5d488f088523090d4f41e8542f069e9a4eb7791c2ad SHA512 a4e6ad50d3089ff980a07a6ea6f7fcc22e3efc4da4c5721492aae001861fa185f12d68fc5effb55ccce8d67042b7a605c28096f4bca88f2ba9d5b4eb2593d14c
diff --git a/media-libs/flac/flac-1.3.3.ebuild b/media-libs/flac/flac-1.3.3.ebuild
index a258efad8017..35bc0961f2f9 100644
--- a/media-libs/flac/flac-1.3.3.ebuild
+++ b/media-libs/flac/flac-1.3.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/${PN}/${P}.tar.xz"
 
 LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx debug ogg cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_x86_sse static-libs"
 
 RDEPEND="ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/fluidsynth-dssi/Manifest b/media-libs/fluidsynth-dssi/Manifest
index 629980b86b73..94521da76044 100644
--- a/media-libs/fluidsynth-dssi/Manifest
+++ b/media-libs/fluidsynth-dssi/Manifest
@@ -1,5 +1,4 @@
 AUX 1.0.0-fluidsynth2.patch 2976 BLAKE2B 37574f9644ca71cd2d3eda56582deed12affc57a0ede91ed7f5c8ad41e438c4cdb2463897ead130ceda633781094e2ed03354689308653e018e58dd6412c3cfc SHA512 62848af647f754d46e785c3af13cb5921bdadf54fffbe4bb9d6f15ba1f8ddd1ed55e1c28ec95470cc101a948028f2861820f8d2e77619e58dd4e215d5277d557
 DIST fluidsynth-dssi-1.0.0.tar.gz 325047 BLAKE2B 1290a3eda38e9381bba3fcdaeac7cdcd6fe4bd33e521d40ae084118da77f8aa00c45456b5bf71c919c3009b47aa18f4cfc4eb9a643e66c9e0e6b25b6f2fa021d SHA512 e67ef9c4133c1c0bdba16a094f2e179ddc4c0ed5cff22bfd832dd29697604211de6dc5092e9d6cc82dfe6243fa2a91fe6fc41cccb1d9f5a8ee5b31ebc9d2b724
 EBUILD fluidsynth-dssi-1.0.0-r1.ebuild 551 BLAKE2B 8349defd67b934d1c5317f6852007a952f991c89d9a8e9e3ac02390bbacb993c7b38b278a965184f2f18c15ca3fdaa60f51a6ceecce5eb28e720857b03a0b6a7 SHA512 5a5e51722c2ca239e3217877106eb8bde93bea599408360566562c04196ad24293f21ddea4cbaa1768c52dcf3f922d145d158c134e4a3a6db5af100de92488bb
-EBUILD fluidsynth-dssi-1.0.0.ebuild 453 BLAKE2B 6a8abd215ddf4cf8a78b80d67c526bdb9c69758de28f0a4205108d2b329c8ac19318f0623db4adf70e5632d29052a24d405ac74fa004bed595989dee06b14b0e SHA512 db5f0af73dbea7e49c458055edad07e83ce429789d91c2cd3125cf725e1124a8ace450c3729339d5f3ef5c98f830460602edf085c5f5846a7128c2d0b5e05cd1
 MISC metadata.xml 343 BLAKE2B e857bc160f1b72d05f1395dea52fac9f2084e559480515b1f123c027d24e3e2c170045006dcf877a7dc7fdd5df7e8cb412d74f6c0f8f3ddd5df7242da15f57e5 SHA512 a7eb8732dae53f7a4c9766de1a04a093483149b52c4b180bcb44b32c751741414b075e65c191c0fa01d50af75ca24d569c0d001211a826e546fff94886b0a44d
diff --git a/media-libs/fluidsynth-dssi/fluidsynth-dssi-1.0.0.ebuild b/media-libs/fluidsynth-dssi/fluidsynth-dssi-1.0.0.ebuild
deleted file mode 100644
index ab3fb0a9843b..000000000000
--- a/media-libs/fluidsynth-dssi/fluidsynth-dssi-1.0.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="DSSI Soft Synth Interface"
-HOMEPAGE="http://dssi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/dssi/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND=">=media-libs/dssi-0.9.0
-	x11-libs/gtk+:2
-	>=media-libs/liblo-0.12
-	>=media-sound/fluidsynth-1.0.3"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
diff --git a/media-libs/freealut/Manifest b/media-libs/freealut/Manifest
index 371974a12f63..ff6ae7a4c0ce 100644
--- a/media-libs/freealut/Manifest
+++ b/media-libs/freealut/Manifest
@@ -1,3 +1,4 @@
 DIST freealut-1.1.0.tar.gz 461830 BLAKE2B e19c800e2d678dd41b9e41153e0f99d84300b3f6d0226bd81e7724515597a2641fc2203e46b193dd506a1c90e968d2d951f84afa29cf375fbf5acb72999c1305 SHA512 270f74972548b4ac6b98c52c51787ed43c20cf79979063d073bbee7bd08ac4f34c2b579fbf15c09c4e606a5ed38dcd0252f5c46fb3cfe43b727b6b53cf747933
 EBUILD freealut-1.1.0-r3.ebuild 863 BLAKE2B 5c0e7c5bf5a37463a45f80a856c50f2444be842f855b1e65e71c28809b5a9a8a09f1ca9832dcef3d104abf4ea742b55dd1a0200a065be9c231fab7173c7541e9 SHA512 377531d2c0dd33231349f92c44d98c1ad269c9eaf37f3b014aa445d80fae7939b149f58bd2fccd7d1ee769c77b23a145f52b4e6a88d4e24e080d2a5e5b004a9d
+EBUILD freealut-1.1.0-r4.ebuild 917 BLAKE2B e52359bb52c776c4b81d66954e8b48bc0d5465d6fe4bbc247189807c68c4aec1988897a231c55d5e44c0bf1eaa628720a205b2f466e43a456362c8065b709da7 SHA512 5095f2c32e904eead9fac60c9aefdd4dcc0684a5446ac985ea7efab7f86e3e4aee3ebbe4f9061aa3c24037d4e391ea9eb6226390449a9ae8c7335a6105a2c891
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/freealut/freealut-1.1.0-r4.ebuild b/media-libs/freealut/freealut-1.1.0-r4.ebuild
new file mode 100644
index 000000000000..255b5e27b5b2
--- /dev/null
+++ b/media-libs/freealut/freealut-1.1.0-r4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="The OpenAL Utility Toolkit"
+HOMEPAGE="https://www.openal.org/"
+SRC_URI="http://http.debian.net/debian/pool/main/f/${PN}/${PN}_${PV}.orig.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/openal-1.15.1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# Link against openal and pthread
+	sed -e 's/libalut_la_LIBADD = .*/& -lopenal -lpthread/' \
+		-i src/Makefile.am || die
+	AT_M4DIR="admin/autotools/m4" eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf --disable-static
+}
+
+multilib_src_install_all() {
+	local HTML_DOCS=( doc/. )
+	einstalldocs
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest
index a8486986659b..e50cf0a1e8e3 100644
--- a/media-libs/freeimage/Manifest
+++ b/media-libs/freeimage/Manifest
@@ -1,3 +1,4 @@
+AUX freeimage-3.18.0-CVE-2019-12211-CVE-2019-12213.patch 6242 BLAKE2B 3deb724b2cd5c125a41885787e9165434047bc8710861fade7741c67c6fd6e7f21cafae07b36cbe81fc7a372cb2c470ca44b02f06ac8c0004473aaf00b39365e SHA512 eb658babe27289ce24cd23bbcac52de7a351cc52a9c62cb561925ea17b8e476b03c1e2202b042fac4a60fae805e1a422333db4203d2bcc20319789a689a38125
 AUX freeimage-3.18.0-disable-plugin-G3.patch 1553 BLAKE2B d122df83a8889cd599d12c65cee5678b3654266c2e128d1d8d963eed7743b62ba6da7c582acc389f874fd218e2f7857d718a562bd81c52cf23f31284fdc00dc4 SHA512 9a0adeaaa3bf839387dbbccc54e0e32e0af87af4c398edd4cc44f1c6d380228dc7c174a7715ac397c15d48b7b5337543aac05020e25b6680187e179e8738dccd
 AUX freeimage-3.18.0-libjpeg9.patch 520 BLAKE2B 4788a3c4c209568df7176ed7b2699f9c33efb8c2ff2dc51d1e6bc76329ade073bdd296d7e9aa2441a655e46407df31cc5dd84c0d1805ca75418bae9d4ca4ecfa SHA512 75fc7c4d257d4bd67202c5c91af23f3e990342490c4661ab2219b89c40626703d9ceb5f05dc8d2a912153fbe5b9e07f24566570597f84cec15fbe03cb7d4b69e
 AUX freeimage-3.18.0-raw.patch 432 BLAKE2B 96c89d051a849f5909bdb9b3f720d4146651504f972a1661b55caa6344eeac3dc64dda1beb027e43e9b2eb7ce5ac8193db424422e74ce957744d9e6d14086a7a SHA512 01e150205a62ee9eb240890a5c9b92160a74073a1fe43811ed8941aeda824ba3c87bf4a2e631cbe367a7391374e93d309d95a6b5ec31009e4e8f1c2fc6b10da1
@@ -7,4 +8,5 @@ AUX freeimage-3.18.0-unbundling.patch 20960 BLAKE2B 61ee63e7be0d5db7bf4a3bc053bb
 DIST FreeImage3180.pdf 1665541 BLAKE2B 5d40ee6fa0a1e73df0cc961edbd70a2835ef88fb540f123fd81f2bb826d4c949d2a60dfe3fc02406ce632a389935abac0d471c963c9803b8c2aece2b48afb003 SHA512 632f68b14f7a5916a1b95bbf86c268d0afe786a2537472301bb002254aa3195f046efb41f073133633211e985e90edbb99285ab6f42bc55501c756292a3c4c03
 DIST FreeImage3180.zip 7415716 BLAKE2B b695271f4e80eb304eccde66e38b5095eceae51fbe0dd97df69c55f364f8440d8c97139b8edc2f01c400f5c53a7336fdfab1e28aa3ea04f485901d5def443d25 SHA512 9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818
 EBUILD freeimage-3.18.0-r1.ebuild 2972 BLAKE2B be0c69f23fc61d60b0587e1acb9be99d6b59028f98c03da37825a19a0ad15a20271550f15a1ab2b55b6df6c2dffeb2a993896f6b4b63e2831a5e31fff1b54e96 SHA512 3d55e13976038b63109c39dcee4bdd34a8b78dd9db98a3b07b1f90095a5a875bd1b047230a03b7364a0b2669f896956ae130bca93f663270d940345ae283d8dd
+EBUILD freeimage-3.18.0-r2.ebuild 3038 BLAKE2B b7f954a18acbcdb728cb8bfdf734cb6ac294774412f4a98684e8007d01b817608f668a9b7697e4a99d1bdd77377502411fe70d28aa096176978de501e38ac946 SHA512 d7dd2c679c9890086f8ad29b7e1432b08f393a2ec6f34bf579764867f1d5624c5765bfd68ffc371c64341c5e35c7f5cb1bc1f50d591f683d81abe9153bd27484
 MISC metadata.xml 403 BLAKE2B e4d54e3da3203c09e5b281d7d9a5ee1c42f98d081751195edb3754809e9cfc9037b79f70da579f01485b4cda65fe4ddaa70f5522d6138af5b214cdbcbd412928 SHA512 08dffea02b8771a4728338c3cdfa0fd7f312d4570838bdfea4ec395c007cc36f3ef87432db5da44468c7b3834855e2de8ae13ddf9447cba9c88da4367c6cc10c
diff --git a/media-libs/freeimage/files/freeimage-3.18.0-CVE-2019-12211-CVE-2019-12213.patch b/media-libs/freeimage/files/freeimage-3.18.0-CVE-2019-12211-CVE-2019-12213.patch
new file mode 100644
index 000000000000..fc861854509c
--- /dev/null
+++ b/media-libs/freeimage/files/freeimage-3.18.0-CVE-2019-12211-CVE-2019-12213.patch
@@ -0,0 +1,193 @@
+commit 1826164f90d97b7207247ad268fd2622cd1c6717
+Author: drolon <drolon@f6e0daa0-2725-47c6-9c0b-5e6e9cdd0720>
+Date:   Mon Nov 11 05:45:27 2019 +0000
+
+    improved TIFF plugin when working with malicious images
+    
+    git-svn-id: https://svn.code.sf.net/p/freeimage/svn@1825 f6e0daa0-2725-47c6-9c0b-5e6e9cdd0720
+
+diff --git a/Source/FreeImage/PluginTIFF.cpp b/Source/FreeImage/PluginTIFF.cpp
+index f85c2201..a8053196 100644
+--- a/Source/FreeImage/PluginTIFF.cpp
++++ b/Source/FreeImage/PluginTIFF.cpp
+@@ -122,9 +122,14 @@ static void ReadThumbnail(FreeImageIO *io, fi_handle handle, void *data, TIFF *t
+ static int s_format_id;
+ 
+ typedef struct {
++	//! FreeImage IO functions
+     FreeImageIO *io;
++	//! FreeImage handle
+ 	fi_handle handle;
++	//! LibTIFF handle
+ 	TIFF *tif;
++	//! Count the number of thumbnails already read (used to avoid recursion on loading)
++	unsigned thumbnailCount;
+ } fi_TIFFIO;
+ 
+ // ----------------------------------------------------------
+@@ -184,10 +189,8 @@ Open a TIFF file descriptor for reading or writing
+ */
+ TIFF *
+ TIFFFdOpen(thandle_t handle, const char *name, const char *mode) {
+-	TIFF *tif;
+-	
+ 	// Open the file; the callback will set everything up
+-	tif = TIFFClientOpen(name, mode, handle,
++	TIFF *tif = TIFFClientOpen(name, mode, handle,
+ 	    _tiffReadProc, _tiffWriteProc, _tiffSeekProc, _tiffCloseProc,
+ 	    _tiffSizeProc, _tiffMapProc, _tiffUnmapProc);
+ 
+@@ -460,12 +463,10 @@ CreateImageType(BOOL header_only, FREE_IMAGE_TYPE fit, int width, int height, ui
+ 			}
+ 			
+ 		}
+-		else {
+-
+-			dib = FreeImage_AllocateHeader(header_only, width, height, MIN(bpp, 32), FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
++		else if (bpp <= 32) {
++			dib = FreeImage_AllocateHeader(header_only, width, height, bpp, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
+ 		}
+ 
+-
+ 	} else {
+ 		// other bitmap types
+ 		
+@@ -1067,9 +1068,12 @@ static void * DLL_CALLCONV
+ Open(FreeImageIO *io, fi_handle handle, BOOL read) {
+ 	// wrapper for TIFF I/O
+ 	fi_TIFFIO *fio = (fi_TIFFIO*)malloc(sizeof(fi_TIFFIO));
+-	if(!fio) return NULL;
++	if (!fio) {
++		return NULL;
++	}
+ 	fio->io = io;
+ 	fio->handle = handle;
++	fio->thumbnailCount = 0;
+ 
+ 	if (read) {
+ 		fio->tif = TIFFFdOpen((thandle_t)fio, "", "r");
+@@ -1125,6 +1129,27 @@ check for uncommon bitspersample values (e.g. 10, 12, ...)
+ */
+ static BOOL 
+ IsValidBitsPerSample(uint16 photometric, uint16 bitspersample, uint16 samplesperpixel) {
++	// get the pixel depth in bits
++	const uint16 pixel_depth = bitspersample * samplesperpixel;
++
++	// check for a supported pixel depth
++	switch (pixel_depth) {
++		case 1:
++		case 4:
++		case 8:
++		case 16:
++		case 24:
++		case 32:
++		case 48:
++		case 64:
++		case 96:
++		case 128:
++			// OK, go on
++			break;
++		default:
++			// unsupported pixel depth
++			return FALSE;
++	}
+ 
+ 	switch(bitspersample) {
+ 		case 1:
+@@ -1165,6 +1190,8 @@ IsValidBitsPerSample(uint16 photometric, uint16 bitspersample, uint16 samplesper
+ 		default:
+ 			return FALSE;
+ 	}
++	
++	return FALSE;
+ }
+ 
+ static TIFFLoadMethod  
+@@ -1254,16 +1281,31 @@ Read embedded thumbnail
+ static void 
+ ReadThumbnail(FreeImageIO *io, fi_handle handle, void *data, TIFF *tiff, FIBITMAP *dib) {
+ 	FIBITMAP* thumbnail = NULL;
++
++	fi_TIFFIO *fio = (fi_TIFFIO*)data;
++
++	/*
++	Thumbnail loading can cause recursions because of the way 
++	functions TIFFLastDirectory and TIFFSetSubDirectory are working.
++	We use here a hack to count the number of times the ReadThumbnail function was called. 
++	We only allow one call, check for this
++	*/
++	if (fio->thumbnailCount > 0) {
++		return;
++	}
++	else {
++		// update the thumbnail count (used to avoid recursion)
++		fio->thumbnailCount++;
++	}
+ 	
+ 	// read exif thumbnail (IFD 1) ...
+ 	
+-	/*
+-	// this code can cause unwanted recursion causing an overflow, it is thus disabled until we have a better solution
+-	// do we really need to read a thumbnail from the Exif segment ? knowing that TIFF store the thumbnail in the subIFD ...
+-	// 
+ 	toff_t exif_offset = 0;
+ 	if(TIFFGetField(tiff, TIFFTAG_EXIFIFD, &exif_offset)) {
+ 		
++		// this code can cause unwanted recursion causing an overflow, because of the way TIFFLastDirectory work
++		// => this is checked using 
++
+ 		if(!TIFFLastDirectory(tiff)) {
+ 			// save current position
+ 			const long tell_pos = io->tell_proc(handle);
+@@ -1273,15 +1315,15 @@ ReadThumbnail(FreeImageIO *io, fi_handle handle, void *data, TIFF *tiff, FIBITMA
+ 			int page = 1;
+ 			int flags = TIFF_DEFAULT;
+ 			thumbnail = Load(io, handle, page, flags, data);
++
+ 			// store the thumbnail (remember to release it before return)
+ 			FreeImage_SetThumbnail(dib, thumbnail);
+-			
++		
+ 			// restore current position
+ 			io->seek_proc(handle, tell_pos, SEEK_SET);
+ 			TIFFSetDirectory(tiff, cur_dir);
+ 		}
+ 	}
+-	*/
+ 	
+ 	// ... or read the first subIFD
+ 	
+@@ -1297,12 +1339,15 @@ ReadThumbnail(FreeImageIO *io, fi_handle handle, void *data, TIFF *tiff, FIBITMA
+ 				// save current position
+ 				const long tell_pos = io->tell_proc(handle);
+ 				const uint16 cur_dir = TIFFCurrentDirectory(tiff);
++
++				// this code can cause unwanted recursion causing an overflow, because of the way TIFFSetSubDirectory work
+ 				
+ 				if(TIFFSetSubDirectory(tiff, subIFD_offsets[0])) {
+ 					// load the thumbnail
+ 					int page = -1; 
+ 					int flags = TIFF_DEFAULT;
+ 					thumbnail = Load(io, handle, page, flags, data);
++
+ 					// store the thumbnail (remember to release it before return)
+ 					FreeImage_SetThumbnail(dib, thumbnail);
+ 				}
+@@ -2058,7 +2103,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) {
+ 				}
+ 
+ 				// calculate src line and dst pitch
+-				int dst_pitch = FreeImage_GetPitch(dib);
++				unsigned dst_pitch = FreeImage_GetPitch(dib);
+ 				uint32 tileRowSize = (uint32)TIFFTileRowSize(tif);
+ 				uint32 imageRowSize = (uint32)TIFFScanlineSize(tif);
+ 
+@@ -2088,7 +2133,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) {
+ 						BYTE *src_bits = tileBuffer;
+ 						BYTE *dst_bits = bits + rowSize;
+ 						for(int k = 0; k < nrows; k++) {
+-							memcpy(dst_bits, src_bits, src_line);
++							memcpy(dst_bits, src_bits, MIN(dst_pitch, src_line));
+ 							src_bits += tileRowSize;
+ 							dst_bits -= dst_pitch;
+ 						}
diff --git a/media-libs/freeimage/freeimage-3.18.0-r2.ebuild b/media-libs/freeimage/freeimage-3.18.0-r2.ebuild
new file mode 100644
index 000000000000..3e551b4b3492
--- /dev/null
+++ b/media-libs/freeimage/freeimage-3.18.0-r2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils toolchain-funcs
+
+MY_PN=FreeImage
+MY_PV=${PV//.}
+MY_P=${MY_PN}${MY_PV}
+
+DESCRIPTION="Image library supporting many formats"
+HOMEPAGE="https://freeimage.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
+	mirror://sourceforge/${PN}/${MY_P}.pdf"
+
+LICENSE="|| ( GPL-2 FIPL-1.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
+
+# The tiff/ilmbase isn't a typo.  The TIFF plugin cheats and
+# uses code from it to handle 16bit<->float conversions.
+RDEPEND="
+	sys-libs/zlib
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	mng? ( media-libs/libmng:= )
+	openexr? ( media-libs/openexr:= )
+	png? ( media-libs/libpng:0= )
+	raw? ( media-libs/libraw:= )
+	tiff? (
+		media-libs/ilmbase:=
+		media-libs/tiff:0
+	)
+	webp? ( media-libs/libwebp:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_PN}
+
+DOCS=( "${DISTDIR}"/${MY_P}.pdf README.linux Whatsnew.txt )
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.18.0-unbundling.patch
+	"${FILESDIR}"/${PN}-3.18.0-remove-jpeg-transform.patch
+	"${FILESDIR}"/${PN}-3.18.0-rename-jpeg_read_icc_profile.patch
+	"${FILESDIR}"/${PN}-3.18.0-disable-plugin-G3.patch
+	"${FILESDIR}"/${PN}-3.18.0-raw.patch
+	"${FILESDIR}"/${PN}-3.18.0-libjpeg9.patch
+	"${FILESDIR}"/${PN}-3.18.0-CVE-2019-12211-CVE-2019-12213.patch
+)
+
+src_prepare() {
+	pushd Source >/dev/null || die
+	cp LibJPEG/{transupp.c,transupp.h,jinclude.h} . || die
+	cp LibTIFF4/{tiffiop,tif_dir}.h . || die
+	rm -rf LibPNG LibMNG LibOpenJPEG ZLib OpenEXR LibRawLite LibTIFF4 LibJPEG LibWebP LibJXR || die
+	popd >/dev/null || die
+
+	edos2unix Makefile.{gnu,fip,srcs} fipMakefile.srcs */*.h */*/*.cpp
+	sed -i \
+		-e "s:/./:/:g" \
+		-e "s: ./: :g" \
+		-e 's: Source: \\\n\tSource:g' \
+		-e 's: Wrapper: \\\n\tWrapper:g' \
+		-e 's: Examples: \\\n\tExamples:g' \
+		-e 's: TestAPI: \\\n\tTestAPI:g' \
+		-e 's: -ISource: \\\n\t-ISource:g' \
+		-e 's: -IWrapper: \\\n\t-IWrapper:g' \
+		-e 's:INCLS:\nINCLS:g' \
+		Makefile.srcs fipMakefile.srcs || die
+	sed -i \
+		-e "/LibJPEG/d" \
+		-e "/LibJXR/d" \
+		-e "/LibPNG/d" \
+		-e "/LibTIFF/d" \
+		-e "/Source\/ZLib/d" \
+		-e "/LibOpenJPEG/d" \
+		-e "/OpenEXR/d" \
+		-e "/LibRawLite/d" \
+		-e "/LibMNG/d" \
+		-e "/LibWebP/d" \
+		-e "/LibJXR/d" \
+		Makefile.srcs fipMakefile.srcs || die
+
+	default
+}
+
+foreach_make() {
+	local m
+	for m in Makefile.{gnu,fip} ; do
+		emake -f ${m} \
+			USE_EXR=$(usex openexr) \
+			USE_JPEG=$(usex jpeg) \
+			USE_JPEG2K=$(usex jpeg2k) \
+			USE_MNG=$(usex mng) \
+			USE_PNG=$(usex png) \
+			USE_TIFF=$(usex tiff) \
+			USE_RAW=$(usex raw) \
+			USE_WEBP=$(usex webp) \
+			$(usex static-libs '' STATICLIB=) \
+			"$@"
+	done
+}
+
+src_compile() {
+	tc-export AR PKG_CONFIG
+	foreach_make \
+		CXX="$(tc-getCXX) -fPIC" \
+		CC="$(tc-getCC) -fPIC" \
+		${MY_PN}
+}
+
+src_install() {
+	foreach_make install DESTDIR="${ED}" INSTALLDIR="${ED}"/usr/$(get_libdir)
+	einstalldocs
+}
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 228bafd37898..1f9b30342453 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -10,7 +10,7 @@ DIST ft2demos-2.10.1.tar.xz 229228 BLAKE2B 015448f3f246fc7772b10f55037450866323e
 DIST ft2demos-2.10.2.tar.xz 230672 BLAKE2B dd81e72bb1360f6a952874c183598fffe3eddb4bed4d07715a75810d2e81623b94082b1274f916bf7550615a66ba7a327c5413fca9d470111aeb1fa31ce4dd73 SHA512 912e3c3cbcdfd30fd918897d28240e04eb7248d130fc519e7d1613873a11d275d658ff247c6d517ebecf7a09de0d05f3dc10631411226015e1b147cba9a8a438
 DIST ft2demos-2.9.1.tar.bz2 233462 BLAKE2B c689942b222b2c600b5ec3963791621ae87acefb9b01caa5dc35af52525d03e3a1094e48c0789d5eaabbce787bddd7c3055e12454e54ea3c7fae92bca47614de SHA512 38bee59184b20c2eb983deaa5c1f241e31c1b4793e47dc06b1b419601489cfece3b11fde4cf4fb6c5af12254ad0c1ce9a1547885c208e8e715655e9c48f22a46
 EBUILD freetype-2.10.1.ebuild 6715 BLAKE2B 5e0e09f3a6eae8a63429935c9439c399708bb29be75a7498fa13d7cc261de77fc8aac1c0282ecb6a096e5078305b72ff52fb3a257802235ba1a8be85ffc0c752 SHA512 c3ad5724caf8671c065daf247f1131c7497f92884db7fc0296fc6bafb86b713028e4882b9db6e89a53d6f318ac060cdccdb1a8e50e0d393ebd47cd3e5882fb2e
-EBUILD freetype-2.10.2-r1.ebuild 6792 BLAKE2B 2f652670cda49a8ef474dcc3b63c2711c0a49256214301013d53b82615215c7fa53897583df12a0585c4967b8a0fd06d17c93b455c945f6493c5447f4d69be04 SHA512 91f64c79e8065e228cd5b389f1276d499405e0e7486505eebc80ed4916da9ac1de426685ccbe331c4baa6c9223bedc7f84fe5ec520a287689b290d66032d4078
+EBUILD freetype-2.10.2-r1.ebuild 6783 BLAKE2B a11fa72fc58ab86599ec752d0b3189add79ec33ee7b1de77c6d36ac35306a88f63c947580adb9563471ff3e31f6c8f6c4d9be38f3c5c45ee8a308c92082f21f0 SHA512 e2ebce63a8b9409db873d3e739ceb3c1c9a5937b99202a9c0ab81fa0959b38e6cac548f40c3fa09206c2166c28e1d0197d14107f1fbc05d5cb858553b57309b4
 EBUILD freetype-2.9.1-r3.ebuild 6659 BLAKE2B e60afd962ec321996c11b948912e3d809a9842fad9ffb9e126028eb93640a35a22b918cbd38a977828ace531721aa2e0d0946aae44a1d82ceca2c4c618751ad0 SHA512 70b9bf7943f2e095e1b4e226831d026c0c80fd48c425140927a568cdecb7cafccfc9c9ab68f904514a4542cb08ceff18a4c9ecc624bd5954e5780a6bf5315c53
 EBUILD freetype-2.9.1-r4.ebuild 6669 BLAKE2B dadd3c7643ee9da87dabfce17e5ea8ce9bc2b106385708031e2b2483f64c90620d6f35a0ccaf12174ed4ac33e23841d4a17c6a7db0c7d686e85eaa799156b896 SHA512 1fcece6d60327b7dec038b7e368b18941dfde5527caa41639f78140423be2250518098680137e7b28121e2e65f66ec98122da3724e8cd413a2c0a3f1c2a291bc
 EBUILD freetype-9999.ebuild 6792 BLAKE2B 2f652670cda49a8ef474dcc3b63c2711c0a49256214301013d53b82615215c7fa53897583df12a0585c4967b8a0fd06d17c93b455c945f6493c5447f4d69be04 SHA512 91f64c79e8065e228cd5b389f1276d499405e0e7486505eebc80ed4916da9ac1de426685ccbe331c4baa6c9223bedc7f84fe5ec520a287689b290d66032d4078
diff --git a/media-libs/freetype/freetype-2.10.2-r1.ebuild b/media-libs/freetype/freetype-2.10.2-r1.ebuild
index 37247e155193..6166c56a0485 100644
--- a/media-libs/freetype/freetype-2.10.2-r1.ebuild
+++ b/media-libs/freetype/freetype-2.10.2-r1.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
 			mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	IUSE+=" doc"
 else
 	inherit autotools git-r3
diff --git a/media-libs/game-music-emu/Manifest b/media-libs/game-music-emu/Manifest
index 9fa4e373465c..d31ec36e057d 100644
--- a/media-libs/game-music-emu/Manifest
+++ b/media-libs/game-music-emu/Manifest
@@ -1,3 +1,4 @@
+AUX game-music-emu-0.6.2-gcc10.patch 546 BLAKE2B ef04c95fbb0fc51afbfaf27d93cb38c689ff07499f3b7362a0c50ccf726082bf68f4b7d6bc36a3abdff9d81a8bb87f650ddac362e989da590471ebbece810e92 SHA512 a09190e164c969760eded45474c965db1ebd53d78485b748d31e067eccc42f32f370ccab80d4ed51bab393d535ccc499ec8212eb4258428417c60b79399691c9
 DIST game-music-emu-0.6.2.tar.xz 163052 BLAKE2B 8bce2a5c09eef947f02cfc3521aa380564ddaad5f8a8f40ac38b645fc146332ba1cb6755592892dab00200c169a4d1f94978d80c52976c04e120d9d01c8db9dc SHA512 1808d28b54cbbd8dc5e3240eb27d2e546398fb62ab6577e59430a7543cfdaa06482f70b4750656b73a05f1c1bc0c0254db97d0940271ea2144724e1c44f5da10
-EBUILD game-music-emu-0.6.2.ebuild 465 BLAKE2B aca36bd017df790b3c43169ca2b01730b64adecf43152d7c7877d4fc90c3edc9837bbc1f3669be2d510177ad368b4ff1f6662d0b3a84a10bf8c0db5578c26401 SHA512 6380c5eeeeea1069df97f1a0c55bd3e989256037a4efbd42a31c114434dcf3ca43277ce1e76ceae7f497d78ddc7c28df0eff9bf7fb29fb5b3188456189f61252
+EBUILD game-music-emu-0.6.2.ebuild 526 BLAKE2B c74fa0fd11ceff2781fa702d710f2974c3007228d112cf2b8625eb51183a705ba0c6899cfb0042af73d1e5c5741f6ec0c9003c1612e92f36f30d762929e3bf20 SHA512 0d407ebde76ff506a516a0190c5fd277eba121200bd35ba0901d814aeb69b7bd17007c851581556db69f90d99fd8d3dbfb82a931ab367cd406faf59328643b0b
 MISC metadata.xml 400 BLAKE2B 1dd7cab3e13a3364222e52dc2e4c3dcbeb12e4169aaaa4196bc8ab325e42e04aa7b8aaa6fccb64db1de7ed6163d3060fdddb6df21c7243c4c0b3a7b7f28bd3ed SHA512 2abd1362876b6019d1538a6cd6a5740c29c1920037db3f3c622fb7c533a64b6d559ef8cdead9e2fdecc9c64c799fd1d2f8fc5887d493354604e4a99ed77cbf1d
diff --git a/media-libs/game-music-emu/files/game-music-emu-0.6.2-gcc10.patch b/media-libs/game-music-emu/files/game-music-emu-0.6.2-gcc10.patch
new file mode 100644
index 000000000000..620085ca7b78
--- /dev/null
+++ b/media-libs/game-music-emu/files/game-music-emu-0.6.2-gcc10.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -66,7 +66,7 @@
+    if (__LIBGME_TEST_VISIBILITY)
+       # get the gcc version
+       exec_program(${CMAKE_CXX_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info)
+-      string (REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
++      string (REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" _gcc_version "${_gcc_version_info}")
+ 
+       # gcc <4.1 had poor support for symbol visibility
+       if ((${_gcc_version} VERSION_GREATER "4.1") OR (${_gcc_version} VERSION_EQUAL "4.1"))
diff --git a/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild b/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild
index 0ff5dae7ee70..54d6d0478cd6 100644
--- a/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild
+++ b/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild
@@ -15,3 +15,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 x86"
 IUSE=""
 
 DOCS=( changes.txt design.txt gme.txt readme.txt )
+
+PATCHES=(
+	"${FILESDIR}/game-music-emu-0.6.2-gcc10.patch"
+)
diff --git a/media-libs/ganv/Manifest b/media-libs/ganv/Manifest
index 18ffb15b7722..f6d5a2c5c7fa 100644
--- a/media-libs/ganv/Manifest
+++ b/media-libs/ganv/Manifest
@@ -1,6 +1,4 @@
-AUX ganv-1.4.2-no-fdgl.patch 843 BLAKE2B ae7007f466712536681a5736d73e585315a6129538642fb20676fb967aa978bb3f4acbd61be6652b2918bbff235faa4c2e6f38cd96158e3f04ee13a784c82f62 SHA512 94f0cf7536ae6ae844088cabce0a22caa61113145c51332fda0831878af23267d24780416e2157eb6b50e9690deb508b9474c9b50b08186fb367406a896de55c
-DIST ganv-1.4.2.tar.bz2 175510 BLAKE2B 4e6d7e411c78a516ea6603245ae13787607591b061d3856f305bcc4731f27ef46897d032a9b8a1f672776b41351823f89a2ddfeac40b47f584dbf638af79d466 SHA512 0609dea81cceb0c560286ad2f132f318c2d583af5163dcea4511155e78a022248dcb7ae535233493bdf906fb036422ebd4368d688123f3e1676c4e0398cbc6c2
 DIST ganv-1.6.0.tar.bz2 377068 BLAKE2B f78c4783f0188fd163b087c789d50eb67a54a77d26d261d3557fba46a7bee09fc3326204273ad496d6b2ae262368015c3f186c290f2b85e6d5297eeed7596677 SHA512 05900aa63e65646e75f805dfe6ae5901efb19ae31a3f0a6730a713bfaffc47bb93f683879ce2a75093ea09e84a9d3137966b68b4ad307707753dead1df439a09
-EBUILD ganv-1.4.2-r1.ebuild 1056 BLAKE2B 1f2c2c92f244b04cd2c45fda244c9d45f4ebb483cbf14af2900715152de856e3e35c31c54a68acc12dc54bc72cdff1aa400aeff4c5e745b0582f8ef88b1c6ead SHA512 197393a1a1eb0f37ea3bf571805b014f845d878329ed0d0e4cc385672f1215099ef46ac13abce415a474800105b9725a45456cc497ba358d77ea752f48b19daa
-EBUILD ganv-1.6.0.ebuild 1011 BLAKE2B d4687ad27eacf1692259cfbce92daf28cd85dce5834a98bc12546d0725fe466f1d9b3b7ea1122b8b2a69670f4640fcd41b7e3ba938f99213f1a32f7d5b675017 SHA512 c50c3da14cceb7eeaf334dae40828025f065fa30d6d066349086e1dcc5e5e58173fb9bc23e96e42538360f8814077b048db9c83f6c69f985364d330dbe283fc9
+EBUILD ganv-1.6.0-r1.ebuild 991 BLAKE2B 2e1e77a083e189cc07d7ae283074082b50e6ae81f30c0e6dbdd2eb10b5ff1c1321b915017ee64fbcbba6476fdd2d7acd6bae0f3449a7da0460af445548fd98fa SHA512 b97f6e76a5faa15d68413f41d4333e52ed4858331ee6dc6f87a64449dd62a844b2e03f9d1868be4b1c70d2363fe3c4fa06b4f3ba94ba2e2a40840878c45cfb49
+EBUILD ganv-1.6.0.ebuild 981 BLAKE2B 4e89d763ac96e2d847638c43461844339857395c020a480d9a3c8f832e2d5164235d40ceeed40692bd031f3b1f046256c8e9d21dae4dc04fa2295d8531fd8bab SHA512 7753b095c07a859de04e521d689a1ecddb8d4c23747cdddd30820b0033548bf5972d3e2c94788c1100908e58eec0d3caee44e53c3ebafc3f4290b3b6ace141cd
 MISC metadata.xml 356 BLAKE2B 0ca0ad63495c9f314c3fe7bfc48a7538d07ad65f9b772996b86ffc268420bf9548002a920a9a7f53f25984c309fc50d9a1735281dd18421a82cef913e10d49da SHA512 f2b5f01deb2f8d879b4a4107571ac469caf163bd2c44a066b8758a9596445f0baaa125b5e3ea883008221aee90d98982222b40b43c10f694d2672842bc1103ef
diff --git a/media-libs/ganv/files/ganv-1.4.2-no-fdgl.patch b/media-libs/ganv/files/ganv-1.4.2-no-fdgl.patch
deleted file mode 100644
index 3fb29a7f0b54..000000000000
--- a/media-libs/ganv/files/ganv-1.4.2-no-fdgl.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/src/Canvas.cpp b/src/Canvas.cpp
-index c01021c..1c66a6c 100644
---- a/src/Canvas.cpp
-+++ b/src/Canvas.cpp
-@@ -760,6 +760,18 @@ GanvCanvasImpl::layout_dot(const std::string& filename)
- }
- #endif
- 
-+inline uint64_t
-+get_monotonic_time()
-+{
-+#if GLIB_CHECK_VERSION(2, 28, 0)
-+	return g_get_monotonic_time();
-+#else
-+	GTimeVal time;
-+	g_get_current_time(&time);
-+	return time.tv_sec + time.tv_usec;
-+#endif
-+}
-+
- #ifdef GANV_FDGL
- 
- inline Region
-@@ -788,18 +800,6 @@ apply_force(GanvNode* a, GanvNode* b, const Vector& f)
- 	b->impl->force = vec_sub(b->impl->force, f);
- }
- 
--inline uint64_t
--get_monotonic_time()
--{
--#if GLIB_CHECK_VERSION(2, 28, 0)
--	return g_get_monotonic_time();
--#else
--	GTimeVal time;
--	g_get_current_time(&time);
--	return time.tv_sec + time.tv_usec;
--#endif
--}
--
- gboolean
- GanvCanvasImpl::layout_iteration()
- {
diff --git a/media-libs/ganv/ganv-1.4.2-r1.ebuild b/media-libs/ganv/ganv-1.6.0-r1.ebuild
index 1928d7753de0..8f7045e0bab4 100644
--- a/media-libs/ganv/ganv-1.4.2-r1.ebuild
+++ b/media-libs/ganv/ganv-1.6.0-r1.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-# oes not work with python3
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE='threads(+)'
 inherit eutils flag-o-matic waf-utils python-any-r1
 
@@ -13,7 +12,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+fdgl +graphviz introspection nls"
 
 RDEPEND="
@@ -31,10 +30,6 @@ DEPEND="${RDEPEND}
 	nls? ( virtual/libintl )
 "
 
-PATCHES=(
-	"${FILESDIR}"/${P}-no-fdgl.patch
-)
-
 src_configure() {
 	append-cxxflags -std=c++11
 	waf-utils_src_configure \
diff --git a/media-libs/ganv/ganv-1.6.0.ebuild b/media-libs/ganv/ganv-1.6.0.ebuild
index 516ec4cbc85d..54805ef9a7f8 100644
--- a/media-libs/ganv/ganv-1.6.0.ebuild
+++ b/media-libs/ganv/ganv-1.6.0.ebuild
@@ -2,7 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-# oes not work with python3
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE='threads(+)'
 inherit eutils flag-o-matic waf-utils python-any-r1
@@ -13,7 +12,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+fdgl +graphviz introspection nls"
 
 RDEPEND="
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index a6e0dc4de44f..4b081139a6dc 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -1,35 +1,16 @@
-AUX gegl-0.2.0-cve-2012-4433-1e92e523.patch 2365 BLAKE2B 64361413f30f81e881c51b050d644f7c83a5d44359568c93fc1139b89b98607f6005a3aba33c3c86fb9bc292415116d71653c84255ee3f8cc28adcd13e554b37 SHA512 f27c89ac3b7742da348f75190cb1d5ad2569ab71a188b42a64e23a6254489770c701714e8de49602fdb8e8f063c3c9130abac330dceacee15603098bc1b70348
-AUX gegl-0.2.0-cve-2012-4433-4757cdf7.patch 1952 BLAKE2B bd601e99324c3861ef3da7685518891ba7e55f316120da8660b8afc85179c9ce7e9ef54c0c73d99754ed3ca0cd05f4e3803613db438909fb6983958cfcbb5221 SHA512 c48ed73b4a042263464819981e5f9fb0c0fc7abe8291840da9e839833a8cd548077fa99fed4b523a5bbac120d4336d2007a243baa359b40a0f0e3ff633bffa57
-AUX gegl-0.2.0-ffmpeg-0.11.diff 2022 BLAKE2B 11fb013522cdeaa06bef97c421763d3b4d0900181667b7dd5688c0fc0a666a68ab50cccdce7105f20802df5e7ce58f67bc48e16f9447fe0fbe27efb60ed52f0b SHA512 b2d56e4abaae76d7995e8e454b023a5f1e4e74e3bf1f3cbe9663040031762941c3947db5de312ee516733f23e03d72d779794ab7f206e7334b14e298c0ceb493
-AUX gegl-0.2.0-ffmpeg-4-0-compat.patch 507 BLAKE2B 348cd79471d63192b65a52d8ab91c9e227d9364876db04da707bf7fb36a9211b27781061a85442a7d1cd178f9ba5a459e806e451c9eee5c5c4e841b96abef05f SHA512 e80364dcbd47eb49f0a10d3104ef2927e2eeda27a0a9016e2157401ebd17aa99b8707a42c1ae12e4118d7fc3d8fa15f49f4a3230e00177a5158511618c4a2339
-AUX gegl-0.2.0-ffmpeg-av_frame_alloc.patch 1340 BLAKE2B 485bca4ea457dd135535058ce3cd62fcff8f237ab94c98243c8ac17a1b137d67bc4d8750e30372345798b1c197e21158694d79ffccba9a076b32e4b9e1fad7ce SHA512 142d35b2c75b0f3512c3ba3a1f4e5597c282401a13c688069caed4f868b6ce0dbf16764a7b87cecd8d7e48f98ed5cd1c5cccec833f40bbb3816b898fea3939ac
-AUX gegl-0.2.0-fix-without-exiv2.patch 823 BLAKE2B f2f0f8ff2d12ae0586518d4bfdbeea55ace61dc63171ed14a4196d8672f6009e26766553b882732801e6e56a28fca640a5a33dd8335682353f096ff77c149db7 SHA512 19b8299e82bbfb0d6879ffd4d75e149c4ea3c6ae474bf9e2f4b975d87240985fe136731e388d0c63b3baadebc30871a5b54241d683107aa19bc7bcdbd710d118
-AUX gegl-0.2.0-g_log_domain.patch 1079 BLAKE2B 7d0ba02291aa33b4a8077d56de01c5b0e10b46740c64565bf8b6a9867a6d76fe6fa07a752d0698f0674236e0be06c41135af114847096cfec642572fba315c06 SHA512 a538d42164dbefbd5044461fe8fdac5d3b2de2d7df5013a5206b0230fe48ea7cf537972b8aab2a40081a15ece1dd818bef70cef95cd0a04bc7179764070a1e45
-AUX gegl-0.2.0-introspection-version.patch 1233 BLAKE2B 1565b0600b5d5c55e0e3909670c59fb6b73d91222911cc4caac07025cfadba39af39d60d42d133ed209f1464bf97aa5a5bd7da233e673a4557ef4451999ab7f3 SHA512 539508215c769a5571ba0b798ab001d37756a0f264817394282ee3aa9d46ca83fe10a3d37ee8915afe79453d1e72e7adcb928fbb54a22229a06cf0a308095d23
-AUX gegl-0.2.0-libopenraw-0.1.patch 1733 BLAKE2B 16aacee7c0a702b0965c0f342822710b8b791fc950e10040de92a4eef06b4d5010b1f8fb8c0d1b23d5bc43e92487e37d278dd750baf06a641d91bbd5205b676f SHA512 8eaa767c7d30e77ebffacb9ebb01789f05c82385ed7671767f0e04dba98a95ee22a4a8f0ca8f19365e0b26e74641dbe00939ff8baa40e84a8a26770c325ad980
-AUX gegl-0.2.0-underlinking.patch 2038 BLAKE2B 80dc1aeeb73d08ae7184f5eb57f97a16ec4d5b237bf7fb4232fef16c443f913d16b179a297e0bea8b8b459cd740720843d06d537e9cc703c66ae3b54b6c70255 SHA512 c952d015ac74eefea96c6b6c4190fc5c230654cb6efee20ea06f9b43e4f3dac8953ce94f604602489556e4ab59b44f85daff95e3e7c98c640b2b532d1de3dfc5
-AUX gegl-0.3.12-failing-tests.patch 888 BLAKE2B 548933991347ac397b98ac044d5524d0ae8e5307d52e8b48eb0168d30eda8b73350cec57bc5233abde708184c152ee94ec5c2b3213161ffff93b2a6494a2d36f SHA512 a7b8f58ff9057e086412ec5b12694ffc4e30e2a7b3a8bfa72ef34bc230d0d91c80aa45de94f8e48496844c96e257cee6d3791db0e520abc7cbcc2691d1a5ce84
 AUX gegl-0.3.34-failing-tests.patch 1076 BLAKE2B 39ebadca2d03708d6449849bf8a1c23d05c591493c229b55093d5308c277cb12b428e69b6410ce428cb5c9dbace91c5f3d4822ec3b32c0afc33aee95a58bdbf6 SHA512 084d42d50ba9d750d0a3d729f53da4fad177674862eacde17f2e4ea1bbc62d91fa62164fd7bb5dc1d3cda2fbf08a9db048f577927f203cc912ecf365eb4cc688
 AUX gegl-0.3.34-fno-common.patch 184 BLAKE2B a1994ad4171f60a52695ea36814d0051addb358413a49725d089667aa842f45da7e3e3027c8e29fdb7a5ce378186ae10eab685b538c2685c1f2d40c3bf5a9ac9 SHA512 4c1f787fabbfac1d13dd5f997fc799e3238f7b17cf8b51a63253ad7d5dac7f99c92990aa31aef14740e0e66d100ec0b532a0aef899f49f6142d785529d2b808f
-AUX gegl-0.4.0-ffmpeg-4-0-compat-1.patch 2181 BLAKE2B 8bf1c46395ee4981fad7c5518c9091043374b54c9c4a684e6decc376e8b57e2a60b7ff5c5b21e07f24d7835f92f62a7aebf976122391d206450cc1d5a52bcb30 SHA512 1edf86549a0a91b7e66ad1b59373b141c20e7f63fff981aaa5a0ba535b38e89b593c60a4a4573cf6fa723181cb38a10c6ac4a0838fc947bb54713a3bde299e4f
-AUX gegl-0.4.0-ffmpeg-4-0-compat-2.patch 786 BLAKE2B c2ee0da954aa16c755f76058c54ca9d19ceb70667aff40e126d52bb10b7ecaa6e346667fa9cf7f96605b87a1d41e511d4787a33b004409708d8e3496de391745 SHA512 1084d1cd802eebdeacc536115d4808ce310a85063110bfc06627c8836b86e65396d175a4c3bc6b2083a9a486b7fb21d0210e42fcc8ef3c404b6b930797ecc83a
 AUX gegl-0.4.18-cltostring_force_utf8.patch 910 BLAKE2B 9d5ca10ba4f7ba3b79726daef87fac72617cc627f2d4324409212f41255e524be2000aac415e361105afe2e0b488811e835f1e584c11dfda64eedfafd63a7bb9 SHA512 62d4ecf5f010648d479de674264ce428a8d71c542beeb92401c329c34f83a0bac22c4d805bceb7ca76c498f63276bdaa589588d96d735402346c55c2dd58a547
 AUX gegl-0.4.18-drop-failing-tests.patch 1040 BLAKE2B 5f747ad8bffa2a11a2275a2773d4835f13d8ff0d271fe83ca5da93ad83da7f5e808b8be3858b6812b4e102d0086fcb55270157b6fd3a568882537d4ddf33d298 SHA512 efeb64b100e2e5d548fdcfe49be3ee5fe208e90b8655b16f0dcfe08821d1ea792501ad372d7ae0029552ffe762bb5408543e573f9d7977d238afb8f261f521f5
 AUX gegl-0.4.18-meson_cpu_detection.patch 1506 BLAKE2B ad1038c71b3d2b735fe20010710a94c9460990d9bfb965731c732945d00f992d27f9168fd3fdda3b88ac913c984ad4ad7f231f1d5cd7bae8a8312e91d37cfdf2 SHA512 d9e96e57db0821c5510bb3d8faee3850ab4083e2f1697b5acda75e719ca778cd48ae86cffbc66b621de65dbf5096d125e612af329c7a7ef11f586d24be52a3dc
 AUX gegl-0.4.18-program-suffix.patch 1071 BLAKE2B c529fe0cea80688201dfd4064fc54ca66ff26a322c877bb1cf9d83a436f8a455bf05e68a33cd6415f76337d98997e5e0ed38aba1db4c5ae3c84eb0905c5ccef2 SHA512 e47f32c9f3c82b50320759dca08dbc31c5db838252d4fc43be10a75eee469a17f91c92aefcfd01711d9628fac16ed2d612f037fc9509e7fc823ed77086edc417
-DIST gegl-0.2.0.tar.bz2 7502040 BLAKE2B 29b33bf6aa878b74461e929a96570fca9a56e52931ee66356ca9c3c4cec7cdc0668330aa25756d0baf531d0b90c4830c1f244e8327b238a63d68cb74d486e961 SHA512 16ef3f6852fd8efef2b6468a754342a2d003f2c2bef468d9465a448e6c89dedb8e791570f073a9faed05218a7c94c6c418eaa0f3abeadfb3e6b88d766ab792c8
-DIST gegl-0.3.34.tar.bz2 6707964 BLAKE2B 4424a2c218067bd0a77d79c2334528da393350db3062019f3889b8cdb8d222f6e436ccfc845b61fdf425a1634698a7a6963702a29bb1666f515b1395c50dc99f SHA512 a7a394dcce4137d5224163ca324f1585e64d1cc797e77d452ba444afe2bff39aa2e2d5d040d07b394697b75162bc310bc51490a5af80240b26aac14b6e7abe02
-DIST gegl-0.4.16.tar.bz2 7304904 BLAKE2B a3f6021ed7b9d8b784b909057fcdc39e73b6b8b811009adae3c4a6805263e9a887e874ad662d8cd5c673ae324fe39e8f0299651139783fd3ece08675b70896fd SHA512 38eacbd53d9993ca99d061bf6f80553a86ff06bf42d1710403ac5f15629ccc9b1f4395ee7700a04cebc954ed7fe8745c5bef85453c9c56d89681dd53a1552b27
 DIST gegl-0.4.18.tar.xz 4812756 BLAKE2B b8e5902b62c3549f57dd0ce52a0a406974bf8664d5b85389b79f7d698bcf2643d19861add3d8a9bd5c99036aba4da97b70884dcaacf2cb89170b995f1d1497a0 SHA512 e79874cd50e9f0c27c7dc9d9b952545c31d0a48e2b158aa54b92c3e933267877222f86ede7256f2528f18985dc85d6eadbcd809f7a3563efc4449ec7634f15fd
 DIST gegl-0.4.22.tar.xz 4826748 BLAKE2B 3b6ddca1dff17d0336614fb02cdf94c7497586f075fa548fef66f9f81f62a8055c58e008b9eed989dd283fa701a07d4e22ee81b85c35a0a55f4a92e51cf6b780 SHA512 3118fb17532bcd5893a77739eaf936f5d1e2020178abc497098d227c25f726679621503ac83e7d14a9883d259247d97b92016174e76a2e6e950be7e26ce251ab
-EBUILD gegl-0.2.0-r6.ebuild 4873 BLAKE2B 5bc1189a195da303ebbb13e7e211743cdd711561c399513139dbc098287e9333698fc106cfe2ed1959874e0a740f4a8b25f23134d5962aa6f3aa55bd87276239 SHA512 4c677caf2159ae4300244a84f05e28836c32327ad85abbb812435987756cd704f95557bb779f0a7510edf8263f3422004791ada25b6b9cf5ccc61d77d2e774a8
-EBUILD gegl-0.3.34-r1.ebuild 5237 BLAKE2B 126d2ae08ac5620cfdf77fc9f0dbfe5aac17936863c22cdf4114cf8702ea04dd23f0b47305ec35808819c91b77ba35cdba07f0e2892018b651e7492cbfa1d30f SHA512 ac2acdd2fa6dbe3f41855d0419b868905067e0932876a7554272de0578cf033bece1719127deaa180c1ac269328810c24f9325698091f2a64bd7854d3deeacbc
-EBUILD gegl-0.3.34.ebuild 5295 BLAKE2B a6fc62fd62139fa40fadb7e14ff1160c408e21a5b9e383fa79ddf4232452856c7235e2b74cc5a330ed38f4910b9223225ffaf8efc59f54fdc73c38036a66ac06 SHA512 58fc9363a644ce358c29217783c1beb0b2291605af9f507adcc34f8cff15a582087e03817398dc9c4d442e624a98035c46a27b9d7a440c97f6125286bb36128b
-EBUILD gegl-0.4.16-r1.ebuild 4832 BLAKE2B 5250f514403c6da6e62cd9dfd56b623af7affc9075f088ff687e205c269e62fcd72ab114d511f95c4cf7202b2fdb5a4de79165f7fd838a6dbeb8a6b2bf8d58cd SHA512 bbefeb2c55be67533b8428afb52a7dfc350fc653d45b6b69e30b4280439899bd0df3d725795afcba312ce1c4f3ecafd8491b625fccaa3f4c767f274d88fb6793
-EBUILD gegl-0.4.16.ebuild 4785 BLAKE2B a5a4eee532e7454cd5c154d2067a339a268d6cb5f2bcf58b602f853ba50f7e64beeeb8dfcb9145b888806e651778dd20c4419bd8885176dde8cbbd000978c38f SHA512 c351367b7445dc6bb360bea700638e1a23026abe8fd4707612325b2ac7096155b10941d8947976eefb76367f0b6b1695c209fb9f188736a4ec4eb3dfd63ae54a
-EBUILD gegl-0.4.18-r1.ebuild 4822 BLAKE2B e2d3604bdb9424d8a46b6b696dea3078df5a8c71b35e35beb18f2713f6e4ed2c9d5fd6f148cd7bd6efe4e3c1ac8e8b26217d0556eb173c0bfa548d4752c6dce1 SHA512 e699700774e5728354a708de6f704dfd67694cf37765c002b629b5f34875cf02aeffc568aa949e8e23330dfbf29a15343f84fc7f3bdd636352e478e4b5586613
-EBUILD gegl-0.4.18.ebuild 4815 BLAKE2B 071fdd84d129cbe18bb3c01a613d8286aaf5d464ce46e04b39b13368bd9eceba2400ece71a6b2becaece62e7933ea3737f1db58abde220ac6b3addf2d79e3057 SHA512 fe41c1f229eb5c34b0413bce192bd5ca03f2f94fad1a99928fad2e603b5bcbe0e9996b966a05a2f200b2eb2a1f2a29246086993276b8a1d29af471847e06eb51
-EBUILD gegl-0.4.22-r1.ebuild 4781 BLAKE2B fed7f87e693fa3d662b52c1729ce3eec8a606c78a6b8ade14e6d28f9456681854a28b31ebbc6c97c9601e77419489254b0b303861a86c150d0b7e2bd57575aa1 SHA512 04b9d4a338dbd4b3f45c2fd01fd9d0dc07d0f9d26d301992cb02154d327949a58ec8c52a73552a3cc49f023a91ef3e86a308f510531f35be827b1c395e081537
-EBUILD gegl-0.4.22.ebuild 4774 BLAKE2B 7d220b64f490ab65dbe3a87cafb7d1b55dae285b4d03179939479431eca4b44fd11edcc4eb3d31c1aee979cc6d3122b71c60b5ec9d980a8c2b8911f5497ede7b SHA512 5d321f47fd284e67f748115dbc87591fd4fe18463df747d43b54e8aac07fe763a9ece2e0eea1bc31481806c58bc58dbf84ec8c1b8c44ff39d0eb08b9fcf2df5b
-EBUILD gegl-9999.ebuild 4395 BLAKE2B 18c36f50c02010c6fee96c1d90a6154b20f1338f66b824100e358210cee92385972d7b70b2fbafaf5a2a178c7184455017a5da607738cb7368024b9eb99999f3 SHA512 f221199f6db08de50b3f19fa6006528bed6754db0dd5afdf49da49a0031f467d09f76ae7314364df894ac26c0ccb2f1d1bd939c5df50409c61f99f6251962b46
+DIST gegl-0.4.24.tar.xz 4937056 BLAKE2B a6237d0642713e2dc6fb5aa889dea31aad688608b99e985d69dfa43580caae634a6fc41ff050372d8b364f2f002e260335159325c01f73a10719c3d1bda70d36 SHA512 09d857332eeabe39327d312b1a1692b7c6c9f8f952ae3e3cc06b5a5c262757d8b86467c25a4e66c90c37922fd3548fc1342a9864732d17924f97e7b6c6c1786d
+EBUILD gegl-0.4.18-r1.ebuild 4763 BLAKE2B d4cea7753856b77dd0adfef506a68e2d6d12ce8f653f58eccf63f16772b7af0fb7b420237ef384c61e7c737b289cdf936cd5752319ec51f7b1664b024e5bc3da SHA512 d86ac00595ed73e3047f8e902e20517817dff79f977ac08968873c3537448dd418eed0d7a6c820443cf7ec808ef8c1190686f93f20282a76d6faeccbb04696df
+EBUILD gegl-0.4.18.ebuild 4756 BLAKE2B dc2c7d5f917192b380e234a1c560c1ec604010fdfd534598d8e7bed6a399b24b56c2329ee2a2cad60e64fb7d8e568a6e6bc5d5ae39971b8d7c0625f4efaba2b4 SHA512 77186edc254f7d76f30481ee47dcfe74b923859c78739aa3c2fb28f8dc249f9f09cdea9b4064b52edec0f39d8139c97b4947497012e380d7037025f5420b9d5d
+EBUILD gegl-0.4.22-r1.ebuild 4722 BLAKE2B 1d154668b7004738e5e85e850a1f106912bbba4d792892ac979c6fd628411909c0fcf513b0ff3ad47b81094f5903b975cffb08cd00f5dd206043f9f89754842c SHA512 f77899a70cfaf9d35be73f76bff9c385d6c487782b1dfe386b18c632acf052d9f8711648373ade81782f25f5014c7b683fefdbff0b5e8e364f6900958ea598b9
+EBUILD gegl-0.4.22.ebuild 4715 BLAKE2B 9a164071500ebf3acc505b7f259b36e8ae90870e5a7620e621f0006245419e0bb18ca6ab44c7800e4ca6f27819d6a0eb48be8545b763881b65b1aa88cf9ca41e SHA512 abd52bc37f8164900e6d0ec093615713ec828007695a88205f20693ab040f1d448c5d4caa974e7c1760a510aefc15b8df61733690cb3525d16ea9be52ade8124
+EBUILD gegl-0.4.24.ebuild 4728 BLAKE2B 4fc14a34770df8cfd7ed2840212fb04732d362aae008cf9db76cf26e085c263359e837afc3f9cb8465600d0a522c9bb96dc495b95716409cc662ee5976ab1cea SHA512 9db9c9a476a2310afb265f70d0c087c0cf67a775fa317116453f00f6f7a3c6f5855637ad8744e6264e9a53522aac60f146b2cde0ed37af57b212d61479cb62fd
+EBUILD gegl-9999.ebuild 4336 BLAKE2B 04d0df100f84f9e0b4c016d6c8d01e6a69ccb65fe22e17afb095291c9e9afddfaa043f01b66c9c3f3e9ea0c4afb8bb9b1cadb5a5eb887279ab0359ead2dd5841 SHA512 a0fbd02d61fdd484017c1c09020616426649eb8a546408ce0bd33df939a5940917b08d246f4ab3f585d13dc3d2c0b42e2a58e8c61cfb3196be94474ba66b9655
 MISC metadata.xml 550 BLAKE2B 8afb3a5aa69ba6b3139f3183ed013cd0797edad0865b0aebcd2824a31549f4968e938017adb85506fea2e60c18ea1278fd3bce0ce1cf9be0efb74b1f0b020470 SHA512 8c5637454afcab249f671518153067a99cac9d60d8e9108688b4328a19ea653de21948a63c7e680585d208c0b3230fd2fb87c2d8a0a7266d31bc328342a47016
diff --git a/media-libs/gegl/files/gegl-0.2.0-cve-2012-4433-1e92e523.patch b/media-libs/gegl/files/gegl-0.2.0-cve-2012-4433-1e92e523.patch
deleted file mode 100644
index 0babb0f41c1b..000000000000
--- a/media-libs/gegl/files/gegl-0.2.0-cve-2012-4433-1e92e523.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 1e92e5235ded0415d555aa86066b8e4041ee5a53 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils@redhat.com>
-Date: Tue, 16 Oct 2012 14:58:27 +0000
-Subject: ppm-load: CVE-2012-4433: don't overflow memory allocation
-
-Carefully selected width/height values could cause the size of a later
-allocation to overflow, resulting in a buffer much too small to store
-the data which would then written beyond its end.
----
-diff --git a/operations/external/ppm-load.c b/operations/external/ppm-load.c
-index efe6d56..3d6bce7 100644
---- a/operations/external/ppm-load.c
-+++ b/operations/external/ppm-load.c
-@@ -84,7 +84,6 @@ ppm_load_read_header(FILE       *fp,
-     /* Get Width and Height */
-     img->width  = strtol (header,&ptr,0);
-     img->height = atoi (ptr);
--    img->numsamples = img->width * img->height * CHANNEL_COUNT;
- 
-     fgets (header,MAX_CHARS_IN_ROW,fp);
-     maxval = strtol (header,&ptr,0);
-@@ -109,6 +108,16 @@ ppm_load_read_header(FILE       *fp,
-       g_warning ("%s: Programmer stupidity error", G_STRLOC);
-     }
- 
-+    /* Later on, img->numsamples is multiplied with img->bpc to allocate
-+     * memory. Ensure it doesn't overflow. */
-+    if (!img->width || !img->height ||
-+        G_MAXSIZE / img->width / img->height / CHANNEL_COUNT < img->bpc)
-+      {
-+        g_warning ("Illegal width/height: %ld/%ld", img->width, img->height);
-+        return FALSE;
-+      }
-+    img->numsamples = img->width * img->height * CHANNEL_COUNT;
-+
-     return TRUE;
- }
- 
-@@ -229,12 +238,24 @@ process (GeglOperation       *operation,
-   if (!ppm_load_read_header (fp, &img))
-     goto out;
- 
--  rect.height = img.height;
--  rect.width = img.width;
--
-   /* Allocating Array Size */
-+
-+  /* Should use g_try_malloc(), but this causes crashes elsewhere because the
-+   * error signalled by returning FALSE isn't properly acted upon. Therefore
-+   * g_malloc() is used here which aborts if the requested memory size can't be
-+   * allocated causing a controlled crash. */
-   img.data = (guchar*) g_malloc (img.numsamples * img.bpc);
- 
-+  /* No-op without g_try_malloc(), see above. */
-+  if (! img.data)
-+    {
-+      g_warning ("Couldn't allocate %" G_GSIZE_FORMAT " bytes, giving up.", ((gsize)img.numsamples * img.bpc));
-+      goto out;
-+    }
-+
-+  rect.height = img.height;
-+  rect.width = img.width;
-+
-   switch (img.bpc)
-     {
-     case 1:
---
-cgit v0.9.0.2
diff --git a/media-libs/gegl/files/gegl-0.2.0-cve-2012-4433-4757cdf7.patch b/media-libs/gegl/files/gegl-0.2.0-cve-2012-4433-4757cdf7.patch
deleted file mode 100644
index f78557f5772a..000000000000
--- a/media-libs/gegl/files/gegl-0.2.0-cve-2012-4433-4757cdf7.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 4757cdf73d3675478d645a3ec8250ba02168a230 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils@redhat.com>
-Date: Tue, 16 Oct 2012 14:56:40 +0000
-Subject: ppm-load: CVE-2012-4433: add plausibility checks for header fields
-
-Refuse values that are non-decimal, negative or overflow the target
-type.
----
-diff --git a/operations/external/ppm-load.c b/operations/external/ppm-load.c
-index 3d6bce7..465096d 100644
---- a/operations/external/ppm-load.c
-+++ b/operations/external/ppm-load.c
-@@ -36,6 +36,7 @@ gegl_chant_file_path (path, _("File"), "", _("Path of file to load."))
- #include "gegl-chant.h"
- #include <stdio.h>
- #include <stdlib.h>
-+#include <errno.h>
- 
- typedef enum {
-   PIXMAP_ASCII  = 51,
-@@ -44,8 +45,8 @@ typedef enum {
- 
- typedef struct {
- 	map_type   type;
--	gint       width;
--	gint       height;
-+	glong      width;
-+	glong      height;
-         gsize      numsamples; /* width * height * channels */
-         gsize      bpc;        /* bytes per channel */
- 	guchar    *data;
-@@ -82,11 +83,33 @@ ppm_load_read_header(FILE       *fp,
-       }
- 
-     /* Get Width and Height */
--    img->width  = strtol (header,&ptr,0);
--    img->height = atoi (ptr);
-+    errno = 0;
-+    img->width  = strtol (header,&ptr,10);
-+    if (errno)
-+      {
-+        g_warning ("Error reading width: %s", strerror(errno));
-+        return FALSE;
-+      }
-+    else if (img->width < 0)
-+      {
-+        g_warning ("Error: width is negative");
-+        return FALSE;
-+      }
-+
-+    img->height = strtol (ptr,&ptr,10);
-+    if (errno)
-+      {
-+        g_warning ("Error reading height: %s", strerror(errno));
-+        return FALSE;
-+      }
-+    else if (img->width < 0)
-+      {
-+        g_warning ("Error: height is negative");
-+        return FALSE;
-+      }
- 
-     fgets (header,MAX_CHARS_IN_ROW,fp);
--    maxval = strtol (header,&ptr,0);
-+    maxval = strtol (header,&ptr,10);
- 
-     if ((maxval != 255) && (maxval != 65535))
-       {
---
-cgit v0.9.0.2
diff --git a/media-libs/gegl/files/gegl-0.2.0-ffmpeg-0.11.diff b/media-libs/gegl/files/gegl-0.2.0-ffmpeg-0.11.diff
deleted file mode 100644
index 8e9a328524c3..000000000000
--- a/media-libs/gegl/files/gegl-0.2.0-ffmpeg-0.11.diff
+++ /dev/null
@@ -1,57 +0,0 @@
-From 97067622352e58f86a24851dacb1f5daa0762897 Mon Sep 17 00:00:00 2001
-From: nick black <nick.black@sprezzatech.com>
-Date: Fri, 14 Dec 2012 04:11:16 +0000
-Subject: port gegl forward to libav 54
-
----
-diff --git a/operations/external/ff-load.c b/operations/external/ff-load.c
-index 442ec5f..75d26e9 100644
---- a/operations/external/ff-load.c
-+++ b/operations/external/ff-load.c
-@@ -137,7 +137,7 @@ ff_cleanup (GeglChantO *o)
-       if (p->enc)
-         avcodec_close (p->enc);
-       if (p->ic)
--        av_close_input_file (p->ic);
-+        avformat_close_input(&p->ic);
-       if (p->lavc_frame)
-         av_free (p->lavc_frame);
- 
-@@ -216,9 +216,9 @@ decode_frame (GeglOperation *operation,
-             {
-               do
-                 {
--                  if (av_read_packet (p->ic, &p->pkt) < 0)
-+                  if (av_read_frame (p->ic, &p->pkt) < 0)
-                     {
--                      fprintf (stderr, "av_read_packet failed for %s\n",
-+                      fprintf (stderr, "av_read_frame failed for %s\n",
-                                o->path);
-                       return -1;
-                     }
-@@ -271,12 +271,12 @@ prepare (GeglOperation *operation)
-       gint err;
- 
-       ff_cleanup (o);
--      err = av_open_input_file (&p->ic, o->path, NULL, 0, NULL);
-+      err = avformat_open_input(&p->ic, o->path, NULL, 0);
-       if (err < 0)
-         {
-           print_error (o->path, err);
-         }
--      err = av_find_stream_info (p->ic);
-+      err = avformat_find_stream_info (p->ic, NULL);
-       if (err < 0)
-         {
-           g_warning ("ff-load: error finding stream info for %s", o->path);
-@@ -312,7 +312,7 @@ prepare (GeglOperation *operation)
-       if (p->codec->capabilities & CODEC_CAP_TRUNCATED)
-         p->enc->flags |= CODEC_FLAG_TRUNCATED;
- 
--      if (avcodec_open (p->enc, p->codec) < 0)
-+      if (avcodec_open2 (p->enc, p->codec, NULL) < 0)
-         {
-           g_warning ("error opening codec %s", p->enc->codec->name);
-           return;
---
-cgit v0.9.1
diff --git a/media-libs/gegl/files/gegl-0.2.0-ffmpeg-4-0-compat.patch b/media-libs/gegl/files/gegl-0.2.0-ffmpeg-4-0-compat.patch
deleted file mode 100644
index 6b8e9792c026..000000000000
--- a/media-libs/gegl/files/gegl-0.2.0-ffmpeg-4-0-compat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./operations/external/ff-load.c.org	2018-12-18 09:22:34.467409854 +0100
-+++ ./operations/external/ff-load.c	2018-12-18 09:22:50.921379092 +0100
-@@ -309,8 +309,8 @@
-           g_warning ("codec not found");
-         }
- 
--      if (p->codec->capabilities & CODEC_CAP_TRUNCATED)
--        p->enc->flags |= CODEC_FLAG_TRUNCATED;
-+      if (p->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
-+        p->enc->flags |= AV_CODEC_FLAG_TRUNCATED;
- 
-       if (avcodec_open2 (p->enc, p->codec, NULL) < 0)
-         {
diff --git a/media-libs/gegl/files/gegl-0.2.0-ffmpeg-av_frame_alloc.patch b/media-libs/gegl/files/gegl-0.2.0-ffmpeg-av_frame_alloc.patch
deleted file mode 100644
index 6998a02e75f5..000000000000
--- a/media-libs/gegl/files/gegl-0.2.0-ffmpeg-av_frame_alloc.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 6e9ac140385d28210afdd2ed2bf9b0533ca0aac1 Mon Sep 17 00:00:00 2001
-From: fafryd <dz1125.bug.tracker@gmail.com>
-Date: Sat, 5 Mar 2016 22:11:39 +0100
-Subject: [PATCH] use av_frame_alloc instead of avcodec_alloc_frame
-
----
- operations/external/ff-load.c          | 2 +-
- operations/workshop/external/ff-save.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/operations/external/ff-load.c b/operations/external/ff-load.c
-index 442ec5f..0b9d8e8 100644
---- a/operations/external/ff-load.c
-+++ b/operations/external/ff-load.c
-@@ -321,7 +321,7 @@ prepare (GeglOperation *operation)
-       p->width = p->enc->width;
-       p->height = p->enc->height;
-       p->frames = 10000000;
--      p->lavc_frame = avcodec_alloc_frame ();
-+      p->lavc_frame = av_frame_alloc ();
- 
-       if (p->fourcc)
-         g_free (p->fourcc);
-diff --git a/operations/workshop/external/ff-save.c b/operations/workshop/external/ff-save.c
-index 0f3105d..84d68c5 100644
---- a/operations/workshop/external/ff-save.c
-+++ b/operations/workshop/external/ff-save.c
-@@ -537,7 +537,7 @@ alloc_picture (int pix_fmt, int width, int height)
-   uint8_t  *picture_buf;
-   int       size;
- 
--  picture = avcodec_alloc_frame ();
-+  picture = av_frame_alloc ();
-   if (!picture)
-     return NULL;
-   size = avpicture_get_size (pix_fmt, width, height);
--- 
-2.7.2
diff --git a/media-libs/gegl/files/gegl-0.2.0-fix-without-exiv2.patch b/media-libs/gegl/files/gegl-0.2.0-fix-without-exiv2.patch
deleted file mode 100644
index 96a4188926df..000000000000
--- a/media-libs/gegl/files/gegl-0.2.0-fix-without-exiv2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From c0b4da18e199d1043738c034269f5dd6a4aa7d99 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Wed, 10 Jan 2018 22:39:05 +0100
-Subject: [PATCH] Fix ./configure --without-exiv2
-
-Variable names were in error
-
-Bug: https://bugs.gentoo.org/641872
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 30d306e..146b271 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -977,8 +977,8 @@ AC_SUBST(LIBSPIRO)
- 
- AC_ARG_WITH(exiv2, [  --without-exiv2         build without libexiv2 support])
- 
--have_libexiv2="no"
--if test "x$with_libexiv2" != "xno"; then
-+have_exiv2="no"
-+if test "x$with_exiv2" != "xno"; then
-   PKG_CHECK_MODULES(EXIV2, exiv2,
-     have_exiv2="yes",
-     have_exiv2="no  (exiv2 library not found)")
--- 
-2.16.0.rc0
-
diff --git a/media-libs/gegl/files/gegl-0.2.0-g_log_domain.patch b/media-libs/gegl/files/gegl-0.2.0-g_log_domain.patch
deleted file mode 100644
index cdb42b2ca5f2..000000000000
--- a/media-libs/gegl/files/gegl-0.2.0-g_log_domain.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From deaa974528ac1f4099d091a333214b1a50147243 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Wed, 1 May 2013 00:39:42 +0200
-Subject: [PATCH] Prevent double escaping / error "stray ‘\’ in program"
-
----
- gegl/Makefile.am | 1 +
- 1 file changed, 1 insertion(+), 0 deletion(-)
-
-diff --git a/gegl/Makefile.am b/gegl/Makefile.am
-index 43010ce..fd046d2 100644
---- a/gegl/Makefile.am
-+++ b/gegl/Makefile.am
-@@ -119,7 +119,8 @@ INCLUDES = $(AM_CFLAGS) $(AM_CPPFLAGS)
- 
- Gegl-@GEGL_API_VERSION@.gir: libgegl-@GEGL_API_VERSION@.la Makefile
- Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 GLib-2.0 Babl-0.1
- Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_CFLAGS = $(INCLUDES)
-+INTROSPECTION_SCANNER_ENV = CFLAGS="${CFLAGS} "-D'G_LOG_DOMAIN="GEGL-"__FILE__'  # No extra backslashes here!
- Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_LIBS = libgegl-@GEGL_API_VERSION@.la
- Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_FILES = $(introspection_sources)
- INTROSPECTION_GIRS += Gegl-@GEGL_API_VERSION@.gir
--- 
-1.8.1.5
-
diff --git a/media-libs/gegl/files/gegl-0.2.0-introspection-version.patch b/media-libs/gegl/files/gegl-0.2.0-introspection-version.patch
deleted file mode 100644
index 1ac28dc62964..000000000000
--- a/media-libs/gegl/files/gegl-0.2.0-introspection-version.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 35469116fbf0b398d748f8116e4dcc8bdaee12c7 Mon Sep 17 00:00:00 2001
-From: Jon Nordby <jononor@gmail.com>
-Date: Thu, 12 Apr 2012 12:10:05 +0000
-Subject: gobject-introspection: Fix build after 0.2.x version bump
-
-Remove hardcoding of version numbers so that this does
-not happen again.
----
-(limited to 'gegl/Makefile.am')
-
-diff --git a/gegl/Makefile.am b/gegl/Makefile.am
-index aef4c33..43010ce 100644
---- a/gegl/Makefile.am
-+++ b/gegl/Makefile.am
-@@ -118,10 +118,10 @@ introspection_sources = \
- INCLUDES = $(AM_CFLAGS) $(AM_CPPFLAGS)
- 
- Gegl-@GEGL_API_VERSION@.gir: libgegl-@GEGL_API_VERSION@.la Makefile
--Gegl_0_1_gir_INCLUDES = GObject-2.0 GLib-2.0 Babl-0.1
--Gegl_0_1_gir_CFLAGS = $(INCLUDES)
--Gegl_0_1_gir_LIBS = libgegl-@GEGL_API_VERSION@.la
--Gegl_0_1_gir_FILES = $(introspection_sources)
-+Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 GLib-2.0 Babl-0.1
-+Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_CFLAGS = $(INCLUDES)
-+Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_LIBS = libgegl-@GEGL_API_VERSION@.la
-+Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_FILES = $(introspection_sources)
- INTROSPECTION_GIRS += Gegl-@GEGL_API_VERSION@.gir
- 
- girdir = $(datadir)/gir-1.0
---
-cgit v0.9.1
diff --git a/media-libs/gegl/files/gegl-0.2.0-libopenraw-0.1.patch b/media-libs/gegl/files/gegl-0.2.0-libopenraw-0.1.patch
deleted file mode 100644
index ec1227039554..000000000000
--- a/media-libs/gegl/files/gegl-0.2.0-libopenraw-0.1.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 1ad5d7656891f53b76efd6783d75d14b9cbb4daa Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Mon, 4 Dec 2017 21:18:56 +0100
-Subject: [PATCH] Support (and require) libopenraw 0.1.0+
-
----
- configure.ac                  | 4 ++--
- operations/external/openraw.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 30d306e..febdddb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -47,7 +47,7 @@ m4_define([lensfun_required_version], [0.2.5])
- m4_define([librsvg_required_version], [2.14.0])
- m4_define([lua_required_version], [5.1.0])
- m4_define([openexr_required_version], [0.0.0])
--m4_define([openraw_required_version], [0.0.5])
-+m4_define([openraw_required_version], [0.1.0])
- m4_define([pango_required_version], [0.0.0])
- m4_define([pangocairo_required_version], [0.0.0])
- m4_define([png_required_version], [0.0.0])
-@@ -790,7 +790,7 @@ AC_ARG_WITH(libopenraw, [  --without-libopenraw    build without openraw support
- 
- have_libopenraw="no"
- if test "x$with_libopenraw" != "xno"; then
--  PKG_CHECK_MODULES(OPENRAW, libopenraw-1.0 >= openraw_required_version,
-+  PKG_CHECK_MODULES(OPENRAW, libopenraw-0.1 >= openraw_required_version,
-     have_libopenraw="yes",
-     have_libopenraw="no  (openraw library not found)")
- fi
-diff --git a/operations/external/openraw.c b/operations/external/openraw.c
-index 9fc1e95..b4b4a13 100644
---- a/operations/external/openraw.c
-+++ b/operations/external/openraw.c
-@@ -116,7 +116,7 @@ load_buffer (GeglOperation *operation)
-       goto clean_file;
-     }
- 
--  if(or_rawdata_format (rawdata) != OR_DATA_TYPE_CFA)
-+  if(or_rawdata_format (rawdata) != OR_DATA_TYPE_RAW)
-     {
-       goto clean_file;
-     }
--- 
-2.15.0
-
diff --git a/media-libs/gegl/files/gegl-0.2.0-underlinking.patch b/media-libs/gegl/files/gegl-0.2.0-underlinking.patch
deleted file mode 100644
index 00e936ce68ea..000000000000
--- a/media-libs/gegl/files/gegl-0.2.0-underlinking.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From bedd95f5f14524360117209ed6a1a83627523f54 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Wed, 10 May 2017 17:33:05 +0200
-Subject: [PATCH] Backport $(MATH_LIB) patch to GEGL 0.2
-
-Source:
-https://git.gnome.org/browse/gegl/patch/?id=c9bbc815378cb81ba8a48be35f615e7e2d74dffc
----
- bin/Makefile.am      | 2 +-
- examples/Makefile.am | 2 +-
- tools/Makefile.am    | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/bin/Makefile.am b/bin/Makefile.am
-index c85ecbd..08a156b 100644
---- a/bin/Makefile.am
-+++ b/bin/Makefile.am
-@@ -23,7 +23,7 @@ AM_CFLAGS = \
- 
- AM_LDFLAGS =  \
- 	$(no_undefined) ../gegl/libgegl-$(GEGL_API_VERSION).la \
--	$(DEP_LIBS) $(BABL_LIBS) $(PNG_LIBS) $(LIBSPIRO)
-+	$(DEP_LIBS) $(BABL_LIBS) $(PNG_LIBS) $(LIBSPIRO) $(MATH_LIB)
- 
- bin_PROGRAMS = gegl
- 
-diff --git a/examples/Makefile.am b/examples/Makefile.am
-index c29a1dd..5c4ac3a 100644
---- a/examples/Makefile.am
-+++ b/examples/Makefile.am
-@@ -42,4 +42,4 @@ AM_CFLAGS = $(DEP_CFLAGS) $(GTK_CFLAGS) $(BABL_CFLAGS) $(PNG_CFLAGS)
- 
- AM_LDFLAGS =  \
- 	$(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la \
--	$(DEP_LIBS) $(GTK_LIBS) $(BABL_LIBS) $(PNG_LIBS)
-+	$(DEP_LIBS) $(GTK_LIBS) $(BABL_LIBS) $(PNG_LIBS) $(MATH_LIB)
-diff --git a/tools/Makefile.am b/tools/Makefile.am
-index 8f1077d..4dd3845 100644
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -22,7 +22,7 @@ AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
- 
- AM_LDFLAGS = \
- 	$(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la \
--	$(DEP_LIBS) $(BABL_LIBS)
-+	$(DEP_LIBS) $(BABL_LIBS) $(MATH_LIB)
- 
- noinst_PROGRAMS = introspect operation_reference img_cmp
- 
-diff --git a/tests/buffer/Makefile.am b/tests/buffer/Makefile.am
-index d62ce71..0a4df53 100644
---- a/tests/buffer/Makefile.am
-+++ b/tests/buffer/Makefile.am
-@@ -30,7 +30,7 @@ AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
- 
- buffer_test_LDADD = 						\
- 	$(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la	\
--	$(DEP_LIBS) $(BABL_LIBS)
-+	$(DEP_LIBS) $(BABL_LIBS) $(MATH_LIB)
- 
- 
- # Our custom target rules
--- 
-2.12.2
-
diff --git a/media-libs/gegl/files/gegl-0.3.12-failing-tests.patch b/media-libs/gegl/files/gegl-0.3.12-failing-tests.patch
deleted file mode 100644
index c886419925af..000000000000
--- a/media-libs/gegl/files/gegl-0.3.12-failing-tests.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From e3ffef75aabd2d078cf341124ba42ce7673419b3 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Wed, 22 Mar 2017 19:59:38 +0100
-Subject: [PATCH] Disable failing tests
-
-https://bugs.gentoo.org/show_bug.cgi?id=595332#c3
----
- tests/simple/Makefile.am | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/tests/simple/Makefile.am b/tests/simple/Makefile.am
-index e28680a..aa7efd8 100644
---- a/tests/simple/Makefile.am
-+++ b/tests/simple/Makefile.am
-@@ -15,7 +15,6 @@ noinst_PROGRAMS =			\
- 	test-gegl-rectangle		\
- 	test-gegl-color		    \
- 	test-gegl-tile			\
--	test-image-compare		\
- 	test-license-check		\
- 	test-misc			\
- 	test-node-connections		\
-@@ -23,7 +22,6 @@ noinst_PROGRAMS =			\
- 	test-node-properties		\
- 	test-object-forked		\
- 	test-opencl-colors		\
--	test-serialize \
- 	test-path			\
- 	test-proxynop-processing	\
- 	test-scaled-blit		\
--- 
-2.12.0
-
diff --git a/media-libs/gegl/files/gegl-0.4.0-ffmpeg-4-0-compat-1.patch b/media-libs/gegl/files/gegl-0.4.0-ffmpeg-4-0-compat-1.patch
deleted file mode 100644
index fc8027f08ae4..000000000000
--- a/media-libs/gegl/files/gegl-0.4.0-ffmpeg-4-0-compat-1.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 8f2545886ce3be8f1b1229bddcfa5af3216110d3 Mon Sep 17 00:00:00 2001
-From: Franz Brausse <brausse@informatik.uni-trier.de>
-Date: Sun, 6 May 2018 13:38:09 +0200
-Subject: operations/external/ff-save: ffmpeg-4.0 compat; fixes #795625
-
----
- operations/external/ff-save.c | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/operations/external/ff-save.c b/operations/external/ff-save.c
-index 90b6162..e7edd3e 100644
---- a/operations/external/ff-save.c
-+++ b/operations/external/ff-save.c
-@@ -88,6 +88,11 @@ property_int (me_subpel_quality, _("me-subpel-quality"), 0)
- #include <libavutil/opt.h>
- #include <libswscale/swscale.h>
- 
-+/* remove if libavcodec_required_version is changed to > 56.41.100 */
-+#if LIBAVCODEC_VERSION_INT <= AV_VERSION_INT(56,41,100)
-+# define AV_CODEC_FLAG_GLOBAL_HEADER	CODEC_FLAG_GLOBAL_HEADER
-+#endif
-+
- typedef struct
- {
-   gdouble    frame;
-@@ -290,7 +295,7 @@ add_audio_stream (GeglProperties *o, AVFormatContext * oc, int codec_id)
-   c->codec_type = AVMEDIA_TYPE_AUDIO;
- 
-   if (oc->oformat->flags & AVFMT_GLOBALHEADER)
--    c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+    c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
- 
-   return st;
- }
-@@ -699,7 +704,9 @@ open_video (GeglProperties *o, AVFormatContext * oc, AVStream * st)
-     }
- 
-   p->video_outbuf = NULL;
-+#if (LIBAVFORMAT_VERSION_MAJOR < 58) /* AVFMT_RAWPICTURE got removed from ffmpeg: "not used anymore" */
-   if (!(oc->oformat->flags & AVFMT_RAWPICTURE))
-+#endif
-     {
-       /* allocate output buffer, 1 mb / frame, might fail for some codecs on UHD - but works for now */
-       p->video_outbuf_size = 1024 * 1024;
-@@ -803,6 +810,7 @@ write_video_frame (GeglProperties *o,
-   picture_ptr      = p->picture;
-   picture_ptr->pts = p->frame_count;
- 
-+	#if (LIBAVFORMAT_VERSION_MAJOR < 58) /* AVFMT_RAWPICTURE got removed from ffmpeg: "not used anymore" */
-   if (oc->oformat->flags & AVFMT_RAWPICTURE)
-     {
-       /* raw video case. The API will change slightly in the near
-@@ -821,6 +829,7 @@ write_video_frame (GeglProperties *o,
-       ret = av_write_frame (oc, &pkt);
-     }
-   else
-+#endif
-     {
-       /* encode the image */
-       AVPacket pkt2;
--- 
-cgit v0.12
-
diff --git a/media-libs/gegl/files/gegl-0.4.0-ffmpeg-4-0-compat-2.patch b/media-libs/gegl/files/gegl-0.4.0-ffmpeg-4-0-compat-2.patch
deleted file mode 100644
index 260ff3b2c1a4..000000000000
--- a/media-libs/gegl/files/gegl-0.4.0-ffmpeg-4-0-compat-2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2896800b5e7d0c656710c70fdea57098032f3ccc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=98yvind=20Kol=C3=A5s?= <pippin@gimp.org>
-Date: Sun, 6 May 2018 15:09:03 +0200
-Subject: ff-save: update another occurance of CODEC_FLAG_GLOBAL_HEADER
-
----
- operations/external/ff-save.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/operations/external/ff-save.c b/operations/external/ff-save.c
-index 1edac31..f30bf10 100644
---- a/operations/external/ff-save.c
-+++ b/operations/external/ff-save.c
-@@ -638,7 +638,7 @@ add_video_stream (GeglProperties *o, AVFormatContext * oc, int codec_id)
- #endif
- 
-    if (oc->oformat->flags & AVFMT_GLOBALHEADER)
--     c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+     c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
- 
-   return st;
- }
--- 
-cgit v0.12
-
diff --git a/media-libs/gegl/gegl-0.2.0-r6.ebuild b/media-libs/gegl/gegl-0.2.0-r6.ebuild
deleted file mode 100644
index 5f3add9b4af4..000000000000
--- a/media-libs/gegl/gegl-0.2.0-r6.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WANT_AUTOMAKE=1.11  # see bug 471990, comment 3
-# vala and introspection support is broken, bug #468208
-#VALA_MIN_API_VERSION=0.14
-#VALA_USE_DEPEND=vapigen
-
-inherit versionator gnome2-utils eutils autotools #vala
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="http://www.gegl.org/"
-SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-IUSE="cairo debug ffmpeg jpeg lensfun cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
-
-RDEPEND="
-	>=media-libs/babl-0.1.10
-	>=dev-libs/glib-2.28:2
-	>=x11-libs/gdk-pixbuf-2.18:2
-	x11-libs/pango
-	sys-libs/zlib
-	cairo? ( x11-libs/cairo )
-	ffmpeg? ( >=media-video/ffmpeg-4:0= )
-	jpeg? ( virtual/jpeg:0 )
-	openexr? ( media-libs/openexr )
-	png? ( media-libs/libpng:0= )
-	raw? ( >=media-libs/libopenraw-0.1:0= )
-	sdl? ( media-libs/libsdl )
-	svg? ( >=gnome-base/librsvg-2.14:2 )
-	umfpack? ( sci-libs/umfpack )
-	lensfun? ( >=media-libs/lensfun-0.2.5 )
-"
-#	>=media-libs/babl-0.1.10[introspection?]
-#	introspection? ( >=dev-libs/gobject-introspection-0.10
-#			>=dev-python/pygobject-2.26:2 )
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40.1
-	dev-lang/perl
-	virtual/pkgconfig
-	>=sys-devel/libtool-2.2
-"
-#	vala? ( $(vala_depend) )"
-
-DOCS=( ChangeLog INSTALL README NEWS )
-
-PATCHES=(
-	# https://bugs.gentoo.org/show_bug.cgi?id=636780
-	"${FILESDIR}/${P}-ffmpeg-av_frame_alloc.patch"
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=442016
-	"${FILESDIR}/${P}-cve-2012-4433-1e92e523.patch"
-	"${FILESDIR}/${P}-cve-2012-4433-4757cdf7.patch"
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=416587
-	"${FILESDIR}/${P}-introspection-version.patch"
-
-	"${FILESDIR}/${P}-ffmpeg-0.11.diff"
-	"${FILESDIR}"/${P}-g_log_domain.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=605216
-	# https://bugs.gentoo.org/show_bug.cgi?id=617430
-	"${FILESDIR}"/${P}-underlinking.patch
-	"${FILESDIR}"/${P}-libopenraw-0.1.patch  # bug 639834
-	"${FILESDIR}"/${P}-fix-without-exiv2.patch  # bug 641872
-
-	"${FILESDIR}"/${P}-ffmpeg-4-0-compat.patch  # bug 673378
-)
-
-src_prepare() {
-	default
-	# fix OSX loadable module filename extension
-	sed -i -e 's/\.dylib/.bundle/' configure.ac || die
-	# don't require Apple's OpenCL on versions of OSX that don't have it
-	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
-		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
-	fi
-
-	eautoreconf
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=468248
-	local deps_file="${PN}/${PN}-$(get_version_component_range 1-2).deps"
-	[[ -f "${deps_file}" ]] || touch "${deps_file}"
-
-#	use vala && vala_src_prepare
-}
-
-src_configure() {
-	# never enable altering of CFLAGS via profile option
-	# libspiro: not in portage main tree
-	# disable documentation as the generating is bit automagic
-	#    if anyone wants to work on it just create bug with patch
-
-	# Also please note that:
-	#
-	#  - Some auto-detections are not patched away since the docs are
-	#    not built (--disable-docs, lack of --enable-gtk-doc) and these
-	#    tools affect re-generation of docs, only
-	#    (e.g. ruby, asciidoc, dot (of graphviz), enscript)
-	#
-	#  - Parameter --with-exiv2 compiles a noinst-app only, no use
-	#
-	#  - Parameter --disable-workshop disables any use of Lua, effectivly
-	#
-	#  - v4l support does not work with our media-libs/libv4l-0.8.9,
-	#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
-	#
-	#  - There are two checks for dot, one controllable by --with(out)-graphviz
-	#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
-	#
-	# So that's why USE="exif graphviz lua v4l" got resolved.  More at:
-	# https://bugs.gentoo.org/show_bug.cgi?id=451136
-	#
-	econf \
-		--disable-profile \
-		--without-libspiro \
-		--disable-docs --disable-workshop \
-		--with-pango --with-gdk-pixbuf \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable debug) \
-		$(use_with cairo) \
-		$(use_with cairo pangocairo) \
-		--without-exiv2 \
-		$(use_with ffmpeg libavformat) \
-		--without-graphviz \
-		$(use_with jpeg libjpeg) \
-		--without-jasper \
-		--without-lua \
-		$(use_with openexr) \
-		$(use_with png libpng) \
-		$(use_with raw libopenraw) \
-		$(use_with sdl) \
-		$(use_with svg librsvg) \
-		$(use_with umfpack) \
-		--without-libv4l \
-		$(use_with lensfun) \
-		--disable-introspection \
-		--without-vala
-#		$(use_enable introspection) \
-#		$(use_with vala)
-}
-
-src_test() {
-	gnome2_environment_reset  # sandbox issues
-	default
-}
-
-src_compile() {
-	gnome2_environment_reset  # sandbox issues (bug #396687)
-	default
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete
-}
diff --git a/media-libs/gegl/gegl-0.3.34-r1.ebuild b/media-libs/gegl/gegl-0.3.34-r1.ebuild
deleted file mode 100644
index 8abaed16a8d8..000000000000
--- a/media-libs/gegl/gegl-0.3.34-r1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-# vala and introspection support is broken, bug #468208
-VALA_USE_DEPEND=vapigen
-
-inherit gnome2-utils eutils autotools python-any-r1 vala
-
-SRC_URI="http://download.gimp.org/pub/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="http://www.gegl.org/"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-SLOT="0.3"
-
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	svg? ( cairo )
-	test? ( introspection )
-	vala? ( introspection )
-"
-
-RESTRICT="!test? ( test )"
-
-# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
-#       so there is no chance to support libav right now (Gentoo bug #567638)
-#       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	dev-libs/json-glib
-	>=media-libs/babl-0.1.66[introspection(-)?,lcms(-)?]
-	sys-libs/zlib
-	>=x11-libs/gdk-pixbuf-2.32:2
-	x11-libs/pango
-
-	cairo? ( >=x11-libs/cairo-1.12.2 )
-	ffmpeg? ( >=media-video/ffmpeg-2.8:0= )
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	virtual/jpeg:0=
-	lcms? ( >=media-libs/lcms-2.8:2 )
-	lensfun? ( >=media-libs/lensfun-0.2.5 )
-	openexr? ( >=media-libs/openexr-1.6.1:= )
-	>=media-libs/libpng-1.6.0:0=
-	raw? ( >=media-libs/libraw-0.15.4:0= )
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	svg? ( >=gnome-base/librsvg-2.40.6:2 )
-	tiff? ( >=media-libs/tiff-4:0 )
-	umfpack? ( sci-libs/umfpack )
-	v4l? ( >=media-libs/libv4l-1.0.1 )
-	webp? ( >=media-libs/libwebp-0.5.0:= )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	dev-lang/perl
-	>=dev-util/gtk-doc-am-1
-	>=sys-devel/gettext-0.19.8
-	>=sys-devel/libtool-2.2
-	virtual/pkgconfig
-	test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') )
-	vala? ( $(vala_depend) )
-"
-
-pkg_setup() {
-	use test && use introspection && python-any-r1_pkg_setup
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
-	"${FILESDIR}"/${PN}-0.3.34-failing-tests.patch       # bug 631930, 686202
-	"${FILESDIR}"/${PN}-0.3.34-fno-common.patch          # bug 719198
-	"${FILESDIR}"/${PN}-0.4.0-ffmpeg-4-0-compat-1.patch  # bug 654172
-	"${FILESDIR}"/${PN}-0.4.0-ffmpeg-4-0-compat-2.patch  # bug 654172
-)
-
-src_prepare() {
-	default
-
-	# FIXME: the following should be proper patch sent to upstream
-	# fix OSX loadable module filename extension
-	sed -i -e 's/\.dylib/.bundle/' configure.ac || die
-	# don't require Apple's OpenCL on versions of OSX that don't have it
-	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
-		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
-	fi
-
-	# commit 7c78497b : tests that use gegl.png are broken on non-amd64
-	sed -e '/clones.xml/d' \
-		-e '/composite-transform.xml/d' \
-		-i tests/compositions/Makefile.am || die
-
-	eautoreconf
-
-	gnome2_environment_reset
-
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	# never enable altering of CFLAGS via profile option
-	# libspiro: not in portage main tree
-	# disable documentation as the generating is bit automagic
-	#    if anyone wants to work on it just create bug with patch
-
-	# Also please note that:
-	#
-	#  - Some auto-detections are not patched away since the docs are
-	#    not built (--disable-docs, lack of --enable-gtk-doc) and these
-	#    tools affect re-generation of docs, only
-	#    (e.g. ruby, asciidoc, dot (of graphviz), enscript)
-	#
-	#  - Parameter --with-exiv2 compiles a noinst-app only, no use
-	#
-	#  - Parameter --disable-workshop disables any use of Lua, effectivly
-	#
-	#  - v4l support does not work with our media-libs/libv4l-0.8.9,
-	#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
-	#
-	#  - There are two checks for dot, one controllable by --with(out)-graphviz
-	#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
-	#
-	#  - mrg is not in tree and gexiv2 support only has effect when mrg support
-	#    is enabled
-	#
-	# So that's why USE="exif graphviz lua v4l" got resolved.  More at:
-	# https://bugs.gentoo.org/show_bug.cgi?id=451136
-	#
-	econf \
-		--disable-docs \
-		--disable-profile \
-		--disable-workshop \
-		--program-suffix=-${SLOT} \
-		--with-gdk-pixbuf \
-		--with-pango \
-		--without-exiv2 \
-		--without-gexiv2 \
-		--without-graphviz \
-		--without-jasper \
-		--without-libspiro \
-		--without-lua \
-		--without-mrg \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable debug) \
-		$(use_with cairo) \
-		$(use_with cairo pangocairo) \
-		$(use_with ffmpeg libavformat) \
-		$(use_with lcms) \
-		$(use_with lensfun) \
-		$(use_with openexr) \
-		$(use_with raw libraw) \
-		$(use_with sdl) \
-		$(use_with svg librsvg) \
-		$(use_with tiff libtiff) \
-		$(use_with umfpack) \
-		$(use_with v4l libv4l) \
-		$(use_with v4l libv4l2) \
-		$(use_enable introspection) \
-		$(use_with vala) \
-		$(use_with webp)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/gegl/gegl-0.3.34.ebuild b/media-libs/gegl/gegl-0.3.34.ebuild
deleted file mode 100644
index af4e531eaabf..000000000000
--- a/media-libs/gegl/gegl-0.3.34.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-# vala and introspection support is broken, bug #468208
-VALA_USE_DEPEND=vapigen
-
-inherit versionator gnome2-utils eutils autotools ltprune python-any-r1 vala
-
-if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
-	SRC_URI=""
-else
-	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="http://www.gegl.org/"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-SLOT="0.3"
-
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	svg? ( cairo )
-	vala? ( introspection )
-"
-
-# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
-#       so there is no chance to support libav right now (Gentoo bug #567638)
-#       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	dev-libs/json-glib
-	>=media-libs/babl-0.1.46
-	sys-libs/zlib
-	>=x11-libs/gdk-pixbuf-2.32:2
-	x11-libs/pango
-
-	cairo? ( >=x11-libs/cairo-1.12.2 )
-	ffmpeg? ( >=media-video/ffmpeg-2.8:0= )
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	virtual/jpeg:0=
-	lcms? ( >=media-libs/lcms-2.8:2 )
-	lensfun? ( >=media-libs/lensfun-0.2.5 )
-	openexr? ( >=media-libs/openexr-1.6.1:= )
-	>=media-libs/libpng-1.6.0:0=
-	raw? ( >=media-libs/libraw-0.15.4:0= )
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	svg? ( >=gnome-base/librsvg-2.40.6:2 )
-	tiff? ( >=media-libs/tiff-4:0 )
-	umfpack? ( sci-libs/umfpack )
-	v4l? ( >=media-libs/libv4l-1.0.1 )
-	webp? ( >=media-libs/libwebp-0.5.0:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1
-	>=sys-devel/gettext-0.19.8
-	dev-lang/perl
-	virtual/pkgconfig
-	>=sys-devel/libtool-2.2
-	test? ( introspection? (
-		$(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]') ) )
-	vala? ( $(vala_depend) )
-"
-
-pkg_setup() {
-	use test && use introspection && python-any-r1_pkg_setup
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
-	"${FILESDIR}"/${PN}-0.4.0-ffmpeg-4-0-compat-1.patch  # bug 654172
-	"${FILESDIR}"/${PN}-0.4.0-ffmpeg-4-0-compat-2.patch  # bug 654172
-)
-
-src_prepare() {
-	default
-
-	# FIXME: the following should be proper patch sent to upstream
-	# fix OSX loadable module filename extension
-	sed -i -e 's/\.dylib/.bundle/' configure.ac || die
-	# don't require Apple's OpenCL on versions of OSX that don't have it
-	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
-		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
-	fi
-
-	# commit 7c78497b : tests that use gegl.png are broken on non-amd64
-	sed -e '/clones.xml/d' \
-		-e '/composite-transform.xml/d' \
-		-i tests/compositions/Makefile.am || die
-
-	eautoreconf
-
-	gnome2_environment_reset
-
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	# never enable altering of CFLAGS via profile option
-	# libspiro: not in portage main tree
-	# disable documentation as the generating is bit automagic
-	#    if anyone wants to work on it just create bug with patch
-
-	# Also please note that:
-	#
-	#  - Some auto-detections are not patched away since the docs are
-	#    not built (--disable-docs, lack of --enable-gtk-doc) and these
-	#    tools affect re-generation of docs, only
-	#    (e.g. ruby, asciidoc, dot (of graphviz), enscript)
-	#
-	#  - Parameter --with-exiv2 compiles a noinst-app only, no use
-	#
-	#  - Parameter --disable-workshop disables any use of Lua, effectivly
-	#
-	#  - v4l support does not work with our media-libs/libv4l-0.8.9,
-	#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
-	#
-	#  - There are two checks for dot, one controllable by --with(out)-graphviz
-	#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
-	#
-	#  - mrg is not in tree and gexiv2 support only has effect when mrg support
-	#    is enabled
-	#
-	# So that's why USE="exif graphviz lua v4l" got resolved.  More at:
-	# https://bugs.gentoo.org/show_bug.cgi?id=451136
-	#
-	econf \
-		--disable-docs \
-		--disable-profile \
-		--disable-workshop \
-		--program-suffix=-${SLOT} \
-		--with-gdk-pixbuf \
-		--with-pango \
-		--without-libspiro \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable debug) \
-		$(use_with cairo) \
-		$(use_with cairo pangocairo) \
-		--without-exiv2 \
-		$(use_with ffmpeg libavformat) \
-		--without-gexiv2 \
-		--without-graphviz \
-		--without-jasper \
-		$(use_with lcms) \
-		$(use_with lensfun) \
-		--without-lua \
-		--without-mrg \
-		$(use_with openexr) \
-		$(use_with raw libraw) \
-		$(use_with sdl) \
-		$(use_with svg librsvg) \
-		$(use_with tiff libtiff) \
-		$(use_with umfpack) \
-		$(use_with v4l libv4l) \
-		$(use_with v4l libv4l2) \
-		$(use_enable introspection) \
-		$(use_with vala) \
-		$(use_with webp)
-}
-
-src_compile() {
-	default
-
-	[[ ${PV} == *9999* ]] && emake ./ChangeLog  # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped."
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/media-libs/gegl/gegl-0.4.16.ebuild b/media-libs/gegl/gegl-0.4.16.ebuild
deleted file mode 100644
index e690845d68b8..000000000000
--- a/media-libs/gegl/gegl-0.4.16.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-# vala and introspection support is broken, bug #468208
-VALA_USE_DEPEND=vapigen
-
-inherit autotools gnome2-utils python-any-r1 vala
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
-	SRC_URI=""
-else
-	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="http://www.gegl.org/"
-
-LICENSE="|| ( GPL-3+ LGPL-3 )"
-SLOT="0.4"
-
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	svg? ( cairo )
-	vala? ( introspection )
-"
-
-# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
-#       so there is no chance to support libav right now (Gentoo bug #567638)
-#       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	dev-libs/json-glib
-	>=media-libs/babl-0.1.62
-	>=media-libs/libpng-1.6.0:0=
-	virtual/jpeg:0=
-	>=x11-libs/gdk-pixbuf-2.32:2
-	x11-libs/pango
-	cairo? ( >=x11-libs/cairo-1.12.2 )
-	ffmpeg? ( media-video/ffmpeg:0= )
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	lcms? ( >=media-libs/lcms-2.8:2 )
-	lensfun? ( >=media-libs/lensfun-0.2.5 )
-	openexr? ( >=media-libs/openexr-2.2.0:= )
-	pdf? ( >=app-text/poppler-0.71.0[cairo] )
-	raw? ( >=media-libs/libraw-0.15.4:0= )
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	svg? ( >=gnome-base/librsvg-2.40.6:2 )
-	tiff? ( >=media-libs/tiff-4:0 )
-	umfpack? ( sci-libs/umfpack )
-	v4l? ( >=media-libs/libv4l-1.0.1 )
-	webp? ( >=media-libs/libwebp-0.5.0:= )
-	zlib? ( >=sys-libs/zlib-1.2.0 )
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	>=dev-util/gtk-doc-am-1
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	>=sys-devel/libtool-2.2
-	test? ( ffmpeg? ( media-libs/gexiv2 )
-		introspection? (
-			$(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]')
-		)
-	)
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.3.12-failing-tests.patch"
-)
-
-pkg_setup() {
-	use test && use introspection && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# FIXME: the following should be proper patch sent to upstream
-	# fix OSX loadable module filename extension
-	sed -i -e 's/\.dylib/.bundle/' configure.ac || die
-	# don't require Apple's OpenCL on versions of OSX that don't have it
-	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
-		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
-	fi
-
-	# commit 7c78497b : tests that use gegl.png are broken on non-amd64
-	sed -e '/clones.xml/d' \
-		-e '/composite-transform.xml/d' \
-		-i tests/compositions/Makefile.am || die
-
-	eautoreconf
-
-	gnome2_environment_reset
-
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		# disable documentation as the generating is bit automagic
-		#    if anyone wants to work on it just create bug with patch
-		--disable-docs
-		# never enable altering of CFLAGS via profile option
-		--disable-profile
-		#  - Parameter --disable-workshop disables any use of Lua, effectivly
-		--disable-workshop
-		--program-suffix=-${SLOT}
-		--with-gdk-pixbuf
-		--with-pango
-		#  - There are two checks for dot, one controllable by --with(out)-graphviz
-		#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
-		--without-graphviz
-		# libspiro: not in portage main tree
-		--without-libspiro
-		--without-lua
-		--without-mrg
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable debug)
-		$(use_enable introspection)
-		$(use_with cairo)
-		$(use_with cairo pangocairo)
-		$(use_with ffmpeg libavformat)
-		--without-jasper
-		$(use_with lcms)
-		$(use_with lensfun)
-		$(use_with openexr)
-		$(use_with pdf popplerglib)
-		$(use_with raw libraw)
-		$(use_with sdl)
-		$(use_with svg librsvg)
-		$(use_with tiff libtiff)
-		$(use_with umfpack)
-		#  - v4l support does not work with our media-libs/libv4l-0.8.9,
-		#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
-		$(use_with v4l libv4l)
-		$(use_with v4l libv4l2)
-		$(use_with vala)
-		$(use_with webp)
-		$(use_with zlib)
-	)
-
-	if use test; then
-		myeconfargs+=( $(use_with ffmpeg gexiv2) )
-	else
-		myeconfargs+=( --without-gexiv2 )
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	[[ ${PV} == *9999* ]] && emake ./ChangeLog  # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped."
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/gegl/gegl-0.4.18-r1.ebuild b/media-libs/gegl/gegl-0.4.18-r1.ebuild
index cad3f9ebf9b5..799cc107712f 100644
--- a/media-libs/gegl/gegl-0.4.18-r1.ebuild
+++ b/media-libs/gegl/gegl-0.4.18-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/gegl/gegl-0.4.18.ebuild b/media-libs/gegl/gegl-0.4.18.ebuild
index 6d4f3f52d4ca..3aac36f5af6f 100644
--- a/media-libs/gegl/gegl-0.4.18.ebuild
+++ b/media-libs/gegl/gegl-0.4.18.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/gegl/gegl-0.4.22-r1.ebuild b/media-libs/gegl/gegl-0.4.22-r1.ebuild
index f7d5f9dbbd43..da3d78a2c25d 100644
--- a/media-libs/gegl/gegl-0.4.22-r1.ebuild
+++ b/media-libs/gegl/gegl-0.4.22-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/gegl/gegl-0.4.22.ebuild b/media-libs/gegl/gegl-0.4.22.ebuild
index b97e0c511394..026ab0c6bdc0 100644
--- a/media-libs/gegl/gegl-0.4.22.ebuild
+++ b/media-libs/gegl/gegl-0.4.22.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/gegl/gegl-0.4.16-r1.ebuild b/media-libs/gegl/gegl-0.4.24.ebuild
index fe4898d8fc2a..e71bb9f8c80d 100644
--- a/media-libs/gegl/gegl-0.4.16-r1.ebuild
+++ b/media-libs/gegl/gegl-0.4.24.ebuild
@@ -2,20 +2,20 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 )
 
+PYTHON_COMPAT=( python3_{6,7,8} )
 # vala and introspection support is broken, bug #468208
 VALA_USE_DEPEND=vapigen
 
-inherit autotools gnome2-utils python-any-r1 vala
+inherit meson gnome2-utils python-any-r1 vala
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
 	SRC_URI=""
 else
-	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A graph based image processing framework"
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.gegl.org/"
 LICENSE="|| ( GPL-3+ LGPL-3 )"
 SLOT="0.4"
 
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib"
+IUSE="cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
 REQUIRED_USE="
 	svg? ( cairo )
 	test? ( introspection )
@@ -38,18 +38,20 @@ RESTRICT="!test? ( test )"
 #       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
 RDEPEND="
 	>=dev-libs/glib-2.44:2
-	dev-libs/json-glib
-	>=media-libs/babl-0.1.66[introspection(-)?,lcms(-)?]
+	>=dev-libs/json-glib-1.2.6
+	>=media-libs/babl-0.1.78[introspection?,lcms?,vala?]
+	media-libs/libnsgif
 	>=media-libs/libpng-1.6.0:0=
+	>=sys-libs/zlib-1.2.0
 	virtual/jpeg:0=
 	>=x11-libs/gdk-pixbuf-2.32:2
-	x11-libs/pango
+	>=x11-libs/pango-1.38.0
 	cairo? ( >=x11-libs/cairo-1.12.2 )
 	ffmpeg? ( media-video/ffmpeg:0= )
 	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
 	lcms? ( >=media-libs/lcms-2.8:2 )
 	lensfun? ( >=media-libs/lensfun-0.2.5 )
-	openexr? ( >=media-libs/openexr-2.2.0:= )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
 	pdf? ( >=app-text/poppler-0.71.0[cairo] )
 	raw? ( >=media-libs/libraw-0.15.4:0= )
 	sdl? ( >=media-libs/libsdl-1.2.0 )
@@ -58,7 +60,6 @@ RDEPEND="
 	umfpack? ( sci-libs/umfpack )
 	v4l? ( >=media-libs/libv4l-1.0.1 )
 	webp? ( >=media-libs/libwebp-0.5.0:= )
-	zlib? ( >=sys-libs/zlib-1.2.0 )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -67,26 +68,28 @@ BDEPEND="
 	>=sys-devel/gettext-0.19.8
 	>=sys-devel/libtool-2.2
 	virtual/pkgconfig
-	test? ( ffmpeg? ( media-libs/gexiv2 )
-		$(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]')
-	)
+	test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') )
 	vala? ( $(vala_depend) )
 "
 
+DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt )
+
 PATCHES=(
-	"${FILESDIR}/${PN}-0.3.12-failing-tests.patch"
+	"${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch
+	"${FILESDIR}"/${PN}-0.4.18-program-suffix.patch
 )
 
+python_check_deps() {
+	has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
+}
+
 pkg_setup() {
-	use test && use introspection && python-any-r1_pkg_setup
+	use test && python-any-r1_pkg_setup
 }
 
 src_prepare() {
 	default
 
-	# FIXME: the following should be proper patch sent to upstream
-	# fix OSX loadable module filename extension
-	sed -i -e 's/\.dylib/.bundle/' configure.ac || die
 	# don't require Apple's OpenCL on versions of OSX that don't have it
 	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
 		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
@@ -95,9 +98,13 @@ src_prepare() {
 	# commit 7c78497b : tests that use gegl.png are broken on non-amd64
 	sed -e '/clones.xml/d' \
 		-e '/composite-transform.xml/d' \
-		-i tests/compositions/Makefile.am || die
+		-i tests/compositions/meson.build || die
 
-	eautoreconf
+	# fix skipping mipmap tests due to executable not found
+	for item in "invert-crop.sh" "invert.sh" "rotate-crop.sh" "rotate.sh" "unsharp-crop.sh" "unsharp.sh"; do
+		sed -i "s:/bin/gegl:/bin/gegl-0.4:g" "${S}/tests/mipmap/${item}" || die
+		sed -i "s:/tools/gegl-imgcmp:/tools/gegl-imgcmp-0.4:g" "${S}/tests/mipmap/${item}" || die
+	done
 
 	gnome2_environment_reset
 
@@ -105,66 +112,47 @@ src_prepare() {
 }
 
 src_configure() {
-	local myeconfargs=(
-		# disable documentation as the generating is bit automagic
+	local emesonargs=(
+		#  - Disable documentation as the generating is bit automagic
 		#    if anyone wants to work on it just create bug with patch
-		--disable-docs
-		# never enable altering of CFLAGS via profile option
-		--disable-profile
-		#  - Parameter --disable-workshop disables any use of Lua, effectivly
-		--disable-workshop
-		--program-suffix=-${SLOT}
-		--with-gdk-pixbuf
-		--with-pango
+		-Ddocs=false
+		-Dexiv2=disabled
+		-Dgdk-pixbuf=enabled
+		-Dgexiv2=disabled
 		#  - There are two checks for dot, one controllable by --with(out)-graphviz
 		#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
-		--without-graphviz
-		# libspiro: not in portage main tree
-		--without-libspiro
-		--without-lua
-		--without-mrg
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable debug)
-		$(use_enable introspection)
-		$(use_with cairo)
-		$(use_with cairo pangocairo)
-		$(use_with ffmpeg libavformat)
-		--without-jasper
-		$(use_with lcms)
-		$(use_with lensfun)
-		$(use_with openexr)
-		$(use_with pdf popplerglib)
-		$(use_with raw libraw)
-		$(use_with sdl)
-		$(use_with svg librsvg)
-		$(use_with tiff libtiff)
-		$(use_with umfpack)
+		-Dgraphviz=disabled
+		-Djasper=disabled
+		-Dlibjpeg=enabled
+		-Dlibpng=enabled
+		#  - libspiro: not in portage main tree
+		-Dlibspiro=disabled
+		-Dlua=disabled
+		-Dmrg=disabled
+		-Dpango=enabled
+		-Dsdl2=disabled
+		#  - Parameter -Dworkshop=false disables any use of Lua, effectivly
+		-Dworkshop=false
+		$(meson_feature cairo)
+		$(meson_feature cairo pangocairo)
+		$(meson_feature ffmpeg libav)
+		$(meson_feature lcms)
+		$(meson_feature lensfun)
+		$(meson_feature openexr)
+		$(meson_feature pdf poppler)
+		$(meson_feature raw libraw)
+		$(meson_feature sdl sdl1)
+		$(meson_feature svg librsvg)
+		$(meson_feature test pygobject)
+		$(meson_feature tiff libtiff)
+		$(meson_feature umfpack)
 		#  - v4l support does not work with our media-libs/libv4l-0.8.9,
 		#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
-		$(use_with v4l libv4l)
-		$(use_with v4l libv4l2)
-		$(use_with vala)
-		$(use_with webp)
-		$(use_with zlib)
+		$(meson_feature v4l libv4l)
+		$(meson_feature v4l libv4l2)
+		$(meson_feature vala vapigen)
+		$(meson_feature webp)
+		$(meson_use introspection)
 	)
-
-	if use test; then
-		myeconfargs+=( $(use_with ffmpeg gexiv2) )
-	else
-		myeconfargs+=( --without-gexiv2 )
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	[[ ${PV} == *9999* ]] && emake ./ChangeLog  # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped."
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
+	meson_src_configure
 }
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index c854f48fae02..6fe143f95cde 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index 81895e81ad16..cfd753aadaa1 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -2,8 +2,10 @@ AUX gexiv2-0.10.10-meson-fixup.patch 1718 BLAKE2B 0460652424a8314eeba8f0d677b5df
 AUX gexiv2-0.10.10-vala-fixup.patch 1785 BLAKE2B d82ec357f2ee7d50b79fa1c82bd9c4b6d0a528561fcacc08e966c73f9d89daf3c2ce2e2712f69e246507e14e0f10a0a5470c830e43aeeb06fdceffc3484cbc0e SHA512 e9708245ddee0fb88939ae26987e4e5859fd5e13efb03f01d276eeb77d4361832eac11b2873e73984ef25dbdcf502f2f3a82a78330f3c7b57b2e186cfb49395f
 DIST gexiv2-0.10.10.tar.xz 638168 BLAKE2B ae75a06007dcaca4c22e463661073d796b77921a313a5bb450c488ee963f72c6095d7abc12dedc0d089a28905cf386062221073100ba3513d9fb13eb524365ee SHA512 41e5b4a9d81882ea4b1bc6f3b9ced95ca4d03f836de30ff90b7a43311e5319f7c0f46cbad767bf2b00926c8e5fd2c1e8ca2a2113c308e23b7a4c21205399abf7
 DIST gexiv2-0.12.0.tar.xz 370816 BLAKE2B 7768cffafedf41948ca6ddd22614f0eb3b44a317a23ade3c8d39d5ec5ff77c0d8c61dd8dcca5108b3403e0e3ec8be6659c16445de27163e8689c6c40f5313566 SHA512 c89e7d307359c718dff1f3991acb4ece66bce985a3d8bee1c8fccf4ce39187af62684c87eaae9b0425a6fdbf147b7330902041d9588e52a4bad1da4255d245e9
+DIST gexiv2-0.12.1.tar.xz 372104 BLAKE2B e712bc8056e0e02d66ee831425776c26b65275db8f4cb4a526dbe9f00bddc473312f6c4c8e011906ca02ff256c00c7fe8d602acd64c787b05e13ad582ff8ebee SHA512 cbf83ea79eead9aab15ba760217fd6a1b55a5c60059f14f243327ad7d3c09d6a0528dbdb33a8ee235c76dac5aab0afa8b7d2ab4367fe9128a096dce5da19a68d
 EBUILD gexiv2-0.10.10-r1.ebuild 1847 BLAKE2B 6df34b756c2676082fafd030e77a4f3e3616233d6de1e31b1fe6b4ac486d4a9d681e1203da8bb758619b5d52a33107e6b6d9148afc42d46cac612fcc97c3ebad SHA512 e984aee5f691d012ae3324cda44b59b56b756d871d5af79b0e7915c5aef7e98c9ce702c7afcc3276ac732771656372b440ffe04f6c18fe7f553e19af9e3521b3
-EBUILD gexiv2-0.12.0-r1.ebuild 1786 BLAKE2B 5238825cfd390b528e54d248eac9e3f2d391c0c5311825fce1a593eb3a6aad96d130f299031ca5849be1e648be5194e4991a8b221f1d598807f4b651e0698c78 SHA512 c88c04f9107527b4971d3ebb48a8ebfc46bdb38e400b3dbd4b9dbda580c3e70f9ef7e881dce8ca77e2b6afe7e61a68d7b31e196d465d283815d978fba12765ce
+EBUILD gexiv2-0.12.0-r1.ebuild 1785 BLAKE2B 59051cdab00b0bbc4cd97b70e766b601922037e33aca40b9e274d11723ecd94664005ff5c58900911fe8b26af18c4c5757c5e5f892198b86f41b271c30e51efa SHA512 1a16de479c4d773cb399bdfa303800125c5f244c11c3847e6653cc51579904150916c8256c7f00363a071cc4ed0b47a394e40472355b90354ebb638dc3f6aeb2
 EBUILD gexiv2-0.12.0.ebuild 1630 BLAKE2B a5b80844189a30261272c1687ea8dd77fba10a0601d42883839b5798735bf901afe677e33542c83d3a1a6cd472e2891e0c6f79eab96f383ef5a353c54491faab SHA512 2f6f9ac560721c464ecc85f83f2379f58ce1a1d34eafa6465d2d622b61a7916e9ed486572ad0bd63b74430163bbf20cc79389211eb80b3ab1743d007f58820f6
+EBUILD gexiv2-0.12.1.ebuild 1792 BLAKE2B 6dc63ca13b1866b2f5271863f72f941dc44ca691252e3edae8cfb4ed5b3bc062b81debd19f5d4b31cfbd1792cc1ec529fa1f992c9b8cfef6a9af77cf34b08937 SHA512 16c118ef4c1a37e2ee9ee9bcc1da92f3043604e55b08d029ea7839e6363acde555d003188b7db9965ac27c73fed3f6a922622e232bc7e640dc9f261acb09df36
 EBUILD gexiv2-9999.ebuild 1630 BLAKE2B a5b80844189a30261272c1687ea8dd77fba10a0601d42883839b5798735bf901afe677e33542c83d3a1a6cd472e2891e0c6f79eab96f383ef5a353c54491faab SHA512 2f6f9ac560721c464ecc85f83f2379f58ce1a1d34eafa6465d2d622b61a7916e9ed486572ad0bd63b74430163bbf20cc79389211eb80b3ab1743d007f58820f6
 MISC metadata.xml 513 BLAKE2B 7820281c36922b5e68aacb3c3935f7193e2725515f196eaf72f6eba42327a8c8d10ceaed6422fb95cf15b0f1a0d96a168c7a677e42ae847fe050b26c39c39a0b SHA512 deb951010c3342738d8ad5b9e79baa790913f3b906799f9f72f59d4e978f0564fc52f14482bb632ffe817488d154bd8bafe98bc5eea07b7c2da1504867d671b0
diff --git a/media-libs/gexiv2/gexiv2-0.12.0-r1.ebuild b/media-libs/gexiv2/gexiv2-0.12.0-r1.ebuild
index d6b5842d05a2..814a3757847b 100644
--- a/media-libs/gexiv2/gexiv2-0.12.0-r1.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.12.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit meson python-r1 vala
 
diff --git a/media-libs/gexiv2/gexiv2-0.12.1.ebuild b/media-libs/gexiv2/gexiv2-0.12.1.ebuild
new file mode 100644
index 000000000000..f563da04ff2c
--- /dev/null
+++ b/media-libs/gexiv2/gexiv2-0.12.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit meson python-r1 vala
+
+DESCRIPTION="GObject-based wrapper around the Exiv2 library"
+HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gexiv2.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+LICENSE="LGPL-2.1+ GPL-2"
+SLOT="0"
+IUSE="gtk-doc +introspection python static-libs test +vala"
+REQUIRED_USE="
+	python? ( introspection ${PYTHON_REQUIRED_USE} )
+	test? ( python introspection )
+	vala? ( introspection )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=media-gfx/exiv2-0.26:=
+	>=dev-libs/glib-2.46.0:2
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	python? ( ${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	test? ( media-gfx/exiv2[xmp] )
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	default
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+		$(meson_use vala vapi)
+		-Dtools=false # requires vala, freshly promoted tool that some other distros don't ship yet either
+		# Prevents installation of python modules (uses install_data from meson
+		# which does not optimize the modules)
+		-Dpython2_girdir=no
+		-Dpython3_girdir=no
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use python ; then
+		python_moduleinto gi/overrides/
+		python_foreach_impl python_domodule GExiv2.py
+	fi
+}
diff --git a/media-libs/glew/Manifest b/media-libs/glew/Manifest
index c028f3991646..a52a5087fb82 100644
--- a/media-libs/glew/Manifest
+++ b/media-libs/glew/Manifest
@@ -7,5 +7,5 @@ DIST glew-2.2.0.tgz 835861 BLAKE2B f403f3ebd5a78d21cf5744e8e6714a0558c7cda579307
 EBUILD glew-1.10.0-r100.ebuild 1919 BLAKE2B 849a2bbe51e9c5a72fab2e21450ae0a2a0feedd688052d9a4782f5faca846d7edafd4102b1d96e8d0f33cce59b21aa64e67bc4fd37da574079161a5df546a9c4 SHA512 7ae0a493de5d57190aca2266f204de6e1014447090f1d21d039a441175d5991886eeaa4b77cc4146a3eaadd15bd2e9a25c378afa15cea52ce7e0e66087aec0fa
 EBUILD glew-1.6.0-r100.ebuild 1892 BLAKE2B 1919a435320a83c0b117831c4267390fa221dda016618ece17da909b2544fdbfffcd0c832fd52b88f5955a4c717c9782489e6843be4d9ec126c23e0f06b286bf SHA512 2e0267dadae76d0c59903f87d12886b4236c1d327266c5541931c75437986d565724f8e88a28df9a516b12d637b42b66ee64aef1b195fed2e1cf3ba161b17db5
 EBUILD glew-2.1.0-r1.ebuild 2496 BLAKE2B 18ea433d149081a8402030e392a215036f987357a15c7695d145516893db718e0bc89c85d25c2f1bc06c1e8ce96d0ecfe029a5bf789b079dd6ddeca6b4c38f69 SHA512 f0922f41700f98819002a5de1846650c69a5337f47a0da2c84ef7d1c7c4793b71124ece9be66e99d011eb80c89b84240b6f39e7a37b61036e54a6ae48d1ace5c
-EBUILD glew-2.2.0.ebuild 2464 BLAKE2B 5958f94db509649dade0f881d30d7017f3c9406f91e9f34b1d1c89b6d804035bc570f58a428f8b1f256156955326f3439293ae9814c543e043dfe70eb8014a2c SHA512 8a2bb89e861fbbacbccec477c20a50e0c6ba7567af1b6b91eafb69f49ccf560821b85b88c0cfbaca8956192e94c1b9d13a6c80a7c106a177bed6068c48a8f10e
+EBUILD glew-2.2.0.ebuild 2457 BLAKE2B 5a905deb9ccf8797d9591e807916f7ac7224eca88059eea80f996662ae5a4ba3e26f21e293fc8ff21c173dae243efe0f446f8a3a3938c1620dd5904319e7f1a9 SHA512 e818f6d470bbd77741e75924519b059f2f4f0ec0d98d9646b5dcecbbf3ab6e31784989abf2853421fc246a5be72a8df63a69e41aa84094397f73d26fc13a5847
 MISC metadata.xml 296 BLAKE2B 14e5921f53872e45c3b43dbe5d95fbb36162ce327eadfc41b34cbee17c11d1de02562152920026592f3dc508faf080e4e8b4150490a815cf7629b1ecfccda758 SHA512 60f31ba192f23a74365955e122ab54aae36c45b9158a2a5201bac68c46c07195025a9978fec01fa6e9804bc731bf1f7b495445bafb9e53d94f895c128075aa3d
diff --git a/media-libs/glew/glew-2.2.0.ebuild b/media-libs/glew/glew-2.2.0.ebuild
index bec447dbda58..d5d9c30c769a 100644
--- a/media-libs/glew/glew-2.2.0.ebuild
+++ b/media-libs/glew/glew-2.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="BSD MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 DEPEND="
diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest
index 4407503608f9..f53e2a83f880 100644
--- a/media-libs/glm/Manifest
+++ b/media-libs/glm/Manifest
@@ -1,9 +1,11 @@
 AUX glm-0.9.9.6-simd.patch 427 BLAKE2B 9f6e4637ff526497ba9a77247125d1fe5f06eda9bb689b5c42661deb72703b004e2c18f7236503f0673b354ba0e6fa7b13361606ea64fc0e7b9e55eccead91a2 SHA512 72f46827cd6651dd6fddc7ba548f8d9132fd74b9799a8eca6e94435141e96f752917b4343d4c3f37536bbc7713e978e4d85842da6d262c086019eb85f351a431
+AUX glm-0.9.9.8-clang.patch 712 BLAKE2B 1bd883548efd33e33759828979f9d62be0576b76ae187ea0ff52a817b58262e5e7859d99d5405e87ebef1fa30bb70f712636acb4bdf12e61b54536b363074b69 SHA512 be04ae74a3466516a284dd159dae0c0e063f2b5b424b3552888d36adbd24a937c7beb27bd0bbb917343bb9746198ae14b39fdad5ff117e408d89b4bf00badd1a
 AUX glm.pc.in 149 BLAKE2B 9a34ca2590ef006315e004fa6ba0b08469c9da348d8354d0ab6a7e602da1d49126cffbd28c2aab2e2dbe711d047d482b4aead45d1e8770ab571e23e895201b4d SHA512 c875971c208bac82c1a326ebcd327ec9dd92a5b86981d26bf759516107204876a401ac9c57ca6c9965021364678ebbffcaaca6a3b4ee0e532d468d7b03b3ab9b
 DIST glm-0.9.9.5.tar.gz 4578601 BLAKE2B 9ce4dc7e638a651f958e2e0e1bfa0da121aefc382579838bfd810952bb8f4253e17caa6d743de713c86a4e8bd5f1afa38f8162e5f2d98ab141d94574d1103d40 SHA512 3b329acf5144aab1c0f47f8045d34e097699bd6685118ad8322c5ce23afdcb44ba2bb07e49301db06355b8eef7d4340b72251d55e113b533740d1e6ef6609911
 DIST glm-0.9.9.7.tar.gz 4357077 BLAKE2B 59746a8775e0fc20fe8a8c3ae01c48841066d6092ce3cd7fa93bbf29f5247c42645bc920a3dbf3f0b4b61eb1e47f46514d9cd98c4e6df133ced0072ba6a570ee SHA512 9c557788d6382777317c94f8b30bc3df7e533877705514fa5d384f97b076d6bc750e841acbecdec8113e21af07bd8850159f5f1e079aaa2cde25540b480f983b
 DIST glm-0.9.9.8.tar.gz 4368032 BLAKE2B 41e4d4a9fbd75c6c6717e43b6a6ae09bb7da3b4b2ee7c5b04308f3aa875b306638b638aca3e457c039845c489fcf0716a080ec2166bf5e9db93c25944f4ba81a SHA512 9484b0c12175414237c5b9486a2990099b1cb727e442f25ecda18b081aa661f7e92a44481f642989553cd3da7992a773441ee5688991bd539ce19fb66a5ce9e8
 EBUILD glm-0.9.9.5.ebuild 888 BLAKE2B 8b24c2462309c9ee9447cb55e443f6b02971e62b038ba3147b33a66a3324c94f056acfd690c412cacaf009c21296ffe002ce1c84879dab029d3f48c3d6bfce65 SHA512 79bbe88e3487f1ea637272e74c4e81f0037c5249aead813e4ce3060adcfa3040efa2340a3fb3fa7a31fa6f8a0ae129e0b64bf8d1e5ef394d91b8fca614d830df
 EBUILD glm-0.9.9.7.ebuild 1211 BLAKE2B b567e64d07b301f9290e7ab533145497307185050b3ffea4de9fc8c27ba6c3d2f6eb3356d35b2aa1517aa1495cd2632de8afdbba0d157186246789841950f5f6 SHA512 c7ff576f73564277be087ac108e255699017ede17ead85ea50074b08bcacadf25f1bcdd6286f046893f3f4afc514ca03c7612462707cb170d8c982f409225a0a
-EBUILD glm-0.9.9.8.ebuild 1197 BLAKE2B 01474e9465ad18eff753d34865928b490e4e3f84f2eb33831fc08c617908d74891947549f71f5616da51b296fba076333fe6ef2274f7a289b71d672096f33b8d SHA512 12272fb86c57ed5c78ad4646431126f8a63f78a6fab7386524825d35a6d75752344dd13d5a073f55e4cde99f112eeac416d851bfa06134b5d0ec36c39a2b32c1
+EBUILD glm-0.9.9.8-r1.ebuild 1381 BLAKE2B a9100dc51f5c51e40f06c07cfa43cf3af9bf049f4781210af1734babfc6b06ed75a219fe582fabfbb278d90f92675cca7f68ba54160dc39796c4d50bac130227 SHA512 0ebd101cb2ba46b73809514a3ae512d902567b28e70d2786dd0ae12055dd01c7af138ae3ad2598d0de67b6f322d5cb12b07b32a77ae8d120b4169df0f34a00b4
+EBUILD glm-0.9.9.8.ebuild 1229 BLAKE2B 137b4407d122ed1cabce0a0083216499fd4cad705fcc0f66bc14191b5abdac188b58746c9272f7ca316311547410d9f0eb297b437adf98f36b7a5d05d80d2d22 SHA512 3b103f7db0bd6df218109da65d17f1f323aaae481dea170ae6fc34e51aab7f802478abeba6bf5d40c848b02068f7217d4c0de5adae7667f78e98420e531b80df
 MISC metadata.xml 545 BLAKE2B 842701f1a6d1483b75f14aa99f546975b4c7de1a84d36b1e15a882d17662d98d37b491e236da73d9457706b667f0499405b5717af3ccfed73ad0518f34167c72 SHA512 637114ed9721e6d1c8f1d1ce56e9b9c208ca4dfe5f3a0c2b844d90bcdbab8344c00682c9647f7323eec7c485abcd841ef37300a8fe0bc8a5f5c12cfbb1da4971
diff --git a/media-libs/glm/files/glm-0.9.9.8-clang.patch b/media-libs/glm/files/glm-0.9.9.8-clang.patch
new file mode 100644
index 000000000000..af763d5b452a
--- /dev/null
+++ b/media-libs/glm/files/glm-0.9.9.8-clang.patch
@@ -0,0 +1,11 @@
+--- a/test/CMakeLists.txt	2020-07-07 08:44:31.304955458 +0200
++++ b/test/CMakeLists.txt	2020-07-07 08:44:38.962844309 +0200
+@@ -197,7 +197,7 @@
+ 		message("GLM: Clang - ${CMAKE_CXX_COMPILER_ID} compiler")
+ 	endif()
+ 
+-	add_compile_options(-Werror -Weverything)
++	add_compile_options(-Weverything)
+ 	add_compile_options(-Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-c++11-long-long -Wno-padded -Wno-gnu-anonymous-struct -Wno-nested-anon-types)
+ 	add_compile_options(-Wno-undefined-reinterpret-cast -Wno-sign-conversion -Wno-unused-variable -Wno-missing-prototypes -Wno-unreachable-code -Wno-missing-variable-declarations -Wno-sign-compare -Wno-global-constructors -Wno-unused-macros -Wno-format-nonliteral)
+ 
diff --git a/media-libs/glm/glm-0.9.9.8-r1.ebuild b/media-libs/glm/glm-0.9.9.8-r1.ebuild
new file mode 100644
index 000000000000..23b762f4160f
--- /dev/null
+++ b/media-libs/glm/glm-0.9.9.8-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="OpenGL Mathematics"
+HOMEPAGE="http://glm.g-truc.net/"
+SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( HappyBunny MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.9.6-simd.patch
+	"${FILESDIR}"/${P}-clang.patch
+)
+
+src_configure() {
+	# Header-only library
+	if use test; then
+		local mycmakeargs=(
+			-DGLM_TEST_ENABLE=ON
+			-DGLM_TEST_ENABLE_SIMD_SSE2="$(usex cpu_flags_x86_sse2 ON OFF)"
+			-DGLM_TEST_ENABLE_SIMD_SSE3="$(usex cpu_flags_x86_sse3 ON OFF)"
+			-DGLM_TEST_ENABLE_SIMD_AVX="$(usex cpu_flags_x86_avx ON OFF)"
+			-DGLM_TEST_ENABLE_SIMD_AVX2="$(usex cpu_flags_x86_avx2 ON OFF)"
+		)
+		cmake_src_configure
+	fi
+
+	sed \
+		-e "s:@CMAKE_INSTALL_PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@GLM_VERSION@:$(ver_cut 1-3):" \
+		"${FILESDIR}"/glm.pc.in \
+		> "${BUILD_DIR}/glm.pc" || die
+}
+
+src_compile() {
+	# Header-only library
+	if use test; then
+		cmake_src_compile
+	fi
+}
+
+src_install() {
+	doheader -r glm
+	insinto /usr/share/pkgconfig
+	doins "${BUILD_DIR}/glm.pc"
+	insinto /usr/share
+	doins -r cmake
+	dodoc readme.md manual.md
+}
diff --git a/media-libs/glm/glm-0.9.9.8.ebuild b/media-libs/glm/glm-0.9.9.8.ebuild
index dcd6a2c59118..6fd8711eea6d 100644
--- a/media-libs/glm/glm-0.9.9.8.ebuild
+++ b/media-libs/glm/glm-0.9.9.8.ebuild
@@ -19,6 +19,7 @@ RDEPEND=""
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.9.9.6-simd.patch
+	"${FILESDIR}"/${P}-clang.patch
 )
 
 src_prepare() {
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 1ec98edc20db..ca9d8e22f867 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -3,9 +3,11 @@ DIST intel-gmmlib-19.3.4.tar.gz 706943 BLAKE2B 12eef2d0bed76e94770295461935b4056
 DIST intel-gmmlib-19.4.1.tar.gz 707375 BLAKE2B 0627889bebf763a8225c691e7ec6a2b3c1f403f62e5d11b557e3578e02b6cc3fe032e8b0d79483f34e9310bcfcd7667c407b1c4e549a2bb414247468b020f796 SHA512 264f111348bbaccd6c14c31ab15c7b02e63def56b0d3effa01067fb5e696d6d3e2ad3d5a9cc3a36f33b835dda12ec3916a31d3a812443de9d5dd815e2e4cde53
 DIST intel-gmmlib-20.1.1.tar.gz 707814 BLAKE2B 49983345d0187114de6622522a1342f978f67347f210a0f5a67c847089268e9f6730f76f365c2e15160c538231f057be68ca3b1dd1c4c5deb0693ab7c94f54f7 SHA512 e16472f24c5d1fb9f56c45ce1aefe6b1799a2c968aab09808115eeb9deda9a7610da989ae2fdc1796d94d05ca09a19ab2e74be62b4192eeee70ead404561a03f
 DIST intel-gmmlib-20.2.2.tar.gz 728309 BLAKE2B 1c26661c5317d66797ca8a72fe910ae73a97c7bc3b5730b6c270daa3eac753287cd83334085c90ce081ff4a8a4d1f79b46e832059b08c36602c5c39f3b3a1af5 SHA512 ebd23658aec78ebdf7cd13577f5ca408e2995c4df6135c951d3bea4a59a84461690d71f6e7ebc2014daa5508e07d32ff20c25019d90255150e7c93e241d403fc
+DIST intel-gmmlib-20.2.4.tar.gz 728821 BLAKE2B a9babd8202ef8e7843eebca0b27fa53e02f7ffa82f753d7ec2ac679b5daeab412730fffa813ed69de22f291f1415e445a10c84e51709685052fa2773c23c717f SHA512 398acc4fe366d5c1c0d6b6c5f64494bd27905285985e878ecb4a4a51af585cb54fab9500c35f106f40ecc7a048fec1fbcd8cc3978ae5170a3a594dbdc5da448a
 EBUILD gmmlib-19.3.4.ebuild 832 BLAKE2B c679b2b098ab9b69bca49506c3579417f0bba14abc968eb64f58d7d47dceec272288f7bea7ac076f92fd6416c12adf476db57b4f08e58a63094bc6f7e40bf787 SHA512 3a4bcd7e49d73af846df1abd753e5d8d07920b5c589196217854a0968825763f8c89e16b5b2e4e1432c83af6123f3259f97589a3a45012de3332c8c8c42b2e28
 EBUILD gmmlib-19.4.1.ebuild 832 BLAKE2B ad5129164827dfb589cb81f84f772067ddb1bb3eff42d484ee35265e740f4a68a37c48d8ac9888b4dc5e18fa27ccff9a23a9a9de363e829e0570790ec88d4f15 SHA512 fa254f63c00d6db9cdf6f11dabf2dcad1a1be563d94caaaf3890d610a427d2f014a0103d71d5b8244450d97766ba0741865c278fcb89eed7d7a0055fcc8a6f89
 EBUILD gmmlib-20.1.1.ebuild 815 BLAKE2B 5bd051fa42312dfe39b81a42a8bbaff61beccb1472fe2547beb080ff5017962631fa803791a39244076bda5eebf7909ca1a97257c3a9b97f9f2766859310591a SHA512 154fc95bd6b1832457d0252d5491d8ea2f8cee596fbbdef635be25c4c69bd67b62d6ec7254f223b93efb0d9f2c14ec2a5b9312c80d96ffcad2174e580f3f1dd2
-EBUILD gmmlib-20.2.2.ebuild 884 BLAKE2B 424f9213091b171856cfa6980d30b38de1bdf8ed58ef70ba05292b7a00799ebc53f4dbdb0fd9d40447113a0637d1c91ca3a4f94c0f1b77853a996700074ff6bb SHA512 384e50e434e5efdd7b43c2532707d5571b30b5fa3ff934118d66d3a29e4e2d3e73fecdb2d430ead8391ddfa451733f0b9c8eddfd949984f09b86d856309c0c7c
+EBUILD gmmlib-20.2.2.ebuild 888 BLAKE2B bb3f30b545eabfe214fa659f887c082f1fa45fd1bbbd823ad7a98ee9a24ff78d121a0dcc59ea0ce18e343c2a666fa5a1b6d948dd41b118c2f5bb6711b9c65828 SHA512 04b82961035d0297f4f2323f63e48c09d03b1d354f452cc1c626b5f91e6d81300af3109fe2bef55168a440d98ab29bc544591d22a1b1149fa470f27db54122da
+EBUILD gmmlib-20.2.4.ebuild 884 BLAKE2B 424f9213091b171856cfa6980d30b38de1bdf8ed58ef70ba05292b7a00799ebc53f4dbdb0fd9d40447113a0637d1c91ca3a4f94c0f1b77853a996700074ff6bb SHA512 384e50e434e5efdd7b43c2532707d5571b30b5fa3ff934118d66d3a29e4e2d3e73fecdb2d430ead8391ddfa451733f0b9c8eddfd949984f09b86d856309c0c7c
 EBUILD gmmlib-9999.ebuild 832 BLAKE2B c679b2b098ab9b69bca49506c3579417f0bba14abc968eb64f58d7d47dceec272288f7bea7ac076f92fd6416c12adf476db57b4f08e58a63094bc6f7e40bf787 SHA512 3a4bcd7e49d73af846df1abd753e5d8d07920b5c589196217854a0968825763f8c89e16b5b2e4e1432c83af6123f3259f97589a3a45012de3332c8c8c42b2e28
 MISC metadata.xml 322 BLAKE2B 802cb8da9b68866ac616c175586bc3651330ecbfb1b08fe3fad52ec8817e1994f347ae49815869d50296504d9607fcf6c41d40543d8896fafd8d36c4421604f6 SHA512 52324c98984d04659d8ee327850152e41b6146f45a35b147a1fba2043be7ca91e220dd57fc3712e5154b416d04f8a1b0f614259cd9fde8c66ad7734853bb50ec
diff --git a/media-libs/gmmlib/gmmlib-20.2.2.ebuild b/media-libs/gmmlib/gmmlib-20.2.2.ebuild
index 2cb36edcb25f..cc8bd01ae170 100644
--- a/media-libs/gmmlib/gmmlib-20.2.2.ebuild
+++ b/media-libs/gmmlib/gmmlib-20.2.2.ebuild
@@ -19,11 +19,11 @@ DESCRIPTION="Intel Graphics Memory Management Library"
 HOMEPAGE="https://github.com/intel/gmmlib"
 if [[ ${PV} == *9999 ]] ; then
 	SRC_URI=""
-	KEYWORDS=""
+	KEYWORDS="amd64"
 else
 	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
 	S="${WORKDIR}/${PN}-intel-${P}"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/gmmlib/gmmlib-20.2.4.ebuild b/media-libs/gmmlib/gmmlib-20.2.4.ebuild
new file mode 100644
index 000000000000..2cb36edcb25f
--- /dev/null
+++ b/media-libs/gmmlib/gmmlib-20.2.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+fi
+
+DESCRIPTION="Intel Graphics Memory Management Library"
+HOMEPAGE="https://github.com/intel/gmmlib"
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
+	S="${WORKDIR}/${PN}-intel-${P}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/grilo/Manifest b/media-libs/grilo/Manifest
index 24a2c6c1103f..b4a33dcce1a9 100644
--- a/media-libs/grilo/Manifest
+++ b/media-libs/grilo/Manifest
@@ -1,5 +1,3 @@
-DIST grilo-0.3.11.tar.xz 233516 BLAKE2B 4f239ae99bbd0fefe501e60bbb1249641a2996a26cc8342d5b8daf0665baaad268de9e295bf52b0b504da5c9a0a1f9174664c1afe1303e5dc8a5b547b2e1d160 SHA512 fd46d035982b14ed19681acce3f4878cc678919babc031ce5eb577a21d14f97b905eb5094b344b7fc732bf317fb504dae940cffb7875de2d577bae431b7f9c36
 DIST grilo-0.3.12.tar.xz 234340 BLAKE2B dd9f2558dee73080d87a98209816ca79a13fee4934a9e456190616e11565095e3c08e64f3ccec30e3bb7a102a9e23c25ba32a95f963676516a354a785bd6bdd6 SHA512 c0badc4b3f96efa04e6f3b5f32b2322855d9a660f748ce68012d266a6f5936f850bd63e559c782ae02ee24ba282c3b3882c6b8fae99019b913d74ff927a31017
-EBUILD grilo-0.3.11.ebuild 2180 BLAKE2B 61b553437971cc50a0e7dc2fd6422285a883c3cbcdd35c10a1c5a7247727c6dd3c7b03c51f3cda9a23e73a4e4da680f685788133b5e190c5c2014470dc8e9450 SHA512 c6089603299430d6da1a6f6635a72914816b0cff07852e86652f6c440cc440c9c26f41bc8fa4e84eea2ef730cbe62444d9281e2daf2d3f1c8f67a884f39dfd0c
 EBUILD grilo-0.3.12.ebuild 2180 BLAKE2B 27550bf4f8514ff6df87612a22681109f16e65fee25ec0c347b9f1cbd44002ef83bc9e30104158f9be5d2952ea1344b6235d9caacf7ecc9717d279c585aa7ccf SHA512 0f65d12581b16f1b7684b107224eebf880727bd03dbb5eeed3db68ebe551a04bca7579901afce3e8f3a7159f369713e71c0a08e7e76f39472a5e0df58b0e07fe
 MISC metadata.xml 728 BLAKE2B f552b3317894c70912c17e3e46367198f4451940b5029508f83ba3ce904faea24ed3876195f1b062145582dd268064e0c63636ddd5d6033b7032b392e10abba0 SHA512 bbd75a063a5697c257dd9084961d6519fb71409dcd1375d66ff25218deee87841c822edfa66d440cd5c6bfbad70942f01b30f2b7e1a3cc9727beac23ca717b5f
diff --git a/media-libs/grilo/grilo-0.3.11.ebuild b/media-libs/grilo/grilo-0.3.11.ebuild
deleted file mode 100644
index e4711be72aa5..000000000000
--- a/media-libs/grilo/grilo-0.3.11.ebuild
+++ /dev/null
@@ -1,75 +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} )
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org meson python-any-r1 vala xdg
-
-DESCRIPTION="A framework for easy media discovery and browsing"
-HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
-
-LICENSE="LGPL-2.1+"
-SLOT="0.3/0" # subslot is libgrilo-0.3 soname suffix
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="gtk gtk-doc +introspection +network +playlist test vala"
-REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!test? ( test )"
-
-# oauth could be optional if meson is patched - used for flickr oauth in grilo-test-ui tool
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	dev-libs/libxml2:2
-	network? ( >=net-libs/libsoup-2.41.3:2.4[introspection?] )
-	playlist? ( >=dev-libs/totem-pl-parser-3.4.1 )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-
-	gtk? (
-		net-libs/liboauth
-		>=x11-libs/gtk+-3.14:3 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.10
-		app-text/docbook-xml-dtd:4.3 )
-	${PYTHON_DEPS}
-	test? ( sys-apps/dbus )
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	sed -i -e "s:'GETTEXT_PACKAGE', meson.project_name():'GETTEXT_PACKAGE', 'grilo-${SLOT%/*}':" meson.build || die
-	sed -i -e "s:meson.project_name():'grilo-${SLOT%/*}':" po/meson.build || die
-	sed -i -e "s:'grilo':'grilo-${SLOT%/*}':" doc/grilo/meson.build || die
-
-	# Drop explicit unversioned vapigen check
-	sed -i -e "/find_program.*vapigen/d" meson.build || die
-
-	# Don't build examples; they get embedded in gtk-doc, thus we don't install the sources with USE=examples either
-	sed -i -e "/subdir('examples')/d" meson.build || die
-
-	xdg_src_prepare
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use network enable-grl-net)
-		$(meson_use playlist enable-grl-pls)
-		$(meson_use gtk-doc enable-gtk-doc)
-		$(meson_use introspection enable-introspection)
-		$(meson_use gtk enable-test-ui)
-		$(meson_use vala enable-vala)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	dbus-run-session meson test -C "${BUILD_DIR}" || die
-}
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index 50a2f737884c..dd508904cf12 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -3,5 +3,5 @@ AUX gst-plugins-bad-1.16.2-make43.patch 7494 BLAKE2B f3207f46b7bb4a56acb70ca5a33
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-bad-1.14.5.ebuild 2705 BLAKE2B 7f6071a63b6b0d33e255f2982731f3693fba2a663bd19079e40c1a913a1fc2aefe0a476fe7b9603c85d64c6edf13fdd1952bfd188acb045b3dbbf12b4a1e724e SHA512 801628a4d531b1495e7c8b595c4e053fec91d31a56417cd6e37612bd28de07bdabecae53e9a54f5232b6f401a7608d64762b472640ff120fa3d9e5808bacd51d
-EBUILD gst-plugins-bad-1.16.2.ebuild 2330 BLAKE2B 97853c562ffa06be0c611182f3e7ded7ab42bcc0b885318c2f7adc3a13b974dcc72810753655e15b419c132f51ed265f189b2aa89729785cb85dfad556fd0611 SHA512 95e57e2874f9f23f7b27cdeac0e08981351ca2c6eb2d259ae958438518664784f7f83baee8b1381f194cf2608d0239801bab326926a4e69564a32e7adfa0f59d
+EBUILD gst-plugins-bad-1.16.2.ebuild 2329 BLAKE2B 917ae4974ac84102e7ed900b319197074c5280bc7a2a1c4c5e059f6e4100bfdfbe2c975e34e370cba5e7990c0d4ebab6891cc6a828601a8fa07b7792a86286bb SHA512 9475682355aa66e8044f5686897af2bb474ac10789911b6fd96270de945a2f4544ae123521568c374288183f7fac3b441325633bc505a6f45001eb6bf4924494
 MISC metadata.xml 439 BLAKE2B 5a4a36ccf4bd485eaf1fa66650eec8fa592d4c5bbf9fa478f1645e1b39649b7115694bf55dee7aeb4a5c53b2ba3c4614591cdf4e7d745938397c304108e0aa7c SHA512 9bd27a1a513fc2d697f7d0f2ceb7fa0701c446fe21b597256afd4c2c1f44145e875323ed1ef6202bf7b85472ab4aab43a4b6db5795bb1d28ff53a2a7e484055e
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.2.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.2.ebuild
index 87a99c982508..f595db40f17a 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.2.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Less plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="X bzip2 +introspection +orc vnc wayland"
 
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index c2e688e25229..ca7dcc7b9972 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -4,5 +4,5 @@ DIST gst-plugins-base-1.14.5.tar.xz 3717076 BLAKE2B 461e90df614c60d7efce6fabcf8a
 DIST gst-plugins-base-1.16.2.tar.xz 3939868 BLAKE2B 7313e50dc0842f02cde0113462c8d4b393dafe271da6e2a1af89dc997f2ec77a9f06bc467516c607c8b7b822e49efd1af829440a28a9af8356ef07e7fa899968 SHA512 f28e71bba8ba25d4f18ba3a196f057721151f1ebf1309d808bd6771a3f9a68facfa1970dc4353b6f2fd1e8945edf5272854d328ea11ef399544f8b330f754a42
 EBUILD gst-plugins-base-1.14.5-r1.ebuild 6025 BLAKE2B 0b7698e494efef8651973fb3ad48af145c9d7c94afa9964aa5598beacbd64d4e85147caa3b2d89d34925851bcdb3a6558f7e515fd3430c6bc35cf6a82b9adb46 SHA512 e19f197d53cc5758645db08e32e336004433270f897f8253200eac634480ea41ccfe162b625e27a0722e005e35ea05bf6fe9943ab9317803d91de21f6f225bb6
 EBUILD gst-plugins-base-1.14.5.ebuild 6037 BLAKE2B 7a94909cb8e237fb07c2dce50447647b92c6e1fc8fe5d859724f74468a045b8d9a04501c4dc167e8ca222f82a722e56499ed31f0534937c690737ee9ed84a816 SHA512 e9a8b42046bb5e59cc4771b7d033d3691c06ecb83f6b30b151d7f954be76e72432c37f0144d38af04771c77eefdab1b76b80a97780a81aa67e938933f7263867
-EBUILD gst-plugins-base-1.16.2.ebuild 6028 BLAKE2B 9851991edbecd3634a64ebeca68cff705656487fea3932cb98c06fc4b12a7eec33a667dd6ba5413538bd1ec4f18edb469bad4d8946e1fcf7a8cec353dfedb6fb SHA512 15b3bbfa51d7be3942ff5219f9c68a12c6a878d64b4cf4acbc45c50fb0eb5f32b08c018db9cc5659e385e75a8f4ff84dd34d92629afe09f7f03997f8dec2ffc8
+EBUILD gst-plugins-base-1.16.2.ebuild 6027 BLAKE2B 2f8b999ebb0e6972792dabf2ace447be6d9f43c19a79e27df8234b714da2f2f197a815b8fe7cabf86e09fc65d408522cc0379a9f7bf44002c00104211062388e SHA512 3df146a3d993e413016e8fb83f2ba97b870cb72ea0e6e9cbdbfb3873974bb463e2f287711581db5d1e4f833c75b03151ffe9879d580dcdbfdb9cfa4ea0b619b1
 MISC metadata.xml 1065 BLAKE2B 9736df3218c6157e5cc0f14e96a15ec6ab6140e8774c7361dd4fe9378efd37d1a3da593527313a81591818ad48a5585bd4395fbeb85d357449b00bf7e51bbb5c SHA512 520802b59fc6575e16edd765dacab4ff0ff6e51dd162f03fe7e4e07eb472aeb78f3974a32ba613939932e123179106a450c503234ed806a08416dc6b8dd534c2
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.16.2.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.16.2.ebuild
index ddfbd549540c..71958c5fb67e 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.16.2.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.16.2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # For OpenGL we have three separate concepts, with a list of possibilities in each:
 #  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index e34e91c967c2..29e3752d67a1 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -3,5 +3,5 @@ AUX gst-plugins-good-1.16.2-make43.patch 1927 BLAKE2B ff38be465f3300f8b6821b3787
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-good-1.14.5.ebuild 1506 BLAKE2B 4f7fa9ec216eba6ba101b8ffdfa9d35151f2c6956bb40fdfbacfc88fe8b800a0cdc5e645fc662f183d41eb569885da7036e5a82cfdb370d15485efc47110c212 SHA512 54bebe46bbede74adcb733677f92f4694cc770edae5cd1e45fe7aa0056cd67e4838a7612215f0ccee160eaa51d274d2fa0a38513cb695805966549d495767b32
-EBUILD gst-plugins-good-1.16.2.ebuild 1509 BLAKE2B 218dbde44c3bd1f9db28836f9cae2beb157ec1331e0340e77a3299ad401c937b86228fdeb1b2c19876b46390f4ad0c0317c67962d1d62cd311377294ec64edca SHA512 665d99a0cf58a4499bbb8f15a29f16760070c15900fc66f21aacae25fc3f91d56f0b31dad8c21279a46a6faf9e806785ff99a433bceb18427c38c8ba48a6458e
+EBUILD gst-plugins-good-1.16.2.ebuild 1508 BLAKE2B 995e0950c9b12165ef59f6401e27b722e39ddfdcc0e90d06143b007e5402fb399a029409ee41930e9ef1ed73105ff31eecd0d79673f0c2fca8256667bdb14b0b SHA512 cae14af7050282f2cc42559b6eba55bb3f77ea54eec9d4da95766d5c63c4c3eda348e68be54fac2c898f40beab0abe3d9708aeb06d98e167a24a787c24698418
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.16.2.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.16.2.ebuild
index 05020372b438..d1cc2a906a31 100644
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.16.2.ebuild
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.16.2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-libs/gst-plugins-ugly/Manifest b/media-libs/gst-plugins-ugly/Manifest
index de080d08a9ef..9281bd0d6a85 100644
--- a/media-libs/gst-plugins-ugly/Manifest
+++ b/media-libs/gst-plugins-ugly/Manifest
@@ -2,5 +2,5 @@ AUX gst-plugins-ugly-1.14.3-make43.patch 540 BLAKE2B 13b53beb26c0f70233178c97433
 DIST gst-plugins-ugly-1.14.3.tar.xz 889492 BLAKE2B 0c76ca28e1f062d0eac438f1692d2af33536719913ec10229eb6bc64f1f957bc7f6afe45e1c528ab4015c25dec61b8b9d2c517fee78a8a992c76bd41ff9e75d1 SHA512 0866bbcc3f1d0d668e77b5ef83fa7469dc80c957d2c6526126e761db46e83ff18d941c247833d27336106d8ba043e9ad50cafbddbff241f95bb16f9b1a0fbacc
 DIST gst-plugins-ugly-1.16.2.tar.xz 893964 BLAKE2B c607a7aa3459625a930021d247705f00e418e57557c57b8f9793bce74cb5c4d708b253250f0bbebd9698e9ff80d5636d578dded8c360ca2d34e3d43c9a722416 SHA512 9f393043f51b12b376607e68b3b86437af86e321e3a3566e59c7f3507ed26622211df87e30a23bcc927f37bc11f53ca3b29f1b12bf58e623ce18edc88a9cdee3
 EBUILD gst-plugins-ugly-1.14.3.ebuild 1040 BLAKE2B b407e5fd151f84fdad9b7b15fcf3a26911a741fb38fe7e87cc8f85e983b7a98628bfc41ab1db9ebbd72542b0232f268b58c3bd86f90bf384de6ea4728fa1d98f SHA512 2dea55696ecad8c8e71dda5f882908a41eec0b29f127235eda786721052d28cee41a8fadd5b0bc44145b1b71a64829f053a8f45284e1c17854b6ea11c8e92945
-EBUILD gst-plugins-ugly-1.16.2.ebuild 1043 BLAKE2B a8016daa1680cf07eefbce130a62a8ebc698e60f1340b5d82c5e396bfb3304a18a26e12289cfe1d780619a67ab0ea92d63e90d9fc3a55a3141f71896004972b6 SHA512 10c1034196b81384fa0c7ca98e5aec8d2b62ba28583d9ed2ac65842aaa508b7acf0b1790539774e8f347b716cb6b5f2b0af4bf1275ed008ca31c124b4222a606
+EBUILD gst-plugins-ugly-1.16.2.ebuild 1042 BLAKE2B c5a5a7d8a2ae0fea146e814b176ac5f716697bf0559a48d09e2fd57ab590c6b6a036e2a817975a01e0d07648be64ea2c0f23926d9ba745a91d57632ce5f57cf0 SHA512 153bf706bc2ad0691bc6eb824e18500a75cdf3ed20fe4d3b556bdb8235e6eee7ae706f03ee8bbb932968536efb0765bc7c5b6b23069e58ac43f4b2d0937c96ca
 MISC metadata.xml 345 BLAKE2B c8af39d4811da5ca9cad30110ed9b2a090fd27a957bf32f831b4c3f5a22bb87fcc15957151ce9752521d2a92c667568d8ab002c8f4f9ba3363d9b7ca79655ce8 SHA512 c8c693633f2fdbf66f2308a2ee82880bf0cdd58b0c1e42a2d3b2733b3a7411769da60e8beb375def6473fe50303f1a68a0c7712e48abf88935b045f93103b206
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.16.2.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.16.2.ebuild
index ea99b5cda7c9..74f61e39d40c 100644
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.16.2.ebuild
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.16.2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 4bb783f17c1a..405e7d09f52e 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -3,5 +3,5 @@ AUX gstreamer-1.14.5-make43.patch 3176 BLAKE2B a221894affd68da53d475c65544cfe825
 DIST gstreamer-1.14.5.tar.xz 3268756 BLAKE2B 6ef5bdcb103b4d8fd581ae7342d6d467f4c6919610bdd620e4a531755347d8e3276a50f2e637045b9b97cbf7726495608437c180d37a1019ec8a79ab1bc4e4d6 SHA512 1a97ae17f8fff041db5e24d712d33c7116e408be1fabc2abd7b652b067b6ebe6c0943845a33a21335a5b4fa0a1ba178873158659f761f1e3aab04a969029c5d8
 DIST gstreamer-1.16.2.tar.xz 3328600 BLAKE2B 9bc12330fc5a7fa3a65e2c03f9d06172d787e9aadb4c2cb7d98f8f7c5850e05535cf23f747bf89514a609447f3894942bcb2fa4a6d3d3406e129e1eb67b49158 SHA512 a8dcdb452a88f411676e54016fcf83149068b2f0b60422bebdbc81220078c61c415512006010ba0299df81ffb59853695c3ce00580f8fc46a079f6aaaa42609f
 EBUILD gstreamer-1.14.5.ebuild 3519 BLAKE2B 68989e70071e43baa0b35007b7b42be640a1cadff4c0f8d494ac3fd2fa2e3b13c5e2063b7bca967b4f59b86ac9b41a9fe8aa5f2438f1e44fbc9835f3f8766a9b SHA512 3b6bcd25bd60f9706820412ec58c8781e8dd9ba8955392c4cacbdf8ebad89793429859e55acd0a8b9f720d0eb04e1a2126b3fde52eda6f223f644a83402e0cc6
-EBUILD gstreamer-1.16.2.ebuild 3440 BLAKE2B d44509058d61b56163154a1aa0834d079da41794212a5e9b083943b2c6ed2785ea559db546f457207c0414def52260cc9372bf65a89a514f605d87bf27ccb6aa SHA512 38d56f2c46fbec2c86c01aa09ce050e618ea6475b4ce45b1d4c9aee273ff0aff2826f44a99fc940f4c25aa2dc257e1517159a50c263c767cda9e0104c0a6bbed
+EBUILD gstreamer-1.16.2.ebuild 3439 BLAKE2B 011ef98ddb68f728b1edc8e839cfb45d71b760f434c84fb755c98850fdc1898218e8d506fef8b776f447aaf23af0c8a2733e8c8bcd0b5d3c4ed00b5704f04541 SHA512 5e57c0d0fba6b0e5580e09897c7e30178494bbc42d1349fc69b30f89e847da1fda685b9fcd653cda954593440577a3ec476b7321d071c796bbf2d26dfe37aa71
 MISC metadata.xml 586 BLAKE2B 319df0c2c013f3018bdb31afddcd80b298f9b74d0a581981f30d483b0773339befe4dc62eb78a267b3a0f5a63a7e6462bd0ece4d4285c0ca91a1329c12ba1b93 SHA512 f7de0325f671119a5b787dcba9572d06d58375ba9d815854beffd668da55e4d4695f586365b3455e63cd56f4469fb8e1a92ab6de4e05847668f56c076dfdaf57
diff --git a/media-libs/gstreamer/gstreamer-1.16.2.ebuild b/media-libs/gstreamer/gstreamer-1.16.2.ebuild
index 56580d9773e9..960fbd97dc46 100644
--- a/media-libs/gstreamer/gstreamer-1.16.2.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.16.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+caps +introspection nls +orc test unwind"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 6f3d76679f3a..04c58b733d3c 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,12 +1,12 @@
-DIST harfbuzz-2.6.4.tar.xz 5967468 BLAKE2B 24d215324a408a724f47a901c4a56605144d15373518bd52643ece83705d0c63582a80635ecef6a6d8d2f5f39c750076d553fb39aaa8c0dd41702ee910c32f24 SHA512 d8664bb64fda11ff7646693070637e3827f8b3d1de50e11ecf108ce4d19c878b26b2ba4cff278da6e6cc0cb431e1630d9eaa7c32a9bebb9655a7aa8dabf7114f
 DIST harfbuzz-2.6.5.tar.xz 8510596 BLAKE2B e495fbba7e0cb58918afeb6beb3ebcf936be896ca606cef27dcbfb9b5f10add144f7fcaa50dec35a9f909d7e87deebadb7c9e6bbbadcbd799effd96076786cde SHA512 ae66211f9b4233c1da4b22b703ab4912f684390294c5c88113e6c927d5aeda8960da3ff607a7c7be5968d9fbb5a95b1f6933070d0aab2aa442a3ec8a112cd16f
-DIST harfbuzz-2.6.6.tar.xz 8530984 BLAKE2B 59ddbffdd6d7af44a1564079e8313cd24a5811cae2de46a632ebf7ec3e76b3c600d159b8be0e52cc1a776c9975955d0e888ce69c304467b3eaef41f09b2be493 SHA512 b0b6323b893a3540e36e2358cc7e7d27c98aa14f1debe65cd8eaf817a55752ea4f22369e37e195abefd03bbc787f178d1b64f167237683ac208b9a65b0ae09c8
 DIST harfbuzz-2.6.7.tar.xz 9001936 BLAKE2B bd3a195506253a1446e877c35c067cc874826fc6fdae3bc3a9bfd2b7682ce12de7e6d7fd4ebe03b8178d8b678c06aa2d71715b27236347224a68e4d98a72039e SHA512 6fdd6e0952a73e1949349aa5416ef8fb3fc351b15c95be4fe1f341b111159fe58113b73a334db2697f4e3aaef5a761bd8f1d8964514406cad40f9862768d59de
 DIST harfbuzz-2.6.8.tar.xz 8976516 BLAKE2B 46401ae06ec70172621d2aa354901f03173a273abdb0db909332946643e82b4286be690ac717a29304e9db121dd7f693b4ce19522de772f5d140986d6333e7ce SHA512 651b23d7d4fab6fef472ee57db39bbaebc31c2f40ea3a482c1499ad1a7b549b86a2bccbe9da191c8e9ecdf464191dd3c9a7485546b51695ad8ab3c0329732d9d
-EBUILD harfbuzz-2.6.4.ebuild 3031 BLAKE2B 6dc0820449927f7323cedcdb16c843b7d548695f53bb40aa1a57a994897e6cc79d86cd4205c67796a5d3ab07ae7dc42ac215bdf9e33ebb2a62f7e9f33aaf3d73 SHA512 163e5e15ab58531d6ed13484315435a35ae8227366f9f8074519384cfee804aa76d1fd14184efb67ed38aadcf0ff1a7f86faf73d42dc756e5d55b14c8c52f0e3
+DIST harfbuzz-2.7.0.tar.gz 16278518 BLAKE2B 4d4bcbcd08c90cbdb34f8aca3571bcd836d578e7eab81187d7dba8a19ae586744b5f9ac83cfb6a50302648c502a87f4aa9dccdfbf39edc70d4318d831f4a55b0 SHA512 65d5b9bd3a53be659dd7d220da220f6873f7246c2ab11205132998e4ac4245fcf51b6968e705b81cc7652db5bbacc90c8db977cf1020edf7957a626a19e055c0
+DIST harfbuzz-2.7.1.tar.gz 16603949 BLAKE2B 4c1792dfb8f2c777efb2f01dfc7e4642bda507813d21db5beee467b1368e991db0f0c3f903662da0a267e7af9a6c30bb258fa057e42d3096f9f8d23ccf4bac9e SHA512 a04864e0f5e523e9d025f066e0850afdfdf53acc9881c0284034ab4384088b118551a899ae5e77bbd821c344b97fb5e0a3d4506bbb812eb0019080be7b3f75f1
 EBUILD harfbuzz-2.6.5.ebuild 3164 BLAKE2B 205fecfb2ba8f0bbcbe68bff20c0e7136589a0415270ef4f96b62941e52da1fc26a99216324eddabdccc98465fa5c466411d360387f049b1f1184c4f22043416 SHA512 988a256f1994d61e0e7e1b526617f566e6c7fe3fa05057a445995a93dcd97a3ee8859bd40e1e0fb3043f46b3ce46bddabacbf6634823e47197372079a78ec8bd
-EBUILD harfbuzz-2.6.6.ebuild 3172 BLAKE2B 232619df1e95eb0caa3cb4c04697ed49b30f4a7703d71f42f23eea057537eac686217e64ec91db04b1cfa24bab37ea265d40523ddb41adf7e9da3f099073a042 SHA512 1142604a0975cd202231b58261d689bba20f4c38f13c50e81ce3d7c22f717530c8dece6c8e10824cf9c446d02096042d6caac071945115b36272aec9b2779540
 EBUILD harfbuzz-2.6.7.ebuild 3166 BLAKE2B 46cd9589c0b7b0b44c0bd2f7e14a3c544a774facf19c9aaa74a5bb6fc8a54655505b36b9cd20009eeb305ffd89bd415031b748212bf2312c82b4dfa543d62a82 SHA512 13e0a1085100ed74c9f18ac9c9b50af99e940d49e441f55ad42010b5e4cfeabcf209170600e2c48838ac9cc4036f4762cdb5d2c8811346ffc9a06ffb8b53e294
 EBUILD harfbuzz-2.6.8.ebuild 3172 BLAKE2B 232619df1e95eb0caa3cb4c04697ed49b30f4a7703d71f42f23eea057537eac686217e64ec91db04b1cfa24bab37ea265d40523ddb41adf7e9da3f099073a042 SHA512 1142604a0975cd202231b58261d689bba20f4c38f13c50e81ce3d7c22f717530c8dece6c8e10824cf9c446d02096042d6caac071945115b36272aec9b2779540
-EBUILD harfbuzz-9999.ebuild 3172 BLAKE2B 232619df1e95eb0caa3cb4c04697ed49b30f4a7703d71f42f23eea057537eac686217e64ec91db04b1cfa24bab37ea265d40523ddb41adf7e9da3f099073a042 SHA512 1142604a0975cd202231b58261d689bba20f4c38f13c50e81ce3d7c22f717530c8dece6c8e10824cf9c446d02096042d6caac071945115b36272aec9b2779540
+EBUILD harfbuzz-2.7.0.ebuild 2999 BLAKE2B 4cb166145447a0d178aecf826c4f7e3002a14eab99d1607231df8a8531208112e030c709c3c51232ed441bef2068da09930b8f3883c72099fa1439506a7fa049 SHA512 2f0375296833fdcda59173fd040ae79bc2d10410678a3279f22cf309b925b11594fff90aa97d4718793d52d6c1b5265cd59ebf76f6c6999d67c779cdebcf1016
+EBUILD harfbuzz-2.7.1.ebuild 2676 BLAKE2B 97f707097c94ce4a506aea6a65e9a855c471e4b03d8d8507068489f1e4a4d7b9469e6675a00773d856f63f18cdea77c7a16386d23b6120fc78439a6a9399c374 SHA512 0ac9dde94fff7fff9376fe73f9fd492d904506dce73b0221ac2448b754cb39bb3923c110ae553e460c44e661994c0d58b18e345b984a1b1a4d26ad8d954e0618
+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.4.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild
deleted file mode 100644
index 0efff7bc4152..000000000000
--- a/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild
+++ /dev/null
@@ -1,111 +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 flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
-
-if [[ ${PV} = 9999 ]] ; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 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
-
-	[[ ${PV} == 9999 ]] && eautoreconf
-	elibtoolize # for Solaris
-
-	# bug 618772
-	append-cxxflags -std=c++14
-}
-
-multilib_src_configure() {
-	# harfbuzz-gobject only used for instrospection, bug #535852
-	local myeconfargs=(
-		--without-coretext
-		--without-fontconfig #609300
-		--without-uniscribe
-		$(use_enable static-libs static)
-		$(multilib_native_use_with cairo)
-		$(use_with glib)
-		$(use_with introspection gobject)
-		$(use_with graphite graphite2)
-		$(use_with icu)
-		$(multilib_native_use_enable introspection)
-		$(use_with truetype freetype)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/html docs/html || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/media-libs/harfbuzz/harfbuzz-2.6.6.ebuild b/media-libs/harfbuzz/harfbuzz-2.7.0.ebuild
index bdc327af67b0..8bb87bd9b556 100644
--- a/media-libs/harfbuzz/harfbuzz-2.6.6.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.7.0.ebuild
@@ -14,14 +14,14 @@ 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"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	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"
+IUSE="+cairo debug doc +glib +graphite icu +introspection static-libs test +truetype"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="introspection? ( glib )"
 
@@ -34,20 +34,13 @@ RDEPEND="
 	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
+	>=dev-libs/gobject-introspection-common-1.34
 	test? ( ${PYTHON_DEPS} )
 "
 BDEPEND="
-	dev-util/gtk-doc-am
 	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
 "
-# 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
@@ -68,18 +61,17 @@ src_prepare() {
 		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
+		|| die # bug 726120
+
+	if ! use doc ; then
+		# Taken from shipped autogen.sh script
+		echo "EXTRA_DIST = " > gtk-doc.make
+	fi
 
 	eautoreconf
 	elibtoolize # for Solaris
@@ -94,6 +86,8 @@ multilib_src_configure() {
 		--without-coretext
 		--without-fontconfig #609300
 		--without-uniscribe
+		$(multilib_native_use_enable doc gtk-doc)
+		$(multilib_native_use_enable doc gtk-doc-html)
 		$(use_enable static-libs static)
 		$(multilib_native_use_with cairo)
 		$(use_with glib)
diff --git a/media-libs/harfbuzz/harfbuzz-2.7.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.7.1.ebuild
new file mode 100644
index 000000000000..d8d692333627
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-2.7.1.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 ~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/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index bdc327af67b0..d8d692333627 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit autotools flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
+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"
@@ -14,14 +14,14 @@ 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"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	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"
+IUSE="+cairo debug doc +glib +graphite icu +introspection static-libs test +truetype"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="introspection? ( glib )"
 
@@ -34,20 +34,14 @@ RDEPEND="
 	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
+	>=dev-libs/gobject-introspection-common-1.34
 	test? ( ${PYTHON_DEPS} )
 "
 BDEPEND="
-	dev-util/gtk-doc-am
 	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+	introspection? ( dev-util/glib-utils )
 "
-# 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
@@ -61,56 +55,50 @@ src_prepare() {
 
 	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
+		|| 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 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)
+	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)
 	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+	meson_src_configure
+}
 
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/html docs/html || die
-	fi
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
 }
 
 multilib_src_install_all() {
 	einstalldocs
-	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index e6c75520cef4..0762be6fd09a 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -1,5 +1,8 @@
 AUX ilmbase-2.3.0-fix-bashisms.patch 8531 BLAKE2B e21eb0c1d2ec002867048923f94f6521d9f247854febbc35eb1ba8720491a9f46fff899d68719b3b542524cccf21adae6267703801faa65542c2b93c7d588d40 SHA512 972285da78ad70c9efa6b1477621fc3f73270711a5ffa40cd1d11762f83e846716782124eb9a38adf1b99f6edc5858a66648e7ab8c54946f15b7b93aa19f8f7b
 AUX ilmbase-2.3.0-testBox.patch 2826 BLAKE2B ddafd231e641cd518ca864e6aa27f88b24b81f1bed29fe05fe79accc033484479e891482529ead24ddc2b1b931d808eb20a6b960f7281da83357b637c3d937ca SHA512 81eb09823fed3841742ef8b85b262d9d6fbce97ae87fdc5e902c4d85c7f8c7a01b7be08acac23fee5c5cfdb8815f410b200f2af4039ade0cedd31866312015db
+AUX ilmbase-2.5.2-musl.patch 2134 BLAKE2B eb22304535301b717adf2397343b6f43bfcfb900497d0e549cfc19b78ab9af6511c37aeee77a7f8f99e9214e1519b7fbf808bab28eb9fce63be65a04eb9ac177 SHA512 3505444148a3062f853dea35abf5b2e932c7caf72416c5b083e324cb2b1fcb54fee20f240bfb36c4b1c9d226765ad4520f7784feaf9ea4b7c17009480abab486
 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
-MISC metadata.xml 303 BLAKE2B 53fb5019bd6fe939d485f1eccb4a140ca9b7ce121b06744d8155842ccb6c5e1378ea39a9ae74c8d519be7b3926bd76040df4b8107137fcc2e25be97431e7a1be SHA512 0ab8d735dd7a8e0dc96b14cfde1ae06969d15cfbad956f4fda60b093660aee38fe98709376eedc9362a26858678d2f28eec795c1accb2560858fd804a11bb7ca
+EBUILD ilmbase-2.5.2.ebuild 1328 BLAKE2B d155d7586a8a6bce9f95727a7176919ab3363fcaef6bf67893a81228723b6b3474255d8814666138d85f9c4ce162699b392909ced91cfff077a12fde770b3648 SHA512 5e56f93bb7853c8dfa8bed4819e5db15f50a5541a3dfcf949227ba7434f6647659e55b230be6b84819e3f73c3ce00d677770735f875bd592c9f57e6e7e7ef4da
+MISC metadata.xml 653 BLAKE2B 355a987fbbb2073049234f241a5574b0f023b82c8b7597145bc4242eb084a7499fc13d5a4dff56cc5c608fc56d8d264affa2045bf8f35875a7dae54828a51143 SHA512 bde3f1221e1cde98af0137b166c41b39f0342875217ee002e0c754f66fbb921ab4fc9657befa62ddfc97ee07fd9b53fccc3c12fba2a5ab7788bdf0120109f9d2
diff --git a/media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch b/media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch
new file mode 100644
index 000000000000..80f11e44c12e
--- /dev/null
+++ b/media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch
@@ -0,0 +1,50 @@
+From c7af102e6bce6638add2f38576ffe9c6741ba768 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
+Date: Thu, 30 Jul 2020 02:21:07 +0200
+Subject: [PATCH] IexMathFpu.cpp: Fix build on non-glibc (e.g. musl libc).
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Originally from:
+https://github.com/void-linux/void-packages/blob/80bbc168faa25448bd3399f4df331b836e74b85c/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+
+Fixes error:
+
+    IlmBase/IexMath/IexMathFpu.cpp: In function ‘void Iex_2_4::FpuControl::restoreControlRegs(const ucontext_t&, bool)’:
+    IlmBase/IexMath/IexMathFpu.cpp:284:38: error: ‘struct _fpstate’ has no member named ‘cw’; did you mean ‘cwd’?
+      284 |     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
+          |                                      ^~
+          |                                      cwd
+    IlmBase/IexMath/IexMathFpu.cpp:287:20: error: ‘struct Iex_2_4::FpuControl::_fpstate_64’ has no member named ‘magic’
+      287 |     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
+          |                    ^~~~~
+
+Signed-off-by: Niklas Hambüchen <mail@nh2.me>
+---
+ IlmBase/IexMath/IexMathFpu.cpp | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/IlmBase/IexMath/IexMathFpu.cpp b/IlmBase/IexMath/IexMathFpu.cpp
+index ceed658e0..439329e50 100644
+--- a/IexMath/IexMathFpu.cpp
++++ b/IexMath/IexMathFpu.cpp
+@@ -281,10 +281,18 @@ restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
+ inline void
+ restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
+ {
++#if defined(__GLIBC__) || defined(__i386__)
+     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
++#else
++    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
++#endif
+     
+     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
++#if defined(__GLIBC__) || defined(__i386__)
+     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
++#else
++    setMxcsr (kfp->mxcsr, clearExceptions);
++#endif
+ }
+ 
+ #endif
diff --git a/media-libs/ilmbase/ilmbase-2.5.2.ebuild b/media-libs/ilmbase/ilmbase-2.5.2.ebuild
new file mode 100644
index 000000000000..3e9e28c44118
--- /dev/null
+++ b/media-libs/ilmbase/ilmbase-2.5.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic
+
+DESCRIPTION="OpenEXR ILM Base libraries"
+HOMEPAGE="http://openexr.com/"
+SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+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"
+IUSE="large-stack static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/openexr-${PV}/IlmBase"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/IlmBaseConfigInternal.h )
+
+PATCHES=( "${FILESDIR}"/${P}-musl.patch )
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DILMBASE_BUILD_BOTH_STATIC_SHARED=$(usex static-libs)
+		-DILMBASE_ENABLE_LARGE_STACK=$(usex large-stack)
+		-DILMBASE_INSTALL_PKG_CONFIG=ON
+	)
+
+	# Disable use of ucontext.h wrt #482890
+	if use hppa || use ppc || use ppc64; then
+		mycmakeargs+=(
+			-DILMBASE_HAVE_UCONTEXT_H=OFF
+		)
+	fi
+
+	# needed for running tests with x86_32
+	# see https://github.com/AcademySoftwareFoundation/openexr/issues/346
+	if use abi_x86_32 && use test; then
+		append-cppflags -ffloat-store
+	fi
+
+	cmake_src_configure
+}
diff --git a/media-libs/ilmbase/metadata.xml b/media-libs/ilmbase/metadata.xml
index fc9e500d69e1..454b3da09a54 100644
--- a/media-libs/ilmbase/metadata.xml
+++ b/media-libs/ilmbase/metadata.xml
@@ -1,10 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>waebbl@gmail.com</email>
+		<name>Bernd Waibel</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>media-video@gentoo.org</email>
 	</maintainer>
+	<use>
+		<flag name="large-stack">
+			Enables code to take advantage of large stack support
+		</flag>
+	</use>
 	<upstream>
-		<remote-id type="github">openexr/openexr</remote-id>
+		<remote-id type="github">AcademySoftwareFoundation/openexr</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/jbig2dec/Manifest b/media-libs/jbig2dec/Manifest
index 57107a08f180..41092d4ce80c 100644
--- a/media-libs/jbig2dec/Manifest
+++ b/media-libs/jbig2dec/Manifest
@@ -1,7 +1,6 @@
-AUX jbig2dec-0.17-fix-test_jbig2dec.py.patch 1550 BLAKE2B 274b37da363b9d09ae98fdba32b9d319b8e8646cabbdcd2d48defecae6fe048dc0d909906fa6096b2c1934267c91e217d2cdd348368fadd4256801884f098acd SHA512 f098733ca2aed78f3f45b821b6eb21cf268d64e715169b2683419116f83cc293c3d38e364d8edb44db3f414e5c911d7b51af8231e332e423ac210b3b513c605f
+AUX jbig2dec-0.18-extra-overflow-checks.patch 2490 BLAKE2B 1a60208ec6b219c9735330d38cfd8ac1d5304e929c263caaf22957cdd659e8a22ed181da200cbbb13fd9c26629d952ea75fb1dd744fe996abc8f032c77dbc149 SHA512 1a4e03bec23cb06783a1ce3b239e7e026b0d637e297caac62702fd3e1e6b6c6c28c814b5253837e6cd8a4275a36e9db485893b435ecf2b46063be258713a60a7
+AUX jbig2dec-0.18-overflow-IAID.patch 1285 BLAKE2B d2733f588b57af91ea40844750a888003d14491dcf71123c9e36f2533189f906668eb1f583ad7ca8759215d772f06153f4ac0ff98b22d4e12540e55d8e32e580 SHA512 d78bac4088d6a0cff3965f16042a0993b10b281d8a03fe282cfc896fe4bdbb18e1aec6c60e245d3531ab95fde62991be98c56a2455c8a5fa38e78239092b527d
 DIST jb2streams.zip 1285838 BLAKE2B 9a2b6047a7b970439693d6f5fdefb9488019a562e7f831288b27df09bb19dec2f84854cf7fea50b5b041d331e925145f37f2f89848058ecdc074e7d6c238033f SHA512 382890b36345b8aaebb3554e776a53f3276c6d835335ce41f3f41829ff62bba7ae646602544103ba8541a7a824dca92d682b682c254ab2918c7fe45b3e358b45
-DIST jbig2dec-0.14.tar.gz 463572 BLAKE2B 91351a3879bd1906fabe2620cf5379fbbc32eaae808a8c2754c661d6dc592d3c9da13c558c8f7ced30c48b73fbd9ed4631f2817298f959b59ad4dff5fce9ac1a SHA512 066bd880ac0665fc1e42b0ae0e481008b125aab6e173b7f82d61a2a30e72c90085cbded9b2a68c6836f92dea3d8d8d5c2228dba76e0d99c79c922197d215705b
-DIST jbig2dec-0.17.tar.gz 141195 BLAKE2B 858befb59c0b943cddbc4ae2e9ffc6cdb7e1dd2185cedbffb577f0152f27a548f565548b4b0a4867e3973692b8b019a565eabe2cf672334a6b2994fd7988dcaf SHA512 79b3957186a30fc304ecd571d31c5cc421364921eb4eba242c3ea941ea111f461773f86c975657fa2ce91f2f79ff9abf760ef9bed404c7a4f35c036e5642ba0f
-EBUILD jbig2dec-0.14.ebuild 1141 BLAKE2B 5bec117e5f087d42b74bc9e665ea82ef0091d93e7abaa0bebcbb6f48a7c56a4069858921a8f03955db98ad2c50074a9e977bc66d644b2cff6b897ba8e656eb57 SHA512 0fabea3ebe23edd6b29ab513f1e37de10b7c374fd27b098ea12ecdef583757779b384464c72323cd95d0125da0b04341bce8793c97efc8522f75359bf1e8de0a
-EBUILD jbig2dec-0.17-r1.ebuild 1615 BLAKE2B 0a67e44adf16face69d8a4eaa56fe437f40253cc49364c71d81d6c7dda4d0e71e53e299f71738d238cf7ed92130f72e9b6c0b5a137793566bd25961f366f1005 SHA512 8832d6c0b9d649e620950c5f348ecd59e488450cbd356c66ce49ff1f4447c3626b97140d24b5dae9fd5530b374ef9a4d4a27247c48c8974bb92e62c6faae9e57
+DIST jbig2dec-0.18.tar.gz 148563 BLAKE2B a864fd5b00abca3ae0f847c1d8fd537d92d68a3c042c851b6bebd51bb674f5bc4a36811f2b4fd7753db4d3641e544e03ec184cb90d43da0247d8affd7cf62c11 SHA512 5931530ee3b811f9009c95d08ad65701564ef8ebf6511145acb969cc7c99dab5028daaee580dd83358b6bdc477cffe347712b9c9768c9b1a63395e366046267d
+EBUILD jbig2dec-0.18.ebuild 1655 BLAKE2B d1039e26d0b0a7573b0a8c1c60b109a70d8d5e0d9aa2dd3918037405e6470ac3a6ff5d2b82fbb587526efd739bf55aad54a2c4314fb6a102a23537157b4452f1 SHA512 39af2ce59fe84344f6fc8a6b366af223a3c34d27e61e0bfa2b68081386c13fadc78311554a8ba404cab9ef0c16e4adf1ce56039c6e1bfe5e8c7d5de2e92215fc
 MISC metadata.xml 347 BLAKE2B 6c6d66bb933731270b688e7f0d9174f3cac5e697d30af47398425b7f3789e6960f87a67c192d931603c0120622839a92ad93bb6154c1ceecf07ba2827488f001 SHA512 7472b2c0abdc9db46fc886ba58d9c9daf16efc76d306087b4ccec7bffdb1ddf034f433ede85681a7bb2b87d7959f7eef557743c9fbde7891efd4e3c5058aeda7
diff --git a/media-libs/jbig2dec/files/jbig2dec-0.17-fix-test_jbig2dec.py.patch b/media-libs/jbig2dec/files/jbig2dec-0.17-fix-test_jbig2dec.py.patch
deleted file mode 100644
index e99a298f5de9..000000000000
--- a/media-libs/jbig2dec/files/jbig2dec-0.17-fix-test_jbig2dec.py.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From c48d802aa6f65cc0284c8aa9824b6ae4e7dd5aa1 Mon Sep 17 00:00:00 2001
-From: Sebastian Rasmussen <sebras@gmail.com>
-Date: Fri, 14 Jun 2019 22:18:14 +0200
-Subject: [PATCH] jbig2dec: Make tests expect that some test files return white
- image.
-
-Previously these tests would just error out and jbig2dec would not
-return any output file at all. Now, jbig2dec parses as much as
-possible, while emitting warning/error messages. In the case of a
-few of the test files the end result is a white image.
----
- test_jbig2dec.py | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/test_jbig2dec.py b/test_jbig2dec.py
-index a841438..33008e5 100755
---- a/test_jbig2dec.py
-+++ b/test_jbig2dec.py
-@@ -60,6 +60,7 @@ class KnownFileHash(SelfTest):
- 
-   # hashes of known test inputs
-   known_NOTHING_DECODED = "da39a3ee5e6b4b0d3255bfef95601890afd80709"
-+  known_WHITE_PAGE_DECODED = "28a6bd83a8a3a36910fbc1f5ce06c962e4332911"
-   known_042_DECODED = "ebfdf6e2fc5ff3ee2271c2fa19de0e52712046e8"
-   known_amb_DECODED = "3d4b7992d506894662b53415bd3d0d2a2f8b7953"
- 
-@@ -103,10 +104,10 @@ class KnownFileHash(SelfTest):
- 			known_042_DECODED),
-                    ('../ubc/042_13.jb2',
- 			"7d428bd542f58591b254d9827f554b0552c950a7",
--			known_NOTHING_DECODED),
-+			known_WHITE_PAGE_DECODED),
-                    ('../ubc/042_14.jb2',
- 			"c40fe3a02acb6359baf9b40fc9c49bc0800be589",
--			known_NOTHING_DECODED),
-+			known_WHITE_PAGE_DECODED),
-                    ('../ubc/042_15.jb2',
- 			"a9e39fc1ecb178aec9f05039514d75ea3246246c",
- 			known_042_DECODED),
diff --git a/media-libs/jbig2dec/files/jbig2dec-0.18-extra-overflow-checks.patch b/media-libs/jbig2dec/files/jbig2dec-0.18-extra-overflow-checks.patch
new file mode 100644
index 000000000000..52a7f448e6f3
--- /dev/null
+++ b/media-libs/jbig2dec/files/jbig2dec-0.18-extra-overflow-checks.patch
@@ -0,0 +1,51 @@
+https://github.com/ArtifexSoftware/jbig2dec/commit/873694419b3498708b90c5c36ee0a73795a90c84
+----
+From 873694419b3498708b90c5c36ee0a73795a90c84 Mon Sep 17 00:00:00 2001
+From: Sebastian Rasmussen <sebras@gmail.com>
+Date: Sun, 15 Sep 2019 17:31:48 +0200
+Subject: [PATCH] jbig2dec: Handle under-/overflow detection and messaging
+ better.
+
+Previously SYMWIDTH was capped too early in order to prevent underflow
+Moreover TOTWIDTH was allowed to overflow.
+
+Now the value DW is checked compared to SYMWIDTH, preventing over
+underflow and overflow at the correct limits, and an overflow
+check has been added for TOTWIDTH.
+---
+ jbig2_symbol_dict.c | 18 ++++++++++++++----
+ 1 file changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/jbig2_symbol_dict.c b/jbig2_symbol_dict.c
+index e606529..bc6e98c 100644
+--- a/jbig2_symbol_dict.c
++++ b/jbig2_symbol_dict.c
+@@ -428,14 +428,24 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
+                 break;
+             }
+ 
++            if (DW < 0 && SYMWIDTH < (uint32_t) -DW) {
++                code = jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number, "DW value (%d) would make SYMWIDTH (%u) negative at symbol %u", DW, SYMWIDTH, NSYMSDECODED + 1);
++                goto cleanup;
++            }
++            if (DW > 0 && DW > UINT32_MAX - SYMWIDTH) {
++                code = jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number, "DW value (%d) would make SYMWIDTH (%u) too large at symbol %u", DW, SYMWIDTH, NSYMSDECODED + 1);
++                goto cleanup;
++            }
++
+             SYMWIDTH = SYMWIDTH + DW;
+-            TOTWIDTH = TOTWIDTH + SYMWIDTH;
+-            if ((int32_t) SYMWIDTH < 0) {
+-                code = jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number, "invalid SYMWIDTH value (%d) at symbol %d", SYMWIDTH, NSYMSDECODED + 1);
++            if (SYMWIDTH > UINT32_MAX - TOTWIDTH) {
++                code = jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number, "SYMWIDTH value (%u) would make TOTWIDTH (%u) too large at symbol %u", SYMWIDTH, TOTWIDTH, NSYMSDECODED + 1);
+                 goto cleanup;
+             }
++
++            TOTWIDTH = TOTWIDTH + SYMWIDTH;
+ #ifdef JBIG2_DEBUG
+-            jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, segment->number, "SYMWIDTH = %d TOTWIDTH = %d", SYMWIDTH, TOTWIDTH);
++            jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, segment->number, "SYMWIDTH = %u TOTWIDTH = %u", SYMWIDTH, TOTWIDTH);
+ #endif
+             /* 6.5.5 (4c.ii) */
+             if (!params->SDHUFF || params->SDREFAGG) {
diff --git a/media-libs/jbig2dec/files/jbig2dec-0.18-overflow-IAID.patch b/media-libs/jbig2dec/files/jbig2dec-0.18-overflow-IAID.patch
new file mode 100644
index 000000000000..7205c980fc28
--- /dev/null
+++ b/media-libs/jbig2dec/files/jbig2dec-0.18-overflow-IAID.patch
@@ -0,0 +1,36 @@
+https://github.com/ArtifexSoftware/jbig2dec/commit/f6d326878893dc92b45cbd18e25ab4d2b3a8db73
+----
+From f6d326878893dc92b45cbd18e25ab4d2b3a8db73 Mon Sep 17 00:00:00 2001
+From: Sebastian Rasmussen <sebras@gmail.com>
+Date: Sun, 15 Sep 2019 18:12:31 +0200
+Subject: [PATCH] jbig2dec: Add overflow detection for IAID context size.
+
+---
+ jbig2_arith_iaid.c | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/jbig2_arith_iaid.c b/jbig2_arith_iaid.c
+index 78dc830..bbc38a0 100644
+--- a/jbig2_arith_iaid.c
++++ b/jbig2_arith_iaid.c
+@@ -44,9 +44,18 @@ struct _Jbig2ArithIaidCtx {
+ Jbig2ArithIaidCtx *
+ jbig2_arith_iaid_ctx_new(Jbig2Ctx *ctx, int SBSYMCODELEN)
+ {
+-    Jbig2ArithIaidCtx *result = jbig2_new(ctx, Jbig2ArithIaidCtx, 1);
+-    int ctx_size = 1 << SBSYMCODELEN;
++    Jbig2ArithIaidCtx *result;
++    size_t ctx_size;
+ 
++    if (sizeof(ctx_size) * 8 <= SBSYMCODELEN)
++    {
++        jbig2_error(ctx, JBIG2_SEVERITY_FATAL, -1, "requested IAID arithmetic coding state size too large");
++        return NULL;
++    }
++
++    ctx_size = 1 << SBSYMCODELEN;
++
++    result = jbig2_new(ctx, Jbig2ArithIaidCtx, 1);
+     if (result == NULL) {
+         jbig2_error(ctx, JBIG2_SEVERITY_FATAL, -1, "failed to allocate IAID arithmetic coding state");
+         return NULL;
diff --git a/media-libs/jbig2dec/jbig2dec-0.14.ebuild b/media-libs/jbig2dec/jbig2dec-0.14.ebuild
deleted file mode 100644
index 4b9601c3e6c3..000000000000
--- a/media-libs/jbig2dec/jbig2dec-0.14.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A decoder implementation of the JBIG2 image compression format"
-HOMEPAGE="http://ghostscript.com/jbig2dec.html"
-SRC_URI="http://downloads.ghostscript.com/public/${PN}/${P}.tar.gz
-	test? ( http://jbig2dec.sourceforge.net/ubc/jb2streams.zip )"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 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"
-
-RDEPEND="png? ( media-libs/libpng:0= )"
-DEPEND="${RDEPEND}
-	test? ( app-arch/unzip )"
-
-RESTRICT="test"
-# bug 324275
-
-DOCS=( CHANGES README )
-
-src_prepare() {
-	default
-
-	if use test; then
-		mkdir "${WORKDIR}/ubc" || die
-		mv -v "${WORKDIR}"/*.jb2 "${WORKDIR}/ubc/" || die
-		mv -v "${WORKDIR}"/*.bmp "${WORKDIR}/ubc/" || die
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with png libpng)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -exec rm {} + || die
-}
diff --git a/media-libs/jbig2dec/jbig2dec-0.17-r1.ebuild b/media-libs/jbig2dec/jbig2dec-0.18.ebuild
index 3eefc412058c..44a2bb95f724 100644
--- a/media-libs/jbig2dec/jbig2dec-0.17-r1.ebuild
+++ b/media-libs/jbig2dec/jbig2dec-0.18.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit autotools python-any-r1
 
@@ -22,14 +22,18 @@ BDEPEND="
 	test? (
 		app-arch/unzip
 		${PYTHON_DEPS}
-	)"
+	)
+"
 
 RDEPEND="png? ( media-libs/libpng:0= )"
 DEPEND="${RDEPEND}"
 
 DOCS=( CHANGES README )
 
-PATCHES=( "${FILESDIR}"/${PN}-0.17-fix-test_jbig2dec.py.patch )
+PATCHES=(
+	"${FILESDIR}/${P}-extra-overflow-checks.patch"
+	"${FILESDIR}/${P}-overflow-IAID.patch"
+)
 
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
@@ -64,5 +68,6 @@ src_configure() {
 
 src_install() {
 	default
+
 	find "${ED}" -name '*.la' -exec rm {} + || die
 }
diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index e80215e8e723..ced1c32f1b58 100644
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -1,13 +1,5 @@
 AUX jpeg-7-maxmem_sysconf.patch 1313 BLAKE2B 7289891453e5b4ecb474ab7b77a107f7d2446ac34362f53327353e29719500cf8eaf420886114a04b052e0d38ef81a3b2cf7e2ee2ff00b7d30cb4cb948c40165 SHA512 42a3bccf20db20d1b0e9dee3b5a8b1733b81b5d3dcda83aae8e910d023af0fcbce920c010d11dc8b637935886eede05161393d8e594f48189f72a346f3f8fed8
-AUX jpeg-8d-CVE-2013-6629.patch 459 BLAKE2B 7657e4c2584d23e2997ec9d4ac8242b4d7ce24ccf12c973323e091a543947d28108a5fe2e917ebfd0bb69424e48609ac7fe210bc2a116acf90e15a76ba563197 SHA512 7a08085ebce49be6d14c4b52bfc06e67c7f46f6aea38ddf1475f041cc84010ba535394d85dae9a957074a39fe5d22ae60f228192e24795105009f189e7f9f4b0
-DIST jpeg-6b-patchset-1.tar.xz 2592 BLAKE2B 6518fc5e94dcb4cecbb2d9f4edd2ad297d1f7b64f3da4f03ab54acc6eb9f11374091b7337b005a76f644c6795cdddc2ea032a9f41c9a9a3f5e06e0ba9f02f939 SHA512 6deb845a08f4ac6b88c47803b528842cedd145fb12295060d52553b8c803ba192478306496701a409c796c264ceaed0988575ae8f7717e2e7b24da5733bc9c2b
-DIST jpegsrc.v6b.tar.gz 613261 BLAKE2B d08406bebcbec9aa0197ef7854f163dc12d916e7e7df466e5408e715aa20738c047f0f709699311186e17da443af9afc208765f74bcc51a7bab2284c54351868 SHA512 5d37d3695105fc345ca269ab98cd991472e5de72f702c9a8a652a7d114a40eb99670c69a87ecb24bf64e96318fc0ee2bcb44c497d9d3d2a67378c99e4eb348fe
-DIST jpegsrc.v8d.tar.gz 991456 BLAKE2B 6644af7dd47a3b1cbcbc8f6bc111c882ed1790eaad6bee06e9b95b803bf756beb6ad61abc76c889d53dfcd05139286ec870372d50d2b79bf28b32d0e8d50a2ab SHA512 7a8b4cff5b1caf6a7281c5dce4e1efa1b68360bd64dd2e619b60c9e1d49f22624bc8780b681bfab073e7b1d4b7f41008a464a58f0eeeacb0a40ff996d7eb5753
-DIST jpegsrc.v9c.tar.gz 1028200 BLAKE2B 621ef910f3fa397da0d19da1e1771b13ae1e524ba541f7f2562de1da27a8a3b26abc63d01218ae56ddbf480ba5d6ea6a778a23693304f7b4364edb1bcd4839e7 SHA512 c95aacb0f1972a2271953ee17b5c6a6c3662d5f4fbc4d1e9aef59dece42a169b0f34d3fa1d385b88580ad11cefd194250094ee72843f4e0028204df6741cb611
 DIST jpegsrc.v9d.tar.gz 1070160 BLAKE2B a905a15c0eadc8ebd797fe009685a2c300dc39600ed7416d58adf1ed326a26ca45146387fe73a87a589f4bed95e652f5385b4df5e7544a4e348bda27356295c2 SHA512 c425cf413e679e4112b428592e6facc813cadf92e42a6b850c5d348b3dd47b0599e2f4a119d7ff543b762cdcadd42a77ed1429a08874e73f64a54fb869714357
 DIST libjpeg8_8d-1.debian.tar.gz 13676 BLAKE2B ac6fab3e52f91c9ece95ed809fc972afc92c55754a59358f7dacb056917b1878f6f9be85a20ccb34eb13489a9963a00659fe25c27e8b18b44961c6ba5f3214cd SHA512 7def4f13524f0af3b9adf35a370027a18f43b9a635f56a17d5bb7883370db8b18b8a12737d0f0cb4b0287ccf8fb474eb5f754de6b398ffe7d522c54e5bf68040
-EBUILD jpeg-6b-r12.ebuild 1111 BLAKE2B ea32ca2509659217d2e5ce8d8e714e09cf71d7a8fbd77e5effa3da1c51ad430a9f888355bc992de56966896ad3b7b297b1e65fefa690c4b8cdd61829aab51ce4 SHA512 729c6970970fd738182cfa9cd454f7fa589e18fb1034cc0c45478d9300453550a7725ea599a8332005da906876c7267b1948976271ee6841fa3d8011230692f7
-EBUILD jpeg-8d-r2.ebuild 1388 BLAKE2B f5727b52bfd19b9690a615fc3309d65480a4c1d88b1c892952ea78d60706097ef0ccfdb9b10869ab7acd4cc4ac49b9d8174ffb43efdc12b334e55f0c00638e22 SHA512 4a569c78ccffea89adfa37568d6d5e95a2df66bb965d757c6cdebd3e1730aefc10906ee7f632458c3f04153b31449803b245d6a7247a6c12c9b2d050a6a87da5
-EBUILD jpeg-9c.ebuild 1983 BLAKE2B 4bd96d7634c43435e9ab200c364a6be807d637e32055da5f85876b95947aeb85d5856b05067976aef1b8b6bf99f082d3984cb4193f168b8c9512b47ae2a4f07d SHA512 cd12c2be6d222d954129fdb93ab0129e2f29c136fe4fcebd4dc27f9e37f7c2866865b01a255a6188acd805f949e9cd5cec12a11d184d494c90eeec95704ba855
 EBUILD jpeg-9d.ebuild 1983 BLAKE2B 4bd96d7634c43435e9ab200c364a6be807d637e32055da5f85876b95947aeb85d5856b05067976aef1b8b6bf99f082d3984cb4193f168b8c9512b47ae2a4f07d SHA512 cd12c2be6d222d954129fdb93ab0129e2f29c136fe4fcebd4dc27f9e37f7c2866865b01a255a6188acd805f949e9cd5cec12a11d184d494c90eeec95704ba855
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-libs/jpeg/files/jpeg-8d-CVE-2013-6629.patch b/media-libs/jpeg/files/jpeg-8d-CVE-2013-6629.patch
deleted file mode 100644
index a1535a79ffec..000000000000
--- a/media-libs/jpeg/files/jpeg-8d-CVE-2013-6629.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://bugs.gentoo.org/491152
-
---- jdmarker.c
-+++ jdmarker.c
-@@ -347,6 +347,12 @@
-     
-     TRACEMS3(cinfo, 1, JTRC_SOS_COMPONENT, cc,
- 	     compptr->dc_tbl_no, compptr->ac_tbl_no);
-+
-+    /* This CSi (cc) should differ from the previous CSi */
-+    for (ci = 0; ci < i; ci++) {
-+      if (cinfo->cur_comp_info[ci] == compptr)
-+        ERREXIT1(cinfo, JERR_BAD_COMPONENT_ID, cc);
-+    }
-   }
- 
-   /* Collect the additional scan parameters Ss, Se, Ah/Al. */
diff --git a/media-libs/jpeg/jpeg-6b-r12.ebuild b/media-libs/jpeg/jpeg-6b-r12.ebuild
deleted file mode 100644
index 1c6ea51b57d6..000000000000
--- a/media-libs/jpeg/jpeg-6b-r12.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# this ebuild is only for the libjpeg.so.62 SONAME for ABI compat
-
-PATCH_VER=1
-inherit eutils libtool toolchain-funcs multilib-minimal
-
-DESCRIPTION="library to load, handle and manipulate images in the JPEG format (transition package)"
-HOMEPAGE="http://www.ijg.org/"
-SRC_URI="mirror://gentoo/jpegsrc.v${PV}.tar.gz
-	https://dev.gentoo.org/~ssuominen/${P}-patchset-${PATCH_VER}.tar.xz"
-
-LICENSE="IJG"
-SLOT="62"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DOCS=""
-
-RDEPEND="!>=media-libs/libjpeg-turbo-1.3.0-r2:0"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-	epatch "${FILESDIR}"/${PN}-8d-CVE-2013-6629.patch
-	elibtoolize
-}
-
-multilib_src_configure() {
-	tc-export CC
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-shared \
-		--disable-static \
-		--enable-maxmem=64
-}
-
-multilib_src_compile() {
-	emake libjpeg.la
-}
-
-multilib_src_install() {
-	newlib.so .libs/libjpeg.so.62.0.0 libjpeg.so.62
-}
diff --git a/media-libs/jpeg/jpeg-8d-r2.ebuild b/media-libs/jpeg/jpeg-8d-r2.ebuild
deleted file mode 100644
index e8f537b63244..000000000000
--- a/media-libs/jpeg/jpeg-8d-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# this ebuild is only for the libjpeg.so.8 SONAME for ABI compat
-
-inherit eutils libtool toolchain-funcs multilib-minimal
-
-DESCRIPTION="Library to load, handle and manipulate images in the JPEG format"
-HOMEPAGE="http://jpegclub.org/ http://www.ijg.org/"
-SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz"
-
-LICENSE="IJG"
-SLOT="8"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="!=media-libs/jpeg-8*:0
-	!<media-libs/libjpeg-turbo-1.3.0-r2"
-DEPEND="${RDEPEND}"
-
-DOCS=""
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-7-maxmem_sysconf.patch \
-		"${FILESDIR}"/${P}-CVE-2013-6629.patch
-	elibtoolize
-}
-
-multilib_src_configure() {
-	# Fix building against this library on eg. Solaris and DragonFly BSD, see:
-	# http://mail-index.netbsd.org/pkgsrc-bugs/2010/01/18/msg035644.html
-	local ldverscript=
-	[[ ${CHOST} == *-solaris* ]] && ldverscript="--disable-ld-version-script"
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-static \
-		--enable-maxmem=64 \
-		${ldverscript}
-}
-
-multilib_src_compile() {
-	emake libjpeg.la
-}
-
-multilib_src_install() {
-	newlib.so .libs/libjpeg.so.8.4.0 libjpeg.so.8
-}
diff --git a/media-libs/jpeg/jpeg-9c.ebuild b/media-libs/jpeg/jpeg-9c.ebuild
deleted file mode 100644
index 8839bf4b7e74..000000000000
--- a/media-libs/jpeg/jpeg-9c.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool toolchain-funcs multilib-minimal
-
-DESCRIPTION="Library to load, handle and manipulate images in the JPEG format"
-HOMEPAGE="http://jpegclub.org/ http://www.ijg.org/"
-SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
-	mirror://debian/pool/main/libj/lib${PN}8/lib${PN}8_8d-1.debian.tar.gz"
-
-LICENSE="IJG"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-DEPEND=""
-RDEPEND="!media-libs/libjpeg-turbo:0"
-
-DOCS=( change.log example.c README {coderules,filelist,install,jconfig,libjpeg,structure,usage,wizard}.txt )
-
-PATCHES=( "${FILESDIR}"/${PN}-7-maxmem_sysconf.patch )
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-multilib_src_configure() {
-	# Fix building against this library on eg. Solaris and DragonFly BSD, see:
-	# http://mail-index.netbsd.org/pkgsrc-bugs/2010/01/18/msg035644.html
-	local ldverscript=
-	[[ ${CHOST} == *-solaris* ]] && ldverscript="--disable-ld-version-script"
-
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		--enable-maxmem=64 \
-		${ldverscript}
-}
-
-multilib_src_compile() {
-	emake
-
-	if multilib_is_native_abi; then
-		# Build exifautotran and jpegexiforient
-		cd ../debian/extra
-		emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	find "${D}" -name '*.la' -delete || die
-
-	einstalldocs
-
-	# Install exifautotran and jpegexiforient
-	newdoc ../debian/changelog changelog.debian
-	cd ../debian/extra
-	emake \
-		DESTDIR="${D}" prefix="${EPREFIX}"/usr \
-		INSTALL="install -m755" INSTALLDIR="install -d -m755" \
-		install
-	# Remove +x bits from man pages.
-	find "${ED}"/usr/share/man/ -type f -perm /1 -exec chmod a-x {} + || die
-}
diff --git a/media-libs/ladspa-cmt/Manifest b/media-libs/ladspa-cmt/Manifest
deleted file mode 100644
index 0f0f8ef1e2d3..000000000000
--- a/media-libs/ladspa-cmt/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX cmt.rdf 3943 BLAKE2B e45e6b1e25a8be51d687e0eb931e62bba4a2c821bb35e7784077983df8b66b3b5f9a9497df19588acf68ab2f55a28a50c1cc392fcdc58651befda54f8e60edc3 SHA512 265bb9ed2cff657a2698dc1182bb3079a6d3f70a6db86aa20cfc992b5cf54a341a65f9af278630671c3657dc730de85a0b95caae785893412ad5659a195b820c
-AUX ladspa-cmt-1.16-darwin.patch 316 BLAKE2B 898372b2a5a4a621758209adeb4d96185a5dd0dcd3cfec57bbc0cce4798f4a78b12eaf2e1bb9ec96b61457099bdea4a5cf2883a58ea17f38101829b45a7ccf17 SHA512 1a73be4184681fff4f6827fa47508d8177c1fccb492b66ad89638a5c4725fcc828545b225db6b38eb6971aefe7eef92edee4f6b3a7013365eb60010935db1497
-AUX ladspa-cmt-1.16-mallocstdlib.patch 1992 BLAKE2B 0b1703227bb3d413fad609519a8c1555f2173684ec9b7f32e5d62d51877a8c98b52542c7e2321181b1b00d2d49fa41aab3f8a82b54827254bc9b3c14fa5cfaa8 SHA512 6b099ad314f4c2c3048a3b8e171d36bdf8dbca277989270666779881e02d1f9ba5b4027e5b1676c2092eca19221cd4f3d46789b4dcf7bdee0ab57e5e51d769e7
-AUX ladspa-cmt-1.16-respect-ldflags.patch 369 BLAKE2B 4d64564551d56b9aad53e019c4b217f5d4e1fefdfce60995294783a74825a7bf356aab5ae48d5e4d83751e1fdd33e96fb2e814eb057a0a756ca28f9d7d13ee12 SHA512 3f4cfdab23de0b2fa2c841c4699a2f975b526575261f29756cdb3e9515dd7629e34bf847d027a305e32a9489e414dd59efd55e18a368f3ffc928ce86f80a5add
-AUX ladspa-cmt-1.16-sa.patch 666 BLAKE2B de5b533d76cece9d5ffb93ae9956218bd090ee0f5b88afa8eca3ca9d435af401e472831f1e91c954719eb7c59057464057ed17bd7ffb9d93829d21aed39f20f1 SHA512 162791653741af546a64cabd74f8737f965c9e8799a1d80ae5d2b292b200b1710702b901aaf759457b7737530f2b03824cd135150329f60a2aa56011f17fd244
-DIST cmt_src_1.16.tgz 63909 BLAKE2B b476b701f63125a11e2f03cb837552ddf26beba0c897873959c2577f3d897866bea0dccb480e4fcb0462a0ffea4d380b5a99998b082a46f7222049d2d2db4c9f SHA512 be4aaa064183b6121b4ca8d7d2535cb9a3bcb557e3a2f22b45ec9775b0e296f70a9a7edf697b78095d6ef1564bb5459bb742649082ac724d1774c0790379af21
-EBUILD ladspa-cmt-1.16-r4.ebuild 1367 BLAKE2B f3c90e34c874a34f3762ca787c502cd9d43254ca2094266dcf133624778f604950c00a3494e6a30e46e63eb1c3836042de974ec1f85edea0e0ca4d93bad84e88 SHA512 69b0ed4be1fdee5f3c91adb3f28f89aa0f1e9ff8136cd5fa68517a3c9b6384f9299d866a8f71c8a94e1cde1d16f929b03235ea7c537cc27d95690114830e909c
-MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/ladspa-cmt/files/cmt.rdf b/media-libs/ladspa-cmt/files/cmt.rdf
deleted file mode 100644
index c63fd9249a1b..000000000000
--- a/media-libs/ladspa-cmt/files/cmt.rdf
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<!DOCTYPE rdf:RDF [
-        <!ENTITY rdf 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
-        <!ENTITY rdfs 'http://www.w3.org/2000/01/rdf-schema#'>
-        <!ENTITY dc 'http://purl.org/dc/elements/1.1/'>
-        <!ENTITY ladspa 'http://ladspa.org/ontology#'>
-]>
-<rdf:RDF xmlns:rdf="&rdf;"
-         xmlns:rdfs="&rdfs;"
-         xmlns:dc="&dc;"
-         xmlns:ladspa="&ladspa;">
-
-  <!-- New classes needed by CMT -->
-  <rdfs:Class rdf:about="&ladspa;AmbisonicPlugin" ladspa:hasLabel="Ambisonic">
-    <rdfs:subClassOf rdf:resource="&ladspa;UtilityPlugin" />
-  </rdfs:Class>
-
-  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1092"/>
-  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1091"/>
-  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1090"/>
-  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1093"/>
-  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1087"/>
-  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1094"/>
-  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1089"/>
-  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1088"/>
-
-  <ladspa:AmplifierPlugin rdf:about="&ladspa;1067"/>
-  <ladspa:AmplifierPlugin rdf:about="&ladspa;1068"/>
-  <ladspa:ModulatorPlugin rdf:about="&ladspa;1070"/>
-
-  <ladspa:DistortionPlugin rdf:about="&ladspa;1846"/>
-  <ladspa:DistortionPlugin rdf:about="&ladspa;1227"/>
-  <ladspa:WaveshaperPlugin rdf:about="&ladspa;1097"/>
-
-  <ladspa:DelayPlugin rdf:about="&ladspa;1225"/>
-  <ladspa:DelayPlugin rdf:about="&ladspa;1053"/>
-  <ladspa:DelayPlugin rdf:about="&ladspa;1054"/>
-  <ladspa:DelayPlugin rdf:about="&ladspa;1055"/>
-  <ladspa:DelayPlugin rdf:about="&ladspa;1056"/>
-  <ladspa:DelayPlugin rdf:about="&ladspa;1057"/>
-  <ladspa:DelayPlugin rdf:about="&ladspa;1058"/>
-  <ladspa:DelayPlugin rdf:about="&ladspa;1059"/>
-  <ladspa:DelayPlugin rdf:about="&ladspa;1060"/>
-  <ladspa:DelayPlugin rdf:about="&ladspa;1061"/>
-  <ladspa:DelayPlugin rdf:about="&ladspa;1062"/>
-
-  <ladspa:UtilityPlugin rdf:about="&ladspa;1080"/>
-  <ladspa:UtilityPlugin rdf:about="&ladspa;1081"/>
-  <ladspa:UtilityPlugin rdf:about="&ladspa;1078"/>
-  <ladspa:UtilityPlugin rdf:about="&ladspa;1079"/>
-  <ladspa:UtilityPlugin rdf:about="&ladspa;1098"/>
-  <ladspa:UtilityPlugin rdf:about="&ladspa;1099"/>
-  <ladspa:UtilityPlugin rdf:about="&ladspa;1849"/>
-  <ladspa:UtilityPlugin rdf:about="&ladspa;1071"/>
-  <ladspa:UtilityPlugin rdf:about="&ladspa;1083"/>
-  <ladspa:UtilityPlugin rdf:about="&ladspa;1084"/>
-  <ladspa:UtilityPlugin rdf:about="&ladspa;1085"/>
-  <ladspa:UtilityPlugin rdf:about="&ladspa;1086"/>
-  <ladspa:UtilityPlugin rdf:about="&ladspa;1082"/>
-
-  <ladspa:ReverbPlugin rdf:about="&ladspa;1123"/>
-
-  <ladspa:GeneratorPlugin rdf:about="&ladspa;1221"/>
-  <ladspa:GeneratorPlugin rdf:about="&ladspa;1096"/>
-  <ladspa:GeneratorPlugin rdf:about="&ladspa;1069"/>
-  <ladspa:GeneratorPlugin rdf:about="&ladspa;1222"/>
-  <ladspa:GeneratorPlugin rdf:about="&ladspa;1226"/>
-  <ladspa:GeneratorPlugin rdf:about="&ladspa;1841"/>
-  <ladspa:GeneratorPlugin rdf:about="&ladspa;1844"/>
-  <ladspa:GeneratorPlugin rdf:about="&ladspa;1843"/>
-  <ladspa:GeneratorPlugin rdf:about="&ladspa;1063"/>
-  <ladspa:GeneratorPlugin rdf:about="&ladspa;1064"/>
-  <ladspa:GeneratorPlugin rdf:about="&ladspa;1065"/>
-  <ladspa:GeneratorPlugin rdf:about="&ladspa;1066"/>
-  <ladspa:GeneratorPlugin rdf:about="&ladspa;1223"/>
-
-  <ladspa:GatePlugin rdf:about="&ladspa;1845"/>
-  <ladspa:LimiterPlugin rdf:about="&ladspa;1848"/>
-  <ladspa:LimiterPlugin rdf:about="&ladspa;1842"/>
-  <ladspa:LimiterPlugin rdf:about="&ladspa;1076"/>
-  <ladspa:LimiterPlugin rdf:about="&ladspa;1077"/>
-  <ladspa:CompressorPlugin rdf:about="&ladspa;1072"/>
-  <ladspa:CompressorPlugin rdf:about="&ladspa;1073"/>
-  <ladspa:ExpanderPlugin rdf:about="&ladspa;1074"/>
-  <ladspa:ExpanderPlugin rdf:about="&ladspa;1075"/>
-
-  <ladspa:LowpassPlugin rdf:about="&ladspa;1051"/>
-  <ladspa:LowpassPlugin rdf:about="&ladspa;1224"/>
-  <ladspa:HighpassPlugin rdf:about="&ladspa;1052"/>
-
-</rdf:RDF>
diff --git a/media-libs/ladspa-cmt/files/ladspa-cmt-1.16-darwin.patch b/media-libs/ladspa-cmt/files/ladspa-cmt-1.16-darwin.patch
deleted file mode 100644
index f4352bfdcb91..000000000000
--- a/media-libs/ladspa-cmt/files/ladspa-cmt-1.16-darwin.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u src-org/makefile src/makefile
---- src-org/makefile	Thu Oct 28 19:22:56 2004
-+++ src/makefile	Thu Oct 28 19:28:16 2004
-@@ -68,7 +68,7 @@
- targets:	$(PLUGIN_LIB)
- 
- $(PLUGIN_LIB):	$(PLUGIN_OBJECTS)
--	$(CXX)	-shared							\
-+	$(CXX)	-dynamiclib -ldl						\
- 		-o $(PLUGIN_LIB)					\
- 		$(PLUGIN_OBJECTS)					
- 
diff --git a/media-libs/ladspa-cmt/files/ladspa-cmt-1.16-mallocstdlib.patch b/media-libs/ladspa-cmt/files/ladspa-cmt-1.16-mallocstdlib.patch
deleted file mode 100644
index f4e7663282c6..000000000000
--- a/media-libs/ladspa-cmt/files/ladspa-cmt-1.16-mallocstdlib.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Index: cmt/src/analogue.cpp
-===================================================================
---- cmt.orig/src/analogue.cpp
-+++ cmt/src/analogue.cpp
-@@ -24,7 +24,6 @@
- 
- /*****************************************************************************/
- 
--#include <malloc.h>
- #include <math.h>
- #include <stdlib.h>
- #include "cmt.h"
-Index: cmt/src/canyondelay.cpp
-===================================================================
---- cmt.orig/src/canyondelay.cpp
-+++ cmt/src/canyondelay.cpp
-@@ -25,7 +25,7 @@
- /*****************************************************************************/
- 
- 
--#include <malloc.h>
-+#include <stdlib.h>
- #include <math.h>
- #include "cmt.h"
- 
-Index: cmt/src/lofi.cpp
-===================================================================
---- cmt.orig/src/lofi.cpp
-+++ cmt/src/lofi.cpp
-@@ -24,7 +24,6 @@
- 
- /*****************************************************************************/
- 
--#include <malloc.h>
- #include <math.h>
- #include <stdlib.h>
- #include "cmt.h"
-Index: cmt/src/phasemod.cpp
-===================================================================
---- cmt.orig/src/phasemod.cpp
-+++ cmt/src/phasemod.cpp
-@@ -24,7 +24,6 @@
- 
- /*****************************************************************************/
- 
--#include <malloc.h>
- #include <math.h>
- #include <stdlib.h>
- #include "cmt.h"
-Index: cmt/src/syndrum.cpp
-===================================================================
---- cmt.orig/src/syndrum.cpp
-+++ cmt/src/syndrum.cpp
-@@ -24,7 +24,7 @@
- 
- /*****************************************************************************/
- 
--#include <malloc.h>
-+#include <stdlib.h>
- #include <math.h>
- #include "cmt.h"
- 
-Index: cmt/src/vcf303.cpp
-===================================================================
---- cmt.orig/src/vcf303.cpp
-+++ cmt/src/vcf303.cpp
-@@ -26,7 +26,7 @@
- /*****************************************************************************/
- 
- 
--#include <malloc.h>
-+#include <stdlib.h>
- #include <math.h>
- #include "cmt.h"
- 
diff --git a/media-libs/ladspa-cmt/files/ladspa-cmt-1.16-respect-ldflags.patch b/media-libs/ladspa-cmt/files/ladspa-cmt-1.16-respect-ldflags.patch
deleted file mode 100644
index e851c2a781ed..000000000000
--- a/media-libs/ladspa-cmt/files/ladspa-cmt-1.16-respect-ldflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=334711
-
---- cmt/src/makefile.old	2010-09-13 16:43:26.000000000 +0100
-+++ cmt/src/makefile	2010-09-13 16:45:08.000000000 +0100
-@@ -66,7 +66,8 @@
- targets:	$(PLUGIN_LIB)
- 
- $(PLUGIN_LIB):	$(PLUGIN_OBJECTS)
--	$(CXX)	-shared							\
-+	$(CXX)	$(LDFLAGS)						\
-+		-shared							\
- 		-o $(PLUGIN_LIB)					\
- 		$(PLUGIN_OBJECTS)					
- 
diff --git a/media-libs/ladspa-cmt/files/ladspa-cmt-1.16-sa.patch b/media-libs/ladspa-cmt/files/ladspa-cmt-1.16-sa.patch
deleted file mode 100644
index 161c06d27eed..000000000000
--- a/media-libs/ladspa-cmt/files/ladspa-cmt-1.16-sa.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fix strict aliasing warnings: reeverb/Components/allpass.h:36:2: warning:
-dereferencing type-punned pointer will break strict-aliasing rules
-
-https://bugs.gentoo.org/show_bug.cgi?id=307563
-
-Index: cmt/src/freeverb/Components/denormals.h
-===================================================================
---- cmt.orig/src/freeverb/Components/denormals.h
-+++ cmt/src/freeverb/Components/denormals.h
-@@ -8,7 +8,7 @@
- #ifndef _denormals_
- #define _denormals_
- 
--#define undenormalise(sample) if(((*(unsigned int*)&sample)&0x7f800000)==0) sample=0.0f
-+#define undenormalise(sample) if((((unsigned int)sample)&0x7f800000)==0) sample=0.0f
- 
- #endif//_denormals_
- 
diff --git a/media-libs/ladspa-cmt/ladspa-cmt-1.16-r4.ebuild b/media-libs/ladspa-cmt/ladspa-cmt-1.16-r4.ebuild
deleted file mode 100644
index 25070b831066..000000000000
--- a/media-libs/ladspa-cmt/ladspa-cmt-1.16-r4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs multilib-minimal
-
-S="${WORKDIR}/cmt/src"
-MY_P="cmt_src_${PV}"
-
-DESCRIPTION="CMT (computer music toolkit) LADSPA library plugins"
-HOMEPAGE="http://www.ladspa.org/"
-SRC_URI="http://www.ladspa.org/download/${MY_P}.tgz"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}]"
-RDEPEND=""
-
-src_prepare() {
-	sed -i \
-		-e "/^CFLAGS/ s/-O3/${CFLAGS}/" \
-		-e 's|/usr/local/include||g' \
-		-e 's|/usr/local/lib||g' makefile \
-			|| die "sed makefile failed"
-	sed -i -e "s/^CXXFLAGS*/CXXFLAGS = ${CXXFLAGS} \$(INCLUDES) -Wall -fPIC\n#/" \
-		"${S}/makefile" || die "sed makefile failed (CXXFLAGS)"
-
-	cd "${S}" || die
-	epatch "${FILESDIR}/${P}-mallocstdlib.patch"
-	epatch "${FILESDIR}/${P}-respect-ldflags.patch"
-	epatch "${FILESDIR}/${P}-sa.patch"
-	use elibc_Darwin && epatch "${FILESDIR}/${P}-darwin.patch"
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export CXX
-	emake PLUGIN_LIB="cmt.so"
-}
-
-multilib_src_install() {
-	insopts -m755
-	insinto /usr/$(get_libdir)/ladspa
-	doins *.so
-}
-
-multilib_src_install_all() {
-	insinto /usr/share/ladspa/rdf/
-	doins "${FILESDIR}/cmt.rdf"
-
-	dodoc ../README
-	dohtml ../doc/*
-}
diff --git a/media-libs/ladspa-sdk/Manifest b/media-libs/ladspa-sdk/Manifest
index 47c26b4d7c81..3b35672de4a9 100644
--- a/media-libs/ladspa-sdk/Manifest
+++ b/media-libs/ladspa-sdk/Manifest
@@ -2,6 +2,9 @@ AUX ladspa-sdk-1.13-asneeded.patch 624 BLAKE2B 2bd011abd4f414075a05e8993aa2b5f69
 AUX ladspa-sdk-1.13-fbsd.patch 440 BLAKE2B 687df7bcd5ea20d7f8827e8639177c47731e58f958874ecc8d6d9e1d137f96e1388352d8c2600c5b2d7652ce657b304bf606d784a381d933ae5758a32debeed2 SHA512 e2649dff971e5c3bae9070b34f53de3a768df8960fe4a93536d0571ada85e892ac7ad55b32b3794d49b5082c7e0d19f6ca22b8613679501d15089e06baf9b5eb
 AUX ladspa-sdk-1.13-no-LD.patch 730 BLAKE2B be0edb600bc1e8834b10d55ec04294c40681900edd87564b36d6f1a3354f8b8f6899e3516d3137c16cf5c431118d79e2c4668045c6183bf99dcfb5eb83a106f7 SHA512 215aa1ce1338532e6a8f4ab90b29bd823030f6544d66a9954e476d4b9d5d8f9304b8dd39e386aa2e93565970878bb3174537b7315dcde9bc4eeba9ceb1cc01c8
 AUX ladspa-sdk-1.13-properbuild.patch 3020 BLAKE2B 4fc412986b9912ec0bee326b111f558b806811f12d430fe39b84a8751529afc96534c78c2e753aca8ba089074aa4e38c0c201237c63020c8cd2d3d5c2a6aac17 SHA512 6e86f309f8029d0de50cc505d7924965bc00d89489d689a7babab55f447ef43fbdf26807bc6f206e331c367a2bb1e5c75867268ac601991e3b7edbb9bf8046b7
+AUX ladspa-sdk-1.15-properbuild.patch 3933 BLAKE2B bbddaddd99c24db14306443b82106c17a096aee2ec684b717c8fccb76dd028e62f0ac8a575777450a0037cc154ea6e1515a6e732dd9822ddff39980afeb0c154 SHA512 bc276c02b9f23643616372477d5b2e9d186977ae1f3aef3a984162d46c362df06dd6e0b8a3156f1eb7e37dc66cbb4db8768cebcd0879ba6b36ab0245db2dbb9b
 DIST ladspa_sdk_1.13.tgz 70540 BLAKE2B cfc5dce5b02107f361cfff3881173d04ea0ff5856cb7e9fb0cf5e23ca62c7f61b8b3b1573b95f67d82eb039cda874a3ba66856b6408e5e6785823c9d53c8cd2e SHA512 a1dab807fda58e08869d3f519be5fa91c394690eb13006fbe7f20b332548e4676b32b01273f5695bf36c8da72190c07618662a76d50f991b3f05068ac2b346ef
+DIST ladspa_sdk_1.15.tgz 71179 BLAKE2B 7a201fd968433241fda190874d51b835f425c8f35270dc8fac9acf4e9e1546fa20d48f85e894b9eb263dd5d84c2b407481d168e18256dfe2cdd026fe0c805a65 SHA512 a521622e23d988284244003e4ccfc3b42f6ddc7944cb00e7949b87e09d7f39a0cbb64b6d8b5a5af0a5ccf7179f88815416a88f02d3912957167e54b74accfc65
 EBUILD ladspa-sdk-1.13-r2.ebuild 1460 BLAKE2B 0eac9f6bd5fe38bd2ce092507e2863a6cd5f43fbdf257e1a45ffa7cc97dd4c3bcca7209d7b5088ca705dd24d4692429f7484228ae0f624fcbc5a5d2accf8cf37 SHA512 ca8e4ab35681effb3a63d4592270de401899d1322f093c6d3102ae7ce64b19094b9e4c50653c94f40c395034731e3b60721ea09ef96a8b5d05a9882068d8b08f
+EBUILD ladspa-sdk-1.15-r1.ebuild 1219 BLAKE2B 0750dec0857a7caa820edf1b12d90fb931478dce7aed446cbe13863d0630d753d6c1cbc9b5f5648aa10fb5917dc0b15d8728823ed974c856132b92b0462ebde9 SHA512 186fbc14b7fb2e57eded688b751e58af2aecbdb505b7819df363840bf817910d9c8076daf5e3c12d9c6c9ac2dad05044c99034bdc86e19405a673f32b516ab06
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/ladspa-sdk/files/ladspa-sdk-1.15-properbuild.patch b/media-libs/ladspa-sdk/files/ladspa-sdk-1.15-properbuild.patch
new file mode 100644
index 000000000000..709ec7c8456a
--- /dev/null
+++ b/media-libs/ladspa-sdk/files/ladspa-sdk-1.15-properbuild.patch
@@ -0,0 +1,118 @@
+diff --git a/src/Makefile b/src/Makefile
+index c339524..2166624 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -13,12 +13,12 @@ INSTALL_BINARY_DIR	=	/usr/bin/
+ # GENERAL
+ #
+ 
++CFLAGS		=	-Wall -Werror -O3
++CXXFLAGS	=	-Wall -Werror -O3
++
+ INCLUDES	=	-I.
+-LIBRARIES	=	-ldl -lm
+-CFLAGS		=	$(INCLUDES) -Wall -Werror -O2 -fPIC 		\
+-			-DDEFAULT_LADSPA_PATH=$(INSTALL_PLUGINS_DIR)
+-BINFLAGS	=	-fPIE -pie
+-CXXFLAGS	=	$(CFLAGS)
++DYNAMIC_LD_LIBS =	-ldl
++LIBRARIES	=	$(DYNAMIC_LD_LIBS) -lm
+ PLUGINS		=	../plugins/amp.so				\
+ 			../plugins/delay.so				\
+ 			../plugins/filter.so				\
+@@ -28,34 +28,25 @@ PROGRAMS	=	../bin/analyseplugin				\
+ 			../bin/applyplugin 				\
+ 			../bin/listplugins
+ CC		=	cc
+-CPP		=	c++
++CXX		=	c++
++MKDIR_P		=	mkdirhier
+ 
+ ###############################################################################
+ #
+ # RULES TO BUILD PLUGINS FROM C OR C++ CODE
+ #
+ 
++../plugins/filter.so:	plugins/filter.c ladspa.h gcc_exports.map
++	$(CC) $(CFLAGS) $(INCLUDES) -fPIC -o plugins/filter.o -c plugins/filter.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -o ../plugins/filter.so plugins/filter.o -nostartfiles -shared -lm
++
+ ../plugins/%.so:	plugins/%.c ladspa.h gcc_exports.map
+-	$(CC) $(CFLAGS) -o plugins/$*.o -c plugins/$*.c
+-	$(CC)	-o ../plugins/$*.so					\
+-		plugins/$*.o						\
+-		-shared							\
+-		$(CFLAGS)						\
+-		-fvisibility=hidden					\
+-		-fvisibility-inlines-hidden				\
+-		-s							\
+-		-Wl,--version-script=gcc_exports.map			
++	$(CC) $(CFLAGS) $(INCLUDES) -fPIC -o plugins/$*.o -c plugins/$*.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -o ../plugins/$*.so plugins/$*.o -nostartfiles -shared
+ 
+ ../plugins/%.so:	plugins/%.cpp ladspa.h gcc_exports.map
+-	$(CPP) $(CXXFLAGS) -o plugins/$*.o -c plugins/$*.cpp
+-	$(CPP)	-o ../plugins/$*.so					\
+-		plugins/$*.o						\
+-		-shared							\
+-		$(CXXFLAGS)						\
+-		-fvisibility=hidden					\
+-		-fvisibility-inlines-hidden				\
+-		-s							\
+-		-Wl,--version-script=gcc_exports.map			
++	$(CXX) $(CXXFLAGS) $(INCLUDES) -fPIC -o plugins/$*.o -c plugins/$*.cpp
++	$(CXX) $(LDFLAGS) -o ../plugins/$*.so plugins/$*.o -shared
+ 
+ ###############################################################################
+ #
+@@ -66,7 +57,7 @@ test:	/tmp/test.wav ../snd/noise.wav always
+ 	@echo ---------------------------------------------
+ 	@echo First listen to the white noise input signal:
+ 	@echo ---------------------------------------------
+-	-sndfile-play ../snd/noise.wav
++	@echo -sndfile-play ../snd/noise.wav
+ 	@echo -------------------------
+ 	@echo Compare to plugin output.
+ 	@echo -------------------------
+@@ -75,12 +66,12 @@ test:	/tmp/test.wav ../snd/noise.wav always
+ 	@echo Test complete.
+ 
+ install:	targets
+-	-mkdir -p $(INSTALL_PLUGINS_DIR)
+-	-mkdir -p $(INSTALL_INCLUDE_DIR)
+-	-mkdir -p $(INSTALL_BINARY_DIR)
+-	cp ../plugins/* $(INSTALL_PLUGINS_DIR)
+-	cp ladspa.h $(INSTALL_INCLUDE_DIR)
+-	cp ../bin/* $(INSTALL_BINARY_DIR)
++	-$(MKDIR_P) $(DESTDIR)$(INSTALL_PLUGINS_DIR)
++	-$(MKDIR_P) $(DESTDIR)$(INSTALL_INCLUDE_DIR)
++	-$(MKDIR_P) $(DESTDIR)$(INSTALL_BINARY_DIR)
++	cp ../plugins/* $(DESTDIR)$(INSTALL_PLUGINS_DIR)
++	cp ladspa.h $(DESTDIR)$(INSTALL_INCLUDE_DIR)
++	cp ../bin/* $(DESTDIR)$(INSTALL_BINARY_DIR)
+ 
+ /tmp/test.wav:	targets ../snd/noise.wav
+ 	../bin/listplugins
+@@ -106,19 +97,19 @@ targets:	$(PLUGINS) $(PROGRAMS)
+ #
+ 
+ ../bin/applyplugin:	applyplugin.o load.o default.o
+-	$(CC) $(CFLAGS) $(BINFLAGS)					\
++	$(CC) $(CFLAGS) $(INCLUDES) $(LDFLAGS)					\
+ 		-o ../bin/applyplugin					\
+ 		applyplugin.o load.o default.o				\
+ 		$(LIBRARIES)
+ 
+ ../bin/analyseplugin:	analyseplugin.o load.o default.o
+-	$(CC) $(CFLAGS) $(BINFLAGS)					\
++	$(CC) $(CFLAGS) $(INCLUDES) $(LDFLAGS)					\
+ 		-o ../bin/analyseplugin 				\
+ 		analyseplugin.o load.o default.o			\
+ 		$(LIBRARIES)
+ 
+ ../bin/listplugins:	listplugins.o search.o
+-	$(CC) $(CFLAGS) $(BINFLAGS)					\
++	$(CC) $(CFLAGS) $(INCLUDES) $(LDFLAGS)					\
+ 		-o ../bin/listplugins	 				\
+ 		listplugins.o search.o					\
+ 		$(LIBRARIES)
diff --git a/media-libs/ladspa-sdk/ladspa-sdk-1.15-r1.ebuild b/media-libs/ladspa-sdk/ladspa-sdk-1.15-r1.ebuild
new file mode 100644
index 000000000000..2f9df4df576c
--- /dev/null
+++ b/media-libs/ladspa-sdk/ladspa-sdk-1.15-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils multilib toolchain-funcs portability flag-o-matic multilib-minimal
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}_${PV}
+
+DESCRIPTION="The Linux Audio Developer's Simple Plugin API"
+HOMEPAGE="http://www.ladspa.org/"
+SRC_URI="http://www.ladspa.org/download/${MY_P}.tgz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=">=sys-apps/sed-4"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-properbuild.patch"
+)
+
+HTML_DOCS="doc/*.html"
+
+src_prepare() {
+	default
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	cd src
+	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+		DYNAMIC_LD_LIBS="$(dlopen_lib)" \
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
+		targets
+}
+
+multilib_src_test() {
+	cd src
+	emake test
+}
+
+multilib_src_install() {
+	cd src
+	emake INSTALL_PLUGINS_DIR="/usr/$(get_libdir)/ladspa" \
+		DESTDIR="${ED}" \
+		MKDIR_P="mkdir -p" \
+		install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# Needed for apps like rezound
+	dodir /etc/env.d
+	echo "LADSPA_PATH=${EPREFIX}/usr/$(get_libdir)/ladspa" > "${ED}/etc/env.d/60ladspa"
+}
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index 5201bbd13c56..b6e57510a3eb 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,6 +1,8 @@
 AUX lcms-2.9-BE-test.patch 1367 BLAKE2B 5888ef7f7466c8a76c0b9ba1c87383e274fcfc0570ccc45f2a04c3409421415e7b466b93d9f3acb358ec16481c15cf2d466d0b5d9986f37f48d6fddf0e0be616 SHA512 17d4e612f4aeb6e62ac918aa5438e6ada16f456e4c740b4a13f4560956ff8ee7b6223360420c41de1d7284524460ebb1ba89784782671e258df19fc5a768f1e1
 DIST lcms2-2.10.tar.gz 15763103 BLAKE2B d5fc0ffd4917c0b73d2df79a2d5acfd93e88b824aa1a083f258f72a63553c0576ba8ec29fe8c3bc46cb80047818bb8ac97765ae7de85b689ac2eb950516531c6 SHA512 3c068e7b2aff4a9aee720ced7afc6bc8b6ec6bf1f2bf0697d486cd68648104882f36b94201dccbf8cb448282998d27986b881c6b784fd9fef86ae72325fcf20d
+DIST lcms2-2.11.tar.gz 6574121 BLAKE2B c729b4dad8326675c73d1752b23b4b55be130441e9dc8754e41f4cbb9b547c7f657f204e8c9a142035a54c60d3a43f36209f5511270675ad6b98b03e9db869fb SHA512 96643da4770c86eb56f454e605d7661024afb33f4e621c23c590307c31a0eec02100eca4f4ac6718639d99d750ed4834a9b2523e910469da717c3ddd78b4b50e
 DIST lcms2-2.9.tar.gz 10953949 BLAKE2B 6f22a0a8901562e8a84a82c077f31b0155bf81d2b5023211059fa157061e78ebe170bd4744f6d15ab76c96ff9dae521a7560e9665a230337d149e1f0c9018788 SHA512 d91e320a97ef9d64cce31585b7df7c85accb52a0c46a10ed0f45a0ba46cc2ad6687de5151e59ac62170ea878ab48595c1493125f4afb1872824afe1c3f3c459b
-EBUILD lcms-2.10.ebuild 1222 BLAKE2B 6cd910f445869a02b79db2ff943dffb441a8227cc2d6d988337f555eece3743d8a19469ed35d1e5f659afa4be10c009869bc3c0c2102ed3db188fa7d649a81d4 SHA512 7771fa312aaab3f2bcee9bcf110bf74abac6a1725b021440a1c28f59b175e1d8d87f62c1cb6b95c7d619093a39b5f0b37b620992893f24f1a4c529a64e78653a
-EBUILD lcms-2.9.ebuild 1252 BLAKE2B 7b6f2d081715b4d41662bfc6636086d13adc26f02a8e655d2013103cf9471cd901399694359a635dc392c22c87c8408bd5b906ca4d7d870b6893f2c94d66af8c SHA512 0a3c2b3698a8e2593f5dc47f5f4fb175f100f7a959a060ee13abf38d2dd59281cafd50a7f55483db9a68fce7455df11d1257fb400ccbc41d31045ab1c7de1ef2
+EBUILD lcms-2.10.ebuild 1210 BLAKE2B 581f9a7df0e9e19fa96e5c33ef9a3e2dbdbdba5910180b700d813e6a2072c097fca73c4635d01f5c3096b6b2acd0d03ccdf87535330024917735cc563ab2651a SHA512 ae33fefe9567e72daad621ccc286e4c2906d5f70e826f3de87e9d92f34be311164b9812935d375b3d3c6ddf4788872cb0eca6bb856fc3aaadf53fb21960bf12e
+EBUILD lcms-2.11.ebuild 1184 BLAKE2B df281869e2f082e27ae89ce20a4ea1f70199675d5f92c8c848122ba8eac26ddf21b617e61e028cb09f6fba990908d7224da082593140444325637002a54f6b04 SHA512 20edb254a2fe9c339ca54d2fdd73c5278ec3cc094434cf9dfed7c69b900372f0c0562e9d1fcbaf302a44e875152590c4e0a8fa5dda45d9791bf97c7ccabf641d
+EBUILD lcms-2.9.ebuild 1240 BLAKE2B df6256d156b2b0dac0acf03c4fb2f7c503edbf0915931e9273c4547688d6980b84f7c1fb03a619dbb1bd967b2ac2694adac0a3ee21eafd59772c57c1a2f13328 SHA512 564d2afaa448d6d560d0c2c6bc8c5e6b90f81e170a16e470d3193c24e71be8accc570d0414dcb0f13a9a82dbc21e0b6e9df31a790ad704b69c8348b29b589bdc
 MISC metadata.xml 410 BLAKE2B 9349e230ddeb0fe27ff503a24fcfecb247c3f314b0a68b31c3ae998aca9707a2b513228a98f92dcadc15fc9b91e2d8fdb4b6153b35d9eb9ba5492e1b7d929b7c SHA512 d010ff15cb753002aa9a0f9c6c246e3b633cd4ea4bd75521a4c3c6c5b336852e108dafd0835c7533bf07e30dec8c1237e53218b672a01bf0d838cd48f0033d43
diff --git a/media-libs/lcms/lcms-2.10.ebuild b/media-libs/lcms/lcms-2.10.ebuild
index f414c375f3d0..ad5b020df94f 100644
--- a/media-libs/lcms/lcms-2.10.ebuild
+++ b/media-libs/lcms/lcms-2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc jpeg static-libs test +threads tiff"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/lcms/lcms-2.11.ebuild b/media-libs/lcms/lcms-2.11.ebuild
new file mode 100644
index 000000000000..36ef2ecf3797
--- /dev/null
+++ b/media-libs/lcms/lcms-2.11.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool multilib-minimal
+
+DESCRIPTION="A lightweight, speed optimized color management engine"
+HOMEPAGE="http://www.littlecms.com/"
+SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc jpeg static-libs test +threads tiff"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-4.0.3-r6:0=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/lcms2-${PV}"
+
+src_prepare() {
+	default
+	elibtoolize  # for Prefix/Solaris
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_with jpeg)
+		$(use_enable static-libs static)
+		$(use_with threads)
+		$(use_with tiff)
+		--without-zlib
+	)
+	ECONF_SOURCE="${S}" econf ${myeconfargs[@]}
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	use doc && dodoc doc/*.odt
+}
diff --git a/media-libs/lcms/lcms-2.9.ebuild b/media-libs/lcms/lcms-2.9.ebuild
index 8b8ad86e6a9f..ba47e182ac4e 100644
--- a/media-libs/lcms/lcms-2.9.ebuild
+++ b/media-libs/lcms/lcms-2.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc jpeg static-libs test +threads tiff"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 7b620bde3ca0..1762ffd3d6e5 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,10 +1,6 @@
-AUX 1.78.0-gnuplot.patch 672 BLAKE2B 85058c0eab02b289df011f3e4462d91c43e9780591c0991206523d55ce91f02fab85ff47c235522614862e14f078d5e0879fd89b88e70607167f91d57f7b63c0 SHA512 846d5488667b3a21dea81a7059505cdfd2916eff51053dadda978f1520a250ce8ebfdf7b5a820e11630dee4dfb9c0b78340aed9dc109f6fd119e01b855c16554
-AUX 1.79.0-tests.patch 15489 BLAKE2B 8fcc6224c055f24d9ac794f4d18be756e8c15f2a789964a1b5795d0c78411fc946d0ed230be7760d543055bfdf2de1fb63c9dda62613146b46b4036b3c734c32 SHA512 b10137bd865c23a74bd0eac79b97adf6d394bb5e651d524df3dd8cb000bd762230d391212e53f40343863743d52a59e45298b8855b39fc2befb507a3972fc181
 AUX baseline_reg.patch 847 BLAKE2B d45b93ba00abffca157438b6140e329de2cafe95be97fafcfc60272fa821fb847984838179cff186babf8931f79decdccb1bfa0a724abc6de675b1551ff0684e SHA512 a35f518aaf384ed35130cbd509e2ae16efc1878a3528d174156105af6d6259a094d205c47084f068b1f42e07ab87e750d6b82113376e00e041e81fedf90dd541
 DIST leptonica-1.74.4.tar.gz 12349877 BLAKE2B 5c4a71c1c4f44b617f16b1b1029455badee268dc1ac459f1c7ffe6af5b8dbe702bdbaa6e5564af6e41d0881c59e1aa43dc40d5164f618f13ca2a563b2aa3bd0e SHA512 e74732c10218430463ca01f15e19d329dceb938e315586ed100c634c4d50809824f1d9bf7eeaf91654caf42ed78a5ae5de7c08e7a1d8884c580c536121627891
-DIST leptonica-1.78.0.tar.gz 12905925 BLAKE2B 6a7b74e8aa78a3e4fa6429bbf180001e7d362ebd37d4fd179ba90df7a41993e52d708813ea5a2b30dc90516b7bec83e5386735025993d73f279ab595c39f6c9c SHA512 f059ccc8e7b5ff2c796aeb4ab18bd25e133ec4f38c36b9e2ee203db35a1e68cf45b8baf78ebc4acba4e3607328d1374ea0e8425f35cbe06c6c5728a1ec8c3f50
-DIST leptonica-1.79.0.tar.gz 13438669 BLAKE2B 59c126c0bc4690cf48937171f818637f420b4e4c56ebf866ca4c0d2a9a8f2ae2653f6ef7650340138fb1dd2ca2d3826e0f844d44afddb14856e31daf10f41c41 SHA512 4d0830683757004bb47752a17985d80c6758b97c0fd6ec64d23bbf43c9c68b04bee751831574afa4c25f5d5030c0c9f7fc22d9fc8ef932aa990401344f588ba5
+DIST leptonica-1.80.0.tar.gz 13926793 BLAKE2B 1c8916acbea7411038c27ad422f7ac8d5769680ae0554a50da332676de4abdd3c6dfab69dfa4abc3525f3aa298062f4f2315548bda9d120e91abf6ffb5b41e1c SHA512 f8062a169b7ac558c8818615e534c0dcb5db48924af4d3106d0e0929e9b2f03347bdeaae45f80bded0b2aed135bb133f775244c8c752891ca4948b5d6b21e147
 EBUILD leptonica-1.74.4.ebuild 1746 BLAKE2B 3db9bed04781b057ad93acca2d0a1a8ba26627c992e7dd1907a6efc9ce05447378a26efb7062f4b26c3966dcda8b01f63fa8ff4c4ab7b9f14c92ecb4881030ed SHA512 aec17f1f1f49dbee29efca27c2d89d1674a8a5c3de87e77b24fd2708a94debc6c7eda3d3fb721d67468c455457dfa9b7fdaf7291fd6f5142da596c85f757c600
-EBUILD leptonica-1.78.0.ebuild 2022 BLAKE2B c85beb7d51ead3f8d623b3f827960f30be744daad608248c99cb4d26c726b1096d24019b1bdeadf55ce706c4f93d5a18d636f7fa7fd74396948d33ca6c0f45d5 SHA512 963f0a3e72ad715442aee66f6aa4b0f3e1c8efccb1718da3f1799319278afab2e99b12463204ea2a4d99d735063ed069c39d94cf4fe989da1d3bcf3991c59ecc
-EBUILD leptonica-1.79.0-r1.ebuild 2070 BLAKE2B 495d494ba3b2a5d13d5f0c61952d184f3813670e69b9f5988c433251ef88e2f8074c0276603035aceb6883ad1f738fb5e677c505f4a8052b581c06c3ffae25cd SHA512 90efb38a2a75f903842b571c647759f2833a8b7e4160805607c51d517119d8024b6c62afa937f8603bb9505ccda44764af081ee546560b5bfc3299a48f251287
+EBUILD leptonica-1.80.0.ebuild 2024 BLAKE2B a6f08294f1183051c19593538b26912629605bcd7872e3c054199fff7ef953157f2ef4a683a29936087263030dc97bfbe10988caf68e8371d140594447330825 SHA512 25f9a6fea60204f9f7a0c919578a617cab49801f275cdc9ff054fd5e67190c7d3630003c1e27de300f3cafb92c069432c94f31208a04d8683ef79121e6777a60
 MISC metadata.xml 518 BLAKE2B 59db99ac81e5c10275950d5c67e1c85c61c48f9eef84d533606a26beb1f3b6b3c1eb844a163687376a74dcd9561dfc91f6b85df4202a20ecf3c58f8e1201b88e SHA512 2a34197102a9d9d90faa90aa2f19e78e8a848e779ad3ad0f1bdb7d3d9d91572749ce2351c402403a0281019af1b59e0fd19c4e1809bd00836cede17647391773
diff --git a/media-libs/leptonica/files/1.78.0-gnuplot.patch b/media-libs/leptonica/files/1.78.0-gnuplot.patch
deleted file mode 100644
index 758b78258dd3..000000000000
--- a/media-libs/leptonica/files/1.78.0-gnuplot.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/prog/reg_wrapper.sh b/prog/reg_wrapper.sh
-index cee1f54..f16d980 100755
---- a/prog/reg_wrapper.sh
-+++ b/prog/reg_wrapper.sh
-@@ -31,7 +31,7 @@ TEST_NAME="${TEST##*/}"
- TEST_NAME="${TEST_NAME%_reg*}"
- 
- case "${TEST_NAME}" in
--    baseline|boxa[12]|colormask|colorspace|dna|enhance|extrema|fpix1|italic|kernel|nearline|numa[12]|projection|rankbin|rankhisto|wordboxes)
-+    baseline|boxa[1234]|colormask|colorspace|dna|enhance|extrema|fpix1|italic|kernel|nearline|numa[12]|projection|rankbin|rankhisto|wordboxes)
-         GNUPLOT=$(type -P gnuplot || type -P wgnuplot)
- 
-         if [ -z "${GNUPLOT}" ] || ! "${GNUPLOT}" -e "set terminal png" 2>/dev/null ; then
diff --git a/media-libs/leptonica/files/1.79.0-tests.patch b/media-libs/leptonica/files/1.79.0-tests.patch
deleted file mode 100644
index eb794240dbd1..000000000000
--- a/media-libs/leptonica/files/1.79.0-tests.patch
+++ /dev/null
@@ -1,299 +0,0 @@
-From b4cdb9256934c8f35cad558bf7288567211a792f Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@aura-online.co.uk>
-Date: Tue, 24 Mar 2020 20:59:17 +0000
-Subject: [PATCH] Fix parallel running of tests by using unique directories
-
-diff --git a/prog/pdfio2_reg.c b/prog/pdfio2_reg.c
-index 3f2090d..19da5a3 100644
---- a/prog/pdfio2_reg.c
-+++ b/prog/pdfio2_reg.c
-@@ -55,7 +55,7 @@ L_REGPARAMS  *rp;
-         return 1;
- 
-     l_pdfSetDateAndVersion(0);
--    lept_mkdir("lept/pdf");
-+    lept_mkdir("lept/pdf2");
- 
-     /* ---------- pdf convert segmented with image regions ---------- */
-     fprintf(stderr, "\n*** Writing segmented images with image regions\n");
-@@ -65,6 +65,12 @@ L_REGPARAMS  *rp;
-          * small bogus regions at the top, but we'll keep them for
-          * the demonstration. */
-     pix1 = pixRead("rabi.png");
-+    pix2 = pixScaleToGray2(pix1);
-+    pixWrite("/tmp/lept/pdf2/rabi8.jpg", pix2, IFF_JFIF_JPEG);
-+    pix3 = pixThresholdTo4bpp(pix2, 16, 1);
-+    pixWrite("/tmp/lept/pdf2/rabi4.png", pix3, IFF_PNG);
-+    pixDestroy(&pix2);
-+    pixDestroy(&pix3);
-     pixSetResolution(pix1, 300, 300);
-     pixGetDimensions(pix1, &w, &h, NULL);
-     pix2 = pixGenerateHalftoneMask(pix1, NULL, NULL, NULL);
-@@ -77,41 +83,41 @@ L_REGPARAMS  *rp;
- 
-         /* 1 bpp input */
-     convertToPdfSegmented("rabi.png", 300, L_G4_ENCODE, 128, boxa1,
--                          0, 0.25, NULL, "/tmp/lept/pdf/file00.pdf");
-+                          0, 0.25, NULL, "/tmp/lept/pdf2/file00.pdf");
-     convertToPdfSegmented("rabi.png", 300, L_JPEG_ENCODE, 128, boxa1,
--                          0, 0.25, NULL, "/tmp/lept/pdf/file01.pdf");
-+                          0, 0.25, NULL, "/tmp/lept/pdf2/file01.pdf");
-     convertToPdfSegmented("rabi.png", 300, L_FLATE_ENCODE, 128, boxa1,
--                          0, 0.25, NULL, "/tmp/lept/pdf/file02.pdf");
-+                          0, 0.25, NULL, "/tmp/lept/pdf2/file02.pdf");
- 
-         /* 8 bpp input, no cmap */
--    convertToPdfSegmented("/tmp/lept/pdf/rabi8.jpg", 150, L_G4_ENCODE, 128,
--                          boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file03.pdf");
--    convertToPdfSegmented("/tmp/lept/pdf/rabi8.jpg", 150, L_JPEG_ENCODE, 128,
--                          boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file04.pdf");
--    convertToPdfSegmented("/tmp/lept/pdf/rabi8.jpg", 150, L_FLATE_ENCODE, 128,
--                          boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file05.pdf");
-+    convertToPdfSegmented("/tmp/lept/pdf2/rabi8.jpg", 150, L_G4_ENCODE, 128,
-+                          boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file03.pdf");
-+    convertToPdfSegmented("/tmp/lept/pdf2/rabi8.jpg", 150, L_JPEG_ENCODE, 128,
-+                          boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file04.pdf");
-+    convertToPdfSegmented("/tmp/lept/pdf2/rabi8.jpg", 150, L_FLATE_ENCODE, 128,
-+                          boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file05.pdf");
- 
-         /* 4 bpp input, cmap */
--    convertToPdfSegmented("/tmp/lept/pdf/rabi4.png", 150, L_G4_ENCODE, 128,
--                          boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file06.pdf");
--    convertToPdfSegmented("/tmp/lept/pdf/rabi4.png", 150, L_JPEG_ENCODE, 128,
--                          boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file07.pdf");
--    convertToPdfSegmented("/tmp/lept/pdf/rabi4.png", 150, L_FLATE_ENCODE, 128,
--                          boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file08.pdf");
-+    convertToPdfSegmented("/tmp/lept/pdf2/rabi4.png", 150, L_G4_ENCODE, 128,
-+                          boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file06.pdf");
-+    convertToPdfSegmented("/tmp/lept/pdf2/rabi4.png", 150, L_JPEG_ENCODE, 128,
-+                          boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file07.pdf");
-+    convertToPdfSegmented("/tmp/lept/pdf2/rabi4.png", 150, L_FLATE_ENCODE, 128,
-+                          boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file08.pdf");
- 
-         /* 4 bpp input, cmap, data output */
-     data = NULL;
--    convertToPdfDataSegmented("/tmp/lept/pdf/rabi4.png", 150, L_G4_ENCODE,
-+    convertToPdfDataSegmented("/tmp/lept/pdf2/rabi4.png", 150, L_G4_ENCODE,
-                               128, boxa2, 0, 0.5, NULL, &data, &nbytes);
--    l_binaryWrite("/tmp/lept/pdf/file09.pdf", "w", data, nbytes);
-+    l_binaryWrite("/tmp/lept/pdf2/file09.pdf", "w", data, nbytes);
-     lept_free(data);
--    convertToPdfDataSegmented("/tmp/lept/pdf/rabi4.png", 150, L_JPEG_ENCODE,
-+    convertToPdfDataSegmented("/tmp/lept/pdf2/rabi4.png", 150, L_JPEG_ENCODE,
-                               128, boxa2, 0, 0.5, NULL, &data, &nbytes);
--    l_binaryWrite("/tmp/lept/pdf/file10.pdf", "w", data, nbytes);
-+    l_binaryWrite("/tmp/lept/pdf2/file10.pdf", "w", data, nbytes);
-     lept_free(data);
--    convertToPdfDataSegmented("/tmp/lept/pdf/rabi4.png", 150, L_FLATE_ENCODE,
-+    convertToPdfDataSegmented("/tmp/lept/pdf2/rabi4.png", 150, L_FLATE_ENCODE,
-                               128, boxa2, 0, 0.5, NULL, &data, &nbytes);
--    l_binaryWrite("/tmp/lept/pdf/file11.pdf", "w", data, nbytes);
-+    l_binaryWrite("/tmp/lept/pdf2/file11.pdf", "w", data, nbytes);
-     lept_free(data);
-     fprintf(stderr, "Segmented images time: %7.3f\n", stopTimer());
- 
-@@ -125,17 +131,17 @@ L_REGPARAMS  *rp;
- 
-     pix1 = pixRead("candelabrum.011.jpg");
-     pix2 = pixScale(pix1, 3.0, 3.0);
--    pixWrite("/tmp/lept/pdf/candelabrum3.jpg", pix2, IFF_JFIF_JPEG);
--    GetImageMask(pix2, 200, &boxa1, rp, "/tmp/lept/pdf/seg1.jpg");
--    convertToPdfSegmented("/tmp/lept/pdf/candelabrum3.jpg", 200, L_G4_ENCODE,
-+    pixWrite("/tmp/lept/pdf2/candelabrum3.jpg", pix2, IFF_JFIF_JPEG);
-+    GetImageMask(pix2, 200, &boxa1, rp, "/tmp/lept/pdf2/seg1.jpg");
-+    convertToPdfSegmented("/tmp/lept/pdf2/candelabrum3.jpg", 200, L_G4_ENCODE,
-                           100, boxa1, 0, 0.25, NULL,
--                          "/tmp/lept/pdf/file12.pdf");
--    convertToPdfSegmented("/tmp/lept/pdf/candelabrum3.jpg", 200, L_JPEG_ENCODE,
-+                          "/tmp/lept/pdf2/file12.pdf");
-+    convertToPdfSegmented("/tmp/lept/pdf2/candelabrum3.jpg", 200, L_JPEG_ENCODE,
-                           100, boxa1, 0, 0.25, NULL,
--                          "/tmp/lept/pdf/file13.pdf");
--    convertToPdfSegmented("/tmp/lept/pdf/candelabrum3.jpg", 200, L_FLATE_ENCODE,
-+                          "/tmp/lept/pdf2/file13.pdf");
-+    convertToPdfSegmented("/tmp/lept/pdf2/candelabrum3.jpg", 200, L_FLATE_ENCODE,
-                           100, boxa1, 0, 0.25, NULL,
--                          "/tmp/lept/pdf/file14.pdf");
-+                          "/tmp/lept/pdf2/file14.pdf");
- 
-     pixDestroy(&pix1);
-     pixDestroy(&pix2);
-@@ -143,25 +149,25 @@ L_REGPARAMS  *rp;
- 
-     pix1 = pixRead("lion-page.00016.jpg");
-     pix2 = pixScale(pix1, 3.0, 3.0);
--    pixWrite("/tmp/lept/pdf/lion16.jpg", pix2, IFF_JFIF_JPEG);
-+    pixWrite("/tmp/lept/pdf2/lion16.jpg", pix2, IFF_JFIF_JPEG);
-     pix3 = pixRead("lion-mask.00016.tif");
-     boxa1 = pixConnComp(pix3, NULL, 8);
-     boxa2 = boxaTransform(boxa1, 0, 0, 3.0, 3.0);
--    convertToPdfSegmented("/tmp/lept/pdf/lion16.jpg", 200, L_G4_ENCODE,
--                          190, boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file15.pdf");
--    convertToPdfSegmented("/tmp/lept/pdf/lion16.jpg", 200, L_JPEG_ENCODE,
--                          190, boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file16.pdf");
--    convertToPdfSegmented("/tmp/lept/pdf/lion16.jpg", 200, L_FLATE_ENCODE,
--                          190, boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file17.pdf");
-+    convertToPdfSegmented("/tmp/lept/pdf2/lion16.jpg", 200, L_G4_ENCODE,
-+                          190, boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file15.pdf");
-+    convertToPdfSegmented("/tmp/lept/pdf2/lion16.jpg", 200, L_JPEG_ENCODE,
-+                          190, boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file16.pdf");
-+    convertToPdfSegmented("/tmp/lept/pdf2/lion16.jpg", 200, L_FLATE_ENCODE,
-+                          190, boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file17.pdf");
- 
-         /* Quantize the non-image part and flate encode.
-          * This is useful because it results in a smaller file than
-          * when you flate-encode the un-quantized non-image regions. */
-     pix4 = pixScale(pix3, 3.0, 3.0);  /* higher res mask, for combining */
-     pix5 = QuantizeNonImageRegion(pix2, pix4, 12);
--    pixWrite("/tmp/lept/pdf/lion16-quant.png", pix5, IFF_PNG);
--    convertToPdfSegmented("/tmp/lept/pdf/lion16-quant.png", 200, L_FLATE_ENCODE,
--                          190, boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file18.pdf");
-+    pixWrite("/tmp/lept/pdf2/lion16-quant.png", pix5, IFF_PNG);
-+    convertToPdfSegmented("/tmp/lept/pdf2/lion16-quant.png", 200, L_FLATE_ENCODE,
-+                          190, boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file18.pdf");
-     fprintf(stderr, "Color segmented images time: %7.3f\n", stopTimer());
- 
-     pixDestroy(&pix1);
-@@ -197,8 +203,8 @@ L_REGPARAMS  *rp;
- 
-     startTimer();
-     convertFilesToPdf("/tmp/lept/image", "file", 100, 0.8, 0, 75, "4 file test",
--                      "/tmp/lept/pdf/file19.pdf");
--    fprintf(stderr, "4-page pdf generated: /tmp/lept/pdf/file19.pdf\n"
-+                      "/tmp/lept/pdf2/file19.pdf");
-+    fprintf(stderr, "4-page pdf generated: /tmp/lept/pdf2/file19.pdf\n"
-                     "Multi-page gen time: %7.3f\n", stopTimer());
-     pixDestroy(&pix1);
-     pixDestroy(&pix2);
-@@ -208,26 +214,26 @@ L_REGPARAMS  *rp;
-     pixDestroy(&pix6);
- #endif
- 
--    regTestCheckFile(rp, "/tmp/lept/pdf/file00.pdf");
--    regTestCheckFile(rp, "/tmp/lept/pdf/file01.pdf");
--    regTestCheckFile(rp, "/tmp/lept/pdf/file02.pdf");
--    regTestCheckFile(rp, "/tmp/lept/pdf/file03.pdf");
--    regTestCheckFile(rp, "/tmp/lept/pdf/file04.pdf");
--    regTestCheckFile(rp, "/tmp/lept/pdf/file05.pdf");
--    regTestCheckFile(rp, "/tmp/lept/pdf/file06.pdf");
--    regTestCheckFile(rp, "/tmp/lept/pdf/file07.pdf");
--    regTestCheckFile(rp, "/tmp/lept/pdf/file08.pdf");
--    regTestCheckFile(rp, "/tmp/lept/pdf/file09.pdf");
--    regTestCheckFile(rp, "/tmp/lept/pdf/file10.pdf");
--    regTestCheckFile(rp, "/tmp/lept/pdf/file11.pdf");
--    regTestCheckFile(rp, "/tmp/lept/pdf/file12.pdf");
--    regTestCheckFile(rp, "/tmp/lept/pdf/file13.pdf");
--    regTestCheckFile(rp, "/tmp/lept/pdf/file14.pdf");
--    regTestCheckFile(rp, "/tmp/lept/pdf/file15.pdf");
--    regTestCheckFile(rp, "/tmp/lept/pdf/file16.pdf");
--    regTestCheckFile(rp, "/tmp/lept/pdf/file17.pdf");
--    regTestCheckFile(rp, "/tmp/lept/pdf/file18.pdf");
--    regTestCheckFile(rp, "/tmp/lept/pdf/file19.pdf");
-+    regTestCheckFile(rp, "/tmp/lept/pdf2/file00.pdf");
-+    regTestCheckFile(rp, "/tmp/lept/pdf2/file01.pdf");
-+    regTestCheckFile(rp, "/tmp/lept/pdf2/file02.pdf");
-+    regTestCheckFile(rp, "/tmp/lept/pdf2/file03.pdf");
-+    regTestCheckFile(rp, "/tmp/lept/pdf2/file04.pdf");
-+    regTestCheckFile(rp, "/tmp/lept/pdf2/file05.pdf");
-+    regTestCheckFile(rp, "/tmp/lept/pdf2/file06.pdf");
-+    regTestCheckFile(rp, "/tmp/lept/pdf2/file07.pdf");
-+    regTestCheckFile(rp, "/tmp/lept/pdf2/file08.pdf");
-+    regTestCheckFile(rp, "/tmp/lept/pdf2/file09.pdf");
-+    regTestCheckFile(rp, "/tmp/lept/pdf2/file10.pdf");
-+    regTestCheckFile(rp, "/tmp/lept/pdf2/file11.pdf");
-+    regTestCheckFile(rp, "/tmp/lept/pdf2/file12.pdf");
-+    regTestCheckFile(rp, "/tmp/lept/pdf2/file13.pdf");
-+    regTestCheckFile(rp, "/tmp/lept/pdf2/file14.pdf");
-+    regTestCheckFile(rp, "/tmp/lept/pdf2/file15.pdf");
-+    regTestCheckFile(rp, "/tmp/lept/pdf2/file16.pdf");
-+    regTestCheckFile(rp, "/tmp/lept/pdf2/file17.pdf");
-+    regTestCheckFile(rp, "/tmp/lept/pdf2/file18.pdf");
-+    regTestCheckFile(rp, "/tmp/lept/pdf2/file19.pdf");
- 
- #if 1
-     /* ------------------ Test multipage pdf generation ----------------- */
-@@ -235,9 +241,9 @@ L_REGPARAMS  *rp;
- 
-         /* Generate a multi-page pdf from all these files */
-     startTimer();
--    concatenatePdf("/tmp/lept/pdf", "file", "/tmp/lept/pdf/cat_lept.pdf");
-+    concatenatePdf("/tmp/lept/pdf2", "file", "/tmp/lept/pdf2/cat_lept.pdf");
-     fprintf(stderr,
--            "All files have been concatenated: /tmp/lept/pdf/cat_lept.pdf\n"
-+            "All files have been concatenated: /tmp/lept/pdf2/cat_lept.pdf\n"
-                     "Concatenation time: %7.3f\n", stopTimer());
- #endif
- 
-@@ -249,7 +255,7 @@ L_REGPARAMS  *rp;
-     lept_mkdir("lept/good");
-     lept_cp("testfile1.pdf", "lept/good", NULL, NULL);
-     lept_cp("testfile2.pdf", "lept/good", NULL, NULL);
--    concatenatePdf("/tmp/lept/good", "file", "/tmp/lept/pdf/good.pdf");
-+    concatenatePdf("/tmp/lept/good", "file", "/tmp/lept/pdf2/good.pdf");
- 
-         /* Make a bad version with the pdf id removed, so that it is not
-          * recognized as a pdf */
-@@ -273,8 +279,8 @@ L_REGPARAMS  *rp;
-     fprintf(stderr, "\nWe attempt to build from a bad directory\n");
-     fprintf(stderr, "The next 3 error messages are intentional\n");
-     lept_cp("testfile1.pdf", "lept/bad", NULL, NULL);
--    concatenatePdf("/tmp/lept/bad", "file", "/tmp/lept/pdf/bad.pdf");
--    filesAreIdentical("/tmp/lept/pdf/good.pdf", "/tmp/lept/pdf/bad.pdf", &same);
-+    concatenatePdf("/tmp/lept/bad", "file", "/tmp/lept/pdf2/bad.pdf");
-+    filesAreIdentical("/tmp/lept/pdf/good.pdf", "/tmp/lept/pdf2/bad.pdf", &same);
-     if (same)
-         fprintf(stderr, "Fixed: files are the same\n"
-                         "Attempt succeeded\n");
-@@ -290,8 +296,8 @@ L_REGPARAMS  *rp;
-     l_int32  ret;
- 
-     fprintf(stderr, "\n*** pdftk writes multipage pdfs from images\n");
--    tempfile1 = genPathname("/tmp/lept/pdf", "file*.pdf");
--    tempfile2 = genPathname("/tmp/lept/pdf", "cat_pdftk.pdf");
-+    tempfile1 = genPathname("/tmp/lept/pdf2", "file*.pdf");
-+    tempfile2 = genPathname("/tmp/lept/pdf2", "cat_pdftk.pdf");
-     snprintf(buffer, sizeof(buffer), "pdftk %s output %s",
-              tempfile1, tempfile2);
-     ret = system(buffer);  /* pdftk */
-diff --git a/prog/webpanimio_reg.c b/prog/webpanimio_reg.c
-index 8f61aab..3938e16 100644
---- a/prog/webpanimio_reg.c
-+++ b/prog/webpanimio_reg.c
-@@ -75,8 +75,8 @@ L_REGPARAMS  *rp;
-     return 0;
- #endif  /* abort */
- 
--    lept_rmdir("lept/webp");
--    lept_mkdir("lept/webp");
-+    lept_rmdir("lept/webpanim");
-+    lept_mkdir("lept/webpanim");
- 
-     niters = 5;
-     duration = 250;   /* ms */
-@@ -85,9 +85,9 @@ L_REGPARAMS  *rp;
-     pixa = pixaCreate(6);
-     pixaAddPix(pixa, pix1, L_COPY);
-     pixaAddPix(pixa, pix2, L_COPY);
--    pixaWriteWebPAnim("/tmp/lept/webp/margeanim.webp", pixa, niters,
-+    pixaWriteWebPAnim("/tmp/lept/webpanim/margeanim.webp", pixa, niters,
-                       duration, 80, 0);
--    regTestCheckFile(rp, "/tmp/lept/webp/margeanim.webp");
-+    regTestCheckFile(rp, "/tmp/lept/webpanim/margeanim.webp");
-     pixaDestroy(&pixa);
-     pixDestroy(&pix1);
-     pixDestroy(&pix2);
-diff --git a/prog/reg_wrapper.sh b/prog/reg_wrapper.sh
-index 94a6fa3..804954c 100755
---- a/prog/reg_wrapper.sh
-+++ b/prog/reg_wrapper.sh
-@@ -31,7 +31,7 @@ TEST_NAME="${TEST##*/}"
- TEST_NAME="${TEST_NAME%_reg*}"
- 
- case "${TEST_NAME}" in
--    baseline|boxa[1234]|colormask|colorspace|dna|enhance|extrema|fpix1|italic|kernel|nearline|numa[12]|projection|rankbin|rankhisto|wordboxes)
-+    baseline|boxa[1234]|colormask|colorspace|dna|enhance|extrema|fpix1|italic|kernel|nearline|numa[12]|pixa1|projection|rankbin|rankhisto|wordboxes)
-         GNUPLOT=$(which gnuplot || which wgnuplot)
- 
-         if [ -z "${GNUPLOT}" ] || ! "${GNUPLOT}" -e "set terminal png" 2>/dev/null ; then
--- 
-2.25.1
diff --git a/media-libs/leptonica/leptonica-1.78.0.ebuild b/media-libs/leptonica/leptonica-1.78.0.ebuild
deleted file mode 100644
index 12157b1bdd76..000000000000
--- a/media-libs/leptonica/leptonica-1.78.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="C library for image processing and analysis"
-HOMEPAGE="http://www.leptonica.org/"
-SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
-IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib"
-RESTRICT="!test? ( test )"
-
-# N.B. Tests need some features enabled:
-REQUIRED_USE="test? ( jpeg png tiff zlib )"
-
-RDEPEND="gif? ( >=media-libs/giflib-5.1.3:=[${MULTILIB_USEDEP}] )
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}]
-		   sys-libs/zlib:=[${MULTILIB_USEDEP}] )
-	tiff? ( media-libs/tiff:0=[${MULTILIB_USEDEP}] )
-	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	test? ( media-libs/tiff:0[zlib] )"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-gnuplot.patch
-)
-
-ECONF_SOURCE="${S}"
-DOCS=( README version-notes )
-
-src_prepare() {
-	default
-
-	# unhtmlize docs
-	local X
-	for X in ${DOCS[@]}; do
-		awk '/<\/pre>/{s--} {if (s) print $0} /<pre>/{s++}' \
-			"${X}.html" > "${X}" || die 'awk failed'
-		rm -f -- "${X}.html"
-	done
-}
-
-multilib_src_configure() {
-	econf \
-		--enable-shared \
-		$(use_with gif giflib) \
-		$(use_with jpeg) \
-		$(use_with jpeg2k libopenjpeg) \
-		$(use_with png libpng) \
-		$(use_with tiff libtiff) \
-		$(use_with webp libwebp) \
-		$(use_with zlib) \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_enable utils programs)
-}
-
-multilib_src_test() {
-	default
-
-	# ${TMPDIR} is not respected. It used to be but it lead to issues
-	# and there have been long debates with upstream about it. :(
-	rm -rf /tmp/lept/ || die
-}
-
-multilib_src_install_all() {
-	# libtool archives covered by pkg-config.
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/media-libs/leptonica/leptonica-1.79.0-r1.ebuild b/media-libs/leptonica/leptonica-1.80.0.ebuild
index 52aa41650f9f..5cf65cc4ca80 100644
--- a/media-libs/leptonica/leptonica-1.79.0-r1.ebuild
+++ b/media-libs/leptonica/leptonica-1.80.0.ebuild
@@ -29,10 +29,6 @@ RDEPEND="gif? ( >=media-libs/giflib-5.1.3:=[${MULTILIB_USEDEP}] )
 DEPEND="${RDEPEND}
 	test? ( media-libs/tiff:0[zlib] )"
 
-PATCHES=(
-	"${FILESDIR}"/${PV}-tests.patch
-)
-
 ECONF_SOURCE="${S}"
 DOCS=( README version-notes )
 
diff --git a/media-libs/libao/Manifest b/media-libs/libao/Manifest
index 84135a64052b..a3b9ea8f6b48 100644
--- a/media-libs/libao/Manifest
+++ b/media-libs/libao/Manifest
@@ -1,5 +1,4 @@
 AUX libao-1.2.2-implicit.patch 530 BLAKE2B 085b0782f7ba13088cac1d063183d6c0a6b5bf784e9ba90d1e2d1587579d78a6d58b5754733e2e2749815562513b0be0898f0709719eb6f7f55d5389040165bb SHA512 fac9d6628ad132215935190ba0d55f5837c638572988426996e3fb91053fed06739dbd57bea2518e11459af4f6e941e45d46bc3094aa2919318386dd93a448c8
 DIST libao-1.2.2.tar.gz 96134 BLAKE2B e5b5d87c4357ee113769732cb6a7e0afa28b2bc4923be8dacd1fa39ac5fb96d8a5e19bc45137ffc8ec63eef0382130ab9b311aad3a66be4566e0cb9761417b23 SHA512 d2736d25b60862e7d7469611ce31b1df40a4366ab160e2ff1b46919ae91692d1596c8468e4f016303b306fc3ac1bddc7b727f535a362f403c3fe7c6532e9045a
-EBUILD libao-1.2.2-r1.ebuild 1576 BLAKE2B 5c8879afa3de4a2aa2946534f9648fc2545aef89bf7fd14575f96b7d9f31a1196e91bf39a05353b238a2274438c30f12011c3d2cd37b08bf05cf0885e143f838 SHA512 85c19a48ce3456b0cb0bd774cd438e28327fd58bd4dc3504532e553e385c863e9feb76050d050f0e1dba245e7a72e76a8d7981db1895e528172c018c038f3772
-EBUILD libao-1.2.2.ebuild 1511 BLAKE2B 89feb90e6d5d0eb8790680443d2dd3b46116bbff42aff706c68ab06943a5dbbf02f0c5a709b7fe48ffede4baaf82289784f1b0ccb7efe0ad1493ce610ee29a12 SHA512 77be60ea83a624088bb09be8df82f16d55e9c5c2d6626f333d90f4d8796d1ed5572131fdd607a2aabe24f536c55805b49d8ba0df7ef0ef9c960db34c0cd0ffd1
+EBUILD libao-1.2.2-r1.ebuild 1568 BLAKE2B 811b4280ef55faf29b54d8cbb54f98fa63948f1b3bda769beb3fa1751c2986cff50bf413424b12b720386fbe67a131a602b7860580ad30930ba3b3d1731c8e5a SHA512 d1c7352b42b631619e1112b6e576096aa7190c3f429da97eda07ae06e4782f881c5dd1dc0589ed1781a8a69234e712ae62dc78221015f7de02a6fda8c14e41eb
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libao/libao-1.2.2-r1.ebuild b/media-libs/libao/libao-1.2.2-r1.ebuild
index 48bceb252b0f..53094134fdd6 100644
--- a/media-libs/libao/libao-1.2.2-r1.ebuild
+++ b/media-libs/libao/libao-1.2.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/xiph/libao/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="alsa nas mmap pulseaudio static-libs"
 
 RDEPEND="
diff --git a/media-libs/libao/libao-1.2.2.ebuild b/media-libs/libao/libao-1.2.2.ebuild
deleted file mode 100644
index 2571b49101e0..000000000000
--- a/media-libs/libao/libao-1.2.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools libtool multilib multilib-minimal
-
-DESCRIPTION="The Audio Output library"
-HOMEPAGE="https://www.xiph.org/ao/"
-#SRC_URI="https://downloads.xiph.org/releases/ao/${P}.tar.gz"
-#SRC_URI="https://git.xiph.org/?p=libao.git;a=snapshot;h=refs/tags/${PV};sf=tgz -> ${P}.tar.gz"
-SRC_URI="https://github.com/xiph/libao/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="alsa nas mmap pulseaudio static-libs"
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	nas? ( >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	sed -i "s:/lib:/$(get_libdir):g" ao.m4 || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-arts
-		--disable-esd
-		$(use_enable alsa alsa)
-		$(use_enable mmap alsa-mmap)
-		$(use_enable nas)
-		$(use_enable pulseaudio pulse)
-		$(use_enable static-libs static)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}/html" install
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS CHANGES README TODO
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/media-libs/libass/Manifest b/media-libs/libass/Manifest
index 08385da9b01d..55a1e81757ab 100644
--- a/media-libs/libass/Manifest
+++ b/media-libs/libass/Manifest
@@ -1,3 +1,3 @@
 DIST libass-0.14.0.tar.xz 356256 BLAKE2B cf38d472003d6590c69da9347310386559b1ce13425d47505daca881b504453802a60cd553bbe478044764c108586668886372b79a61ccba42cdf49b2ed9ca74 SHA512 0f5fe5d7e662ee1d649981f829e5ef7a53457754f74faaed5679252a5a6769c8f267b6119cda922ebc6a8e5b5b331569f13813ac74881b4e94da7b2e8143a9e6
-EBUILD libass-0.14.0.ebuild 1338 BLAKE2B 143ed9f7715f30cdcecb034b437ad1ba1fbdb2cee8994c3c9dfaeb4f5ac5a4d16b507ac1db780efc1b2a28c51f3c4f00647739cdc163bdbbee4061d6577c7b84 SHA512 e4584363bea7e4211c76e2f8826a9382eea613be4d495a9203cde40742bb68835b4ba21cda2ddde81eb1be3357364d60e7e274e367a5ace8cd6a465732fc39b7
+EBUILD libass-0.14.0.ebuild 1327 BLAKE2B f028ea85ba3ba45567bbc89bb39d53b4512e7c277ce9d15426b1fdde06c2f736580626dd06669180ae8d2c5334868b41010754e1841bb4c9ac48d68ec81c503c SHA512 e458b290efad610799460bfdf015430c57d411e47e64ccb21e027e4b8b2b8797142dd5dfc919f63a5e8256bce10e9c62a5bdb89226cd413d8a347185c3ca8638
 MISC metadata.xml 420 BLAKE2B 160123e29ca333ee5aa8cc197a986ae489ea578e54efebab089133db45a7d3ba5b554161c2a835fa0f53537a16043b627d41f26c752460e6bf3118aab185f0d6 SHA512 ea6cdb493942844567b8acc3dddf71983ab02ba05d849aaaa0cdf0c8e435a0acd159eca447c3e049ddf27d384fb0e94826ff9aad42322eea459e4313f0319964
diff --git a/media-libs/libass/libass-0.14.0.ebuild b/media-libs/libass/libass-0.14.0.ebuild
index 2ad3d40c82c4..45a0b21a9312 100644
--- a/media-libs/libass/libass-0.14.0.ebuild
+++ b/media-libs/libass/libass-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0/9" # subslot = libass soname version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-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 ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+fontconfig +harfbuzz static-libs"
 
 RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libcaca/Manifest b/media-libs/libcaca/Manifest
index 1700d7b3c200..9f35deed22ba 100644
--- a/media-libs/libcaca/Manifest
+++ b/media-libs/libcaca/Manifest
@@ -1,5 +1,5 @@
 AUX libcaca-0.99_beta18-fix-tests.patch 1874 BLAKE2B ff5537354ec12b336e6f0e9f35c41d973adc880656b8554b273ce92c3dce99491145e1398a8585bdb89b8f0054cd31c142f745f04dedeafa2cc6a2c445e05642 SHA512 1a10f0c4b006684471505b35bbe0369e6928c2dfc01e9d8c8ed706d9dc6890035c1fbf509e4a02c6030f0af382a982616c83128b92a2b5574a99e0963ae6b20f
 AUX libcaca-0.99_beta18-latex_hacks.patch 641 BLAKE2B ecaaed51bf3d8c7f75641da665bf8a4d25d2aab47de4bb0fe9e8ff40cacb628650a346074e2a57d220f7fa8a5c2063a8f16f65d52aad222dd81eba6269809e7e SHA512 66d878696ae237310cea20e3bd5802afce6fa94f66b07c1660456d17a33218a93e3aea6bcaf99bfada67bef6857089559aa48068a1761e7fe439a81d82a1ab6b
 DIST libcaca-0.99.beta19.tar.gz 1203495 BLAKE2B 65462090fc503d640d91753ff21b55ad1bac360fb6e5aae8f46d8162e62f8834f791a1db6e2045a63deaa7c409c3455b484750294cfb01e1027f0ca8dc2f2798 SHA512 780fc7684d40207cc10df3f87d6d8f1d47ddfffa0e76e41a5ce671b82d5c7f090facb054c3d49ca7c4ea1a619625bb9085ce52f837f50792b4a2d776a4c68e15
-EBUILD libcaca-0.99_beta19-r1.ebuild 4184 BLAKE2B dc81192d129e2eae25033b997fc6e26823fe25ae3c920e6f8f5de10658c63ca2d99a76ce62c7f3a94a88fe42fb471b7559147c95392d3392f1feeca92133cbce SHA512 14b2bfc7228fccf8ea34b146b7f8421df2baabd85de60dfc96b3ffe4fb4739aa91cea41bf66bd2165b55a3a7c00dcda64eef7ffd93e6b290c583a83116fc9de1
+EBUILD libcaca-0.99_beta19-r1.ebuild 4005 BLAKE2B 0d6707bf7cc8ce0f90e0f4fabb783483365b63fc18e2286c6d794df27e4ba51f09e554c5d054ef84809a2391a365bfeb084954b181d4ae141c45b77e2c9a4e7c SHA512 8bf0cc7f495f480b8e59053f37b5c43b6865374ab26d92432a90fc6ddddc9494b90f2359063038a92eb60ca054cb02c36aceacbd1541ebb76e892308d3c7deec
 MISC metadata.xml 219 BLAKE2B bca5749b6f2d3541ba2d2635b59056f9ecdc46553991dec3ee5a7bc9f26393bdae62755418850d3cbda0eeb65b7f72029ddf09d4f088b21c84d407d0e6eaa098 SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2
diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild b/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild
index f1b7568c43af..0bc4e2321bd1 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild
@@ -2,11 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 )
 RUBY_OPTIONAL=yes
 #USE_RUBY=ruby20
 
-inherit autotools ruby-ng eutils flag-o-matic ltprune mono-env multilib java-pkg-opt-2 python-single-r1 multilib-minimal
+inherit autotools ruby-ng eutils flag-o-matic ltprune mono-env multilib java-pkg-opt-2 multilib-minimal
 
 MY_P=${P/_/.}
 DESCRIPTION="A library that creates colored ASCII-art graphics"
@@ -16,11 +15,9 @@ SRC_URI="http://libcaca.zoy.org/files/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2 ISC LGPL-2.1 WTFPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="cxx doc imlib java mono ncurses opengl python ruby slang static-libs test truetype X"
+IUSE="cxx doc imlib java mono ncurses opengl ruby slang static-libs test truetype X"
 RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
+REQUIRED_USE=""
 #	ruby? ( ruby_targets_${USE_RUBY} )
 
 COMMON_DEPEND="imlib? ( >=media-libs/imlib2-1.4.6-r2[${MULTILIB_USEDEP}] )
@@ -32,7 +29,6 @@ COMMON_DEPEND="imlib? ( >=media-libs/imlib2-1.4.6-r2[${MULTILIB_USEDEP}] )
 		>=media-libs/freeglut-2.8.1[${MULTILIB_USEDEP}]
 		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
 	)
-	python? ( ${PYTHON_DEPS} )
 	slang? ( >=sys-libs/slang-2.2.4-r1[${MULTILIB_USEDEP}] )
 	X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )"
 #	ruby? (  $(ruby_implementations_depend) )
@@ -55,7 +51,6 @@ S=${WORKDIR}/${MY_P}
 DOCS=( AUTHORS ChangeLog NEWS NOTES README THANKS )
 
 pkg_setup() {
-	use python && python-single-r1_pkg_setup
 	java-pkg-opt-2_pkg_setup
 	use mono && mono-env_pkg_setup
 }
@@ -124,7 +119,7 @@ multilib_src_configure() {
 			$(use_enable test cppunit) \
 			$(multilib_native_use_enable java) \
 			$(multilib_native_use_enable ruby) \
-			$(multilib_native_use_enable python) \
+			--disable-python \
 			$(multilib_native_use_enable mono csharp) \
 			$(multilib_native_use_enable doc)
 }
diff --git a/media-libs/libdca/Manifest b/media-libs/libdca/Manifest
index e419ec84c7dd..40a5f88498b0 100644
--- a/media-libs/libdca/Manifest
+++ b/media-libs/libdca/Manifest
@@ -2,5 +2,7 @@ AUX libdca-0.0.5-cflags.patch 492 BLAKE2B 3090b187518cd899b76fff017bc544ccafaac0
 AUX libdca-0.0.5-tests-optional.patch 508 BLAKE2B ed77381970c59dee10e0b32d36183b390574acb0cfec1216f83bc4f2af784bc973d303d051f6348fd4d69dcbbcbc8b1bbb2f3dc7857fdaf05c46c885a463aad5 SHA512 0998e84e4855367b4c43e27e73d87c2b12c849a80864de66805e344eb32ad8463d46602d63b92edf1dd177d4fe77aa119c07952c6c2bc5de6add13468a9082a6
 DIST libdca-0.0.5-constant.patch.bz2 3424 BLAKE2B 048d7afd856090b5f9d0db1d5894b78d037fa1c03086271342527a1bf04f41ed379b38fe6d72eb9bbf74a864c67710b5f9abe53177cdb2f4f53a8e7502d77c44 SHA512 37bd56b8c240f16a6ee86b04d44571345278f8b9dd395cbc307e9fb7e6c001487411d1b4775af19dc97f18fcaed63be97fafeb4fe504f0a76b87022ec792d23e
 DIST libdca-0.0.5.tar.bz2 393291 BLAKE2B 093e941e8cd25ca52ae43ab16607f8ff3c5ebb95ffc4b29c3cb771b6bf9ba45da4cc8ebd83cd91ccd66b0dd981c32a6c77cb3e90f46093b64b9a483dd854ffb6 SHA512 d9f0ed34efeb3f27af8424fcb3e6df56744c6735854a65b5709c02b42b4513b9c4618dcc19eb44293afa051bd95616651bda5fc3b49dfabe975d0babfb1bc287
+DIST libdca-0.0.7.tar.bz2 158232 BLAKE2B 943ef3845f6b73d3d7a2cc47fd3c59517544c156f46e1be42b7940e11a164d8c533ba0e1436ea7bee95467bb7fdce95bb390e2816ebe7d8e208821eb325cb9de SHA512 dae15d77d066687c882833d5bed8d65a585c1fc0277b7276563c89ddd5a83b35389ec94cca445f38af28a9b01430b72647e9afd1b08f030959e711de1a08924a
 EBUILD libdca-0.0.5-r3.ebuild 1432 BLAKE2B 10e11663856f32e42876aea5a6ae2acc618681b57827b8ca11af02803ca4f516e5272fe642f70c6b36042b7c660ef1676d77b2bfa01314f2226c2fdd1f2d80b9 SHA512 a49b93d1aa70a8d814dd1a8b00b50e3ef25208f2ae80c458ab501dc891faab77d00b85f11f272baba2f4b88682c50ee93f9354d54371a19776ef296b69b73cec
+EBUILD libdca-0.0.7.ebuild 1340 BLAKE2B 7a42ae834fdfdb55ccaf41e821e5066dbc9de6673f25540ab1cef06ad5d816cba1d016db7643a636152e86206387940b623f4c31f0b6d92a1cb785d7addb0e98 SHA512 570d70930be3bcf4fe87c17cb2ffae47b0d469f1d226eb0aabba988858e94d2305d6f4a72565dfb2f0d7db84a73bfbaee6addb71570ed77b2434029cb0708d77
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libdca/libdca-0.0.7.ebuild b/media-libs/libdca/libdca-0.0.7.ebuild
new file mode 100644
index 000000000000..0e794c3f2109
--- /dev/null
+++ b/media-libs/libdca/libdca-0.0.7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal
+
+DESCRIPTION="Library for decoding DTS Coherent Acoustics streams used in DVD"
+HOMEPAGE="https://www.videolan.org/developers/libdca.html"
+SRC_URI="https://www.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="debug oss"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO doc/${PN}.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.0.5-cflags.patch
+	"${FILESDIR}"/${PN}-0.0.5-tests-optional.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	append-lfs-flags #328875
+
+	local myeconfargs=(
+		--disable-static
+		$(use_enable debug)
+		$(use_enable oss)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	# Those are thrown away afterwards, don't build them in the first place
+	if [[ "${ABI}" != "${DEFAULT_ABI}" ]] ; then
+		sed -e 's/ libao src//' -i Makefile || die
+	fi
+}
+
+multilib_src_compile() {
+	emake OPT_CFLAGS=""
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	find "${D}" -name '*.la' -type f -delete || die
+	rm "${D}"/usr/$(get_libdir)/libdts.a || die
+}
diff --git a/media-libs/libde265/Manifest b/media-libs/libde265/Manifest
index 8f54ad2f0ed9..65a8ee47a126 100644
--- a/media-libs/libde265/Manifest
+++ b/media-libs/libde265/Manifest
@@ -1,6 +1,8 @@
 AUX libde265-1.0.2-qtbindir.patch 1798 BLAKE2B 22e15a1d4dfe7f602c9b13611c17d4d6be396b1cb9d4d4690c43cb85cf6c21f64cde98e01b52551216612cf349f2fe74d59252b99a202cce7041d3c2b6a33dde SHA512 34b6efa56943e50d76c21e6911afff9c45e97d5608cfa5d3a53432bf2bf40f4fc6873d8c426b1a714542a6468670be2a710190191e5e1fe01c5e7dedf75f567c
 AUX libde265-1.0.3-use-new-FFMPEG-enum-names.patch 933 BLAKE2B 50f4f65a7c73365bd6f803c4fe85e029188a184dfe8dce5768e47af15cb489705129a5054aaf6bb12d8822de588c6ed10cf8384db7baeb2b4a6fee1a8a96494d SHA512 cf88bd2d40d9726dbe8bd8c3cddacccfef065635cf20751efd30dd30ac706d640be3b06a284a5bc11b457de63206d699405a6da8fb39cd0d5425371f5d538549
 DIST libde265-1.0.3.tar.gz 399996 BLAKE2B 988b21085f82d3b33b0480542677be96db5219c1b767aae3674f89862fdaf3355dcfea3fa99699798a4fcc6b72a63a3a6f61a3fd8d2ea8483231205cd6d87175 SHA512 0153632afcc9733950e8354997ccd93eddad90e8e0f7362bfe49b93b11cb1756cf803d0ba5c07042aee80e18227613af768ca82baf7891c687edf5e253a129c4
+DIST libde265-1.0.5.tar.gz 381041 BLAKE2B d561a0e5f308bed557237b88317985912537f76701783bc30d81305cf9026a853746449ece5b3092534466ea13d67bac10b3258580c8de07489844bbef0395db SHA512 3ff7310fc4621cac0ef1cb9bbc4df61724f8943d57f5263a3663a77f4d90d84716b2a708ee9fec306e909dc8b5e7fe645a641b6a6db795a89a01799be910831e
 EBUILD libde265-1.0.3.ebuild 1590 BLAKE2B 48de41d7133072b75f48b2fb954390915085931ec6f90daa56d6d437d130795039c682f36a8b053783e29bdbd4faedda8e15d48f0c50df57ba6b754462ca0360 SHA512 431fdd0871422199e7d9278fb21857e5a9a27cb34ba949767526d9f9ada57e65efe5abe3c4fae464e2bf3f021981a786cdeb84a9917032528cf08de4e30b8ac1
-EBUILD libde265-9999.ebuild 1521 BLAKE2B c3795a5d80124f4208d96e1901b69f1286074ce0dbf360b520e6d6e15b40d844980556e8f4da1b0e325712270b816940c680143fea650562637f7f0bc66ad64c SHA512 f2cb046e270197eb0ef2cd4f3e1fbaeac5c089c21fb119c650fa53ca7a85e74c9281e6cb4dd09256e07f94db55569e231a6d58901c6689ed9ff0322e37ec5ba6
-MISC metadata.xml 307 BLAKE2B 785344dd93b51d9103d01c68ba80c44821c36a1f61eeefb0dff56d708da5f6f1991ba142f44b6b652366e320410967deadcf537beaf256995a3a768fce7bee05 SHA512 27b883ff65471f49c87c1b21911172f82058a0492bec54290534fc5229f193a94675223a6b3064c84115eda4035fea6e6f5b5477f924adede2c2a72e55ece273
+EBUILD libde265-1.0.5.ebuild 2501 BLAKE2B cfef427281d76c9b1c0a7a6d8e8d7c813cd6132408effdfa5f55060724735e4110de822908bdbfa102299c6cbc9e4af42605b1ac5568b45ce02ffef670565887 SHA512 6b911086a255f7061e9fe2d6207e345d9c7a8d6218bd5e12440d95c5c4a836894d0e28cf4e68a583740e7e9b05418801f22ceefaf528b8a79fdbcb6ed7560de8
+EBUILD libde265-9999.ebuild 2496 BLAKE2B 645c7f8d7d267eee7b3cbf376ccc12463ca3fb0f3fd823f1a91016021b047f3b60726886e711006640f28843ac8883b64662740c0cbdd0820e44400b72b0f191 SHA512 b33524c9cc21c9cce9b71b29c2de42b248725aff4d790f8bcd2a2da517584b3b9ca641ab51e5a3bae5ce365b3cb6695d624c01db4ac706d70a96c5cf0ee37df7
+MISC metadata.xml 691 BLAKE2B 24cf4f5585ca49df6aa5fbed6ab8daa55451446b1ab2d47953e05ce726b22457f1f2adc18774b745206a2f7342996b210edf83867578f86049e23823e43c1788 SHA512 c121ebe35ce66deb54c5d046fb74fb8096d134348b15607f7bc7f0b7239ce76a2ecc43ecee72382adb6078ac6f50859d0ac3a60bd8a3daf52f6cd04c9a56ecf9
diff --git a/media-libs/libde265/libde265-1.0.5.ebuild b/media-libs/libde265/libde265-1.0.5.ebuild
new file mode 100644
index 000000000000..ff9f2f98af53
--- /dev/null
+++ b/media-libs/libde265/libde265-1.0.5.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+PATCHES=( "${FILESDIR}/${PN}-1.0.2-qtbindir.patch" )
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/strukturag/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Open h.265 video codec implementation"
+HOMEPAGE="https://github.com/strukturag/libde265"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="enc265 dec265 sdl tools debug static-libs cpu_flags_x86_sse4_1 cpu_flags_arm_neon cpu_flags_arm_thumb"
+# IUSE+=" sherlock265" # Require libvideogfx or libswscale
+
+RDEPEND="
+	dec265? (
+		sdl? ( media-libs/libsdl )
+	)
+"
+# Sherlock265 require libvideogfx or libswscale
+#RDEPEND+="
+#	sherlock265? (
+#		media-libs/libsdl
+#		dev-qt/qtcore:5
+#		dev-qt/qtgui:5
+#		dev-qt/qtwidgets:5
+#		media-libs/libswscale
+#	)
+#"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="dec265? ( virtual/pkgconfig )"
+
+# Sherlock265 require libvideogfx or libswscale
+#BDEPEND+=" sherlock265? ( virtual/pkgconfig )"
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# without this, headers would be missing and make would fail
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		ax_cv_check_cflags___msse4_1=$(usex cpu_flags_x86_sse4_1)
+		ax_cv_check_cflags___mfpu_neon=$(usex cpu_flags_arm_neon)
+		$(use_enable cpu_flags_arm_thumb thumb)
+		$(use_enable static-libs static)
+		$(use_enable debug log-info)
+		$(use_enable debug log-debug)
+		$(use_enable debug log-trace)
+		$(multilib_native_use_enable enc265 encoder)
+		$(multilib_native_use_enable dec265)
+		--enable-log-error
+	)
+
+	# myeconfargs+=( $(multilib_native_use_enable sherlock265) ) # Require libvideogfx or libswscale
+	myeconfargs+=( --disable-sherlock265 )
+
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi; then
+		# Remove useless, unready and test tools (Why package ever tried to install them??)
+		rm -f "${ED}/usr/bin/"{tests,gen-enc-table,yuv-distortion} || die
+		if ! use tools; then
+			rm -f "${ED}/usr/bin/"{bjoentegaard,block-rate-estim,rd-curves} || die
+			rm -f "${ED}/usr/bin/acceleration_speed" || die
+		fi
+	else
+		# Remove all non-native binary tools
+		rm -f "${ED}/usr/bin/"* || die
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
diff --git a/media-libs/libde265/libde265-9999.ebuild b/media-libs/libde265/libde265-9999.ebuild
index 7f4f73fb81e2..1b591f16c364 100644
--- a/media-libs/libde265/libde265-9999.ebuild
+++ b/media-libs/libde265/libde265-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Open h.265 video codec implementation"
@@ -20,18 +20,31 @@ HOMEPAGE="https://github.com/strukturag/libde265"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="cpu_flags_x86_sse debug qt5 static-libs"
-
-DEPEND="
-	media-libs/libsdl[${MULTILIB_USEDEP}]
-	media-video/ffmpeg:=[${MULTILIB_USEDEP}]
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
+IUSE="enc265 dec265 sdl tools debug static-libs cpu_flags_x86_sse4_1 cpu_flags_arm_neon cpu_flags_arm_thumb"
+# IUSE+=" sherlock265" # Require libvideogfx or libswscale
+
+RDEPEND="
+	dec265? (
+		sdl? ( media-libs/libsdl )
 	)
 "
-RDEPEND="${DEPEND}"
+# Sherlock265 require libvideogfx or libswscale
+#RDEPEND+="
+#	sherlock265? (
+#		media-libs/libsdl
+#		dev-qt/qtcore:5
+#		dev-qt/qtgui:5
+#		dev-qt/qtwidgets:5
+#		media-libs/libswscale
+#	)
+#"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="dec265? ( virtual/pkgconfig )"
+
+# Sherlock265 require libvideogfx or libswscale
+#BDEPEND+=" sherlock265? ( virtual/pkgconfig )"
 
 src_prepare() {
 	default
@@ -44,26 +57,40 @@ src_prepare() {
 
 multilib_src_configure() {
 	local myeconfargs=(
-		$(use_enable cpu_flags_x86_sse sse)
+		ax_cv_check_cflags___msse4_1=$(usex cpu_flags_x86_sse4_1)
+		ax_cv_check_cflags___mfpu_neon=$(usex cpu_flags_arm_neon)
+		$(use_enable cpu_flags_arm_thumb thumb)
 		$(use_enable static-libs static)
 		$(use_enable debug log-info)
 		$(use_enable debug log-debug)
 		$(use_enable debug log-trace)
+		$(multilib_native_use_enable enc265 encoder)
+		$(multilib_native_use_enable dec265)
 		--enable-log-error
 	)
 
-	if ! multilib_is_native_abi; then
-		myeconfargs+=( --disable-dec265 --disable-sherlock265 )
-	else
-		myeconfargs+=(
-			$(use_enable qt5 dec265)
-			$(use_enable qt5 sherlock265)
-		)
-	fi
+	# myeconfargs+=( $(multilib_native_use_enable sherlock265) ) # Require libvideogfx or libswscale
+	myeconfargs+=( --disable-sherlock265 )
 
 	econf "${myeconfargs[@]}"
 }
 
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi; then
+		# Remove useless, unready and test tools (Why package ever tried to install them??)
+		rm -f "${ED}/usr/bin/"{tests,gen-enc-table,yuv-distortion} || die
+		if ! use tools; then
+			rm -f "${ED}/usr/bin/"{bjoentegaard,block-rate-estim,rd-curves} || die
+			rm -f "${ED}/usr/bin/acceleration_speed" || die
+		fi
+	else
+		# Remove all non-native binary tools
+		rm -f "${ED}/usr/bin/"* || die
+	fi
+}
+
 multilib_src_install_all() {
 	find "${ED}" -name '*.la' -delete || die
 	if ! use static-libs ; then
diff --git a/media-libs/libde265/metadata.xml b/media-libs/libde265/metadata.xml
index 37489247c5ca..524e76641f5f 100644
--- a/media-libs/libde265/metadata.xml
+++ b/media-libs/libde265/metadata.xml
@@ -4,6 +4,13 @@
 	<maintainer type="project">
 		<email>media-video@gentoo.org</email>
 	</maintainer>
+	<use>
+		<flag name="enc265">Enable build of enc265 tool</flag>
+		<flag name="dec265">Enable build of dec265 example program</flag>
+		<flag name="sdl">Enable video output of dec265 example program with <pkg>media-libs/libsdl</pkg></flag>
+		<flag name="tools">Enable installation of varous binary tools</flag>
+		<flag name="static-libs">Enable build of static libraries</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">strukturag/libde265</remote-id>
 	</upstream>
diff --git a/media-libs/libdiscid/Manifest b/media-libs/libdiscid/Manifest
index ad6430930ebe..5968e60a54ae 100644
--- a/media-libs/libdiscid/Manifest
+++ b/media-libs/libdiscid/Manifest
@@ -1,5 +1,3 @@
-DIST libdiscid-0.6.1.tar.gz 366393 BLAKE2B 551616a817922af5f90991690ea6d35523b3fb6606ab26ae7e0e4c51258fab5b653dbac96842526d9a4a51c81b5dfb63c9ec9b4fe723e88e758855cea381d46e SHA512 12808040b6bac7dd513d32b2f7a8424f0d9753a89c5703ede0454d0d8dea508a446adba20d899c3499e8621d2a752b3e8ca787b92e3ae92402c6df7bc2a3819d
 DIST libdiscid-0.6.2.tar.gz 401455 BLAKE2B 0b122f08de89af7863ed21158637e961d8cdbf4dc926e5ff641aad4f23e8b02d8e970221f51caae44d2943b894922134baeb9e99595dee74c085e31b0daefc99 SHA512 7ce9bb589f64644ef44400620bd3e65a329e52c5698b44c3dc1569fb143d9af15d540b95fbdce1b87db0263e2ff55c81133213ed1708cdb25af1b38a46c4e1ac
-EBUILD libdiscid-0.6.1.ebuild 521 BLAKE2B c2c1e8875bc4fa2a024e319bb4c7a8d21d942e25938a90b136ecf9555503e36462a55cdb70ba9854bf1b246ef9fb151136340a7e8aee8321a83e038ade56e115 SHA512 e24eda57c7f6671455aa58ea37006106636850c8c77389bc929d5d5879ca03229bc2f69e9981626235b712ab983e834019523e98b86209fa431c0590594d728b
-EBUILD libdiscid-0.6.2.ebuild 564 BLAKE2B 2c6a20879765b169b25103e1432d683b6c99f5744dc1cff4fb2492fe98829ecaf5e53a41624d873471bec75d009a868904fe9a74bb1e438ec4e7433099eb3917 SHA512 e26a8c930b9191e1c69b5d544ec157f8d8021516f151eb39410e59a561aa2bae5c27d79f97d804e80ec44c442dd73cad0f20d17703d248917c9858568d54bfc3
+EBUILD libdiscid-0.6.2.ebuild 593 BLAKE2B 706018f8cd63740355b396e39f4ce0ac9cfc5d2375938a0748bfa6c616204c650a40f29e17a9acc2701240a96e2dc405b72a822087c90ff29cf0dce93d4698a8 SHA512 9aafc27faf46c79015ded55d289122ce27547757eb666fa665a8d66eb1750ba51d038e1fda799a0aa41f1bca3cb5e6a79da4135f8e91ab8944b0017e9720411c
 MISC metadata.xml 587 BLAKE2B e5d8e996c7015f2796f2ec687989c777e85dff7c64e14cedeb8067604841d13256d73ce81ba4601ecea644e1fa5a7ba05b18749b1233498ca193932952510c3c SHA512 02616572b6782adc2285210f4d3fcfcb1e188012eb97a322468e93755a0ccd0a6760885b345bb7845ef6aaaba114b22afcfd02ae5572fb2e4140209adc6db570
diff --git a/media-libs/libdiscid/libdiscid-0.6.1.ebuild b/media-libs/libdiscid/libdiscid-0.6.1.ebuild
deleted file mode 100644
index 2666155696fa..000000000000
--- a/media-libs/libdiscid/libdiscid-0.6.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="Client library to create MusicBrainz enabled tagging applications"
-HOMEPAGE="http://musicbrainz.org/doc/libdiscid"
-SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DOCS=( AUTHORS ChangeLog examples/discid.c README )
diff --git a/media-libs/libdiscid/libdiscid-0.6.2.ebuild b/media-libs/libdiscid/libdiscid-0.6.2.ebuild
index f00d72a58c00..1c9e122c303b 100644
--- a/media-libs/libdiscid/libdiscid-0.6.2.ebuild
+++ b/media-libs/libdiscid/libdiscid-0.6.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Client library to create MusicBrainz enabled tagging applications"
 HOMEPAGE="http://musicbrainz.org/doc/libdiscid"
@@ -10,10 +10,15 @@ SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DOCS=( AUTHORS ChangeLog examples/discid.c README )
 
 src_configure() {
-	econf $(use_enable static-libs static)
+	econf --disable-static
+}
+
+src_install() {
+	default
+	dodoc examples/discid.c
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libemf/Manifest b/media-libs/libemf/Manifest
index 842c545efbe2..3bcb6e6cb470 100644
--- a/media-libs/libemf/Manifest
+++ b/media-libs/libemf/Manifest
@@ -1,10 +1,3 @@
-AUX libemf-1.0.4-amd64-alpha.patch 3194 BLAKE2B 323edc7677dda422d6a3669ee7cd117fd7fb274265dcc2032b033e13bebfb027a0ee581fc2430283ef465e7fa75a2a087e18a57467c5045aad0d22e20b32c532 SHA512 6e37fcfb52724923ac20f6c6d42450834824e2003f2002802f89b4d9c8b9709af8b179ca94ec80938c20cd0a3ca895021777b088ea95ea593aad2746749d0ee1
-DIST libEMF-1.0.4.tar.gz 818060 BLAKE2B 0abc5f478d06ebc562323a515c51c46afd2a98fd2559d8a309c4b18f16da8063cd65fa7d19a83ba360e8c53a7e9788b590e810d615000069fe7c912194a8eec1 SHA512 8abd6081e79e6045b0a4a1575fbcc19921beeefb22036164ed906a35e4dbc67b6959899acf46bb5db5996ae07cf38aaecf8eb62dd6bf5f528200a4d20b13db55
-DIST libEMF-1.0.7.tar.gz 908973 BLAKE2B cfe2c67bfae9fd7387f5332fa7b5038510d81aab942fc87b04da625ecc39c3e2b711ed14fba46eabae4a2eced4621eb580cedf1c9e67f32fb33afb9bc1ceaa5e SHA512 eff5c46a6e1008d8f581fda59355faa608a825e4832c54dbb074bf20caeee5b038ce18ed3a13181de04bd0601837db7f5c5a0913eb1b8301100dbc26a9ee5888
-DIST libemf-1.0.12.tar.gz 1314880 BLAKE2B 61e1e56e713ce53c589a758ad01eca572d61ca336c0a6cb08f4becb9b850973a82d4fe124b8fd6f39530d2d4637c38ccb137d4c5eecb17469654fc921e9ef150 SHA512 a96f2b14e4dc0b0b388d21789890b3a89e20bdd6aaba3665a7af2c61c3da531718ed19eb0d70ef1ce1f46e1327530a7edc057c1b78f68e7e883b5357829c7453
 DIST libemf-1.0.13.tar.gz 1314905 BLAKE2B a2614aae1e34fdd65292d7feff3c0c002393aad806bbe398c665191e496ff0d3af676b04bf95400e732f09b846d033f98d3f08e47f6d7779dca9694372ef1451 SHA512 37fdc959d2269ad1ae97d49c4f75b914593b7b636024c035d96a5a47b4258b5b522cd1928a5b99392afcdfe54e46c7f2d4c157056f99c8c0d88d71c25813cc60
-EBUILD libemf-1.0.12.ebuild 637 BLAKE2B fda46e44496076d69cd53a97810544b9b52d324c0ea0cb674cb9fb4ffc3d26fd70ee1d1297d7aa387397427f3e82450dcbeb5323ca6bba919b7920f50f683014 SHA512 5f8b8104a0848f6089e551bba5b33ef104cda39ac0ab621df3abe2f1993780d3504db8e16550ac5bba86c1984a73ce2efa0b0fcfbb95c80d3be453eccf317c0a
 EBUILD libemf-1.0.13.ebuild 635 BLAKE2B 11301d6497ae464144fbcd850946eadde0d09a6ee9f2381144041f134022a986d943266786bccbe3ac2a781a81ae72788ff1eda1023fd04562a4e66158e3ff57 SHA512 42ed14eadcf521e614d3e3d8a1afb1f0c6972a81d5893ee495d29ea8d24716ddfc55c0436cb7e1d10bd4e20ba39d89b4f1ac8ed17d9bf57988af59e2c1687e1f
-EBUILD libemf-1.0.4-r1.ebuild 864 BLAKE2B 7c6720af9200e2417baf17d34c8776e2ec9422a9d283d362807b3c8b69b6ddfc53872692fcdab74f83aa3151398b231a9401ebfe806b729883b1c73dbc5c13bb SHA512 dc75bcb21bcd45634877aae19feccbc2048c01e58abbf6e2bba6647c2f55ac1985fede7c38f701975562135327e7b5e7c6f77a5c80af9e10229771db20006fce
-EBUILD libemf-1.0.7.ebuild 815 BLAKE2B a6eba4cc0279401fb72110e17bcf082c6768fd18c3aa3ad94559622680bfba3b7936e15e623078c895cb9147882bca8d36751496cdb8199dcd7ae170bc590bd4 SHA512 b0b3c94474b8aaa809456b89222886f1f0fdf0672d355895f1835e7151a4f5bd8419b8abc31c5ad932afb31167e621049d5feccfa46309209b780a6a3efaccbb
 MISC metadata.xml 248 BLAKE2B dce07ccd35cdf8117e7f05bbe068c807c381bb91d899d48834974c1d362cc25c3d114dffba55b67c669b96893cfcb7cc56451a6ad833cc5b5cf89f577e714b27 SHA512 89826cb9b2687c78bf585335d0f103d00a5c58d9e5902003e18710e9a8afff7304bc39f3909de99f2b14b4b8a6a007a1f0e3aa5f90bf31d0b8d7314a3c7edf05
diff --git a/media-libs/libemf/files/libemf-1.0.4-amd64-alpha.patch b/media-libs/libemf/files/libemf-1.0.4-amd64-alpha.patch
deleted file mode 100644
index 6f809a957e76..000000000000
--- a/media-libs/libemf/files/libemf-1.0.4-amd64-alpha.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- a/include/libEMF/wine/winbase.h
-+++ b/include/libEMF/wine/winbase.h
-@@ -1802,6 +1802,7 @@ LONG        WINAPI InterlockedIncrement(PLONG);
- VOID        WINAPI SetLastError(DWORD);
- #endif  /* __i386__ && __GNUC__ */
- 
-+#if 0
- /* FIXME: should handle platforms where sizeof(void*) != sizeof(long) */
- static inline PVOID WINAPI InterlockedCompareExchangePointer( PVOID *dest, PVOID xchg, PVOID compare )
- {
-@@ -1812,6 +1813,7 @@ static inline PVOID WINAPI InterlockedExchangePointer( PVOID *dest, PVOID val )
- {
-     return (PVOID)InterlockedExchange( (PLONG)dest, (LONG)val );
- }
-+#endif
- 
- #ifdef __WINE__
- #define GetCurrentProcess() ((HANDLE)0xffffffff)
---- a/include/libEMF/wine/winnt.h
-+++ b/include/libEMF/wine/winnt.h
-@@ -29,10 +29,14 @@
- 
- /* Architecture dependent settings. */
- /* These are hardcoded to avoid dependencies on config.h in Winelib apps. */
--#if defined(__i386__)
-+#if defined(__i386__) || defined(__x86_64__)
- # undef  WORDS_BIGENDIAN
- # undef  BITFIELDS_BIGENDIAN
- # define ALLOW_UNALIGNED_ACCESS
-+#elif defined(__alpha__)
-+# undef  WORDS_BIGENDIAN
-+# undef  BITFIELDS_BIGENDIAN
-+# undef  ALLOW_UNALIGNED_ACCESS
- #elif defined(__sparc__)
- # define WORDS_BIGENDIAN
- # define BITFIELDS_BIGENDIAN
-@@ -222,8 +226,13 @@ typedef unsigned short  USHORT,     *PUSHORT,  *LPUSHORT;
- typedef unsigned short  WORD,       *PWORD,    *LPWORD;
- typedef int             INT,        *PINT,     *LPINT;
- typedef unsigned int    UINT,       *PUINT,    *LPUINT;
-+#if defined(_LP64) || defined(__alpha__)
-+typedef unsigned int    DWORD,      *PDWORD,   *LPDWORD;
-+typedef unsigned int    ULONG,      *PULONG,   *LPULONG;
-+#else
- typedef unsigned long   DWORD,      *PDWORD,   *LPDWORD;
- typedef unsigned long   ULONG,      *PULONG,   *LPULONG;
-+#endif
- typedef float           FLOAT,      *PFLOAT,   *LPFLOAT;
- typedef double          DOUBLE,     *PDOUBLE,  *LPDOUBLE;
- typedef double          DATE;
-@@ -263,7 +272,11 @@ typedef VOID           *PVOID,      *LPVOID;
- typedef BYTE            BOOLEAN,    *PBOOLEAN;
- typedef char            CHAR,       *PCHAR;
- typedef short           SHORT,      *PSHORT;
-+#if defined(_LP64) || defined(__alpha__)
-+typedef int             LONG,       *PLONG,    *LPLONG;
-+#else
- typedef long            LONG,       *PLONG,    *LPLONG;
-+#endif
- 
- /* Some systems might have wchar_t, but we really need 16 bit characters */
- #ifndef WINE_WCHAR_DEFINED
-@@ -652,8 +665,13 @@ typedef CONTEXT86 CONTEXT;
- 
- #endif  /* __i386__ */
- 
-+#ifdef __x86_64__
-+#define CONTEXT_FULL		1
-+typedef struct _CONTEXT CONTEXT;
-+#endif
-+
- /* Alpha context definitions */
--#ifdef _ALPHA_
-+#if defined(__alpha__)
- 
- #define CONTEXT_ALPHA   0x00020000
-  
---- a/libemf/libemf.h
-+++ b/libemf/libemf.h
-@@ -306,6 +306,7 @@ namespace EMF {
- 	fread( &word, sizeof(INT16), 1, fp_ );
-       return *this;
-     }
-+#if !(defined(_LP64) || defined(__alpha__))
-     /*!
-      * Output a double word (long) to the stream (swabbed).
-      * \param word word (long) to output.
-@@ -374,6 +375,7 @@ namespace EMF {
- 	fread( &long_, sizeof(LONG), 1, fp_ );
-       return *this;
-     }
-+#endif
-     /*!
-      * Output a (long) int to the stream (swabbed).
-      * \param int_ (long) int to output.
diff --git a/media-libs/libemf/libemf-1.0.12.ebuild b/media-libs/libemf/libemf-1.0.12.ebuild
deleted file mode 100644
index 18a1df100b15..000000000000
--- a/media-libs/libemf/libemf-1.0.12.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Library implementation of ECMA-234 API for the generation of enhanced metafiles"
-HOMEPAGE="http://libemf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libemf/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 -arm ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-src_configure() {
-	econf \
-		--enable-editing \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/html/. )
-	default
-	use static-libs || find "${D}" -name '*.la' -type f -delete
-}
diff --git a/media-libs/libemf/libemf-1.0.4-r1.ebuild b/media-libs/libemf/libemf-1.0.4-r1.ebuild
deleted file mode 100644
index 6f4feb321144..000000000000
--- a/media-libs/libemf/libemf-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-MY_P="${P/emf/EMF}"
-DESCRIPTION="Library implementation of ECMA-234 API for the generation of enhanced metafiles"
-HOMEPAGE="http://libemf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libemf/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 -arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${P}-amd64-alpha.patch )
-
-src_prepare() {
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=( --enable-editing )
-	autotools-utils_src_configure
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/html/. )
-	autotools-utils_src_install
-}
diff --git a/media-libs/libemf/libemf-1.0.7.ebuild b/media-libs/libemf/libemf-1.0.7.ebuild
deleted file mode 100644
index b2375485f9f9..000000000000
--- a/media-libs/libemf/libemf-1.0.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-MY_P="${P/emf/EMF}"
-DESCRIPTION="Library implementation of ECMA-234 API for the generation of enhanced metafiles"
-HOMEPAGE="http://libemf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libemf/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 -arm ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=( --enable-editing )
-	autotools-utils_src_configure
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/html/. )
-	autotools-utils_src_install
-}
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index f0bfc42da2e8..627a2398dc4e 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -1,9 +1,4 @@
 AUX libexif-0.6.13-pkgconfig.patch 255 BLAKE2B 397c0e88f951628e697cdd749936b3e4e676bccac2fb2bff2553b12d5978f03719175b9d25fa66bc06dd459e0f6671af48276d449de9b029202dfe7a3622fc85 SHA512 859c6b5bf179f315184f5f34a986761f113786792ff2e13461cf64ccf394dd2d7bd97215db0651d52819533cb918652d7eae9f18b2a913dd9ccf390cdf3adb65
-AUX libexif-0.6.21-CVE-2017-7544.patch 1060 BLAKE2B 130b95e5f4f44402385bb6825e8728ad32b328dfe621957edcada1da351d8aa01f221c7de2bcc6242166a65a1edeef2e3babb1735909bc7d59594d379d5e325b SHA512 d529c6c5bd26dc21c0946702574184e1f61c2bfd4fb95b41e314f486a0dd55571963ff2cad566d2fb0804de3c0799bcd956c15a3dc10a520ce207728edad4e2d
-AUX libexif-0.6.21-CVE-2018-20030.patch 4629 BLAKE2B 574f95d21507887851da9486cbd8d263ad25e1df59dd8020f1e4b640d5cc4852667c689993e67a7d705c748b521a46cd5e187a99c9d92787bc9758631c8d7741 SHA512 c49437dffebb901209748b884d67192d2b77072b2fb96c77b95f398d3c68272b14ac4a6ddd33111df8dac49cd6ab8f38e230f8f3f0a842d4b40f2fd38f141a1d
-AUX libexif-0.6.21-fix-C89-compatibility-issue.patch 1138 BLAKE2B 5b3923a7fd82fc4c0f267684c67f329b4ff2dc43f9d088acd4a352a9f3c329b08c338c51c77b3f55654e5cf2dbb2f7ba317b10de7e963ccc7b4c1989332fd544 SHA512 a91c2f12141b7a0c399f08f038746ca44cbc468776e5b34672d38921b8a131df3938e400fea04d20c323d6d1363f8fb176a4abac7be4b1ea9bb9694aa902f19e
-DIST libexif-0.6.21.tar.bz2 1368435 BLAKE2B 151e3ddcdd45759fd70be91db27511f48a9b7d5de72c8af510e5a231e2f053f8b5d62d1269a1206e419461b07fb723788492604f1f1142edcb5ab7a0876dd307 SHA512 4e0fe2abe85d1c95b41cb3abe1f6333dc3a9eb69dba106a674a78d74a4d5b9c5a19647118fa1cc2d72b98a29853394f1519eda9e2889eb28d3be26b21c7cfc35
 DIST libexif-0.6.22.tar.gz 2741296 BLAKE2B df57aa0ff7d20faa47ea34f4d8164c33b113887bc2179405481b2c12c0d0336dc9e5321a260ffda64d974bfa9ac6af55c0cfb4cc9a57a941c17944a3d049befd SHA512 e399804c9d67072861988638349115c585546be20f15c4d26bb6f411ff4ee5bce979c1a41305c1456ecc2f830837349f93cfa4136b7a864e0486cecd3607b469
-EBUILD libexif-0.6.21-r3.ebuild 1340 BLAKE2B 3af2fc92b0ae5c2b004ecb125b21fda1171c0b2318b882b927a8490a6a420d263ff8175fe52def0039d6f9723abc73e95cca7c27ef0104043ca23bff937369b0 SHA512 339383b4ac82b6b907465d08b06b53ec0c6e35bd839918085fcec2f61ff3eb6ffe72c454771703721d9520014c0b8deca317704b24ccd64182a3e477ca1c9ef6
 EBUILD libexif-0.6.22.ebuild 1285 BLAKE2B 94bc4fad00f8c4ee923b70e18a875c1b061ead7b067572cadb36f2e7acf6664ce9149161bef4a4a24dad99558c76bc50e6b3e12dc082b5f9ca8ae8eea340d178 SHA512 4b4dd8ff2e2bf256b7791509217ca4c9011ca583668227d5176ca285ec11caaba0febd87234ac0fc5dbf297346d128798b4e7c331ab4e3a6edbe345d1efa1397
 MISC metadata.xml 311 BLAKE2B 0109881067d004082c81401909d6605a6bc792700cabf760db3e62bda628664915647427a3034dbfb52e3f047ce692ec6f279df06dbe76be014c1b676cf796ac SHA512 3b3e7a9c989e72b817e59c9c35ca6cb81dcd00eb27001095f139b1a297f7f1e80d32eee11573344d42881641920aa6a1a2bffc85892f92b347f0d8326d97f7a0
diff --git a/media-libs/libexif/files/libexif-0.6.21-CVE-2017-7544.patch b/media-libs/libexif/files/libexif-0.6.21-CVE-2017-7544.patch
deleted file mode 100644
index 534817417d84..000000000000
--- a/media-libs/libexif/files/libexif-0.6.21-CVE-2017-7544.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From c39acd1692023b26290778a02a9232c873f9d71a Mon Sep 17 00:00:00 2001
-From: Marcus Meissner <marcus@jet.franken.de>
-Date: Tue, 25 Jul 2017 23:38:56 +0200
-Subject: [PATCH] On saving makernotes, make sure the makernote container tags
- has a type with 1 byte components.
-
-Fixes (at least):
-	https://sourceforge.net/p/libexif/bugs/130
-	https://sourceforge.net/p/libexif/bugs/129
----
- libexif/exif-data.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/libexif/exif-data.c b/libexif/exif-data.c
-index 67df4db..91f4c33 100644
---- a/libexif/exif-data.c
-+++ b/libexif/exif-data.c
-@@ -255,6 +255,12 @@ exif_data_save_data_entry (ExifData *data, ExifEntry *e,
- 			exif_mnote_data_set_offset (data->priv->md, *ds - 6);
- 			exif_mnote_data_save (data->priv->md, &e->data, &e->size);
- 			e->components = e->size;
-+			if (exif_format_get_size (e->format) != 1) {
-+				/* e->format is taken from input code,
-+				 * but we need to make sure it is a 1 byte
-+				 * entity due to the multiplication below. */
-+				e->format = EXIF_FORMAT_UNDEFINED;
-+			}
- 		}
- 	}
- 
diff --git a/media-libs/libexif/files/libexif-0.6.21-CVE-2018-20030.patch b/media-libs/libexif/files/libexif-0.6.21-CVE-2018-20030.patch
deleted file mode 100644
index 08179f84b500..000000000000
--- a/media-libs/libexif/files/libexif-0.6.21-CVE-2018-20030.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 6aa11df549114ebda520dde4cdaea2f9357b2c89 Mon Sep 17 00:00:00 2001
-From: Dan Fandrich <dan@coneharvesters.com>
-Date: Fri, 12 Oct 2018 16:01:45 +0200
-Subject: [PATCH] Improve deep recursion detection in
- exif_data_load_data_content.
-
-The existing detection was still vulnerable to pathological cases
-causing DoS by wasting CPU. The new algorithm takes the number of tags
-into account to make it harder to abuse by cases using shallow recursion
-but with a very large number of tags.  This improves on commit 5d28011c
-which wasn't sufficient to counter this kind of case.
-
-The limitation in the previous fix was discovered by Laurent Delosieres,
-Secunia Research at Flexera (Secunia Advisory SA84652) and is assigned
-the identifier CVE-2018-20030.
-
-Adjusted for missing https://github.com/libexif/libexif/commit/5d28011c40ec86cf52cffad541093d37c263898a
-
----
- libexif/exif-data.c | 45 +++++++++++++++++++++++++++++++++++++--------
- 2 files changed, 38 insertions(+), 8 deletions(-)
-
-diff --git a/libexif/exif-data.c b/libexif/exif-data.c
-index e35403d..a6f9c94 100644
---- a/libexif/exif-data.c
-+++ b/libexif/exif-data.c
-@@ -35,6 +35,7 @@
- #include <libexif/olympus/exif-mnote-data-olympus.h>
- #include <libexif/pentax/exif-mnote-data-pentax.h>
- 
-+#include <math.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-@@ -350,6 +351,20 @@ if (data->ifd[(i)]->count) {				\
- 	break;						\
- }
- 
-+/*! Calculate the recursion cost added by one level of IFD loading.
-+ *
-+ * The work performed is related to the cost in the exponential relation
-+ *   work=1.1**cost
-+ */
-+static unsigned int
-+level_cost(unsigned int n)
-+{
-+    static const double log_1_1 = 0.09531017980432493;
-+
-+	/* Adding 0.1 protects against the case where n==1 */
-+	return ceil(log(n + 0.1)/log_1_1);
-+}
-+
- /*! Load data for an IFD.
-  *
-  * \param[in,out] data #ExifData
-@@ -357,13 +372,13 @@ if (data->ifd[(i)]->count) {				\
-  * \param[in] d pointer to buffer containing raw IFD data
-  * \param[in] ds size of raw data in buffer at \c d
-  * \param[in] offset offset into buffer at \c d at which IFD starts
-- * \param[in] recursion_depth number of times this function has been
-- * recursively called without returning
-+ * \param[in] recursion_cost factor indicating how expensive this recursive
-+ * call could be
-  */
- static void
- exif_data_load_data_content (ExifData *data, ExifIfd ifd,
- 			     const unsigned char *d,
--			     unsigned int ds, unsigned int offset, unsigned int recursion_depth)
-+			     unsigned int ds, unsigned int offset, unsigned int recursion_cost)
- {
- 	ExifLong o, thumbnail_offset = 0, thumbnail_length = 0;
- 	ExifShort n;
-@@ -378,9 +393,20 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd,
- 	if ((((int)ifd) < 0) || ( ((int)ifd) >= EXIF_IFD_COUNT))
- 	  return;
- 
--	if (recursion_depth > 30) {
-+	if (recursion_cost > 170) {
-+		/*
-+		 * recursion_cost is a logarithmic-scale indicator of how expensive this
-+		 * recursive call might end up being. It is an indicator of the depth of
-+		 * recursion as well as the potential for worst-case future recursive
-+		 * calls. Since it's difficult to tell ahead of time how often recursion
-+		 * will occur, this assumes the worst by assuming every tag could end up
-+		 * causing recursion.
-+		 * The value of 170 was chosen to limit typical EXIF structures to a
-+		 * recursive depth of about 6, but pathological ones (those with very
-+		 * many tags) to only 2.
-+		 */
- 		exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifData",
--			  "Deep recursion detected!");
-+			  "Deep/expensive recursion detected!");
- 		return;
- 	}
- 
-@@ -422,15 +448,18 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd,
- 			switch (tag) {
- 			case EXIF_TAG_EXIF_IFD_POINTER:
- 				CHECK_REC (EXIF_IFD_EXIF);
--				exif_data_load_data_content (data, EXIF_IFD_EXIF, d, ds, o, recursion_depth + 1);
-+				exif_data_load_data_content (data, EXIF_IFD_EXIF, d, ds, o,
-+					recursion_cost + level_cost(n));
- 				break;
- 			case EXIF_TAG_GPS_INFO_IFD_POINTER:
- 				CHECK_REC (EXIF_IFD_GPS);
--				exif_data_load_data_content (data, EXIF_IFD_GPS, d, ds, o, recursion_depth + 1);
-+				exif_data_load_data_content (data, EXIF_IFD_GPS, d, ds, o,
-+					recursion_cost + level_cost(n));
- 				break;
- 			case EXIF_TAG_INTEROPERABILITY_IFD_POINTER:
- 				CHECK_REC (EXIF_IFD_INTEROPERABILITY);
--				exif_data_load_data_content (data, EXIF_IFD_INTEROPERABILITY, d, ds, o, recursion_depth + 1);
-+				exif_data_load_data_content (data, EXIF_IFD_INTEROPERABILITY, d, ds, o,
-+					recursion_cost + level_cost(n));
- 				break;
- 			case EXIF_TAG_JPEG_INTERCHANGE_FORMAT:
- 				thumbnail_offset = o;
diff --git a/media-libs/libexif/files/libexif-0.6.21-fix-C89-compatibility-issue.patch b/media-libs/libexif/files/libexif-0.6.21-fix-C89-compatibility-issue.patch
deleted file mode 100644
index c423c9daa61c..000000000000
--- a/media-libs/libexif/files/libexif-0.6.21-fix-C89-compatibility-issue.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3840e4f1f550e0d113e4ed70bd74f9f798f7e6f8 Mon Sep 17 00:00:00 2001
-From: Dan Fandrich <dan@coneharvesters.com>
-Date: Sat, 13 Jul 2013 13:34:50 -0700
-Subject: [PATCH] Fixed a C89 compatibility issue (bug #117 reported by Guenter
- Knauf)
-
----
- libexif/exif-entry.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/libexif/exif-entry.c b/libexif/exif-entry.c
-index 54a90a2..bb42473 100644
---- a/libexif/exif-entry.c
-+++ b/libexif/exif-entry.c
-@@ -1375,12 +1375,14 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
- 	case EXIF_TAG_XP_KEYWORDS:
- 	case EXIF_TAG_XP_SUBJECT:
- 	{
-+		unsigned short *utf16;
-+
- 		/* Sanity check the size to prevent overflow */
- 		if (e->size+sizeof(unsigned short) < e->size) break;
- 
- 		/* The tag may not be U+0000-terminated , so make a local
- 		   U+0000-terminated copy before converting it */
--		unsigned short *utf16 = exif_mem_alloc (e->priv->mem, e->size+sizeof(unsigned short));
-+		utf16 = exif_mem_alloc (e->priv->mem, e->size+sizeof(unsigned short));
- 		if (!utf16) break;
- 		memcpy(utf16, e->data, e->size);
- 		utf16[e->size/sizeof(unsigned short)] = 0;
diff --git a/media-libs/libexif/libexif-0.6.21-r3.ebuild b/media-libs/libexif/libexif-0.6.21-r3.ebuild
deleted file mode 100644
index 7cd39206b3d0..000000000000
--- a/media-libs/libexif/libexif-0.6.21-r3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool multilib-minimal
-
-DESCRIPTION="Library for parsing, editing, and saving EXIF data"
-HOMEPAGE="https://libexif.github.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc nls static-libs"
-
-RDEPEND="nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.13-pkgconfig.patch
-	"${FILESDIR}"/${P}-fix-C89-compatibility-issue.patch
-	"${FILESDIR}"/${P}-CVE-2017-7544.patch
-	"${FILESDIR}"/${P}-CVE-2018-20030.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e '/FLAGS=/s:-g::' configure || die #390249
-	elibtoolize # For *-bsd
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf \
-		$(use_enable doc docs) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		--with-doc-dir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	find "${D}" -name '*.la' -delete || die
-	rm -f "${ED}"/usr/share/doc/${PF}/{ABOUT-NLS,COPYING} || die
-}
diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest
index 49b9b6c4e516..67dd17c8999b 100644
--- a/media-libs/libffado/Manifest
+++ b/media-libs/libffado/Manifest
@@ -1,4 +1,6 @@
 AUX libffado-2.4.1-python3-scons-fix.patch 982 BLAKE2B e9e6e5c8e9582db5e936d355abf8b7292c5a03d799dd3c36d567604a1f959b1b509856ee9ac1e7693a1147907ce7105841010c317d8d2981f35c1c125f4cb5a6 SHA512 5e3de46d1e9ff5d0ee0b555218d1d59deb81e87ccf3f4179c6c25fac0888abf27b96e6cd82a8815b58040b3ab949a5cf2128c709c91ea125c3194e19956817e1
 DIST libffado-2.4.1.tgz 1229295 BLAKE2B 3b42493b68fc8648e116784e04baee2278c21e01fa92b22d990340ef329f67c898e247891e76d494410a758009fcf186ba556e900598eaca539a9879664cc704 SHA512 0859f17b87c68108bbde726d1cf8ab0b99f6f7f02cbe36acd8b451e112688a4d1edc21134eb4a2edc8c92dcf5f5da52efeabb2ad0dc07804ed1aa664a3b38d74
+DIST libffado-2.4.4.tgz 1228417 BLAKE2B 70d3b17f7d7317acc63351faaefb27fa850664015134887f0508b4a76aabbf6e9573f87eb2dd9792ac5f4f4b06ac7c872afa33af6af0341e6cceeb43e7a79526 SHA512 065b7f9ce9bf58320c02353b63ed17b3610d0ee8a2de58de27159b2190e39c779094b01ae1123c087387e6077375e646b564b9e7717b192865b2f1f22a3acc80
 EBUILD libffado-2.4.1-r1.ebuild 2834 BLAKE2B 076b3a28bd30ca0e70ee9965fd202b2dd70127c78b170eb7648f863326364a024c38b0341ad60384e6bd505a2f0889dee6b1ac96c8ff2b76557df728eee7e07d SHA512 72552a6e68f95e4063479512458e7b7cbaeb549947333c5f934f3fbe9831cdce98fba296240e7281e6050e7aa1626079a12680503dd31c2d53a8d57c42ef603b
+EBUILD libffado-2.4.4.ebuild 2645 BLAKE2B 6a93dc200dde4f5ea86d50758dcc5184e897322a992c95326911f542ae5621b9925beb674c4ac3a2066c7d9ef877d597e47636bcb97565e4128766bab0c31d1c SHA512 bc8c297b92f542bb584576b62cd3092465761d8e16f2b37fca6cb6a766abbd5d6113a94be73daf4999f93c9d525ea1be1c32745910bfcaf42208df4eeddf4527
 MISC metadata.xml 566 BLAKE2B 66bf590980ba18079dfc4127aad3de692e4544f93518fec98e8c337c129df35fac11ff1c8b2c5c3b606855da6020f7abf311b14a4b8b607b08ed1662ae5adc3a SHA512 f1d19db6ac852100cae4d73b8608a892bae5d4907b35601c4c751a35555111de450edf1f0373c2f81cd68e947c76e9c36c7e2b76a8c9d3aa64345fa9b9227b34
diff --git a/media-libs/libffado/libffado-2.4.4.ebuild b/media-libs/libffado/libffado-2.4.4.ebuild
new file mode 100644
index 000000000000..965054796847
--- /dev/null
+++ b/media-libs/libffado/libffado-2.4.4.ebuild
@@ -0,0 +1,110 @@
+# 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 desktop python-single-r1 scons-utils toolchain-funcs udev multilib-minimal
+
+DESCRIPTION="Driver for IEEE1394 (Firewire) audio interfaces"
+HOMEPAGE="http://www.ffado.org"
+
+if [[ "${PV}" = "9999" ]]; then
+	inherit subversion
+	ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/${PN}"
+else
+	SRC_URI="http://www.ffado.org/files/${P}.tgz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+IUSE="debug qt5 test-programs"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+CDEPEND="${PYTHON_DEPS}
+	dev-cpp/libxmlpp:2.6[${MULTILIB_USEDEP}]
+	dev-libs/dbus-c++
+	dev-libs/libconfig[cxx,${MULTILIB_USEDEP}]
+	media-libs/alsa-lib
+	media-libs/libiec61883[${MULTILIB_USEDEP}]
+	sys-apps/dbus
+	sys-libs/libavc1394[${MULTILIB_USEDEP}]
+	sys-libs/libraw1394[${MULTILIB_USEDEP}]
+	qt5? (
+		$(python_gen_cond_dep '
+			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+			dev-python/PyQt5[dbus,${PYTHON_MULTI_USEDEP}]
+		')
+		x11-misc/xdg-utils
+	)"
+DEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}"
+
+myescons() {
+	local myesconsargs=(
+		PREFIX="${EPREFIX}/usr"
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		MANDIR="${EPREFIX}/usr/share/man"
+		UDEVDIR="$(get_udevdir)/rules.d"
+		CUSTOM_ENV=true
+		DETECT_USERSPACE_ENV=false
+		DEBUG=$(usex debug)
+		PYPKGDIR="$(python_get_sitedir)"
+		# ENABLE_OPTIMIZATIONS detects cpu type and sets flags accordingly
+		# -fomit-frame-pointer is added also which can cripple debugging.
+		# we set flags from portage instead
+		ENABLE_OPTIMIZATIONS=false
+		# This only works for JACK1>=0.122.0 or JACK2>=1.9.9.
+		ENABLE_SETBUFFERSIZE_API_VER=force
+	)
+	if multilib_is_native_abi; then
+		myesconsargs+=(
+			BUILD_MIXER=$(usex qt5 true false)
+			BUILD_TESTS=$(usex test-programs)
+		)
+	else
+		myesconsargs+=(
+			BUILD_MIXER=false
+			BUILD_TESTS=false
+		)
+	fi
+	escons "${myesconsargs[@]}" "${@}"
+}
+
+src_prepare() {
+	default
+
+	# Always use Qt5
+	sed -i -e 's/try:/if False:/' -e 's/except.*/else:/' support/mixer-qt4/ffado/import_pyqt.py || die
+
+	# Bugs #658052, #659226
+	sed -i -e 's/^CacheDir/#CacheDir/' SConstruct || die
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	tc-export CC CXX
+	myescons
+}
+
+multilib_src_install() {
+	myescons DESTDIR="${D}" WILL_DEAL_WITH_XDG_MYSELF="True" install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	python_fix_shebang "${D}"
+	python_optimize "${D}"
+
+	if use qt5; then
+		newicon "support/xdg/hi64-apps-ffado.png" "ffado.png"
+		newmenu "support/xdg/ffado.org-ffadomixer.desktop" "ffado-mixer.desktop"
+	fi
+}
diff --git a/media-libs/libggi/Manifest b/media-libs/libggi/Manifest
index f328b7b0e06c..c0e0f240c079 100644
--- a/media-libs/libggi/Manifest
+++ b/media-libs/libggi/Manifest
@@ -1,3 +1,3 @@
 DIST libggi-2.2.2.src.tar.bz2 1071939 BLAKE2B e583ed802cffe825cec2575ee8d33e619ca5537c841380e12e4b5d07e485b4a3d515936d8b2f4763522b26c5302ccdd2de98810d85243408acaca64b04e520ac SHA512 ee2038dc64cea43994fa1ac716f1062462d17b0bbf30fd9a9d2762e7424a43fedc7c573178d9472738a5069ff3bf977ac26957c0c262c51cdf1065b616370975
 EBUILD libggi-2.2.2-r1.ebuild 1355 BLAKE2B daafa88f9ff9202bcf7db88cd67b070d03297540a916fa2ff66308555141abbfbe33feb64731a10618b1cc669f7a3039caf8c4bb48f383466aa1cb3c50299f79 SHA512 c7fea7b466624f44feb68bbdf0f6d4ca4d5215ac85a0bb152ccc18100ef7f0a681d5db220a100e4ac4a710037ee544aa869c2a6f894dc4a1b6c4662e1120b713
-MISC metadata.xml 386 BLAKE2B 8e5a70d9b2afb8a35826b2742206a4470427ba4daa42159129226374836cc5d3bb254c0e64411208d836aa5bf1e615a987bc93a6d5dd874c7ad309ccd8f7550b SHA512 9ce52c323ecbb57d46f69ecffd48a406b800078e8f67fcdb744dc9b86a3806c30455a1ccf144b139619388668cefb7250e1708581a5954862d695d5f284fe3c4
+MISC metadata.xml 484 BLAKE2B ab01b03cd27a489e6665bef5c38e2468415ef4790cf785cc77dcecf7cb449efe72b13df3fe29743ea37efb7d09d2d371f8dd4a26b9dd1489f06c6c8ef3281507 SHA512 3473e065599be786c0707dad290283abef3e977b74d7559c81b607a4ad9daad2a392d306ec83b9edc4720310983483e9d30f5cd4492ba0f367ecd9b0d477c41d
diff --git a/media-libs/libggi/metadata.xml b/media-libs/libggi/metadata.xml
index efd310f1c602..8261e5522d5c 100644
--- a/media-libs/libggi/metadata.xml
+++ b/media-libs/libggi/metadata.xml
@@ -5,6 +5,8 @@
     <email>media-video@gentoo.org</email>
   </maintainer>
   <use>
+    <flag name="3dfx">Enables support for Voodoo chipsets, also called
+      3DFX and TDFX</flag>
     <flag name="vis">Enables sparc vis support for libggi</flag>
   </use>
   <upstream>
diff --git a/media-libs/libgig/Manifest b/media-libs/libgig/Manifest
index f90cf135e44f..3adc85a84889 100644
--- a/media-libs/libgig/Manifest
+++ b/media-libs/libgig/Manifest
@@ -1,4 +1,4 @@
 DIST libgig-4.2.0.tar.bz2 746637 BLAKE2B a1ee9a0e77a662395c21995c465b8c4e57331de1ba0ae6636015eefc846698341980e908d7aa30cb607bfe6fb48f84999ea88995b0a254fea2465d21b2b9919b SHA512 52c8c749c7852e229c76c17211398dbf5dd5891a1ee9d8e8bc61d55b825c5676595b20b26014e739b9bfd387db36895152b380519609a928a8fa68f4a20279f6
-EBUILD libgig-4.2.0.ebuild 775 BLAKE2B 8669918a950e033082bf740228348fcce8e9a6af1884d68f6041984f851e81ce3182d11e43959cd7366041b98a81c8d76869c957eaa69b3ced9cb5caf1fde74a SHA512 765b17dee47b07b2e1776d1bb6c77bd5e672cecd662f7373713410ffcb00b1faa6bcc6bc9a3966836a1b1000844ecc2bba5edb04319bc77c3ae9f33b3bcf53be
+EBUILD libgig-4.2.0.ebuild 774 BLAKE2B 807d558a753bb569dde2c5efd1e8f938f0ca980ef131762c5debea120fa6566e8589beb2026db4d2973af4d6fa61d23b61c5acf90de60b1d4e9288680140b534 SHA512 e43d9b1637a59a3e98d7f251275a60cf470ca7a2672c18c073f23bdab2c55e362606326cfbe675f0f204cbe6a9152ca6e9992079daf6e9b1bbfcd3dae36ad2a2
 EBUILD libgig-9999.ebuild 851 BLAKE2B ee61ed3123e3e45d21dd4653231e0163ab2459b412524c1f09a486e789b72abc569913777251ab27aa75801dd003d0d9df3fc7a5230c73387c3d6585ef8f1a64 SHA512 9f839169b0ab8e055519c0089b5414357347039ba29a6ee4acb058c2c49921f660bde6839489956095f170d52f7268afb8a57631bb2ee5f7265837aa03d7484e
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libgig/libgig-4.2.0.ebuild b/media-libs/libgig/libgig-4.2.0.ebuild
index 2ccb3fcaa142..d79cf9a5d5f3 100644
--- a/media-libs/libgig/libgig-4.2.0.ebuild
+++ b/media-libs/libgig/libgig-4.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://download.linuxsampler.org/packages/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index f9acf8a643bc..0bb7f9434dea 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,6 +1,4 @@
-DIST libglvnd-1.3.1.tar.bz2 714436 BLAKE2B 31b91f678b0335a7db3e697129dabd157c37fee0ec0f81f7d0be68ffcf9d6be2989a929f7b1fb87b505168ab4a3cc07b4cecf103f1d5a2a3b866eedb5a3a494b SHA512 99bbe8447f7791c8a4b2ab4e9f3067309ea3ffb9a042b0b5e80d1eac7e6e36af8b5ec56ec3266f34343d705521827956f2fdca27be386f40e130cec300e8342c
 DIST libglvnd-1.3.2.tar.bz2 715212 BLAKE2B 4f8d32d630a94dbce3d87926a25941fb915f9b1bb8ba167ee7392e32e55b26c5bb80db4000dd11188449f662b810f0c986b6ecf7f4c5ebf05d7a895b0fdb3c82 SHA512 4fea59150a7dd2c710ded26270e74ae73af00cc127d7141fe70e31263fb492c5c43eabc8ab27d5a568d12394a95023c22f1b60968f4c403dcf6ad6202bec508c
-EBUILD libglvnd-1.3.1.ebuild 1554 BLAKE2B 9262984fc8a25aca9a69be941e33f682664f22c6f830e0f9ff8f8e1ede4d0be76faada6bf92a3e3a075681eb4784627e301c66f8bfe117eda703ebc8563ea66f SHA512 f631b6da703bf214d4d03e86a695c586a4dad9f64f93f1038918021097d043abed4bf60978f3e6e52ec4e40f4f6bca49752e41e745f1d601ecb9c0339dc222ef
-EBUILD libglvnd-1.3.2.ebuild 1562 BLAKE2B 0116ea12b00f40491b76f30ddb5e98b9c1b62d4e16df367136fc6673656ca0300f6d9bc7c997fc144fe0b6a7050e7880212d433151f05fec69a43d5e14d32d30 SHA512 1753a9eb0e6f7d62176b9a4af37794d30f31ea3c5a522d44142e42cd981c2ed0c08d89c8cf6a3cd692654f83c16ca90b25ac88b1ab37ec616a2b4a82d4c06349
+EBUILD libglvnd-1.3.2.ebuild 1554 BLAKE2B 9262984fc8a25aca9a69be941e33f682664f22c6f830e0f9ff8f8e1ede4d0be76faada6bf92a3e3a075681eb4784627e301c66f8bfe117eda703ebc8563ea66f SHA512 f631b6da703bf214d4d03e86a695c586a4dad9f64f93f1038918021097d043abed4bf60978f3e6e52ec4e40f4f6bca49752e41e745f1d601ecb9c0339dc222ef
 EBUILD libglvnd-9999.ebuild 1562 BLAKE2B 0116ea12b00f40491b76f30ddb5e98b9c1b62d4e16df367136fc6673656ca0300f6d9bc7c997fc144fe0b6a7050e7880212d433151f05fec69a43d5e14d32d30 SHA512 1753a9eb0e6f7d62176b9a4af37794d30f31ea3c5a522d44142e42cd981c2ed0c08d89c8cf6a3cd692654f83c16ca90b25ac88b1ab37ec616a2b4a82d4c06349
 MISC metadata.xml 314 BLAKE2B 34c95a3e321c3059bca39c7beb5b7b15e8085b54affb267947fb3676018fa183040a157716e979c5e0381acdea6e738294b37841e75da308c3632fb3587dec33 SHA512 fa12f7fa880b0721baf2eb40b9fd8a68e51c143dd8ede7a199c5afcd5a208f84c51a80fc1f4bc68b266338bac8bf4137b2443d88567150f2c54b2f11913df89c
diff --git a/media-libs/libglvnd/libglvnd-1.3.1.ebuild b/media-libs/libglvnd/libglvnd-1.3.1.ebuild
deleted file mode 100644
index a11e7d7b630f..000000000000
--- a/media-libs/libglvnd/libglvnd-1.3.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2018-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/glvnd/libglvnd.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-VIRTUALX_REQUIRED=manual
-
-inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1 virtualx
-
-DESCRIPTION="The GL Vendor-Neutral Dispatch library"
-HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-	SRC_URI="https://gitlab.freedesktop.org/glvnd/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
-	S=${WORKDIR}/${PN}-v${PV}
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test X"
-RESTRICT="!test? ( test )"
-
-BDEPEND="${PYTHON_DEPS}
-	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-RDEPEND="
-	!media-libs/mesa[-libglvnd(-)]
-	!<media-libs/mesa-19.2.2
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-
-src_prepare() {
-	default
-	sed -i -e "/^PLATFORM_SYMBOLS/a \    '__gentoo_check_ldflags__'," \
-		bin/symbols-check.py || die
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_feature X x11)
-		$(meson_feature X glx)
-	)
-	use elibc_musl && emesonargs+=( -Dtls=disabled )
-
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	if use X; then
-		virtx meson_src_test
-	else
-		meson_src_test
-	fi
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/media-libs/libglvnd/libglvnd-1.3.2.ebuild b/media-libs/libglvnd/libglvnd-1.3.2.ebuild
index 4c976349c6d9..a11e7d7b630f 100644
--- a/media-libs/libglvnd/libglvnd-1.3.2.ebuild
+++ b/media-libs/libglvnd/libglvnd-1.3.2.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 	SRC_URI="https://gitlab.freedesktop.org/glvnd/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
 	S=${WORKDIR}/${PN}-v${PV}
 fi
diff --git a/media-libs/libharu/Manifest b/media-libs/libharu/Manifest
index 8dfb5ba41853..45771314c0bb 100644
--- a/media-libs/libharu/Manifest
+++ b/media-libs/libharu/Manifest
@@ -3,5 +3,5 @@ AUX libharu-2.3.0-2-Avoid-issue-with-libtiff-duplicate-symbols.patch 2867 BLAKE2
 AUX libharu-2.3.0-3-cmake-fixes.patch 6376 BLAKE2B ec14be6aeda6e0e43a40bc2f1d41fcec4b601161cdcf1bdeff3e585bd78d6924aae322ffa5fe48f4fe221b1750b672ec7a80ba0a985368da4e5b00122b7d6617 SHA512 186d36b0b943c811e9fc34d448f58177914d2146a3df5cf8b12fe8c9fe7525046a7e53361052d308164cb99d4ec9a28341e4fe3b6cc69d6cb2c0ea03a49b0355
 AUX libharu-2.3.0-4-Add-support-for-free-form-triangle-Shading-objects.patch 15988 BLAKE2B 6cbd9826317e6d1de126dfdcdd3508bfb6351c34cd58fda8f09fe44efead890d78c67f33750223cb2291312b2299ecf16f7b91e4e20a3024bb6007da96753f86 SHA512 94d1377e529d1d96941a90ac82276748f5bf7f0e248a6770d938394151e453aaa082c0d256c0de28f737e7e995bc0ee60a4eb5562aa450af1dfcc1733b403466
 DIST libharu-2.3.0.tar.gz 1396413 BLAKE2B 7f0c819f17740f12f9bf6c7a7c749eb8c6ada326d98985daeac4d3250733cfc8e085b540e0969cb1b4c3b1055f4d1e148a2ed010d9371685fd265b62a879be9c SHA512 ebcabf1e8488e21185a231e97b4c16f9de742ae0ac2ebc7535b72b6b8e2045c2619bc6a94a820f7f923b0dfeceb217408f4e4c613ef3602104373cdf000d3f41
-EBUILD libharu-2.3.0-r2.ebuild 989 BLAKE2B a43ec8fff874db7c3293a89460f98eee691327489165850660778004a703b69ee2801f662027d869188b5bbe66bc4463c7eca5e9a1838d7f87bf16264dcf365c SHA512 8fd2da54d0e3e2e742771cf6fa9b4fda6526f574ee95ed456aa1ead9a48d97e2e2b61a59350bbcf431c9e1c25716dc55823927344f99aa1875a1f6e72a9550ad
+EBUILD libharu-2.3.0-r2.ebuild 994 BLAKE2B f673398681e9d6fd1f88bb169682c77168297bd0f01fa8af451e5a5f5866889fb4a03ede12736969192a252383a32be694ad0dfb159a885253a74efe8c23a0fe SHA512 51ed100f32b29d56bbe2dcf25832366321bb01423f05aa3387bea6303594b8cd39560e0f5d2c87ec4be0f0a755c0589d0d6773a9a89f9b2bb2933d6e44414921
 MISC metadata.xml 875 BLAKE2B 1c9251d1eed492f8e1e19ba2e579ac05a91e19f52b44c3a04185ff0ecb1e087efd9da03f7eb512b64ff3fb38fee456aab45c6fe696a9f2f26ef77da38fda5380 SHA512 fde85e36972d2a50280cdc8d8baca9e958e7816bcb63c7c8203d65dc4400a1673f8dfd7921e4d87a2322fd0a9a696643e9d530f88cc6642f23388e19f6715853
diff --git a/media-libs/libharu/libharu-2.3.0-r2.ebuild b/media-libs/libharu/libharu-2.3.0-r2.ebuild
index 0a5c2ae4ad1a..7542d93ed89c 100644
--- a/media-libs/libharu/libharu-2.3.0-r2.ebuild
+++ b/media-libs/libharu/libharu-2.3.0-r2.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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${MYP}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="
diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index 52925fe90547..492614c8f433 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,6 +1,12 @@
+AUX heif_test.go 4326 BLAKE2B c9995e9caf35db5f936dcfc54592946e81e0fda9e785309526cce40c43c2ae9663d091a30c46adb97602a6ef1921503fd5c1873b8524774dd3f24a2b3c9f64c7 SHA512 af6212a5cf6cb4e96508cc9ce63072c42e3ec36a16192e4bf0ae2ccd3949f0259617aba544c3eeb2816ffb9747d61b4476fa152720cb2ec708153c967ef08e20
+AUX libheif-1.7.0-aom.patch 1530 BLAKE2B 150b86b0b1ed872ff13dfc59933b1aec80d259456666f7bd3fac11d4c5d220349b2ca927f36835e8710f476e1df2ca13c7a5126545c80a2abd0b069953186f18 SHA512 f30474c9f31aa8676352b9848a49699c320ead37a8a59b5c62b98945e520af40fc24fcbf225240c3237cde638d7b274e45dc135a16a3e8a7b278bbafc2cfca3d
 DIST libheif-1.5.1.tar.gz 1510087 BLAKE2B 1dd5e913c8913c6b62b770653585f8ccf7cda14c4dd79ff2073bf085da4d730accaef8d0f8008ac941238a7e3e131add1a218e0c78a886847b3bcf253d66c9b6 SHA512 05e32ebff08d5f0e82e9b1107253c27882ae1694150033fe7b3ca07db8c64567f09002081276e92a3b490a63022a1522d577b094a7f489742139758d17f484b8
 DIST libheif-1.6.1.tar.gz 1514950 BLAKE2B d658f0c408f9a09eaac890119119327bd3e9c84db785d001b2c7a979b9574a6723403fe063ed6ce77812bface04be124e808fc90c1325c13e3d87f8b46ac0b65 SHA512 5a2104e529d59c23c988b6c0c167f9e7017ff77763eb71fee1c26f97624e9d7e2d0f863123d1886536d37f96ea6b93969a1c53e747672c54a2220aa6f47be1bf
-EBUILD libheif-1.5.1.ebuild 1457 BLAKE2B 083d8e9034d5c4fd5816047ab2e577978b395a13546e3a2d3a747f09c087feb99df885cddf20a0129c3e574bbe981a59c60bfece141505412358214463a4df92 SHA512 79599b18a58d121ffef9b15842c0faa90792d3821fdd9d54a0b2ed2ab81e6c90880230f96137cd21e406d6b254ce1f0b205401d49d0c3a774b6fc923e4b8ce93
-EBUILD libheif-1.6.1.ebuild 1464 BLAKE2B 065ca01588345b31e9f119aaeba6677fa9c126bb9430c1674432dc1094c2261553bdfb7113cc70ccc193552b99a5fc48d962f4c9724f2d4613072b9d40cca3db SHA512 249f96cc76fdca8e0b1df09515f22bdd73f039cc83e3d39d1a62ab9fa2b7f5f6bb0a8116cee3feb1f25e18a7c12eca9bcd1074a6fdc52b4aecc68047ef7ce06a
-EBUILD libheif-9999.ebuild 1464 BLAKE2B 70597a66418d649017792b147e47dee7f69064326b40ca72e37756fd7e778621178dfab5213bbf5f1587b7735235d75d49a3732beb492342692ee57ad0924f6a SHA512 431ba0826e3087c0a95cf3898130ab31bc57ac975a561c0220400e832afa8a93ff0f214223245689488d01e0f681d461b4bbb60f31ce7c5f632f2ecaa8999b5f
-MISC metadata.xml 316 BLAKE2B dcf0d4edec65ba3a6b81a64d7a7d93cf53872a3acd0907ca30e8490f07512dde8e8cec86099352db691fa0e73da5e19d3e6082a9a9ba34c8a7edce93155cf564 SHA512 298555a57208bf6b9e986f3c8b573c2dca354851fa1408a6abd14bddb53f017417c8a63948a2c5d3f47dd4e03de8d0ec667aab16c735d0970976a78a0df43e39
+DIST libheif-1.6.2.tar.gz 1515763 BLAKE2B e7a901394349bc8bbf633a0193d7a08a1cecf7e97a8ac709efb9c2e5e6da387c7fa5e8b551cecf1f67b4e7a7d06f034e64c20d7c55f9a7898c0badb79ed485f7 SHA512 41848c05d88f82827ebdd0662a1870ce8b7899f6a86ef5aa483b301176602da8e69d2c5a49b4d911bc0cac51bdab81a06fd43efae2722092cc09c02119c95f07
+DIST libheif-1.7.0.tar.gz 1526096 BLAKE2B 74b8284875321781d13d17b877eb8291ecdd0fe1700f73a433d3b125a8ee6b33a326310d729e62bac9d9fecfea095f21ef590e711d550dcaac79570b3f917885 SHA512 13c95540fee13f3fba8d8a4f69886bf5563e9fa22c5cd113dbe16d20670b077b5961171e5f9fb0f256cc42c4650e13465c93d3fbb03013997a7fc163463e8b3a
+EBUILD libheif-1.5.1.ebuild 1660 BLAKE2B 955d48d988ea3a8c2685e795eb4ba4b93819b4168adf3bca853ebd8615f059948d5e76f5adff2013877aaa16eb4f97cebdc71c8f183a996a22f276af426c2ebd SHA512 dabb513cb2586114d7db9741a15046c93d30c4793cbe29273a458fb3781768df205b36d2707f33e1d4bbc4c72a2f08e8425ef5546587b57bf1046a5fac58cce4
+EBUILD libheif-1.6.1.ebuild 1667 BLAKE2B 52218a6c045b1bc4acf3ddd233792bdc588050964985f910903b47a2512763d51ac4212acd714c51fccdac181de164458d3d8df7efa94016f3a0f615b3d03e59 SHA512 d2575a6954b26fa4c2221b0b088dcaf01fb5f387e3e32bfee41e36e24cda217e2fbc5ece7ff874b3fcad0ec96a6ee4de478719de27c4af31f9c55219d11c49c9
+EBUILD libheif-1.6.2.ebuild 1672 BLAKE2B 87c53b2ee0a659e36dc9486d84527d1a9c0fe7f0d7e87d9b8c3d4c57315b64be84dab0ce897f795a5b4bdeea27e77b3aa670350370bc15ed466db4d88220f328 SHA512 49fc214c657dbefc3a2b7b5b3a050a32494ce13dc1250bc6877df44476315625d4c10f048ba776262c63e0423f73f4b55a40bdeae096e851501627509b6325a9
+EBUILD libheif-1.7.0.ebuild 1596 BLAKE2B e7b38336980120a2265eb8c70e048986fbe733df54fee6c24195fabd8e27b0cd1837b0cb1f82eb1ac9d493808de1df53ac98b4afaef2ee7ce0c0946d7b174385 SHA512 c0779167e8fa329495352a8f7e081215e34ec51a5737e90bf60d19f664fca56935fa4dbefd591a3ec0c521ccad84a6ac8dc7ec93d7e960fea4ba17b949438fb5
+EBUILD libheif-9999.ebuild 1554 BLAKE2B e81b41fa4bfdf581c40313f5532e421d1a585c35705039f818ef5361c9b4c01499ac5b27b2e14af884d784b0a66566fb7df94cb7e995d43bd8e9113572b6f0d2 SHA512 4084ec9934894657b38efbb616ca085044f9975f39812c94f91b2965ea227d00098c62b257f35bbe12a3f64f41d45d2fe6dd588c1bedab7e1fccd326a36947c4
+MISC metadata.xml 485 BLAKE2B 5e631eaa6f914c0a0d89bfa65a6287b466755d3cdf29461c92ed6ca4b37e673458edf2ffefb84f31b8b86340d153155b6366cc692e7c5d7fadb9461fe43baa84 SHA512 5b88224363374aeafd2b3c5a5d0666d5b22a23a260a65323bce1102b7af6ebe21e7d07c1f0409289abd7c64d2cacb3dc1a4393ee11cbfb0db94acee8481e8fbe
diff --git a/media-libs/libheif/files/heif_test.go b/media-libs/libheif/files/heif_test.go
new file mode 100644
index 000000000000..187d773dea60
--- /dev/null
+++ b/media-libs/libheif/files/heif_test.go
@@ -0,0 +1,155 @@
+/*
+ * GO interface to libheif
+ * Copyright (c) 2018 struktur AG, Joachim Bauch <bauch@struktur.de>
+ *
+ * This file is part of heif, an example application using libheif.
+ *
+ * heif is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * heif is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with heif.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package heif
+
+import (
+	"fmt"
+	"image"
+	"io/ioutil"
+	"os"
+	"path"
+	"testing"
+)
+
+func TestGetVersion(t *testing.T) {
+	version := GetVersion()
+	if version == "" {
+		t.Fatal("Version is missing")
+	}
+}
+
+func CheckHeifImage(t *testing.T, handle *ImageHandle, thumbnail bool) {
+	handle.GetWidth()
+	handle.GetHeight()
+	handle.HasAlphaChannel()
+	handle.HasDepthImage()
+	count := handle.GetNumberOfDepthImages()
+	if ids := handle.GetListOfDepthImageIDs(); len(ids) != count {
+		t.Errorf("Expected %d depth image ids, got %d", count, len(ids))
+	}
+	if !thumbnail {
+		count = handle.GetNumberOfThumbnails()
+		ids := handle.GetListOfThumbnailIDs()
+		if len(ids) != count {
+			t.Errorf("Expected %d thumbnail image ids, got %d", count, len(ids))
+		}
+		for _, id := range ids {
+			if thumb, err := handle.GetThumbnail(id); err != nil {
+				t.Errorf("Could not get thumbnail %d: %s", id, err)
+			} else {
+				CheckHeifImage(t, thumb, true)
+			}
+		}
+	}
+
+	if img, err := handle.DecodeImage(ColorspaceUndefined, ChromaUndefined, nil); err != nil {
+		t.Errorf("Could not decode image: %s", err)
+	} else {
+		img.GetColorspace()
+		img.GetChromaFormat()
+	}
+}
+
+func CheckHeifFile(t *testing.T, ctx *Context) {
+	if count := ctx.GetNumberOfTopLevelImages(); count != 2 {
+		t.Errorf("Expected %d top level images, got %d", 2, count)
+	}
+	if ids := ctx.GetListOfTopLevelImageIDs(); len(ids) != 2 {
+		t.Errorf("Expected %d top level image ids, got %+v", 2, ids)
+	}
+	if _, err := ctx.GetPrimaryImageID(); err != nil {
+		t.Errorf("Expected a primary image, got %s", err)
+	}
+	if handle, err := ctx.GetPrimaryImageHandle(); err != nil {
+		t.Errorf("Could not get primary image handle: %s", err)
+	} else {
+		if !handle.IsPrimaryImage() {
+			t.Error("Expected primary image")
+		}
+		CheckHeifImage(t, handle, false)
+	}
+}
+
+func TestReadFromFile(t *testing.T) {
+	ctx, err := NewContext()
+	if err != nil {
+		t.Fatalf("Can't create context: %s", err)
+	}
+
+	filename := path.Join("..", "..", "examples", "example.heic")
+	if err := ctx.ReadFromFile(filename); err != nil {
+		t.Fatalf("Can't read from %s: %s", filename, err)
+	}
+
+	CheckHeifFile(t, ctx)
+}
+
+func TestReadFromMemory(t *testing.T) {
+	ctx, err := NewContext()
+	if err != nil {
+		t.Fatalf("Can't create context: %s", err)
+	}
+
+	filename := path.Join("..", "..", "examples", "example.heic")
+	data, err := ioutil.ReadFile(filename)
+	if err != nil {
+		t.Fatalf("Can't read file %s: %s", filename, err)
+	}
+	if err := ctx.ReadFromMemory(data); err != nil {
+		t.Fatalf("Can't read from memory: %s", err)
+	}
+	data = nil // Make sure future processing works if "data" is GC'd
+
+	CheckHeifFile(t, ctx)
+}
+
+func TestReadImage(t *testing.T) {
+	filename := path.Join("..", "..", "examples", "example.heic")
+	fp, err := os.Open(filename)
+	if err != nil {
+		t.Fatalf("Could not open %s: %s", filename, err)
+	}
+	defer fp.Close()
+
+	config, format1, err := image.DecodeConfig(fp)
+	if err != nil {
+		t.Fatalf("Could not load image config from %s: %s", filename, err)
+	}
+	if format1 != "heif" {
+		t.Errorf("Expected format heif, got %s", format1)
+	}
+	if _, err := fp.Seek(0, 0); err != nil {
+		t.Fatalf("Could not seek to start of %s: %s", filename, err)
+	}
+
+	img, format2, err := image.Decode(fp)
+	if err != nil {
+		t.Fatalf("Could not load image from %s: %s", filename, err)
+	}
+	if format2 != "heif" {
+		t.Errorf("Expected format heif, got %s", format2)
+	}
+
+	r := img.Bounds()
+	if config.Width != (r.Max.X-r.Min.X) || config.Height != (r.Max.Y-r.Min.Y) {
+		fmt.Printf("Image size %+v does not match config %+v\n", r, config)
+	}
+}
diff --git a/media-libs/libheif/files/libheif-1.7.0-aom.patch b/media-libs/libheif/files/libheif-1.7.0-aom.patch
new file mode 100644
index 000000000000..9dce291f9647
--- /dev/null
+++ b/media-libs/libheif/files/libheif-1.7.0-aom.patch
@@ -0,0 +1,46 @@
+From 331dff0ba58d5265ddcdadeaf5a45c1f0698a388 Mon Sep 17 00:00:00 2001
+From: Jakov Smolic <jakov.smolic@sartura.hr>
+Date: Fri, 14 Aug 2020 22:03:25 +0200
+Subject: [PATCH] Fix building against aom 1.0
+
+Taken from upstream commit:
+https://github.com/strukturag/libheif/commit/6768552c0a99bb2957906be0f369850326486a58
+
+Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr>
+---
+ libheif/heif_encoder_aom.cc | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/libheif/heif_encoder_aom.cc b/libheif/heif_encoder_aom.cc
+index 9953e34..669a51a 100644
+--- a/libheif/heif_encoder_aom.cc
++++ b/libheif/heif_encoder_aom.cc
+@@ -502,9 +502,11 @@ struct heif_error aom_encode_image(void* encoder_raw, const struct heif_image* i
+ 
+ 
+   // --- configure codec
+-
+-  unsigned int aomUsage = (encoder->realtime_mode ? AOM_USAGE_REALTIME : AOM_USAGE_GOOD_QUALITY);
+-
++  unsigned int aomUsage = 0;
++#if defined(AOM_USAGE_REALTIME)
++  // aom 2.0
++  aomUsage = (encoder->realtime_mode ? AOM_USAGE_REALTIME : AOM_USAGE_GOOD_QUALITY);
++#endif
+ 
+   aom_codec_enc_cfg_t cfg;
+   aom_codec_err_t res = aom_codec_enc_config_default(encoder->iface, &cfg, aomUsage);
+@@ -540,7 +542,10 @@ struct heif_error aom_encode_image(void* encoder_raw, const struct heif_image* i
+   aom_codec_control(&encoder->codec, AOME_SET_CPUUSED, encoder->cpu_used);
+ 
+   if (encoder->threads > 1) {
++#if defined(AV1E_SET_ROW_MT)
++    // aom 2.0
+     aom_codec_control(&encoder->codec, AV1E_SET_ROW_MT, 1);
++#endif
+   }
+ 
+   // --- encode frame
+-- 
+2.26.2
+
diff --git a/media-libs/libheif/libheif-1.5.1.ebuild b/media-libs/libheif/libheif-1.5.1.ebuild
index e737b4ce1e4f..ea2fa1ddafbe 100644
--- a/media-libs/libheif/libheif-1.5.1.ebuild
+++ b/media-libs/libheif/libheif-1.5.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 inherit autotools xdg-utils multilib-minimal
 
@@ -34,6 +34,10 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	default
 
+	# heif_test.go is not included in the tarball
+	# https://github.com/strukturag/libheif/issues/289
+	cp "${FILESDIR}/heif_test.go" "${S}/go/heif" || die
+
 	sed -i -e 's:-Werror::' \
 		configure.ac || die
 
@@ -51,6 +55,11 @@ multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
+multilib_src_test() {
+	default
+	emake -C go test
+}
+
 multilib_src_install_all() {
 	find "${ED}" -name '*.la' -delete || die
 	if ! use static-libs ; then
diff --git a/media-libs/libheif/libheif-1.6.1.ebuild b/media-libs/libheif/libheif-1.6.1.ebuild
index bf0048c2ecfc..68966c34be87 100644
--- a/media-libs/libheif/libheif-1.6.1.ebuild
+++ b/media-libs/libheif/libheif-1.6.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 inherit autotools xdg-utils multilib-minimal
 
@@ -35,6 +35,10 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	default
 
+	# heif_test.go is not included in the tarball
+	# https://github.com/strukturag/libheif/issues/289
+	cp "${FILESDIR}/heif_test.go" "${S}/go/heif" || die
+
 	sed -i -e 's:-Werror::' configure.ac || die
 
 	eautoreconf
@@ -51,6 +55,11 @@ multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
+multilib_src_test() {
+	default
+	emake -C go test
+}
+
 multilib_src_install_all() {
 	find "${ED}" -name '*.la' -delete || die
 	if ! use static-libs ; then
diff --git a/media-libs/libheif/libheif-1.6.2.ebuild b/media-libs/libheif/libheif-1.6.2.ebuild
new file mode 100644
index 000000000000..3644fcb74e44
--- /dev/null
+++ b/media-libs/libheif/libheif-1.6.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg-utils multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/strukturag/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/strukturag/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
+HOMEPAGE="https://github.com/strukturag/libheif"
+
+LICENSE="GPL-3"
+SLOT="0/1.6"
+IUSE="static-libs test +threads"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-lang/go )"
+DEPEND="
+	media-libs/libde265:=[${MULTILIB_USEDEP}]
+	media-libs/libpng:0=[${MULTILIB_USEDEP}]
+	media-libs/x265:=[${MULTILIB_USEDEP}]
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	virtual/jpeg:0=[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	# heif_test.go is not included in the tarball
+	# https://github.com/strukturag/libheif/issues/289
+	cp "${FILESDIR}/heif_test.go" "${S}/go/heif" || die
+
+	sed -i -e 's:-Werror::' configure.ac || die
+
+	eautoreconf
+
+	# prevent "stat heif-test.go: no such file or directory"
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable threads multithreading)
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	default
+	emake -C go test
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+}
diff --git a/media-libs/libheif/libheif-1.7.0.ebuild b/media-libs/libheif/libheif-1.7.0.ebuild
new file mode 100644
index 000000000000..3bba1148615d
--- /dev/null
+++ b/media-libs/libheif/libheif-1.7.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg-utils multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/strukturag/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/strukturag/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
+HOMEPAGE="https://github.com/strukturag/libheif"
+
+LICENSE="GPL-3"
+SLOT="0/1.6"
+IUSE="gdk-pixbuf go static-libs test +threads"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-lang/go )"
+DEPEND="
+	media-libs/libde265:=[${MULTILIB_USEDEP}]
+	media-libs/libpng:0=[${MULTILIB_USEDEP}]
+	media-libs/x265:=[${MULTILIB_USEDEP}]
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	virtual/jpeg:0=[${MULTILIB_USEDEP}]
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf )
+	go? ( dev-lang/go )
+"
+RDEPEND="${DEPEND}"
+PATCHES=(
+	"${FILESDIR}"/${P}-aom.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's:-Werror::' configure.ac || die
+
+	eautoreconf
+
+	# prevent "stat heif-test.go: no such file or directory"
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local econf_args=(
+		$(multilib_is_native_abi && use_enable go || echo --disable-go)
+		$(use_enable gdk-pixbuf)
+		$(use_enable static-libs static)
+		$(use_enable threads multithreading)
+	)
+	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+}
diff --git a/media-libs/libheif/libheif-9999.ebuild b/media-libs/libheif/libheif-9999.ebuild
index 6cc971a64be1..3e1aacd0ed3d 100644
--- a/media-libs/libheif/libheif-9999.ebuild
+++ b/media-libs/libheif/libheif-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 inherit autotools xdg-utils multilib-minimal
 
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strukturag/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
@@ -18,8 +18,7 @@ HOMEPAGE="https://github.com/strukturag/libheif"
 
 LICENSE="GPL-3"
 SLOT="0/1.6"
-IUSE="static-libs test +threads"
-
+IUSE="gdk-pixbuf go static-libs test +threads"
 RESTRICT="!test? ( test )"
 
 BDEPEND="test? ( dev-lang/go )"
@@ -29,6 +28,8 @@ DEPEND="
 	media-libs/x265:=[${MULTILIB_USEDEP}]
 	sys-libs/zlib:=[${MULTILIB_USEDEP}]
 	virtual/jpeg:0=[${MULTILIB_USEDEP}]
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf )
+	go? ( dev-lang/go )
 "
 RDEPEND="${DEPEND}"
 
@@ -44,18 +45,17 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable threads multithreading)
+	local econf_args=(
+		$(multilib_is_native_abi && use_enable go || echo --disable-go)
+		$(use_enable gdk-pixbuf)
 		$(use_enable static-libs static)
+		$(use_enable threads multithreading)
 	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
 }
 
 multilib_src_install_all() {
 	find "${ED}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
 }
 
 pkg_postinst() {
diff --git a/media-libs/libheif/metadata.xml b/media-libs/libheif/metadata.xml
index ee4cf414e0db..f92d3bad5e85 100644
--- a/media-libs/libheif/metadata.xml
+++ b/media-libs/libheif/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<use>
+	<flag name='gdk-pixbuf'>Enable <pkg>x11-libs/gdk-pixbuf</pkg> plugin</flag>
+	<flag name='go'>Enable building <pkg>dev-lang/go</pkg> code/examples</flag>
+	</use>
 	<upstream>
 		<bugs-to>https://github.com/strukturag/libheif/issues</bugs-to>
 		<remote-id type="github">strukturag/libheif</remote-id>
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 12d0c9437d81..878bc6434ea9 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -6,10 +6,10 @@ AUX libjpeg-turbo-2.0.4-CVE-2020-13790.patch 1543 BLAKE2B f8a420aed675c7c5adc1d1
 DIST libjpeg-turbo-1.5.3.tar.gz 1658672 BLAKE2B 4d2182802aa9963fa57ec2c4fb5cf0a586847d43803e4c2d2e12cf1144c4da0ede7fdbace5965c77cd6df4547090165615960ebb65c964fd2fac823c021f50b7 SHA512 b611b1cc3d1ddedddad871854b42449d053a5f910ed1bdfa45c98e0270f4ecc110fde3a10111d2b876d847a826fa634f09c0bb8c357056c9c3a91c9065eb5202
 DIST libjpeg-turbo-2.0.3.tar.gz 2161279 BLAKE2B c0def6d6d402eb2070f4861741f9579e5c360e8bc9a64924c7d53c3c65cc8d4577c01e2cf6acf8ddbe7bddc96540f605ddb47d1651a7400738638fb06928824b SHA512 ca7d4dcc5b34e23831ac450b65b8f92894d35e4afba0c52ac9e0c7dc6b41d4fa2bad66eb79198245032ec02b0b2e88cef39b8c696de17b6a869e3093a6b70e36
 DIST libjpeg-turbo-2.0.4.tar.gz 2161812 BLAKE2B 9be870a5bafaae279646941b848b69fdf7c95ec08a686b01674f473ef33fe5923a04ba8a2d57df84384530308ca46fc3880a404c0eff769129417a553faed3bb SHA512 708c2e7418d9ed5abca313e2ff5a08f8176d79cad2127573cda6036583c201973db4cfb0eafc0fc8f57ecc7b000d2b4af95980de54de5a0aed45969e993a5bf9
+DIST libjpeg-turbo-2.0.5.tar.gz 2162983 BLAKE2B d9204e06f075173a420931457c3738aba57a820719fb878765114b169ebb8212df18165a5f86f22126dd7eb8f8aab03caa2ba7f55e87d19196dba094e4a959fa SHA512 5bf9ecf069b43783ff24365febf36dda69ccb92d6397efec6069b2b4f359bfd7b87934a6ce4311873220fccc73acabdacef5ce0604b79209eb1912e8ba478555
 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
-EBUILD libjpeg-turbo-1.5.3-r2.ebuild 2975 BLAKE2B 8adcb465f8dc025163ede13aba9c8c16ad5ba76151181d8800a549c4f3faf2f1ab259fefcca77e13b4384dbaf2f174285f7ee4a76f35b2da2e84ce0b956d189d SHA512 696184c66d92d48a66fffff01d4cd3bf0a4e723896ed659a0d4acd029c768ab23957f6dce4e0b39e576441e4c89e57b89141f8465fc202075a7a11e241cbe63c
-EBUILD libjpeg-turbo-1.5.3-r3.ebuild 2972 BLAKE2B 4154ddd9f709b22356760b786cfe3a3296699e3a7291feb415f830f16ca71963d32307654e69c52c32c054852f29191c126fb757328f017a60e0e4c1dd8bf1c1 SHA512 e4fdfdc8a6f520caf42e692e4610617bbbb132fe20d5cb1af982e2e6166b7a1d52030b2c5802062e9c972a7aeef56f5a88a4543baae6843a0103b15cb7554c51
-EBUILD libjpeg-turbo-2.0.3.ebuild 2596 BLAKE2B f474623d5a37027f79a697bd13d12a14ea05ff4c302ec4cb90a82ee4703775b8290994634caa1d688a06170386f79190f4c030d4539d493b87b6c56925b5c189 SHA512 2b4b663c921eac0f088d4881352a65d81eb7a7dd398dfb17cedd062eb957177c41723a2006da1426e1eb4983bc1358e9b0e449d85fb0fe95beec1c526a41d3e6
-EBUILD libjpeg-turbo-2.0.4-r1.ebuild 2819 BLAKE2B 49ee8d67bb5d39a471fb75980ef91df148aad386518563cd45e0bd8b3099eb131d7d6e19a2c42a9a0b79a9fedb3ea335c1a964a8b16fed0d743a6d57993dbce4 SHA512 ebe40fbbcab1f1edfc73a28bcf9cbdca1c6041c5c63fb9c904496b764105c0546f8da68d9160fbc6b88c81a218f2fb7e2cc475372ed59eb79065c766881cf46b
-EBUILD libjpeg-turbo-2.0.4.ebuild 2764 BLAKE2B 9c43210e19cec992e9966f71aae6249155877d333bdf822716acaf3d2e5893f973f69e8f92b55e3a9a057d270043b62b8a836b2b69196226378d7eb826343fee SHA512 92d67d8c8e27251ebc3806e8769a0912d2f043ba5858c054a0911a90c60546cc3db498af391334711ce47a7a3ce275117cb26352c0a65c05c81b7a622a9d00f4
+EBUILD libjpeg-turbo-1.5.3-r3.ebuild 2964 BLAKE2B 679e11de696a4ce59df452d37f0df0dad315fc1061b7a67f2897e7f0a5f31a0805d2a5fa1827a1f2cd9754aa3b21089e00237b3ddaac09f5f49c074e1cf52317 SHA512 906db6b0eb7c7798b7d40b49b5630a5321e139deda494acc84dc97cd7456e001a142eff48228d2877eb79e48bd3c7789c5dfc44a64e6bdd93e06aadd4d0c7cea
+EBUILD libjpeg-turbo-2.0.3.ebuild 2589 BLAKE2B 0207ab472f818dbdec8c2ab0f5d5309a6cac15996121ab1f89492d6c0f8fa6f9525386491eedc4a39708ac70bfc5b26f35c7ef8a24e4e9090f6ab74bb07b5481 SHA512 1565a66ad1e879a4013aac977f06126219d472550ffe9d76819e4a3dd5f8fb2c9e03524ae8d0cacabd470e5ce7eddcc700143c22dbcf59248a8ae0f808961dae
+EBUILD libjpeg-turbo-2.0.4-r1.ebuild 3016 BLAKE2B f1632139dc72108f4a56e439f6e10fa77c97f2eda9d439b36025feb57fc4076a5bdedf3e1635b33415d247594ae38ef071b7e899fc7a25a0cc2ec53e995b0364 SHA512 438bbc05fff22024fb00c89f3e017c77f570fdaf213501907472cebe0d8ebed033c5aa29b0cd11a3f540ab92be61a4570a3b51207cecebc8ac948808d239fda9
+EBUILD libjpeg-turbo-2.0.5-r1.ebuild 3002 BLAKE2B a2844d7af232ccf71907117f0ff1cc082d267968dc4c46c69d918cfaff1ec6c933306a29095a623005ffe3370f7027ae04c14a896160e0aad4919f38632a5b75 SHA512 ca16b5bce27b11991ddff324cdda2fcd6f6c2d250b323b51ea9fce7fe98832938a6cff9981acc3a325eea9ad16c61cb94b49a4da35837dae23e68851bc60e183
 MISC metadata.xml 328 BLAKE2B 1a865bcdd6aafcc48199e509b1149bf2b6410b189ad24d58613830e8c95943d71eafb0cc35a567d8d1f7afc3eafc40e7c08e6b40a8afad5a52f7bff4ace1db1e SHA512 410df3851c2c9bc731dcd6774dcb571a50676a834f6429ed05bd8c9a0df3c77d266f73486d12fe04bf482bb39757facd9fd8d349c28ba843fc5f1624aa7f9573
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r2.ebuild
deleted file mode 100644
index a04b8db98f05..000000000000
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools libtool ltprune java-pkg-opt-2 libtool toolchain-funcs multilib-minimal
-
-DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
-HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
-
-LICENSE="BSD IJG"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="java static-libs"
-
-ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
-COMMON_DEPEND="!media-libs/jpeg:0
-	!media-libs/jpeg:62"
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.5 )"
-DEPEND="${COMMON_DEPEND}
-	amd64? ( ${ASM_DEPEND} )
-	x86? ( ${ASM_DEPEND} )
-	amd64-fbsd? ( ${ASM_DEPEND} )
-	x86-fbsd? ( ${ASM_DEPEND} )
-	amd64-linux? ( ${ASM_DEPEND} )
-	x86-linux? ( ${ASM_DEPEND} )
-	x64-macos? ( ${ASM_DEPEND} )
-	x64-cygwin? ( ${ASM_DEPEND} )
-	java? ( >=virtual/jdk-1.5 )"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.0-x32.patch #420239
-	"${FILESDIR}"/${P}-divzero_fix.patch #658624
-	"${FILESDIR}"/${P}-cve-2018-11813.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	java-pkg-opt-2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=()
-	if multilib_is_native_abi; then
-		myconf+=( $(use_with java) )
-		if use java; then
-			export JAVACFLAGS="$(java-pkg_javac-args)"
-			export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
-		fi
-	else
-		myconf+=( --without-java )
-	fi
-	[[ ${ABI} == "x32" ]] && myconf+=( --without-simd ) #420239
-
-	# Force /bin/bash until upstream generates a new version. #533902
-	CONFIG_SHELL="${EPREFIX}"/bin/bash \
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		--with-mem-srcdst \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	local _java_makeopts
-	use java && _java_makeopts="-j1"
-	emake ${_java_makeopts}
-
-	if multilib_is_native_abi; then
-		pushd ../debian/extra >/dev/null
-		emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
-		popd >/dev/null
-	fi
-}
-
-multilib_src_test() {
-	emake test
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		exampledir="${EPREFIX}"/usr/share/doc/${PF} \
-		install
-
-	if multilib_is_native_abi; then
-		pushd "${WORKDIR}"/debian/extra >/dev/null
-		emake \
-			DESTDIR="${D}" prefix="${EPREFIX}"/usr \
-			INSTALL="install -m755" INSTALLDIR="install -d -m755" \
-			install
-		popd >/dev/null
-
-		if use java; then
-			rm -rf "${ED}"/usr/classes
-			java-pkg_dojar java/turbojpeg.jar
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-
-	insinto /usr/share/doc/${PF}/html
-	doins -r "${S}"/doc/html/*
-	newdoc "${WORKDIR}"/debian/changelog changelog.debian
-	if use java; then
-		insinto /usr/share/doc/${PF}/html/java
-		doins -r "${S}"/java/doc/*
-		newdoc "${S}"/java/README README.java
-	fi
-}
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r3.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r3.ebuild
index 0d028b01df98..0c6e95570f9f 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r3.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r3.ebuild
@@ -10,9 +10,9 @@ HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-tu
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 	mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
 
-LICENSE="BSD IJG"
+LICENSE="BSD IJG ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="java static-libs"
 
 ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
index ef89ab4a9d29..3ae6b4ab2192 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
@@ -11,10 +11,10 @@ HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-tu
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 	mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
 
-LICENSE="BSD IJG"
+LICENSE="BSD IJG ZLIB"
 SLOT="0"
 [[ "$(ver_cut 3)" -ge 90 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="java static-libs"
 
 ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4-r1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4-r1.ebuild
index c48f5acfac1c..45da50975b47 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4-r1.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4-r1.ebuild
@@ -11,10 +11,10 @@ HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-tu
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 	mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
 
-LICENSE="BSD IJG"
+LICENSE="BSD IJG ZLIB"
 SLOT="0"
 [[ "$(ver_cut 3)" -ge 90 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="java static-libs"
 
 ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
@@ -81,7 +81,16 @@ multilib_src_configure() {
 		-DWITH_JAVA="$(multilib_native_usex java)"
 		-DWITH_MEM_SRCDST=ON
 	)
+
 	[[ ${ABI} == "x32" ]] && mycmakeargs+=( -DREQUIRE_SIMD=OFF ) #420239
+
+	if use ppc ; then
+		# Workaround recommended by upstream:
+		# https://bugs.gentoo.org/715406#c9
+		# https://github.com/libjpeg-turbo/libjpeg-turbo/issues/428
+		mycmakeargs+=( -DFLOATTEST="64bit" )
+	fi
+
 	cmake_src_configure
 }
 
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5-r1.ebuild
index 32928b1d770d..da5546a77efa 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5-r1.ebuild
@@ -11,18 +11,18 @@ HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-tu
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 	mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
 
-LICENSE="BSD IJG"
+LICENSE="BSD IJG ZLIB"
 SLOT="0"
 [[ "$(ver_cut 3)" -ge 90 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="java static-libs"
 
 ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
+
 COMMON_DEPEND="!media-libs/jpeg:0
 	!media-libs/jpeg:62"
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.5 )"
-DEPEND="${COMMON_DEPEND}
+
+BDEPEND=">=dev-util/cmake-3.16.5
 	amd64? ( ${ASM_DEPEND} )
 	x86? ( ${ASM_DEPEND} )
 	amd64-fbsd? ( ${ASM_DEPEND} )
@@ -30,9 +30,14 @@ DEPEND="${COMMON_DEPEND}
 	amd64-linux? ( ${ASM_DEPEND} )
 	x86-linux? ( ${ASM_DEPEND} )
 	x64-macos? ( ${ASM_DEPEND} )
-	x64-cygwin? ( ${ASM_DEPEND} )
+	x64-cygwin? ( ${ASM_DEPEND} )"
+
+DEPEND="${COMMON_DEPEND}
 	java? ( >=virtual/jdk-1.5 )"
 
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.5 )"
+
 MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
 
 src_prepare() {
@@ -59,7 +64,7 @@ install(FILES \${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DESTINATION \${CMAKE_INSTALL_
 EOF
 	done
 
-	default
+	#default
 
 	cmake_src_prepare
 	java-pkg-opt-2_src_prepare
@@ -77,7 +82,16 @@ multilib_src_configure() {
 		-DWITH_JAVA="$(multilib_native_usex java)"
 		-DWITH_MEM_SRCDST=ON
 	)
+
 	[[ ${ABI} == "x32" ]] && mycmakeargs+=( -DREQUIRE_SIMD=OFF ) #420239
+
+	if use ppc ; then
+		# Workaround recommended by upstream:
+		# https://bugs.gentoo.org/715406#c9
+		# https://github.com/libjpeg-turbo/libjpeg-turbo/issues/428
+		mycmakeargs+=( -DFLOATTEST="64bit" )
+	fi
+
 	cmake_src_configure
 }
 
diff --git a/media-libs/libjsw/Manifest b/media-libs/libjsw/Manifest
index d43dc98e7999..66998de06564 100644
--- a/media-libs/libjsw/Manifest
+++ b/media-libs/libjsw/Manifest
@@ -1,4 +1,5 @@
-AUX libjsw-1.5.8-build.patch 3093 BLAKE2B c7e36fb40808241f5c64e8d9d28824f7f9a6824cd74bd4d9d5dd87a2dccb6d2469fdaddfe072a44a4d026ac78a3ec7024fd7e88d8ee9069a2845a63c8631fd84 SHA512 be2933152b4f47637c744364218a00e36dd39efe8a15e2641940ce12dec1cc0a7e4a103f2fec6431c986b357bde2f500d33ba64d649e827ea5cf6d1cb00d824f
+AUX libjsw-1.5.8-build.patch 4628 BLAKE2B 87ec8de6e4c59648dd53c425a7936af8fccd98f0eabd166752b08ba1c5c6f004a40060730ec92be8c8e55ff11387ca68b77ce2d870d74895907152bb3b89b0fc SHA512 928d086db70a35ba8af7b9dd3a6cd4216e8139dadbdae28db540bfa319b13cfa6c14777c3011469fedb8f9b2c3dfa65944d55c65c3354fac942939f4f1b1878e
+AUX libjsw-1.5.8-musl.patch 250 BLAKE2B e68307555f16f53db5e193a41dbe3d38260dfbaf54d1d13168bbbd498d37ec5a76949ede71d2da2939ba0ed82128ba685834faababcaa456d5c0b66792254d36 SHA512 4fa36034e04721edc328eaf45093bcac81ba69e5a297eed346ecd0b974890ba1b3e79d85ca2c896bd4df1741159034df63553c2fdef545dd30801f5a0c4e81b8
 DIST libjsw-1.5.8.tar.bz2 348121 BLAKE2B 5619c32657105eede8fefbd8cba51c1e193853517dfb7642fb9f97888ecd99a753934d30f9c1a3bb689a77607cc1eaf518d2112f7ba5ce2d198b7800642b8c8d SHA512 b858ed124366bd2df6710c07d82a447cc7227f1e442b3a3652d50734d97edef45b42b5a8bf84d4675c0130ab4da080a8409bfb6e1c80cb747930ac431dbf1226
-EBUILD libjsw-1.5.8.ebuild 921 BLAKE2B f096eade3b0ddaf617424f6b5fa829a04c9727f8538381df50681e4afbfa279fdcabe5b8c42bf6007b977ad901f62723df7d4511e20579e1188a288074b46ed3 SHA512 d20b905cc26221cf9e8a561c3635371bef51dde2937fa811bda98c4a8c53efdcc28ec7229b3ea6bce183a242cbc200752568a1c7d36455fb73526a7e1c3f3f9a
+EBUILD libjsw-1.5.8.ebuild 950 BLAKE2B 02c04eae9d27885e36d4f8ac4ab0d0e638f3a26ad467debc71ed03128a3d3b1abc2e61f149dbba386bf7e72b26115b137644c813715e6badf0e315e262dca5ad SHA512 668e5103f995a292030a793657d363efdad05322133c260477de7ce91020bf4724d1d8195a21000277940c3f0408af66a75245e3a5dd066a80cfac865754ad7b
 MISC metadata.xml 327 BLAKE2B 80a44a6643e998cbffdeebefff28dc9f6f3729b82f9d2c88ffb73cd68f6e68926f24f4d3ec30d4f9e6fc94fa511130e6dde1f92cf95a31e542b28dd3879442b9 SHA512 4650cad04ddc9be998c7d9560dfb0732fed12908c288751c256e351444a3c596401ba81eb43fe8679881d660c89bcc5d08dbcd80c5130a8d5aae5f4c2eac7fa1
diff --git a/media-libs/libjsw/files/libjsw-1.5.8-build.patch b/media-libs/libjsw/files/libjsw-1.5.8-build.patch
index d786195058c1..ebe7dfc93ef7 100644
--- a/media-libs/libjsw/files/libjsw-1.5.8-build.patch
+++ b/media-libs/libjsw/files/libjsw-1.5.8-build.patch
@@ -1,60 +1,17 @@
---- libjsw/Makefile.old	2010-03-22 17:03:21.000000000 +0100
-+++ libjsw/Makefile	2010-03-22 17:07:02.000000000 +0100
-@@ -51,10 +51,10 @@
- #                               to debug the program.
- #
- 
--CFLAGS = -Wall -O2 -g
--CFLAGS += -ffast-math
-+CFLAGS += -fPIC
-+CXXFLAGS += -fPIC
- 
--CPPFLAGS = -D__cplusplus
-+CPPFLAGS += -D__cplusplus
- 
- 
- # ########################################################################
-@@ -82,11 +82,9 @@
- OBJ_C   = $(SRC_C:.c=.o)
- OBJ_CPP = $(SRC_CPP:.cpp=.o)
- .c.o:
--	@echo "Compiling module $*.o"
--	@+$(CC) -c $*.c $(INC_DIRS) $(CFLAGS)
-+	$(CC) -c $*.c $(INC_DIRS) $(CFLAGS)
- .cpp.o:
--	@echo "Compiling module $*.o"
--	@+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS)
-+	$(CPP) -c $*.cpp $(INC_DIRS) $(CXXFLAGS) $(CPPFLAGS)
- 
- 
- # ########################################################################
-@@ -95,13 +93,7 @@
- $(LIB): prebuild modules postbuild
- 
- modules: $(OBJ_C) $(OBJ_CPP)
--	@echo  -n "Linking modules..."
--	@$(CC) $(OBJ_C) $(OBJ_CPP) -Wl,-soname=$(LIB) -shared -o $(LIB) $(LIBS) $(LIB_DIRS)
--	@echo -n "   "
--	@$(RM) $(RMFLAGS) $(LIBPFX).so
--	@$(LINK) -s $(LIB) $(LIBPFX).so
--	@$(LINK) -s $(LIB) $(LIBPFX).so.1
--	@-$(LS) $(LSFLAGS) $(LIB)
-+	$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(LIB) $(LDFLAGS) $(LIBS) $(LIB_DIRS)
- 
- prebuild:
- 	@echo "Building library \"$(LIB)\"..."
---- jscalibrator/Makefile.old	2010-03-22 17:08:07.000000000 +0100
-+++ jscalibrator/Makefile	2010-03-22 17:11:26.000000000 +0100
-@@ -59,9 +59,6 @@
+--- a/jscalibrator/Makefile
++++ b/jscalibrator/Makefile
+@@ -59,10 +59,7 @@
  #CFLAGS = -Wall -O -g \
  #         `gtk-config --cflags`
  
 -CFLAGS = -Wall -O6 -fomit-frame-pointer -funroll-loops -ffast-math \
 -         `gtk-config --cflags`
 -
- CPPFLAGS = -D__cplusplus
+-CPPFLAGS = -D__cplusplus
++CPPFLAGS = 
  
  
+ # ########################################################################
 @@ -76,7 +73,7 @@
  #   to the LIB line depending on what you have set in the CFLAGS line
  #   farther above.
@@ -82,21 +39,27 @@
  
  
  # ########################################################################
-@@ -117,11 +114,9 @@
+@@ -111,17 +108,13 @@
+ RM      = rm
+ RMFLAGS = -f
+ 
+-CC  = cc
+-CPP = c++
+ BIN = jscalibrator
  OBJ_C   = $(SRC_C:.c=.o)
  OBJ_CPP = $(SRC_CPP:.cpp=.o)
  .c.o:
 -	@echo "Compiling module $*.o"
 -	@+$(CC) -c $*.c $(INC_DIRS) $(CFLAGS)
-+	$(CC) -c $*.c $(INC_DIRS) $(CFLAGS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(INC_DIRS) -c $< -o $@
  .cpp.o:
 -	@echo "Compiling module $*.o"
 -	@+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS)
-+	$(CPP) -c $*.cpp $(INC_DIRS) $(CXXFLAGS) $(CPPFLAGS)
++	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INC_DIRS) -c $< -o $@
  
  
  # ########################################################################
-@@ -130,10 +125,7 @@
+@@ -130,10 +123,7 @@
  $(BIN): prebuild modules postbuild
  
  modules: $(OBJ_C) $(OBJ_CPP)
@@ -104,7 +67,115 @@
 -	@$(CC) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIBS) $(LIB_DIRS)
 -	@echo -n "   "
 -	@-$(LS) $(LSFLAGS) $(BIN)
-+	$(CC) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LDFLAGS) $(LIB_DIRS) $(LIBS)
++	$(CC) $(LDFLAGS) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB_DIRS) $(LIBS)
  
  prebuild:
  	@echo "Building program \"$(BIN)\"..."
+--- a/jswdemos/Makefile
++++ b/jswdemos/Makefile
+@@ -1,5 +1,5 @@
+ # Compiler flags
+-CFLAGS = -g -O2 -Wall
++CFLAGS += -Wall
+ 
+ # Libraries to link to
+ LIB = -ljsw
+@@ -10,10 +10,6 @@
+ # Include paths
+ INC_DIRS =
+ 
+-# Compiler
+-CC = gcc
+-CPP = g++
+-
+ # Utilities
+ RM      = rm
+ RMFLAGS = -f
+@@ -25,22 +21,23 @@
+ 
+ axis:
+ 	@echo "Compiling program \"axis\""
+-	@$(CC) axis.c -o axis $(CFLAGS) $(LIB) $(LIB_DIRS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) axis.c -o axis $(LIB) $(LIB_DIRS)
+ 
+ basic:
+ 	@echo "Compiling program \"basic\""
+-	@$(CC) basic.c -o basic $(CFLAGS) $(LIB) $(LIB_DIRS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) basic.c -o basic $(LIB) $(LIB_DIRS)
+ 
+ button:
+ 	@echo "Compiling program \"button\""
+-	@$(CC) button.c -o button $(CFLAGS) $(LIB) $(LIB_DIRS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) button.c -o button $(LIB) $(LIB_DIRS)
+ 
+ listing:
+ 	@echo "Compiling program \"listing\""
+-	@$(CC) listing.c -o listing $(CFLAGS) $(LIB) $(LIB_DIRS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) listing.c -o listing $(LIB) $(LIB_DIRS)
++
+ waitbtn:
+ 	@echo "Compiling program \"waitbtn\""
+-	@$(CC) waitbtn.c -o waitbtn $(CFLAGS) $(LIB) $(LIB_DIRS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) waitbtn.c -o waitbtn $(LIB) $(LIB_DIRS)
+ 
+ # Clean up intermediate files
+ clean:
+--- a/libjsw/Makefile
++++ b/libjsw/Makefile
+@@ -51,17 +51,15 @@
+ #                               to debug the program.
+ #
+ 
+-CFLAGS = -Wall -O2 -g
+-CFLAGS += -ffast-math
+-
+-CPPFLAGS = -D__cplusplus
++CFLAGS += -fPIC
++CXXFLAGS += -fPIC
+ 
+ 
+ # ########################################################################
+ # Dependant Libraries:
+ #
+ INC_DIRS =
+-LIBS     = -shared
++LIBS     = -shared -Wl,-soname,libjsw.so.1
+ LIB_DIRS =
+ 
+ 
+@@ -76,18 +74,13 @@
+ LS      = ls
+ LSFLAGS = -s -h -c --color=auto
+ 
+-CC  = cc
+-CPP = c++
+ LIB = $(LIBPFX).so.$(LIBVER)
+ OBJ_C   = $(SRC_C:.c=.o)
+ OBJ_CPP = $(SRC_CPP:.cpp=.o)
+ .c.o:
+-	@echo "Compiling module $*.o"
+-	@+$(CC) -c $*.c $(INC_DIRS) $(CFLAGS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(INC_DIRS) -c $< -o $@
+ .cpp.o:
+-	@echo "Compiling module $*.o"
+-	@+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS)
+-
++	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INC_DIRS) -c $< -o $@
+ 
+ # ########################################################################
+ # Build Rules:
+@@ -95,13 +88,7 @@
+ $(LIB): prebuild modules postbuild
+ 
+ modules: $(OBJ_C) $(OBJ_CPP)
+-	@echo  -n "Linking modules..."
+-	@$(CC) $(OBJ_C) $(OBJ_CPP) -Wl,-soname=$(LIB) -shared -o $(LIB) $(LIBS) $(LIB_DIRS)
+-	@echo -n "   "
+-	@$(RM) $(RMFLAGS) $(LIBPFX).so
+-	@$(LINK) -s $(LIB) $(LIBPFX).so
+-	@$(LINK) -s $(LIB) $(LIBPFX).so.1
+-	@-$(LS) $(LSFLAGS) $(LIB)
++	$(CXX) $(LDFLAGS) $(OBJ_C) $(OBJ_CPP) -o $(LIB) $(LIBS) $(LIB_DIRS)
+ 
+ prebuild:
+ 	@echo "Building library \"$(LIB)\"..."
diff --git a/media-libs/libjsw/files/libjsw-1.5.8-musl.patch b/media-libs/libjsw/files/libjsw-1.5.8-musl.patch
new file mode 100644
index 000000000000..9a6f116e8302
--- /dev/null
+++ b/media-libs/libjsw/files/libjsw-1.5.8-musl.patch
@@ -0,0 +1,11 @@
+--- a/include/os.h
++++ b/include/os.h
+@@ -254,7 +254,7 @@
+ typedef int                     int32_t;
+ typedef unsigned int            u_int32_t;
+ 
+-# if __GNUC__ >= 2
++# if __GLIBC__ >= 2
+ 
+ #  ifndef int64_t
+ typedef long long               int64_t;
diff --git a/media-libs/libjsw/libjsw-1.5.8.ebuild b/media-libs/libjsw/libjsw-1.5.8.ebuild
index c025a7f50f9f..92ca06fcddb4 100644
--- a/media-libs/libjsw/libjsw-1.5.8.ebuild
+++ b/media-libs/libjsw/libjsw-1.5.8.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils multilib
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="provide a uniform API and user configuration for joysticks and game controllers"
 HOMEPAGE="http://freshmeat.net/projects/libjsw/"
@@ -11,34 +12,38 @@ SRC_URI="http://wolfsinger.com/~wolfpack/packages/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE=""
 
-DEPEND=""
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch # 724664
+	"${FILESDIR}"/${P}-musl.patch # 713792
+)
 
 src_prepare() {
-	cp include/jsw.h libjsw/
-	epatch "${FILESDIR}"/${P}-build.patch
+	default
+
+	cp include/jsw.h libjsw/ || die
 	bunzip2 libjsw/man/* || die
 }
 
+src_configure() {
+	tc-export CC CXX
+}
+
 src_compile() {
-	LDFLAGS+=" -Wl,-soname,libjsw.so.1"
-	cd libjsw
-	emake
-	ln -s libjsw.so.${PV} libjsw.so
+	emake -C libjsw
 }
 
 src_install() {
-	insinto /usr/include
-	doins include/jsw.h
+	doheader include/jsw.h
 
 	dodoc README
-	docinto jswdemos
-	dodoc jswdemos/*
+	dodoc -r jswdemos
+	docompress -x /usr/share/doc/${PF}/jswdemos
 
-	cd "${S}"/libjsw
+	cd libjsw || die
 	dolib.so libjsw.so.${PV}
 	dosym libjsw.so.${PV} /usr/$(get_libdir)/libjsw.so
 	dosym libjsw.so.${PV} /usr/$(get_libdir)/libjsw.so.1
+
 	doman man/*
 }
diff --git a/media-libs/liblo/Manifest b/media-libs/liblo/Manifest
index bff9a804e331..1fabc1507822 100644
--- a/media-libs/liblo/Manifest
+++ b/media-libs/liblo/Manifest
@@ -1,5 +1,5 @@
 DIST liblo-0.30.tar.gz 641498 BLAKE2B d884cc723d770f45414e838b6f2520c1f3b2a11972a9977d19b20ba68bc653f895eeb21ba0182a09fde1f096c9be084def1572f747463cd71e96bf0022ef7549 SHA512 51132933cc23237b70ed08fa7986a4a9f838529b83807746b358bcc171f8bbce7f37115b7c855520c9219bae93c74e502aebfb90e44dabdc6d0a00b8335336e3
 DIST liblo-0.31.tar.gz 643928 BLAKE2B 724a6369856b5f2ccd50edb8eacbf309760548b1f855d8b4f343cbfc3257ab3ceffc5f4e40d594ecb20050fcea11b7a6bc26f8e4a6ea72969628ebef05209fd5 SHA512 97f9561296c2e53f92db0cfee625687208b490f8bc229b6cffe88b43ca2a8da1ed3217aaa2151245ea483e54ad6c5e92b9cf10a20661766fa6d3bedb5a8cdd01
 EBUILD liblo-0.30.ebuild 916 BLAKE2B 2f92abf52d3aaedf60ecf0916bd454ce9678f9aebef4c87708170ab50545f748ad7da596c0fbd9843595b4d060cda3eaa9b6fb0f5d83e18e621f5fc29d68fff6 SHA512 0e1c6be66f68f6446e20873a3ec4becfda57ec4e52d3b5d9c660574b3c994a371e4702166fc36264862baaab2111c09d6886752032a81321346464c70219a055
-EBUILD liblo-0.31.ebuild 928 BLAKE2B 49e956416bea33e8a8df9fc6384904b918e42b2bf47685a774b8c403b2f4b6e52193c906ae22479b149c0f7f9b9a5d3b6e0aa6f79d31cf83442a578c6a0a7312 SHA512 639f22c532311205d894a575df38d369f22d1253bdd5ce28b999b65f61416c1f5ed3dc5d299caa35756c3db171b3b29bc21ec9ad0897a6cb4e4603175e05cf63
+EBUILD liblo-0.31.ebuild 932 BLAKE2B ff25f7ff719511f3713aee02f4d4b5df2f1f7ee57c2a6c74bc6f3c841a05990957716f5aec5f45edc12db100b6059166be6efadd79f352798c1365140d276682 SHA512 e1c245aba05517a5d86496e41141582a126736a927b8e5305e75065b3346026d23ea5b257a9b261450debf3e194dbcb6b8da32a00fd40231bf86fe5afdfcaac7
 MISC metadata.xml 470 BLAKE2B 1402a4921f55313ebaa73a1b4733f9e850943fe23033fdd0980df892665ed42355762d27c64f2091a23d4d72e991498628dcca0a26df55603b086ed3c87ab6f5 SHA512 2604ac7fbd125c9f45faeefcad35a40bcd65d4034311cda5a95ceaaa3904b7e46b6e449f0373ad6f0ffca66ff9bd23d785a035a63888adc754939e19fb93eb56
diff --git a/media-libs/liblo/liblo-0.31.ebuild b/media-libs/liblo/liblo-0.31.ebuild
index 2a9f890560a6..db5c797f53cf 100644
--- a/media-libs/liblo/liblo-0.31.ebuild
+++ b/media-libs/liblo/liblo-0.31.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos"
 IUSE="doc ipv6 static-libs"
 
 RESTRICT="test"
diff --git a/media-libs/liblscp/Manifest b/media-libs/liblscp/Manifest
index 53074cafda0a..68a93529d8ec 100644
--- a/media-libs/liblscp/Manifest
+++ b/media-libs/liblscp/Manifest
@@ -1,4 +1,6 @@
 DIST liblscp-0.6.0.tar.gz 670650 BLAKE2B 0cb825743fac7b328c32844f834d59e6622fcb9d860e9a13732d5548ce1f6bd0136928ea5be9b1de0a2811878c38b2e714823973c7a340d99de4735d6c46f637 SHA512 64c5cb51ac7821d65a8769415deb68cefa24684e1d4fa592a68c7e45cf2af02ffa41a2f2300ffc98a6d1d6d880279aa1b61499ac0fe59177c60fc0a2075ada15
+DIST liblscp-0.6.2.tar.gz 689354 BLAKE2B ecc365e8840c8179bd753b8b9ee2706daea7e12948fb079d1b39a4aab388204af5ecab381e27ac8f5feedcbb56fd02a5a236ff8da7041f213a7551d5cd0cb3cc SHA512 672ea452e5dfe5e34dc6a1cc8c9d40dacfd1a415fc4c3ba50b984d3cf064910da53c814dd43a572665c1cbb7a402a09225c0dc7d489b1589c2a98a3f8eb8f0db
 EBUILD liblscp-0.6.0.ebuild 586 BLAKE2B e3299ff0820b51bdfdef112702dbc72acba12370df85fa74f278dadaea50a75474980de4eb3d57759c47208a8ff1f6618d58eb77f940a5e4d70287f681b0642c SHA512 f4ade6a4ea2b72a6bc0c537088633ca8c188dcdc0e3f4a2c5892a39d82d9442b70f543d2bfb5e4a1c1e2edb14559073227e1214426bed87ff1f70bccb6a55705
-EBUILD liblscp-9999.ebuild 665 BLAKE2B 467725b732d81f5f42cc3cf386f383336f2a9fd3cf63b348c1bfd60de45881bf67d50940ecf31e733783b05635670eafb3b071d55423ff5d0d406290c601d158 SHA512 6228569488fa50b3f30ca07e1d72edacabfb8db31142299b1b5cd1d1af2dc74665929889d46d1fb9245a9f0c681dbbfec98fb4c81730b1467448b719ca426109
+EBUILD liblscp-0.6.2.ebuild 639 BLAKE2B bd20f96814da53c61dfc2dec496ce4a0ecf57927c7382126354816352812069a125878db1cb6ba741d00ec91ee47db53ec50b08e0bba8a51b37cab4b96e43db7 SHA512 597c395ee2aa3ad556b2a3434c385ca1e14532916294bef930912278a2654430492fa1f5c6f48003c1e6c70465bd5d5af5fb620b5b5165b49e1480e96135181a
+EBUILD liblscp-9999.ebuild 666 BLAKE2B 6d46b9205a46720401495db41bd03e090e29b1b4f23bac9b41d4d6d86f187a3d3d69d0eac2849a623a30f2b4ce8f43a2ddd85b7e1d8f951cd88f0bfd884eeb78 SHA512 676ddb8b98247c647b70f8283dddaebd318a2a0a2944a3da931492c01aec648042b9ae1d58854a285fa0b23199d8d831b09efbda6ca51d7f61cc82b62c0432d4
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/liblscp/liblscp-0.6.2.ebuild b/media-libs/liblscp/liblscp-0.6.2.ebuild
new file mode 100644
index 000000000000..04dfb13d5d7e
--- /dev/null
+++ b/media-libs/liblscp/liblscp-0.6.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="C++ library for the Linux Sampler control protocol"
+HOMEPAGE="https://www.linuxsampler.org"
+SRC_URI="https://www.rncbc.org/archive/${P}.tar.gz
+https://download.linuxsampler.org/packages/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+DOCS=( AUTHORS ChangeLog TODO NEWS README )
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/media-libs/liblscp/liblscp-9999.ebuild b/media-libs/liblscp/liblscp-9999.ebuild
index 58bf2dff4bf3..f456569bf546 100644
--- a/media-libs/liblscp/liblscp-9999.ebuild
+++ b/media-libs/liblscp/liblscp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="doc"
 
-DEPEND="doc? ( app-doc/doxygen )"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 DOCS=( AUTHORS ChangeLog TODO NEWS README )
 
diff --git a/media-libs/libmad/Manifest b/media-libs/libmad/Manifest
index cb38791ed326..d8b7ffbb89a5 100644
--- a/media-libs/libmad/Manifest
+++ b/media-libs/libmad/Manifest
@@ -2,7 +2,7 @@ AUX libmad-0.15.1b-CVE-2017-8372_CVE-2017-8373_CVE-2017-8374.patch 5122 BLAKE2B
 AUX libmad-0.15.1b-cflags-O2.patch 347 BLAKE2B 65476b488c2dca48bf983da739240651e82f448b8e6546dfb68e2a2f29e953fcb6e6b1f498d1e805ccbf32cc8914f5b49c5135eb19388c8711989312a3692e7c SHA512 13a8bac30cea4861f903b4abc8673f9a35b6253aae6a02915f99b67e5e8c56460fc1fb059a0aa52143b665f888928baba098daf0ed022420e46317be4dbc6161
 AUX libmad-0.15.1b-cflags.patch 4867 BLAKE2B adcfc2732f6b8b2310f50d234a695820d8fdd7f292de6621abfc23922cda512d26b1eb64dcb36751ea8cd34784189bcfe8be7cd46ed654f92370071df7598890 SHA512 01dc8421dba2b652aa8ca6d1f1a5c310645465b18190ebfdeaae516de881869957e8e7c0c373d0d09623da33719d01e028f2f6164790b54c43a71271f5b4dbba
 AUX libmad-0.15.1b-gcc44-mips-h-constraint-removal.patch 2377 BLAKE2B aff2507810157aec4062d157546b921a43cdf63a4e0684f5864ea71b36b4fa726f4ce33d558b7aaec8bb927876abe23c017ef3a1ba9b55715202887010cba3a3 SHA512 de08e0ce3c39b76c2838f940279a39c26e9c7e5b1e762c44f0db1ce3f65364e51036ad4f4ccdc160d80660c723a1bede70a4b505a9a01583de43ebc47aaeedb9
-AUX mad.pc 211 BLAKE2B 3b8678e667461caa6ddc2479687d92a8bab9e7e05be73640e63c9eaf070fcd69d9e26dac1d5e753171795236f5a461c7f59ad46e899ea3227902b9773f9bcfc3 SHA512 ec0b14bd0c6236a216107b507b92c06e295352f1657ba5e45f37fff220a73e1454b262ac36fc715d698c4ffd210d348fca71cf0198e2c49d16fe0ec5ea839f08
+AUX mad.pc 213 BLAKE2B c2ff4ab93b4acf0022690a74ef9c88a2b924fe8918f39a225c7684336d43cd061ec5932ccd76185d5c12fc670180d2b2d367759d166fb3b07c20d20035731b40 SHA512 0b667f39e329732d539f2f01fe9a843b1210d41dbed67e5917fdc173058f32ad0826b3657e1940c7968e073a732a6b462a75d6b8bc32dcd490bd74bb16ee7605
 DIST libmad-0.15.1b.tar.gz 502379 BLAKE2B b00de857a0634d7193f656b74cdd5c0642b674f3ee3303a642f8a6fcb64eebaf2b100c6e09d85d892880b5fc4f224c0a5d1ecf5bd95bc5caf00e959c7beac4a5 SHA512 2cad30347fb310dc605c46bacd9da117f447a5cabedd8fefdb24ab5de641429e5ec5ce8af7aefa6a75a3f545d3adfa255e3fa0a2d50971f76bc0c4fc0400cc45
-EBUILD libmad-0.15.1b-r9.ebuild 2201 BLAKE2B d67e6f7fff48e6554907d174f57ff011f46c2dee9a17cab1b3177a9b5b95be33be3a41921b02b0e13390e14dd43436f1ced2ade8561a91d1d7182b384e504412 SHA512 c2637c57fd299903efc6a6b426fa5e79e86a94e79c09c968b846e0d00bfe05fdeb819651293eb59e8ea6ffb72ad3aef7bc98d2717ec71b9237a56dbc8cf4c11b
+EBUILD libmad-0.15.1b-r10.ebuild 2270 BLAKE2B e7940d0ee46dd00b4d74c34b3011a200a2fec7bad0502449edfa211fc2062ca929255703dd2224f5d563c45cf56e981ee5f502d1c5e9330545896e454116d090 SHA512 73904c47475f5d490a86a3e69e774123be6dbf7f4c364e7cb0fe706cff640b3f2136e975528edbcd09b33435c08e1b36bccb5a7e41a7b381b8fa8083790c95cf
 MISC metadata.xml 326 BLAKE2B a9064ce28313804fb873d3e0b4fcb96681a2fcdcf60011d629268f73ab47f6c00ff6e0d95d2d075ec6af89bbe7aea4b6346ef2500815f08a69318a8736e7201d SHA512 b6c3a0765c5d00fd44caf7266edb75a373d8d4e813ac7f68507067f57713090fdc84f95886e73401d9c912f7f64453c975117030692526a49aebd6f5276751c9
diff --git a/media-libs/libmad/files/mad.pc b/media-libs/libmad/files/mad.pc
index 14a66f552582..329276cdeec6 100644
--- a/media-libs/libmad/files/mad.pc
+++ b/media-libs/libmad/files/mad.pc
@@ -6,6 +6,6 @@ includedir=${prefix}/include
 Name: mad
 Description: MPEG Audio Decoder
 Requires:
-Version: 0.15.0b
+Version: %VERSION%
 Libs: -L${libdir} -lmad -lm
 Cflags: -I${includedir}
diff --git a/media-libs/libmad/libmad-0.15.1b-r9.ebuild b/media-libs/libmad/libmad-0.15.1b-r10.ebuild
index 856aa42c5f77..285cf5467f48 100644
--- a/media-libs/libmad/libmad-0.15.1b-r9.ebuild
+++ b/media-libs/libmad/libmad-0.15.1b-r10.ebuild
@@ -67,7 +67,9 @@ multilib_src_install() {
 
 	# This file must be updated with each version update
 	insinto /usr/$(get_libdir)/pkgconfig
-	doins "${FILESDIR}"/mad.pc
+	cp "${FILESDIR}/mad.pc" "${S}"
+	sed -i "s/%VERSION%/${PV}/g" "${S}/mad.pc"
+	doins "${S}/mad.pc"
 
 	# Use correct libdir in pkgconfig file
 	sed -e "s:^libdir.*:libdir=${EPREFIX}/usr/$(get_libdir):" \
diff --git a/media-libs/libmatemixer/Manifest b/media-libs/libmatemixer/Manifest
index f040fa5cd2ce..ee95949575f4 100644
--- a/media-libs/libmatemixer/Manifest
+++ b/media-libs/libmatemixer/Manifest
@@ -1,5 +1,5 @@
 DIST libmatemixer-1.22.0.tar.xz 432592 BLAKE2B 36f16c0ed516dea05368ae5b4f287cce275844b547fb7eebe7fb0604d0fddce72649dcac1c16475539dc5199f5d310b8bd19f165efd4bfa5c4f1bf31c1141df7 SHA512 6eaa006142601c077ac70739e637273288a4b9713dfc4179341c4832ae4e3b362e92104e150132ee274224d6c5dc057d812b7e1814e49a7690581de6d81e0db8
 DIST libmatemixer-1.24.0.tar.xz 484808 BLAKE2B 8527514cec0770381ce5943f8c87e66f101e92f34527af2b3d4c15696f63df8304f00102fbbfe5b98ebb9b8d8b515f64a3d63b53312f7892b1b4868895539a6f SHA512 bf8c807bd45f3626bbf881eefa1e4638165daf61637bc63a704492d2a67eeec622e35e58c041649d33411294f96f79c99b3ea2406ae6fcf83294ec625cca9dbf
 EBUILD libmatemixer-1.22.0.ebuild 768 BLAKE2B 733ae4de83739d3985378487eddcd75afa3423a6497c623ea42763bc70168ec45c4dad0934ed425495a01566dbbfd8bd37d98e80a6a080663c34997cdc5eb6f9 SHA512 ae806621c9d585b67475c0b6ca25449a19f07d7c12863e213372cd1d044a71be62cb0ec2812bcb033532ea8f8b22419afac3e563f713433b5f0b3976a957ea68
-EBUILD libmatemixer-1.24.0.ebuild 771 BLAKE2B 5f56b73ccfeb50453c2776a1c23af75b3c0a883c698b8041279b296af8553d2589cfb06a9de23936fc5c08e9ffccf46c966f2e4a10f7e77b7b04674ea806cfa8 SHA512 29666dbaec9d0722f5e34686d95317dd63133304702396a7d1ba8d9914b1e4684fce46737863bf2503efefa890e3721cc8ea67df4d0bffb2434173489f7c7ceb
+EBUILD libmatemixer-1.24.0-r1.ebuild 790 BLAKE2B 6af9babc4b49031bb2c021d65e1fa94f84d651b90b25826a81d20d55cf3a13770e14cac5de8223f9afc5ca715f3f11c92c94797896b7380331098a82ff42b93e SHA512 c3aa9397fccce85f87ab8545ec5c33c24fd4c3193fe483ec8b8692831ff5346a718c9a28b349c2b252c755d651e6781a1823c282b9b5c6a7dcad6f08b3e8b07b
 MISC metadata.xml 341 BLAKE2B e060b6c02aaaea5885ec10566d2e3b13fb2f480201b3b43144255fa1f27a93a648a9030fa02f0efd20c8f32ee93e03661f379a63576822ed5c27b094ff6d7d81 SHA512 0c6f04ebdfe4cd26e7fdad53fd184045f6d95c4b9c888883f255ddc566fc02e0cf86138d5557fb71c0e8e9ea12e0d19657b218e1d310ce414e2911470eaa9359
diff --git a/media-libs/libmatemixer/libmatemixer-1.24.0.ebuild b/media-libs/libmatemixer/libmatemixer-1.24.0-r1.ebuild
index ca97e735cc2a..b8bfd31da92d 100644
--- a/media-libs/libmatemixer/libmatemixer-1.24.0.ebuild
+++ b/media-libs/libmatemixer/libmatemixer-1.24.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Mixer library for MATE Desktop"
@@ -35,6 +35,7 @@ DEPEND="${COMMON_DEPEND}
 
 src_configure() {
 	mate_src_configure \
+		--disable-static \
 		--disable-null \
 		$(use_enable alsa) \
 		$(use_enable oss) \
diff --git a/media-libs/libmatroska/Manifest b/media-libs/libmatroska/Manifest
index 475386e1a905..dc633dbc1463 100644
--- a/media-libs/libmatroska/Manifest
+++ b/media-libs/libmatroska/Manifest
@@ -1,5 +1,5 @@
 DIST libmatroska-1.5.2.tar.xz 64996 BLAKE2B 6af202b9817ed54feca76c0a9ed60a0eca0431ffc4ebc9aeae2df191066501c16fb7bb8dc37cb6353eb22c87dfe9fa22420cbbf18d3a6a6edeec4900a59bc0cf SHA512 122b71b91ae89e2a7cc89db17655a006248d58f18d913b4f9ffc885aef7e39681a3a16eed43cd8ecd949c570a939007797c79829f5ee87d08562aee3f0224ba2
-DIST libmatroska-1.6.0.tar.xz 65316 BLAKE2B a374ed7f6ee46b578f4643bea5480d3d429e1cd3240e72876ea8f7bd510f161329b4470bfb0a47053baed34f4e99d7292dd0d213ecf97fd78007e031360edaad SHA512 7908730aeae426e3f7a90c6cc9151686b453e03cc7046b87a655e51c78c6e5fde5c37d7e0db18c2c237ce853dbe428671b983801104a0860ab0ab1919234f30f
+DIST libmatroska-1.6.2.tar.xz 65460 BLAKE2B f746f0dd519b8e3b4f98057d3f83e23a79595ab95e71f0c45c1128b2cbe093d5955a38d9d0565be9336f3d53279e20bddf0a2b4a54378c78faf4ee8f94586686 SHA512 c0b2b475f01e01b064348e96a4cd25f594e93b21ab6f66236d6872d1242b6076d501c155a19dedd642ded8338c0a71be09450fc086e77802099413c8849abab1
 EBUILD libmatroska-1.5.2.ebuild 629 BLAKE2B aaf34a4ca644f26de0d426c9757457f0b96186319cf6b1f8463c5ed695c2e0723ad7b5c3319c93a09dbed57bd102f51df39cc65c83af8d1a55aa84c89169176f SHA512 9f822cd754e842f9f3f5e240e28ec65f063795007190f8f6ff946ba881fb2bf9c473ff10a75ce5d10186bb9979e71b9a3412bf7dc874192ffa8872c8e047e540
-EBUILD libmatroska-1.6.0.ebuild 636 BLAKE2B 6a8054879c53f6782e1bc5dcb6f29789960b203052a183dc2018ac63398a681aaa4aaa14fefc076fdd4407ed68fe62e8d2ee42de8c1c87e886e504c5103fcae2 SHA512 547e40749540fe8fc39377c208069af3d5fc24f9f95180f7429a2836cd23e8f11aa4955ab06b14b0b93583069b30a50c096d52c499d8326874678f5d75aa6342
+EBUILD libmatroska-1.6.2.ebuild 631 BLAKE2B 17b993ed03d564d703b5663cebf1299a27e21bad39daf9ac2f3d801236341fcc451e7076597e63b604bc9cb86f7ffc23514784f67a0e2b628d140ec253545310 SHA512 51ee6bd1f7c72c85d7caad5fd0166c5e6be79e1bb546ed0c40ac2e4e8103db90d9a65b8f66da129086f984f26da059e621d92ec3b61c5dc396b3202b005ff597
 MISC metadata.xml 320 BLAKE2B edd6b2e35a7833d3510edec80f3771a319cbb257cbb203e0f71f33636431496c620cb3307b2bebb44360d6932a7e4376b0d134f3f42d26fc9271423c2eed11f6 SHA512 5c1dad06e1fef24b1ec68fb6b12d0d17b4bd05f22b1953f713c25a513340cb08540eebaec32fbe7c6607ba2142a057b8e6e5743a929b7368665d91bc014f35a9
diff --git a/media-libs/libmatroska/libmatroska-1.6.0.ebuild b/media-libs/libmatroska/libmatroska-1.6.2.ebuild
index b11f8b3bc3d1..88c5a7898a88 100644
--- a/media-libs/libmatroska/libmatroska-1.6.0.ebuild
+++ b/media-libs/libmatroska/libmatroska-1.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/7" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 sparc x86 ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/libebml-1.4.0:="
diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest
index 6e8e83c4b50d..864e16209eec 100644
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@@ -1,4 +1,6 @@
 AUX libmediainfo-0.7.63-pkgconfig.patch 291 BLAKE2B b13ee095a9f1f322222bb10013ffda778eef68dd2f161553b96bdd24f0c0ba81281185604547c355c14190580fd36cbb019778674e8c72a02ef3e3fda9229f76 SHA512 4cc11f6219a68ad59971a3d85f3184c16ec25e60b96ac56ac73796493c516575e0ccccee814610d5c248ba4c8a0a2a590041464d2aa1ac3f8a717839127c91fb
 DIST libmediainfo_20.03.tar.xz 1799940 BLAKE2B a0c50ab27e29b010e33334c207872aefc110396401065d3bebdc6cf34aba325453b87e9f1f1ecfe9882bf5f63aaa26f3bbfe3d791cb0c16fa75ca4bb7ff081f0 SHA512 97dd847edf0e290f7ea0153c71a442cc54944bf295f195486f37fa81230cf4463ae2ecc154e73cf75b876b33c038020a9ff082013d57381ab5516a4a2db5ef87
+DIST libmediainfo_20.08.tar.xz 1808948 BLAKE2B 90af512dc5787f01b3600852f275ed0c0e9e1d5393fc60bdb128045e11947873622f1d78f79eba7a4abd46e4537001b66e41f79008ff895680a016e22c5855fc SHA512 c68b7eb906eac2af7b6f588910824ea9a9bd32d4e7b4f8af3579b0e388f5c547583be0ebd1491cdef52dbdb0eca7e2b2731662e48fc66baaddc1e1ca76f385ff
 EBUILD libmediainfo-20.03.ebuild 1851 BLAKE2B 09ec6c25ec9977f1764f24ca6c39ed2013b3ddda62864fbdf727f9ee308b28c9d0010884c6fdfa4913ab0b91b9c72a4498f1fcf04dc8bcf79de36812391b42c0 SHA512 b74be9f0fa84c180f328546668d94b7db01cd8b4ad5d05ece46f67f7895fe2e2b76849f03ecd6bc6a42af18754b5e1ab1337650c0f8afd9a4426becd7ef78120
+EBUILD libmediainfo-20.08.ebuild 1853 BLAKE2B 668269c8a1db1c58e8033ee508ed9e9c55fa64165e6d7b55f967aeb2949ba71dfeb9c50ea2e5c03bdcda020c54857ab057929be9b6b727bc1b74fd41c01a8f05 SHA512 a56f9890c60876c346118f37618cf3a73f9284781a95fdd5130f620220508a41d550cca50cb636edd2a90a8e2d44819dac581f0610dba570a7a34f21ec60d90e
 MISC metadata.xml 346 BLAKE2B ace7bcc20d5e1a949db03a632f4f181353c530a0aad6b6839ea4d682bcdde0f3184c1886fd3015ba73f6ad63ace53e07f21bcf7f8383f12bf6ad73374d895c7c SHA512 bc66ca588f3042de05db14d4036fba4637f5dd0d03d3cbdbdf7118b90f5a6f8ad0e86a30d9263e7d283d94f61e54da6c92ff03acf1cf83db376366c0c4f76c93
diff --git a/media-libs/libmediainfo/libmediainfo-20.08.ebuild b/media-libs/libmediainfo/libmediainfo-20.08.ebuild
new file mode 100644
index 000000000000..617f561cf174
--- /dev/null
+++ b/media-libs/libmediainfo/libmediainfo-20.08.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils flag-o-matic
+
+MY_PN="MediaInfo"
+DESCRIPTION="MediaInfo libraries"
+HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfoLib"
+SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl doc mms static-libs"
+
+RDEPEND="sys-libs/zlib
+	dev-libs/tinyxml2:=
+	>=media-libs/libzen-0.4.37[static-libs=]
+	curl? ( net-misc/curl )
+	mms? ( >=media-libs/libmms-0.6.1[static-libs=] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+# tests try to fetch data from online sources
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_PN}Lib/Project/GNU/Library
+
+src_prepare() {
+	eapply -p4 "${FILESDIR}"/${PN}-0.7.63-pkgconfig.patch
+	eapply_user
+
+	sed -i 's:-O2::' configure.ac || die
+	append-cppflags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		--with-libtinyxml2 \
+		$(use_with curl libcurl) \
+		$(use_with mms libmms) \
+		$(use_enable static-libs static) \
+		$(use_enable static-libs staticlibs)
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		cd "${WORKDIR}"/${MY_PN}Lib/Source/Doc
+		doxygen Doxyfile || die
+	fi
+}
+
+src_install() {
+	if use doc; then
+		local HTML_DOCS=( "${WORKDIR}"/${MY_PN}Lib/Doc/*.html )
+	fi
+
+	default
+
+	edos2unix ${PN}.pc #414545
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+
+	for x in ./ Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do
+		insinto /usr/include/${MY_PN}/${x}
+		doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}/${x}/*.h
+	done
+
+	insinto /usr/include/${MY_PN}DLL
+	doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}DLL/*.h
+
+	dodoc "${WORKDIR}"/${MY_PN}Lib/*.txt
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libmikmod/Manifest b/media-libs/libmikmod/Manifest
index 931a5c78ef02..f4ffe8242cfc 100644
--- a/media-libs/libmikmod/Manifest
+++ b/media-libs/libmikmod/Manifest
@@ -1,3 +1,3 @@
 DIST libmikmod-3.3.11.1.tar.gz 1240373 BLAKE2B 9de58eea739f8f7a5c4ff482093974f67a623fd0acd3b65752b0832b1376fb05ca00e7fbd09c242a25fb76d90d662afc3886808fbe6cabb15332f263adba37ad SHA512 f2439e2b691613847cd0787dd4e050116683ce7b05c215b8afecde5c6add819ea6c18e678e258c0a80786bef463f406072de15127f64368f694287a5e8e1a9de
-EBUILD libmikmod-3.3.11.1.ebuild 2149 BLAKE2B fde184515f6e0fc3395afda560cfcad8c33c705a6789673a245919e865088d88e4bf172a855d441e9001be96472993d1ad20d718cf08ced87a92454d7cce43f0 SHA512 5c73d6401a9e3d1bc8f520cbdbe4e1b1f5affdd3bce6e8abfa0fa1b9c2d9e0b2e587324bea49f4e87d00216a8ab1d8041f4b3573d39e8efa514d80ec8e07f906
+EBUILD libmikmod-3.3.11.1.ebuild 2148 BLAKE2B 5fc885015eecfeb1c704152ea2d50ccda597541991c54ebba89908543d76863e5ec6e9179e08dd950c202cbb5e8f6388d46b39dda9b2249051be4385befe1e55 SHA512 809d36cc3e2bbec9087181f4a6503811863fcf4a234abdab589bec0e759895dbfc621e5c8a264c93efae4e01fa3207656b932708a058de6bc221a7bf42430862
 MISC metadata.xml 329 BLAKE2B f5950a51c451bd95614667a932e0799427831bed04505850b99dc77173b773cb8c158b50053b6c3a41755c8a1bb87077fb538207d56fbcf94fdce44ea0709093 SHA512 5deced2e8ecff6e1098f1ff339281cebfb8027bb052af10c9d95c7ae1eb80db0448cf5b350d40e5d5f76ed9948ffb5e4f8802f200f9b7f139a40992311eedb55
diff --git a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild b/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
index 13e8f1c7bd27..4d8452039c26 100644
--- a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
 
 LICENSE="LGPL-2+ LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads"
 
 REQUIRED_USE="|| ( alsa coreaudio nas openal oss pulseaudio )"
diff --git a/media-libs/libmodplug/Manifest b/media-libs/libmodplug/Manifest
index 97f849bcde31..64096f8e01c3 100644
--- a/media-libs/libmodplug/Manifest
+++ b/media-libs/libmodplug/Manifest
@@ -1,5 +1,5 @@
 AUX libmodplug-0.8.4-timidity-patches.patch 592 BLAKE2B 7bbee6d0ff833a6ead5e1a1d25953fbdbe0f3fe3f9efb6de560ed93e69dc6d4b74a8096d4517f9c46d3be4772e6eb682a0b068d68dcd30efd705090cebe2cf60 SHA512 9a01299e9886d2e1fb9db18283fdf2d926ed0899fc6068f66739d6f462fdfbd6500fae70da43edd9a20532ab8ac83cc2ed2ed019f33725a964b9b4aae5ad8219
 AUX libmodplug-0.8.9.0-no-fast-math.patch 515 BLAKE2B d1068b8647b59daecbf60470d7d0f6cf6884438c3a833aefb16181b50201f33879ca0d8dd6f341c1690b5e160e0a6eb706aebd28533aa5fbf5bdde0eb47196f2 SHA512 dfcf1497343f5bb145ac41ada3e313c2eaf8b18827dd1dbb55024a945300eb9054503f20d8a60f835dce50820c99eb4edf20109056ce929e7284f247312cd9c1
 DIST libmodplug-0.8.9.0.tar.gz 576566 BLAKE2B 534ce23f37ae60593fcbf0b8984140badcf7d868a7559ea6aef282a4d14dc6ad05847dc128a0221772e1dc2abb8c870ff8d6d46da0c04232169f905468a3ba19 SHA512 880e10154fd367ee24ace53ca7e32a5c1fee7dfff1f934e6499944c12779427da63e2f55f8d6ce25db0a42a5b4424053bf64305b31dbfc4ef6a8909924d655fd
-EBUILD libmodplug-0.8.9.0.ebuild 752 BLAKE2B bb2ed7e71a7ceeb8ca60de29d673bcb9985669478650ac61e12192acd223f930f51ffcdd28a25f97c7a9789ba5f7c8f7d384c9682414bc0c3086349e89570a9e SHA512 8403ffa385e6d44cdcafe222d7550c417162f3d2837c28d0053b4f7eaa53c13e3e2833980840dc4e4695cf6469246262275d7a5efa4cf0dbecf3b4b6f385146a
+EBUILD libmodplug-0.8.9.0.ebuild 751 BLAKE2B 504ed03183809c260fabfb275bc849f1336c30561f4a3e80971b7aa130b38fc9ef95dd380234dacdd38ac51d168f5661aa4b5ad116005d75f027d8f59b9e1e24 SHA512 7524c5f5651b75caa93d926d987ba95bbb2beaab9b16eda8d50f53c42d24aa81bbc7e06b0a1a0f08c6a33637117dec9bf96e039586b61d07419ba07cddaa66e0
 MISC metadata.xml 457 BLAKE2B 2aa3262e69e5eb85c8ee24f912b126c38554bb324652b7a2b91620236a72b1717ce0ada193193d9655883f8ce48be622e85934a8acb69f35e78bc59616d051af SHA512 6b4cb6e098ed3d743e76d98da648ef475288ec82273b7fbdd73bd60cd14e58d98f0798244bbd4432e504402655557aa0ffb5a4104261c5916261e8040430e46d
diff --git a/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild b/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild
index 30981d2829ea..33043e6c0ca8 100644
--- a/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild
+++ b/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://modplug-xmms.sourceforge.net/"
 
 LICENSE="public-domain"
 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="static-libs"
 
 RDEPEND=""
diff --git a/media-libs/libmp4v2/Manifest b/media-libs/libmp4v2/Manifest
index d8610cc475e7..7d4debad90fd 100644
--- a/media-libs/libmp4v2/Manifest
+++ b/media-libs/libmp4v2/Manifest
@@ -1,6 +1,12 @@
+AUX libmp4v2-2.0.0-CVE-2018-14054.patch 1772 BLAKE2B 8e6dfca134866d14689dc2470dadba0c1bfd90559682fd9bed22663b75ad3193f56c556e5c6d8d624ea93a2fd217dbf30113668f8f591257b57d2c2a04321e82 SHA512 3a18c5266efcd20c808d7d0d26c45bcbe4aaf3005eff5b7fe6c4fd918de476c2fea4433eeca928016611b472192a9bd0c03a41e086c47afc1b30e60c0de769a4
+AUX libmp4v2-2.0.0-CVE-2018-14325.patch 2849 BLAKE2B 8ea91b19d07037e6b5d9a7ce01d299f990e955f2163e990b3f64406248f471332d9df3a7320f3e3dae6ba2cffbc0a5359a5ae9e78973c8ec4fee42cd6727994c SHA512 f8a95ba51e4845074b606d2f10baf4e776927735480e4b3b776453be1a5adc28c43a41f1d26f7767881b8e4b9d37be22f858c496c83c90d4dc97eba15a43ff49
+AUX libmp4v2-2.0.0-CVE-2018-14379.patch 1373 BLAKE2B 436923f9ef86d2a05d244a3630d8fab5e1db98016a1c3d90f5bbbbd12f50c04c287823292f80edaac3ddeb98dd9560827fbca5ed2092ba8912724990d47b2eb7 SHA512 fe1b4c6735de7849e2b5dbfaf605c816d7d39247fa2bb470bd454d73a558b4a6e75b361458bdcb810cdf0ec4dc4362b766009a1272d003986e2d03271c627998
+AUX libmp4v2-2.0.0-CVE-2018-14403.patch 949 BLAKE2B 434fe9accaf6dafe9461f97b10c6278cef3af7d5cff7ee975424cff92557485880b4db83de32e3f80dcdaf362b7213ca89abd1e3427b85743ebf93c500e6ab69 SHA512 7ad5278ed37ee10ba04c88bcf9a10445c037bbf3cfea30720e7e8ddf1efd2e681796f223b8f749bee9bdde4d0c0448dee4f057f672305020e412568ef20775f3
 AUX libmp4v2-2.0.0-clang.patch 1157 BLAKE2B cf4763c29017840322d0d31fd859057b2c5151ecb226bcab1d7fab972b4594659dfd9aaed0f7b828d687bf9e05f569cd4d42daf5ce21e6bdb44c0204f1af2028 SHA512 5015dfbd2126d180c7f1b57aecbde592b33fc56d45dc7a4178b0ec88b0ed2dcec23a3a09707bc52dbb6fbeebec1fd272d7625b77e986c7f880994cf6441125fb
 AUX libmp4v2-2.0.0-gcc7.patch 747 BLAKE2B 5bed55f8c9e9593261d9738871de162fdfaec6239078e3ffc0fc85352e60687ba93e37f63edd8fbaf576ffa5966aef07fd58171366ec60ac5969a80eb92f6016 SHA512 18433209711b88cf4a09dcf6ad26d7d717d6593d9b006258e80aac85fee01da17bbf7e67e60c75c82e18652eaddcdb2d945dec52f2f75aa0f236bd5328aab760
 AUX libmp4v2-2.0.0-mp4tags-corruption.patch 642 BLAKE2B 86a1b614dfc2e4dbcee97ebe9b029feac2078eb3d6c25793f291f625ad1e0dc1df85d028813fe96e980e2d8fef4a5eb821da8622f3ce3f8b28835dd020812d7f SHA512 565959560941ec0503b17a1e6a9cae85a03d6f97e4f4ea66cf457c941de96148606f23471525bf786bd95f78097b3376020a40d53fc7a4675c1db9819e7e8593
+AUX libmp4v2-2.0.0-unsigned-int-cast.patch 2922 BLAKE2B 660ee262d6a21540b9646aa87f911373042c1f1f879b18a913d07fd267fa2275556f8a0e18e86c28ce4a737f136d53c2dbd21602635b12b490535f3e8d8e0ef7 SHA512 89cb78624096e4182056c4e9099cc13cb6251330d741ccaabe557eeb21c2df77d71367da21c16d2c33b1a7dde49429f57c7673d49be0e9a459af491a00305f37
 DIST mp4v2-2.0.0.tar.bz2 495672 BLAKE2B 966c90b443bd6f7a81c96fd12f95b00c3ec89cd476aa0fff3e0450b315d54543578ef953c5e3f28d52ca800a0768c601dddc8e99a32ff512767cd65c12832bd5 SHA512 15eb882f33d72d4209053b54c883b67715f539c33096705a0e7bc79015b93f6f3ac80ae29c65a0ffe9eab1bf0dedf07198bdee23fa6eafcd6ccb34f984484be0
 EBUILD libmp4v2-2.0.0-r1.ebuild 1100 BLAKE2B cf62899ba1af8904780a9c8189425fb01262772d399f6ad0392e9eb7cd93debd2e6e08efda58cda604b8f741789cf135a56e41a5b4e3bf6e65b40ccb254ce0f8 SHA512 d6f894b90ef4638bf66ebb9e19b0c65bc8fbbd40b08973cb5e524f7828b6b02b4d02f787c390a9555b14f44725a12311410ee5be027c3c61aaea89ee3a24f9c9
+EBUILD libmp4v2-2.0.0-r2.ebuild 1321 BLAKE2B 55189e2e94ab83ac8de0057031569bd2246e753189f039a900c6b4abb74c157c5254b18e1c8d37b56f7317b12500c1bb29c77ecfb5f851a2ec262b0009e13ef3 SHA512 c48ec1fc00589aa99caa976a0497177bbeb3d094d43274f64e3b306324ad0ee9bd76aa687fba0175dfa10b7b3239efcf8896c17fca38de4f46fc5db9b9aa51c1
 MISC metadata.xml 402 BLAKE2B ed37dabc480f00cf0f23df37f1e1f9203d81415f9c030f307f1265f9550f5e6a2466de8387b0f16eb7c40dd6e3705bff031df7b264594a7319751ba83c1c7d6b SHA512 63643195e04ecdb3a79a862991760894a4fc52aa073ee1aba1efba4babdd926002fe271d04f82e4e40dbf4cad2fa77fd7853620fe11badb14cc83d27c342ad70
diff --git a/media-libs/libmp4v2/files/libmp4v2-2.0.0-CVE-2018-14054.patch b/media-libs/libmp4v2/files/libmp4v2-2.0.0-CVE-2018-14054.patch
new file mode 100644
index 000000000000..3ff3e731b93c
--- /dev/null
+++ b/media-libs/libmp4v2/files/libmp4v2-2.0.0-CVE-2018-14054.patch
@@ -0,0 +1,35 @@
+Upstream: https://github.com/sergiomb2/libmp4v2/commit/3410bc66fb91f46325ab1d008b6a421dd8240949
+Gentoo Bug: https://bugs.gentoo.org/661582
+
+From 3410bc66fb91f46325ab1d008b6a421dd8240949 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
+Date: Sat, 2 Nov 2019 04:21:17 +0000
+Subject: [PATCH] Null out pointer after free to prevent double free
+
+If an exception occurs (because of a crafted MP4) before the value is reassigned, then a double free can occur.  By setting the pointer to NULL after the first free, we prevent the double free in this case.
+Addresses: https://nvd.nist.gov/vuln/detail/CVE-2018-14054
+
+copied form https://github.com/TechSmith/mp4v2/commit/f09cceeee5bd7f783fd31f10e8b3c440ccf4c743
+From: Dave O'Rourke
+Date: Wed, 20 Mar 2019 08:57:29 -0400
+---
+ src/mp4property.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/mp4property.cpp b/src/mp4property.cpp
+index 9a5b1e3..1b8e1d2 100644
+--- a/src/mp4property.cpp
++++ b/src/mp4property.cpp
+@@ -391,8 +391,10 @@ void MP4StringProperty::Read( MP4File& file, uint32_t index )
+         char*& value = m_values[i];
+ 
+         // Generally a default atom setting, e.g. see atom_avc1.cpp, "JVT/AVC Coding"; we'll leak this string if
+-        // we don't free.  Note that MP4Free checks for null.
+-        MP4Free(value); 
++        // we don't free.  Note that this code checks for null before calling free and sets the pointer to null
++        // after freeing it, to prevent a double free in case an exception occurs before the value is reassigned.
++        MP4Free( value );
++        value = NULL;
+ 
+         if( m_useCountedFormat ) {
+             value = file.ReadCountedString( (m_useUnicode ? 2 : 1), m_useExpandedCount, m_fixedLength );
diff --git a/media-libs/libmp4v2/files/libmp4v2-2.0.0-CVE-2018-14325.patch b/media-libs/libmp4v2/files/libmp4v2-2.0.0-CVE-2018-14325.patch
new file mode 100644
index 000000000000..eb23926bb49d
--- /dev/null
+++ b/media-libs/libmp4v2/files/libmp4v2-2.0.0-CVE-2018-14325.patch
@@ -0,0 +1,60 @@
+Upstream: https://github.com/sergiomb2/libmp4v2/commit/9084868fd9f86bee118001c23171e832f15009f4
+Gentoo Bug: https://bugs.gentoo.org/661582
+
+
+From 9084868fd9f86bee118001c23171e832f15009f4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
+Date: Fri, 8 Nov 2019 02:01:32 +0000
+Subject: [PATCH] Fix v3 Integer underflow/overflow in MP4v2 2.0.0
+
+Reference: https://www.openwall.com/lists/oss-security/2018/07/16/1
+
+For the overflow, we could check the result of the integer multiplication:
+
+fix vulnerability where an atom list size is enormous
+and calculating the number of bytes needed to hold the list overflows
+https://github.com/TechSmith/mp4v2/pull/27/commits/70d823ccd8e2d7d0ed9e62fb7e8983d21e6acbeb
+
+Addresses https://nvd.nist.gov/vuln/detail/CVE-2018-14326 and https://nvd.nist.gov/vuln/detail/CVE-2018-14446
+
+For the underflow, we could check if `dataSize >= hdrSize` satisfies:
+Throw exception when invalid atom size would cause integer underflow
+The calculation `hdrSize - dataSize` can underflow the 64-bit unsigned int dataSize type, which can lead to incorrect results.  We throw an exception to stop the code from going any further.
+
+Addresses https://nvd.nist.gov/vuln/detail/CVE-2018-14325
+Based on https://github.com/TechSmith/mp4v2/commit/e475013c6ef78093055a02b0d035eda0f9f01451
+---
+ src/mp4array.h  | 2 ++
+ src/mp4atom.cpp | 6 ++++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/src/mp4array.h b/src/mp4array.h
+index c49d59b..69d470a 100644
+--- a/src/mp4array.h
++++ b/src/mp4array.h
+@@ -102,6 +102,8 @@ class MP4Array {
+         void Resize(MP4ArrayIndex newSize) { \
+             m_numElements = newSize; \
+             m_maxNumElements = newSize; \
++            if ( (uint64_t) m_maxNumElements * sizeof(type) > 0xFFFFFFFF ) \
++               throw new PlatformException("requested array size exceeds 4GB", ERANGE, __FILE__, __LINE__, __FUNCTION__); /* prevent overflow */ \
+             m_elements = (type*)MP4Realloc(m_elements, \
+                 m_maxNumElements * sizeof(type)); \
+         } \
+diff --git a/src/mp4atom.cpp b/src/mp4atom.cpp
+index 7a0a53f..f5d5dc0 100644
+--- a/src/mp4atom.cpp
++++ b/src/mp4atom.cpp
+@@ -143,6 +143,12 @@ MP4Atom* MP4Atom::ReadAtom(MP4File& file, MP4Atom* pParentAtom)
+         dataSize = file.GetSize() - pos;
+     }
+ 
++    if(dataSize < hdrSize) {
++        ostringstream oss;
++        oss << "Invalid atom size in '" << type << "' atom, dataSize = " << dataSize << " cannot be less than hdrSize = " << static_cast<unsigned>( hdrSize );
++        log.errorf( "%s: \"%s\": %s", __FUNCTION__, file.GetFilename().c_str(), oss.str().c_str() );
++        throw new Exception( oss.str().c_str(), __FILE__, __LINE__, __FUNCTION__ );
++    }
+     dataSize -= hdrSize;
+ 
+     log.verbose1f("\"%s\": type = \"%s\" data-size = %" PRIu64 " (0x%" PRIx64 ") hdr %u",
diff --git a/media-libs/libmp4v2/files/libmp4v2-2.0.0-CVE-2018-14379.patch b/media-libs/libmp4v2/files/libmp4v2-2.0.0-CVE-2018-14379.patch
new file mode 100644
index 000000000000..487dc709af39
--- /dev/null
+++ b/media-libs/libmp4v2/files/libmp4v2-2.0.0-CVE-2018-14379.patch
@@ -0,0 +1,33 @@
+Upstream: https://github.com/sergiomb2/libmp4v2/commit/bb920de948c85e3db4a52292ac7250a50e3bfc86
+Gentoo Bug: https://bugs.gentoo.org/661582
+
+From bb920de948c85e3db4a52292ac7250a50e3bfc86 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
+Date: Sat, 2 Nov 2019 04:19:27 +0000
+Subject: [PATCH] Fix v2 Type confusion in MP4v2 2.0.0
+
+The bug is caused by the wrong assumption that the child of an `ilst`
+can never be an `ilst`. So we could fix it by simply adding an ASSERT.
+
+Reference: https://www.openwall.com/lists/oss-security/2018/07/17/1
+Addresses: https://nvd.nist.gov/vuln/detail/CVE-2018-14379
+---
+ src/mp4atom.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/mp4atom.cpp b/src/mp4atom.cpp
+index 520cbc8..7a0a53f 100644
+--- a/src/mp4atom.cpp
++++ b/src/mp4atom.cpp
+@@ -778,8 +778,10 @@ MP4Atom::factory( MP4File &file, MP4Atom* parent, const char* type )
+         const char* const ptype = parent->GetType();
+ 
+         if( descendsFrom( parent, "ilst" )) {
+-            if( ATOMID( ptype ) == ATOMID( "ilst" ))
++            if( ATOMID( ptype ) == ATOMID( "ilst" )) {
++                ASSERT(ATOMID( type ) != ATOMID( "ilst" ));
+                 return new MP4ItemAtom( file, type );
++            }
+ 
+             if( ATOMID( type ) == ATOMID( "data" ))
+                 return new MP4DataAtom(file);
diff --git a/media-libs/libmp4v2/files/libmp4v2-2.0.0-CVE-2018-14403.patch b/media-libs/libmp4v2/files/libmp4v2-2.0.0-CVE-2018-14403.patch
new file mode 100644
index 000000000000..e7bea4e1dee1
--- /dev/null
+++ b/media-libs/libmp4v2/files/libmp4v2-2.0.0-CVE-2018-14403.patch
@@ -0,0 +1,28 @@
+Upstream: https://github.com/sergiomb2/libmp4v2/commit/a94a3372c6ef66a2276cc6cd92f7ec07a9c8bb6b
+Gentoo Bug: https://bugs.gentoo.org/661582
+
+From a94a3372c6ef66a2276cc6cd92f7ec07a9c8bb6b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
+Date: Wed, 17 Oct 2018 16:13:06 +0100
+Subject: [PATCH] Fix Out-of-bounds memory access in MP4v2 2.0.0
+
+The bug can be fixed by more checks when doing type comparison.
+Reference: https://www.openwall.com/lists/oss-security/2018/07/18/3
+
+Addresses https://nvd.nist.gov/vuln/detail/CVE-2018-14403
+---
+ src/mp4util.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/mp4util.cpp b/src/mp4util.cpp
+index 47bd74e..696dab4 100644
+--- a/src/mp4util.cpp
++++ b/src/mp4util.cpp
+@@ -46,6 +46,7 @@ bool MP4NameFirstMatches(const char* s1, const char* s2)
+         s1++;
+         s2++;
+     }
++    if(*s2 != '[' && *s2 != '.' && *s2 != '\0') return false;
+     return true;
+ }
+ 
diff --git a/media-libs/libmp4v2/files/libmp4v2-2.0.0-unsigned-int-cast.patch b/media-libs/libmp4v2/files/libmp4v2-2.0.0-unsigned-int-cast.patch
new file mode 100644
index 000000000000..25830bc596be
--- /dev/null
+++ b/media-libs/libmp4v2/files/libmp4v2-2.0.0-unsigned-int-cast.patch
@@ -0,0 +1,96 @@
+From a5ca35b044bbf13c0b16f0066bf24646604bb218 Mon Sep 17 00:00:00 2001
+From: "Jason A. Donenfeld" <Jason@zx2c4.com>
+Date: Thu, 6 Aug 2020 15:22:04 +0200
+Subject: [PATCH] Static cast to unsigned int for cases
+
+Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
+---
+ libutil/Utility.cpp  | 2 +-
+ util/mp4art.cpp      | 2 +-
+ util/mp4chaps.cpp    | 2 +-
+ util/mp4file.cpp     | 2 +-
+ util/mp4subtitle.cpp | 2 +-
+ util/mp4track.cpp    | 2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/libutil/Utility.cpp b/libutil/Utility.cpp
+index 76cdd12..d6739d4 100644
+--- a/libutil/Utility.cpp
++++ b/libutil/Utility.cpp
+@@ -493,7 +493,7 @@ Utility::process_impl()
+         if( codes.find( code ) == codes.end() )
+             continue;
+ 
+-        switch( code ) {
++        switch( static_cast<unsigned int>( code ) ) {
+             case 'z':
+                 _optimize = true;
+                 break;
+diff --git a/util/mp4art.cpp b/util/mp4art.cpp
+index add935e..6e7f531 100644
+--- a/util/mp4art.cpp
++++ b/util/mp4art.cpp
+@@ -376,7 +376,7 @@ ArtUtility::utility_option( int code, bool& handled )
+ {
+     handled = true;
+ 
+-    switch( code ) {
++    switch( static_cast<unsigned int> ( code ) ) {
+         case LC_ART_ANY:
+             _artFilter = numeric_limits<uint32_t>::max();
+             break;
+diff --git a/util/mp4chaps.cpp b/util/mp4chaps.cpp
+index 98400f8..ccc8b70 100644
+--- a/util/mp4chaps.cpp
++++ b/util/mp4chaps.cpp
+@@ -632,7 +632,7 @@ ChapterUtility::utility_option( int code, bool& handled )
+ {
+     handled = true;
+ 
+-    switch( code ) {
++    switch( static_cast<unsigned int> ( code ) ) {
+         case 'A':
+         case LC_CHPT_ANY:
+             _ChapterType = MP4ChapterTypeAny;
+diff --git a/util/mp4file.cpp b/util/mp4file.cpp
+index c27844b..b127cd1 100644
+--- a/util/mp4file.cpp
++++ b/util/mp4file.cpp
+@@ -189,7 +189,7 @@ FileUtility::utility_option( int code, bool& handled )
+ {
+     handled = true;
+ 
+-    switch( code ) {
++    switch( static_cast<unsigned int>( code ) ) {
+         case LC_LIST:
+             _action = &FileUtility::actionList;
+             break;
+diff --git a/util/mp4subtitle.cpp b/util/mp4subtitle.cpp
+index 7462153..19d977d 100644
+--- a/util/mp4subtitle.cpp
++++ b/util/mp4subtitle.cpp
+@@ -164,7 +164,7 @@ SubtitleUtility::utility_option( int code, bool& handled )
+ {
+     handled = true;
+ 
+-    switch( code ) {
++    switch( static_cast<unsigned int>( code ) ) {
+         case LC_LIST:
+             _action = &SubtitleUtility::actionList;
+             break;
+diff --git a/util/mp4track.cpp b/util/mp4track.cpp
+index d550506..cd63d7e 100644
+--- a/util/mp4track.cpp
++++ b/util/mp4track.cpp
+@@ -788,7 +788,7 @@ TrackUtility::utility_option( int code, bool& handled )
+ {
+     handled = true;
+ 
+-    switch( code ) {
++    switch( static_cast<unsigned int>( code ) ) {
+         case LC_TRACK_WILDCARD:
+             _trackMode = TM_WILDCARD;
+             break;
+-- 
+2.28.0
+
diff --git a/media-libs/libmp4v2/libmp4v2-2.0.0-r2.ebuild b/media-libs/libmp4v2/libmp4v2-2.0.0-r2.ebuild
new file mode 100644
index 000000000000..aff5b31e231a
--- /dev/null
+++ b/media-libs/libmp4v2/libmp4v2-2.0.0-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=${P/lib}
+
+inherit libtool
+
+DESCRIPTION="Functions for accessing ISO-IEC:14496-1:2001 MPEG-4 standard"
+HOMEPAGE="https://code.google.com/p/mp4v2/"
+SRC_URI="https://mp4v2.googlecode.com/files/${MY_P}.tar.bz2"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="static-libs utils"
+# Tests need DejaGnu but are non-existent (just an empty framework)
+RESTRICT="test"
+
+BDEPEND="utils? ( sys-apps/help2man )"
+
+DOCS=( doc/{Authors,BuildSource,Documentation,ReleaseNotes,ToolGuide}.txt README )
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc7.patch"
+	"${FILESDIR}/${P}-mp4tags-corruption.patch"
+	"${FILESDIR}/${P}-clang.patch"
+	"${FILESDIR}/${P}-CVE-2018-14054.patch"
+	"${FILESDIR}/${P}-CVE-2018-14325.patch"
+	"${FILESDIR}/${P}-CVE-2018-14379.patch"
+	"${FILESDIR}/${P}-CVE-2018-14403.patch"
+	"${FILESDIR}/${P}-unsigned-int-cast.patch"
+)
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--disable-gch \
+		$(use_enable utils util) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libmpdclient/Manifest b/media-libs/libmpdclient/Manifest
index ff9f9759d0a8..2c4ab33cbdd9 100644
--- a/media-libs/libmpdclient/Manifest
+++ b/media-libs/libmpdclient/Manifest
@@ -1,3 +1,5 @@
 DIST libmpdclient-2.16.tar.xz 60480 BLAKE2B ef7a077195b08f24304e08701a303a6709f71792112b096b0e1741f550f215352936f30e05f4afad29c0f7a5e4340e87de6d7fd8cfcd4c27f34eda91c7d21891 SHA512 520568f61cee447e48c04075d212c46e9640fd3f82604a5b9f4c6ded94eeb4a841e857e44e9f4edad12d93c1052692e7d32d3dbf505d4c0cde6cc217cff0cae5
+DIST libmpdclient-2.19.tar.xz 69144 BLAKE2B c045c4847d43f166a3e1549654784bd994fa4156e3ecebf7c02a412b34ca150940f3c43cdc385839cd7c281bd4ed4fd1935b757d8505133d146ea955ec2d0832 SHA512 5d67b95d4b615bc750641f6d5a0240122e8f59c66108838a96bd4bc5cdda8b15288ad03d0e35d92d6e562e67c600f68aad643ca541092121074952a1bc5b3590
 EBUILD libmpdclient-2.16.ebuild 1073 BLAKE2B 2628f658dfa8e8bab40607c73316f1da841e7ac294b5f73cf410ea83879931ae544392d5a22b6b8f7086f11d0579f7efa391744bbcf012d0e196cbdf79f11b63 SHA512 869028879f6dfc6305f0611765fbf9cec4920e940a776af84ca4713e3c6d6892e72ca5ca43ce2dd39067625df9d89e3e2a32837f480c9f53cf1f0a07e87aa7c0
+EBUILD libmpdclient-2.19.ebuild 1021 BLAKE2B 1b2913fa2d6957ecc7ab321d49fd7f319a8b674945a71a39619d7886f63a5b67a1776dc17b6656998f047672bfb90b1bf596d6c17e305b2dafb581190ab7fd03 SHA512 3ffb52402ed2466b9debe98296b92121c7c9049b2460e896f954a2425d9e63775fc3c6eea201e0491f75b9a2eed64cbb8759ad181c7b12bafeb181e1f89aeac7
 MISC metadata.xml 348 BLAKE2B 6c3a4f4924ca11d41c0c7fdcf062dbfd43f23f1181a83d4154a4a36a015999786962adb716f751e046127d37d2b88649b2ea9968330a85ae8f9307a96c7d9f96 SHA512 75efcb39f67cb2dfe31846b08e9daa02845a07006fe2002f43feabee680dcc57bd41a0fed3bbfe9e184892a5adad64efd3ed83931a91b924739355ec689f5b00
diff --git a/media-libs/libmpdclient/libmpdclient-2.19.ebuild b/media-libs/libmpdclient/libmpdclient-2.19.ebuild
new file mode 100644
index 000000000000..0a52798377ee
--- /dev/null
+++ b/media-libs/libmpdclient/libmpdclient-2.19.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Library for interfacing Music Player Daemon (media-sound/mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/libmpdclient"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+DEPEND="test? ( dev-libs/check )"
+
+src_prepare() {
+	default
+
+	sed -e "s:@top_srcdir@:.:" -i doc/doxygen.conf.in || die
+
+	# meson doesn't support setting docdir
+	sed -e "/^docdir =/s/meson.project_name()/'${PF}'/" \
+		-e "/^install_data(/s/'COPYING', //" \
+		-i meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddocumentation=$(usex doc true false)
+		-Dtest=$(usex test true false)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	use examples && dodoc src/example.c
+}
diff --git a/media-libs/libmypaint/Manifest b/media-libs/libmypaint/Manifest
index e7274184685c..e02cbe8979cd 100644
--- a/media-libs/libmypaint/Manifest
+++ b/media-libs/libmypaint/Manifest
@@ -3,6 +3,8 @@ AUX libmypaint-1.4.0-drop-libmypaint-gegl-versioning.patch 2841 BLAKE2B ae03c291
 AUX libmypaint-1.4.0-drop-python2-requirement-recommendation.patch 1052 BLAKE2B de6af484456b680f6bb5be82d5b2c2a8749bcb7373c2be7fddc39037f45ddc8664cd3291cb2794e96d54d99bd18e2b94e41bdaa5333dc4a121cdaffcf6651f54 SHA512 6a25e66188010955120055d98124e9dc30757e30826386a45e1d8ed1fb3b11d642c7c63fe8b755a3b047fe70a35a0691848573791581cd6a7298b69207e3b56c
 AUX libmypaint-1.4.0-gegl-0.4.14.patch 4198 BLAKE2B dad2b852ed3c8a68cba650993fa923491aecf31ff28784cd26f58486f62b1a66ee27c51320ba225489be66ad222389fabff819eaec1065e42f958bdd4f9b8a92 SHA512 100b0a6b3f2de32b6cee35924904e75a2c8c6ebd1483a8e02087945144ff078d6a570ebef8160c06194eb0965ebc78cd1d16232a85778414a8552926405bc783
 DIST libmypaint-1.4.0.tar.xz 441596 BLAKE2B d8c55f8dfedbb5cc07abe5c38c935abecf38f8e626b7fec83d7f7a29acdc722ededcd729f31e13e655242250f1d46cf44ca0473899b0de9510b062b123a711cb SHA512 c549a0b8f02976f7863c5ff49d5f16b5c3eae3e6e9e8803fef833edf78cc2a7413dd8dd751ed560c79d2527e0a54b462a92bb8059bcf69271654b2629f583c19
+DIST libmypaint-1.6.1.tar.xz 519464 BLAKE2B 6302914ab7e0876012e5235573c5cb3a76cbca9b5f0707321b0fc0a8406f712b9164ccb02ecc8a63b13d1e640a04cba8063c568bcbe40fc8543fc4a2c1576e5b SHA512 e9413fd6a5336791ab3228a5ad9e7f06871d075c7ded236942f896a205ba44ea901a945fdc97b8be357453a1505331b59e824fe67500fbcda0cc4f11f79af608
 EBUILD libmypaint-1.4.0-r1.ebuild 1709 BLAKE2B 646c5a4fdd64b7a736469cbd812e1fcb5bd90bc195ea8df24dacf191f46251a83e94bb0ed61e5617dffb4a8c73eb8b9d40c5483e1d9e78be7be8d8ae38f83692 SHA512 ee60210e9d56a4d861c14ee0515c70715e18e94f83cccd6f74993e78a64473bea4e9db42e0d99a77d4951368257852ae254edc325226d590303d9112273e0ad2
 EBUILD libmypaint-1.4.0.ebuild 1547 BLAKE2B 2c313f5538f415ccd0aed83030f1b99c735131fe912a8873196b4443175b24a4913706a6512e4c81687d8e8913beb669ff823b8ce5ca9748a5e3a2f1ed8ee712 SHA512 5e0ee94cca9d0fecff12c5fbfc3460a417ae4e7a0517d851e035c4fa8321c678ca4f6e52d9cc9b40dfbee9b027ae1884e5509a070cb7f908849da2aec81fb82a
+EBUILD libmypaint-1.6.1.ebuild 1421 BLAKE2B b0bd8294e8c218cb20555c6f427ea82128c2f44dc83446ba55482b54d85a9a33387870330cd0da1e9ded6722f9ce191678a1d80c81d5b9f4beb3869937655135 SHA512 277a446bf192f81078c1bbc0c01582e9f8abb93cc1fbf4596cd7c85033bb5be160e1ee13beb8298ca5d9108fc4966642dfb5f07f3881500f69154d54e6a31a53
 MISC metadata.xml 335 BLAKE2B 9147fdc98c832807587c5435133f971898c59c5adc5bb17a49a4632c5eb051d1e7e43d7fbefb15f80763771c58faef55e505b8441309c5676130c3e0dd18eee3 SHA512 fd20f4baaf0a494c651b433e3c7a0a75d82db0264ce4ba0d8e34f965f7389bbc5ad27e222b3dcaab307042338993a2761765f217c87d80a83f53a909caadfbdc
diff --git a/media-libs/libmypaint/libmypaint-1.6.1.ebuild b/media-libs/libmypaint/libmypaint-1.6.1.ebuild
new file mode 100644
index 000000000000..f091e98a2772
--- /dev/null
+++ b/media-libs/libmypaint/libmypaint-1.6.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit autotools python-any-r1 toolchain-funcs xdg-utils
+
+MY_PV=${PV/_beta/-beta.}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Library for making brushstrokes"
+HOMEPAGE="https://github.com/mypaint/libmypaint"
+SRC_URI="https://github.com/mypaint/libmypaint/releases/download/v${MY_PV}/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ISC"
+# See https://github.com/mypaint/libmypaint/releases/tag/v1.6.1
+# https://github.com/mypaint/libmypaint/compare/v1.6.0...v1.6.1
+SLOT="0/0.0.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="gegl introspection nls openmp"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	nls? ( dev-util/intltool )
+"
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/json-c:=
+	gegl? (
+		media-libs/babl
+		>=media-libs/gegl-0.4.14:0.4[introspection?]
+	)
+	introspection? ( >=dev-libs/gobject-introspection-1.32 )
+	openmp? ( >sys-devel/gcc-5:*[openmp] )
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	${DEPEND}
+	!<media-gfx/mypaint-1.2.1
+"
+
+src_configure() {
+	tc-ld-disable-gold # bug 589266
+	econf \
+			--disable-debug \
+			--disable-docs \
+			$(use_enable gegl) \
+			--disable-gperftools \
+			$(use_enable nls i18n) \
+			$(use_enable introspection) \
+			$(use_enable openmp) \
+			--disable-profiling
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/media-libs/libnsbmp/Manifest b/media-libs/libnsbmp/Manifest
index c801f44e80de..98efbd3cd7af 100644
--- a/media-libs/libnsbmp/Manifest
+++ b/media-libs/libnsbmp/Manifest
@@ -1,3 +1,3 @@
 DIST libnsbmp-0.1.6-src.tar.gz 463348 BLAKE2B 546f26c0ebbc2b93aec3002424c8e6d5aaeaa06f06fea13712675dd33c71b431c7f6d296c55a4d091cba7c9d5eaf053960b3d7e16e24b0832e42f8f4881f675d SHA512 7e987a47d56216b2e2a795c1233c63599d474fdd9dd495f31bc9a902f92072078ae79e73323da457fd5059908a65f44bacc6c8742f92f0950af80196a4bb4732
-EBUILD libnsbmp-0.1.6.ebuild 735 BLAKE2B 19635f1c6228c3abe3c2c9c67ef97abcf556bcf6d2812766c30310ab5962c99a4861cc48b98f85aa006296c2f733ce1dd27f93d1bfd9dcc1b60ed54cb53a69bd SHA512 b1e39c5b84baa1e37811f91eb5bb7d6450e5c168ad3b46acc5cdc740cd5f8dbe6dad57adf7a6e82bda593f91267033a4ed3a7d5c3c38e433f6c3f15427d80f6c
+EBUILD libnsbmp-0.1.6-r1.ebuild 670 BLAKE2B a83f57ebb3bf8499b04675dac740cb556f1b6ccee5304045b8a8858778d7ff3629dec3118db6f608afe7e01cf911021a22ccf3509290493855f8b7bd363c3ce2 SHA512 355339a4bf7146dda2c04452a24a72ea6e0a2372f2ef3d431cd54caf39981f62803646aef4a29e51c72ef27c9878d48a20adc03209e63527d1108e2ce0e9d5cb
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-libs/libnsbmp/libnsbmp-0.1.6.ebuild b/media-libs/libnsbmp/libnsbmp-0.1.6-r1.ebuild
index 099d99f052eb..81c8075d558d 100644
--- a/media-libs/libnsbmp/libnsbmp-0.1.6.ebuild
+++ b/media-libs/libnsbmp/libnsbmp-0.1.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit netsurf
 
 DESCRIPTION="decoding library for BMP and ICO image file formats, written in C"
 HOMEPAGE="http://www.netsurf-browser.org/projects/libnsbmp/"
@@ -19,7 +19,6 @@ BDEPEND="
 	virtual/pkgconfig"
 
 _emake() {
-	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
 	netsurf_define_makeconf
 	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
 }
diff --git a/media-libs/libnsgif/Manifest b/media-libs/libnsgif/Manifest
index 3a123eed4641..65a022279721 100644
--- a/media-libs/libnsgif/Manifest
+++ b/media-libs/libnsgif/Manifest
@@ -1,4 +1,4 @@
 DIST libnsgif-0.2.1-src.tar.gz 268328 BLAKE2B ccebd1830db1caa016ebc0c1f2c421523963df16e38cdf85c5300d2a9a325dc9c52c89c79ccbddbc315535a20607458bbfedcde8df02b5e2977d383cd6603220 SHA512 29affce6de38574103a9777e741a44b448145d96ef63e4b86056f268c5d1389f6c5f25240a9f3ef2208fab229eabef2542f3d7ce7b37a0137071f204fbd736af
 EBUILD libnsgif-0.2.1-r1.ebuild 883 BLAKE2B 3cb9521d197a236c202e156bb9ba595589f57532c3ed4e0ed2f18ab3e85a5eb5c1aaf884c2eb71684695b871730eadb8a4f5c781ad392ce84adce33a9031d038 SHA512 a50a9179fdc4811f4b97431ebf5e3d76bff815612f07934abd4810d8c3609b2f735821b1d5a3e7db481176cf3019cbe2d20d1471468467d777490c24f43c8a17
-EBUILD libnsgif-0.2.1-r2.ebuild 886 BLAKE2B bfb2a1a99c4b13a2c67fac3ac2497252a9ff9b0d8c03b50e282031a46b3a4220f735bb63a3d0422a318008ebfe49ce84f0fb6cc14ed4d442c19d203bcac5a79f SHA512 d704b5d385e7cf25b1d0078d8aa426b933abe696e4c2b78ae271b7fcf3d7997ece92ba0e2bd0c1172b51b1eb0d9c5e6ded14bd18ffdfa2567cea6805c6e18b37
+EBUILD libnsgif-0.2.1-r3.ebuild 821 BLAKE2B cd2120c7114771e70c1595d52b0408f6e64113511efc2cb6a8bdc774322c8ee3c4c140e5c150c1adfca85cf8d3e817e3e221816a82990de191ce90b3b5173df9 SHA512 aab128848e18e193974b1e74b1520c3acf3d6324289ca97bca299ff50589f99bde289db4b55b8d6f637ebfef01adc5aeacb7663421a9f6add1564bddaab98e9c
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-libs/libnsgif/libnsgif-0.2.1-r2.ebuild b/media-libs/libnsgif/libnsgif-0.2.1-r3.ebuild
index a2572cad5ac3..8478ddc00902 100644
--- a/media-libs/libnsgif/libnsgif-0.2.1-r2.ebuild
+++ b/media-libs/libnsgif/libnsgif-0.2.1-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit netsurf
 
 DESCRIPTION="decoding library for the GIF image file format, written in C"
 HOMEPAGE="https://www.netsurf-browser.org/projects/libnsgif/"
@@ -26,7 +26,6 @@ src_prepare() {
 }
 
 _emake() {
-	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
 	netsurf_define_makeconf
 	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
 }
diff --git a/media-libs/libnspsl/Manifest b/media-libs/libnspsl/Manifest
index ce66c2fe477c..e10584463ae2 100644
--- a/media-libs/libnspsl/Manifest
+++ b/media-libs/libnspsl/Manifest
@@ -1,7 +1,7 @@
 DIST libnspsl-0.1.3-src.tar.gz 311065 BLAKE2B ef846482c677e98a9eae646597e893f4e94161a60482127a88440a3786d2f9e3c4458a823ac878c64bc7d1b00080653facc28f408d2a44b571835958966297af SHA512 da4069dee152d126d53e442c8ced1438707db1ccee779bd2abe752a8d1dc30e40036037674e220bb24adad49fe406633e0d07e5d29d209b9fb223107c0e89415
 DIST libnspsl-0.1.5-src.tar.gz 316104 BLAKE2B e20d2ef94758943b848b6785bf462d5bab706c8396b10e22d3fa6d3718a78ee26aa1bb361e084dc28fcec3cc7498ed5774eea5fc086ca620c3c135e101a71300 SHA512 a46cc8eda6f22936e8d2477b16c094b1e7f9668071823aaf07d2a3c6cc0af645ea4d4cb3ae9fdafcc8dd77602bed736a8ae82f588ba7d56f5c774736da7e1baa
 DIST libnspsl-0.1.6-src.tar.gz 320130 BLAKE2B 8485054d1431f57ff71440120fd28610d62687527927dcc2f3bf7869075e08c05d2583567a90a28a2690aa78721c81949019cc353b570def1aa47e37bbbaa437 SHA512 928ce45bbc75215db5f1238a1cc879b3e91511950fc870c0232d84b1270882ec8c6470ce1a8d5cfbe7b6f24bf9e25745f2053ad2f1f4933f3d648d67d3ba2754
-EBUILD libnspsl-0.1.3-r1.ebuild 726 BLAKE2B d476ae693c24bd71b289cf13e5494850b24b35c6ee1e206b1b2eaf6525f4fab352fc8cc8edcd2d62d1a6c5903879761751dc8b84e109949f72d3fd8d026cde43 SHA512 eaa00f9e818a32a56c31f48232ebfb9d2b1a6bd9657fe4d2fcbd1a8d913663bfd4121c94b2cacf2de099470ddf08114d4743edb2b5ce382392275472b036a270
-EBUILD libnspsl-0.1.5.ebuild 727 BLAKE2B 88c017e94018428786e302321a864cc5ae1cb02080dfd297d36ab4145de976e0d536c8ebc0b3d0094ea24792791694c59a8c5a3303f99f203354cb676c83cbd9 SHA512 fc4237d96028eebf1d80254c57a319ec23bc74fd6111c21640df0e07a773182dc38232e891d48a6e447d452bbd35556c1793eabea7bd636d4144ac66df7bfb20
-EBUILD libnspsl-0.1.6.ebuild 702 BLAKE2B cd926de85f162e1f3e5fbb4bd4c8f1f18adc288b427e3a45e277770d6a4e99b887e4506e8bd1852ea735548a053638714e7b057da86645f0cc4bac313e3fba73 SHA512 27efb4329cdf769bc847fd1ce680845ce1e53c1762b5bde84f135aebbfdbddebba803da2d89bdac6c77206439c722cb7fde443a6213b8807b7b8495804c8d2ad
+EBUILD libnspsl-0.1.3-r2.ebuild 660 BLAKE2B 1c61886e5bfd90cb9eddccbe6a283f498da984330b3a4aad26e86ccc0115ffeb2d6293aafb940a6e4cdc6784261bd604d2427a1b3153140227b941eda7f48b33 SHA512 1c7378c13da02fdc15e202ae6bde0e3bcef55fe6dcd1914380daf74c6a5fd3d1974957588aae82100ca83ed0d2db5832e3aab40ddfbe9daccc89463996b112ea
+EBUILD libnspsl-0.1.5-r1.ebuild 661 BLAKE2B d25718b28467c756d00dc011204af06cf614018a4039d90ef277cc3c3d33e2890ea14a5eb5a3482027f3cbbf2caa2170dc418eafbd01820aecb6efd06640fda8 SHA512 5119a462a08efb130423b14cbac976fa87fa9da403467d9581c609a96f1f91242fe86673c1de5e4ec1552a59cfaf389ba8c2404cb7a7f1f4e0b7209a94a9de76
+EBUILD libnspsl-0.1.6-r1.ebuild 637 BLAKE2B a7da2993a5d76c99f7dc143f9160cd234ef88b6d0f743bfb4034a78f59e335d91d5b064b6d27e03b77ac02d72308cb3eb2988b4553bacabe4890a563b77269aa SHA512 0513d7610641efc165fcc7e8c48ee78068fddc04d0f376f21df65aae00389ef653717d02ddcaea0ba6a639eaa9d2454995a9a70495a18c3aca87afa5c1d9a01a
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-libs/libnspsl/libnspsl-0.1.3-r1.ebuild b/media-libs/libnspsl/libnspsl-0.1.3-r2.ebuild
index ce2346f93d91..2d2bcaa165a1 100644
--- a/media-libs/libnspsl/libnspsl-0.1.3-r1.ebuild
+++ b/media-libs/libnspsl/libnspsl-0.1.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit netsurf
 
 DESCRIPTION="decoding library for BMP and ICO image file formats, written in C"
 HOMEPAGE="http://www.netsurf-browser.org/projects/"
@@ -19,7 +19,6 @@ DEPEND="
 	virtual/pkgconfig"
 
 _emake() {
-	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
 	netsurf_define_makeconf
 	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
 }
@@ -29,5 +28,5 @@ src_compile() {
 }
 
 src_install() {
-	_emake DESTDIR="${ED}" install
+	_emake DESTDIR="${D}" install
 }
diff --git a/media-libs/libnspsl/libnspsl-0.1.5.ebuild b/media-libs/libnspsl/libnspsl-0.1.5-r1.ebuild
index c7c011b72c72..01b50983133a 100644
--- a/media-libs/libnspsl/libnspsl-0.1.5.ebuild
+++ b/media-libs/libnspsl/libnspsl-0.1.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit netsurf
 
 DESCRIPTION="decoding library for BMP and ICO image file formats, written in C"
 HOMEPAGE="http://www.netsurf-browser.org/projects/"
@@ -19,7 +19,6 @@ BDEPEND="
 	virtual/pkgconfig"
 
 _emake() {
-	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
 	netsurf_define_makeconf
 	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
 }
@@ -29,5 +28,5 @@ src_compile() {
 }
 
 src_install() {
-	_emake DESTDIR="${ED}" install
+	_emake DESTDIR="${D}" install
 }
diff --git a/media-libs/libnspsl/libnspsl-0.1.6.ebuild b/media-libs/libnspsl/libnspsl-0.1.6-r1.ebuild
index aa9ede7b9c22..c6381ffa9d9b 100644
--- a/media-libs/libnspsl/libnspsl-0.1.6.ebuild
+++ b/media-libs/libnspsl/libnspsl-0.1.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit netsurf
 
 DESCRIPTION="C library for decoding BMP and ICO images"
 HOMEPAGE="http://www.netsurf-browser.org/projects/"
@@ -19,7 +19,6 @@ BDEPEND="
 	virtual/pkgconfig"
 
 _emake() {
-	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
 	netsurf_define_makeconf
 	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
 }
diff --git a/media-libs/libopenmpt/Manifest b/media-libs/libopenmpt/Manifest
index 35be7dfe2aca..bd3e759ace1d 100644
--- a/media-libs/libopenmpt/Manifest
+++ b/media-libs/libopenmpt/Manifest
@@ -1,3 +1,3 @@
-DIST libopenmpt-0.5.0+release.autotools.tar.gz 1463179 BLAKE2B 666862b67cd5c57877af0bde71960894ac109e57bb53bc0aac953b769823e73e4ac78766d6c8d1f039decc9df271d48ebb0e941913b198e27e6285d264c41825 SHA512 1b62e67deb1541eeeba91b87c393b0bb8a5412e2f4718bad341f14167238bbea0084de9a7c20e5bdd9621ecf5ed78b08924b41526c7148435c0ee5ba31ca9d82
-EBUILD libopenmpt-0.5.0.ebuild 1536 BLAKE2B 2f59ecb70c771eed92cd902cd663a8ffd0449e8d4f9b28a22d26a2073d54abfa825500f3a46f581ec9ba85667f75c5a05c867197ecd6e321db4146ebf9b438c5 SHA512 0e30994bcbe5413137f0ee080162f1d57a0b69b0e110d27c4b8653c184737ab23ea548a85df5aae037e8f88cd92910c86c3b60cac167124d8ed2779e58b2ed84
+DIST libopenmpt-0.5.1+release.autotools.tar.gz 1465318 BLAKE2B 142aca3b946e5ee82fbba0f18360896baac5195412eb3f72f8f69a8ac99ba623e14ccf269bbca9cdbfba146520a14950e12fc7e427cbd930e7243512a10dbf18 SHA512 570787cfcf0b85ca10e753fe49b8a94ff69e1c881ffec5a1aee27a2bc1e142a62ae8cd79de5ab8cf4c7536688de13e9cb675b559a0aa755ad994a24010433a9f
+EBUILD libopenmpt-0.5.1.ebuild 1536 BLAKE2B 2f59ecb70c771eed92cd902cd663a8ffd0449e8d4f9b28a22d26a2073d54abfa825500f3a46f581ec9ba85667f75c5a05c867197ecd6e321db4146ebf9b438c5 SHA512 0e30994bcbe5413137f0ee080162f1d57a0b69b0e110d27c4b8653c184737ab23ea548a85df5aae037e8f88cd92910c86c3b60cac167124d8ed2779e58b2ed84
 MISC metadata.xml 327 BLAKE2B 586d07f006d87d8e0dc4c0be387cdbe4fadaabad3d9fb985f9d6c8afe77ca9686773c2eed48defbe85da365f0256efa3337f32a9e913d61fb8a48781236ce185 SHA512 52b1f22ca0b08f9d6201ec44718875f6c3b4de31703f55ebc22a516e574eeeba7ac8d0d06425e624b258b4658d0d164d1a1b7b44b2e049e151fcb390cfbeb297
diff --git a/media-libs/libopenmpt/libopenmpt-0.5.0.ebuild b/media-libs/libopenmpt/libopenmpt-0.5.1.ebuild
index cfb89e4fb8bc..cfb89e4fb8bc 100644
--- a/media-libs/libopenmpt/libopenmpt-0.5.0.ebuild
+++ b/media-libs/libopenmpt/libopenmpt-0.5.1.ebuild
diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index 6c8704a322cb..dddc20d3fc3c 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -1,10 +1,6 @@
 AUX libplacebo-2.43.0-vulkan-headers-1.2.140-compatibility.patch 2047 BLAKE2B aa2ca755fb95c9a7d3f55992507ce62340897ad9419a875fac31c8e392b9eab1f896dc8feedef96e804f0c938fede16d78a31517ccf5599efbdcb6d6af2773a6 SHA512 d7bfdb158c9f4e263d1937cb400417174a996a3f116231531d8f8c9266a57adf24ca86fd5ebeebb534c9985e89618fc11ddfcf8a9621729eb741a3bbd74212e6
-DIST libplacebo-v1.21.0.tar.gz 326918 BLAKE2B fe9500de23487d7d5dfc51d9f94dd3d33d22bdac3005fc3334814c53a76a46cebd40655675b5172f058d02dd865385a993b3c52a863b9e9b32ac0bc4801e0126 SHA512 5de95b8cc48ba4ec9bc3afb8c8f2c4fae0d53ce6e69ffb53884c3a3ee2580998bae46b8934e462740b6c9c2e66e3c5d5f009f9b0f8ad2cb7b4fba829891cf333
-DIST libplacebo-v1.29.1.tar.gz 330673 BLAKE2B 3094f167afb45097ef6e494d7f6f6d61b7ee4ed00bab9f1d33bfd27b032020489eb43005a30a44934416dc52577eb7fc66baf367fdfda71652e97214d87023df SHA512 9f09560832a88e670d6c31e9f5b9cbc03de437bfb19ceb0985140307b5cdf20e2050a1dab5d07f18258dfa3e5429a51f1d3d54532099be4bfc6a0dafe3ffd516
 DIST libplacebo-v2.43.0.tar.gz 356219 BLAKE2B b5f36dc4b7a0b35a47efc64064d0d7e9cf023dea2974fe355d29a6c835efa67b6f50ec500fa3ce50b932fef5d035a470f0adc8377cd274c5904fb4ffc303bb0c SHA512 c57463a9fcde1b259620fcb7ce6470b0d06e45ed837b4eca35ff0931e4c440ef613590485119ed21237f9cf3c3cdb617253f17699d9d252070f30d5dcbc233ab
 DIST libplacebo-v2.72.0.tar.gz 396124 BLAKE2B 8a9829add4cb8ffe94c0dc8e3c8f64e465992bb21aa8739086986b061e53fc2f0d00c5a512ad94f0b4998fe3e3bd784c0b8df3bef1ffc5ed92090a75c7e31ad7 SHA512 829d8805f8a52e082bf7c33f5be8a280480aa3cfbac73966cdf4ddaf0a01f25cc357b98a04fe85c82a53718b5d570a852edeafbb0cb12312c73cb23295fb9bd9
-EBUILD libplacebo-1.21.0-r1.ebuild 1323 BLAKE2B 6ecdd7d4492f64a25447be420154212b792ce79688c6551b6fc38eec39258d6946cd9701b4fa2ed032968619b876309375bccd52717b9ff7e3dc0730b7ad0319 SHA512 037369e0c9351435347946635cdd8aad4190bdd6faca193f98bc15a093099709105c8e469869bd2040aac3246adcb9c4eee1341f338ee24ab0dceaee44615a22
-EBUILD libplacebo-1.29.1.ebuild 1369 BLAKE2B 539cd7f857d41ae9e4881b9fd03136e08ff9cc0eea21891f49eb60f16637f42292bcccc7ccb60c1aa800d95467c56f3f8d74969423b44c3d810ee9c89ec65aa9 SHA512 717a952a19637c62d4f21585f47c675c545aec53a3579b209c4ecb5222bbdfd1c4c90b259a7f579cc82d1612aebd437dd744a62588b443456b543c16603a74ef
 EBUILD libplacebo-2.43.0.ebuild 1565 BLAKE2B a698e4b9206214bec581b84ae7b9b6d9415869ff34845f94e673a60e006bc3649389a1fccf092e5eb05318ba5e906af7a688bfc20836acbb1efcd3cb6633acee SHA512 9b35fe6eab88288b78789e78c53a6baeacd684e52010845d0194e4349ee126eaa8701aad7e7714bad051d287b586263efe4846f5ded0f156fc04db5c68af3eee
 EBUILD libplacebo-2.72.0.ebuild 1889 BLAKE2B 6d0724bad61f28633b24a61782774d889ee13f33d0e0942b17651defadb19a9af77a0c8f430e746574bdd38d7b2f107ae9869ec1f3001b5f8fd76fdcda7f70ca SHA512 07d8dc86c3df956a34901bcf0e24a1f4455b1781d1357d636b8e18bfcadd37e3210a97e20f1ff7defbba767192d1bc5e03af735cf753ebbe97102a575a15c326
 EBUILD libplacebo-9999.ebuild 1924 BLAKE2B 5ed7fea860e50f3b0d568518ab853aaa6fe58576f9a2cd53efd5dd36c5d0968b0c927df2894ec8c5b9aabdee77a218d7f9578cfce5b07f601fcbc88da3699812 SHA512 d4d065dabde0e25e18f63afaee3086727667c27de2a510fee1420dcf36608da78864e74a3f4df58eddb72c9bc47b9f1b8e8ff54809a31657ff14d368f38eb8a3
diff --git a/media-libs/libplacebo/libplacebo-1.21.0-r1.ebuild b/media-libs/libplacebo/libplacebo-1.21.0-r1.ebuild
deleted file mode 100644
index d646a388cae0..000000000000
--- a/media-libs/libplacebo/libplacebo-1.21.0-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
-	inherit git-r3
-else
-	KEYWORDS="amd64 x86"
-	SRC_URI="https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.gz"
-	S="${WORKDIR}/${PN}-v${PV}"
-fi
-
-inherit meson multilib-minimal
-
-DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
-HOMEPAGE="https://code.videolan.org/videolan/libplacebo"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="glslang lcms +shaderc test +vulkan"
-REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )"
-
-RDEPEND="glslang? ( dev-util/glslang[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] )
-	shaderc? ( >=media-libs/shaderc-2017.2[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-RESTRICT="!test? ( test )"
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_feature glslang)
-		$(meson_feature lcms)
-		$(meson_feature shaderc)
-		$(meson_feature vulkan)
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/media-libs/libplacebo/libplacebo-1.29.1.ebuild b/media-libs/libplacebo/libplacebo-1.29.1.ebuild
deleted file mode 100644
index 9dc0a873f27f..000000000000
--- a/media-libs/libplacebo/libplacebo-1.29.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-	SRC_URI="https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.gz"
-	S="${WORKDIR}/${PN}-v${PV}"
-fi
-
-inherit meson multilib-minimal
-
-DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
-HOMEPAGE="https://code.videolan.org/videolan/libplacebo"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/$(ver_cut 2)" # libplacebo.so version
-IUSE="glslang lcms +shaderc test +vulkan"
-REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )"
-
-RDEPEND="glslang? ( dev-util/glslang[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] )
-	shaderc? ( >=media-libs/shaderc-2017.2[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-RESTRICT="!test? ( test )"
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_feature glslang)
-		$(meson_feature lcms)
-		$(meson_feature shaderc)
-		$(meson_feature vulkan)
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest
index 258d9d92c1df..e796eaf0dd7b 100644
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -1,14 +1,9 @@
 AUX libprojectm-2.1.0-fix-c++14.patch 1505 BLAKE2B 102d3e8aa719fa42e92e81c5dd4fa0f7395672bd0b94fe83ac35d1961acc58f3aba0529d49c5579e8ad4c3661268dd7bdacdd1f5445d1d08cd894daca65b4156 SHA512 071070f2f8c890cccdba09bbe9cb1a68451ebdf30ae339263e322afbaccf974be41a0eabeab12e1432382bc94bff4df46a4f1e2c227c3de77577f5a8776aa3c6
 AUX libprojectm-2.1.0-multilib.patch 1245 BLAKE2B 83f75a317b225816b5649c95fdd04699938f08bfe2b9dbebe95f19abcd1e16c4f7f9619c44639586611f3c7b69784af92d2fbff02ab301503ca626ff9da0d7c0 SHA512 562e9616500a49b52e29d50d7c40b8db2b8eb36dbcf28c2b415975b0ce751d21d8ecc06747c3c810303078a2e83ee1c6ed438818d936ddd86efe94900d1a348d
 AUX libprojectm-2.1.0-path.patch 593 BLAKE2B b4f23ca265e02310e1f7e70ab012e2cdf911182a63108f51957641b02ca7ea782ce1bab506bc7e2df2ebb32a2291256e16d22e776a083ee7d185b4ddd7538fe6 SHA512 c2c7a26de1166dada74e7ee3c50da9548992eaf3e3d3881e637ccbef76649c99639f0e2d64e2db4622ce1beb90670504222de3576efc13c35527f9ef064b5bc3
-AUX libprojectm-3.1.3-bashisms.patch 1741 BLAKE2B 16cf0a172fd79ed442313ce27761540d71f2d45e611aea80f29a8638b5c6fe1dc0b04ca8322fbfba3b7f2d60b9d220b6d5ba7367ef60094d483f6a922ddcf336 SHA512 e5600dd34d48d476331b897c87f6c1c88cf5fe3ded8140bc225b95783795f57433d1e44efb61cc5c38dbb57927c9a309090296f09e00a3a2775f17059657eb89
-DIST libprojectm-3.1.1_rc8.tar.gz 54503673 BLAKE2B f7d781c6a0e54414d0a9ba5ab601556384e6af9b6a23a3123d3f3e0b1613549727b75901681beba1cd3fdd4193415d9e0bb927c4f7b69c41f4e4e85adb5f8597 SHA512 dcf2e7a0a826438bee538f052287b2057a303f5c29e77804874c9d5ea9f3cc0395a51f7734eec027a4f4e687c7b9f818bf908084c8b9da0953cd95d7fa12c864
-DIST libprojectm-3.1.2.tar.gz 54503159 BLAKE2B 5b520a6c1553e80de3fc8b0aedff12c50226252ae7a6d651dff910104244e2f0747fc43791b0524f46f8fa305688749fc4f508b76d04506aa17292f2c8789d1c SHA512 c7c8e61b6262324a7d4094f92796732f7c7bf9fdd82df3dc327efe82fd1d3d8277763059ba72e3fea70875952dd763998cd3b69ed64f594fbff8ae489110dfa2
-DIST libprojectm-3.1.3.tar.gz 54503797 BLAKE2B 2aa8900887201f00f85cbd2e4eb908d5825b95364a2df39cecd9ccdd63e677766bc45fc5280b4b773632b920b3331127be159d9e5e29304c3df4f049e49021c3 SHA512 c9910ec9dd3e6625df885a23cb72616723142974ee80cc40d108992e997342f7b8962c63d5a0512b793f425c7abb0477dbd5d641a70161d8e42f1489e08f402b
+DIST libprojectm-3.1.7.tar.gz 55475848 BLAKE2B c9a9e386d36433504724104e7fb899955095950a1686c6719a5f660bd53b000db6487141ee6b81171ffe5145aa524e3329e8d2aa83656177186ec784a820249b SHA512 410a3429b8f25a43a4ba6444579a4a866338b87844c555dc4b888d9e556448c864482a4bd8e825a7c23aa04b38a2516197d192e621ff570838ddc715e574dd61
 DIST projectM-complete-2.1.0-Source.tar.gz 31130351 BLAKE2B ec3540326751aba45b9620adfe1e7aed21347c97278de6d23b53ed7fb03878c2d02982fba17b4cda4f713d2cf624fd24adeb15b28fed9d2ab165567f9ff49eaa SHA512 53f4531208d2594f1c28a7f7842fb5ee3349ca9e48f9f0d999a90b6a62d315c9c0ae9cba1cdfacb8a149eba3e5ddc4517ac406ee2c53718191be8e26ee2cca5f
-EBUILD libprojectm-2.1.0-r2.ebuild 1469 BLAKE2B 61fc28b30b33e2efa6ee6cad2ba6da19193b1cff80ea981348cb4481cdf7eb6c783492d82ff0d99bce6891914cd71ff6f3c9513a3164bef454f7f45d7dcc3811 SHA512 b05e16995fe77d7ccedbeba67aee38dbae64c2a5f6effdb8f7d67b2bcc353393f2aeea6227e4c8df8753be84ec2b3d301595184a40b008dbe68461922b9f27a3
-EBUILD libprojectm-3.1.1_rc8-r1.ebuild 1211 BLAKE2B b32f57d7dcce5a3c32dd0cd4a6277bd427159b06ba8cd1068049856c97e8337a5d351e98486e1648931224b784c87bf6d06a3b5bece4a0916cb3b004014364b4 SHA512 8952925a4c9573f7b97b44a10b91c42872a7f5d9c2fc3a7f36bf4a8f9ed7cf80aaea453f88918e9f5c98471aa2f00e72b729ddbe1470478c94ca7b0897a14ca4
-EBUILD libprojectm-3.1.2.ebuild 1352 BLAKE2B 6edbdf10a3721fbd4a9aea76f4c7f5400ef0c422e26c61cbceae4c0f47930f9dd72f220932a569b54b251b1b059ca8c278e490d0fa3cee0f838ffd48c0ee6ef6 SHA512 321d2cfb92e76976aac1a5c96e7df2c9712f58a56017e06f218fbff44eddf4d531a6cbf3405f98966bbb2a663d081f52bdc52706f87058644aad94c1cada5504
-EBUILD libprojectm-3.1.3.ebuild 1400 BLAKE2B a1d8c7b7f9dc0a0c4e65ab3e31b1dff97f769d343e6f4074b24632bba4568f42e60f76ef11b77d5d93ef30b0c602cf83f9044f5cab8bba83f412c38c2e943277 SHA512 8dcec3005bd5f5f2f8b357afbc4da25a3e374b12b964019531b58ff2bcd96ded871a7fe8c69c97d7b0337a05536947b49890fd1d6df34bdc522d4553ccffc3d1
+EBUILD libprojectm-2.1.0-r2.ebuild 1462 BLAKE2B 02bd1446c7250f0313805c051814ea9114b881ab8cfa7b5ccde11c88c636826600660026935bdbf7a9a283c540c220080f98b28bce7f626ea21dce830723e73a SHA512 b82ecdef0da92c14e0993d099cad1741ff5f7d5407c2d31c275ce3a9664929001ed3099b554767ca49626a2e104bbb5c4ac90a68689f20f1e0e9e3f58b66c40c
+EBUILD libprojectm-3.1.7.ebuild 1359 BLAKE2B f68f5127f00e1f011c1be28b64c013ea655f2d0f8b47bd790b3a9878737a09098633902697f2c5a802c193157137f0c52fe89dbfde9860c80173ea4900c4aef8 SHA512 76da921f433287a3a46c14f8dd766239c084516f913768440bb465e1d6a3acb081cd469eade3127f6b7314875961cd28c5a822126cd1981f6eb3b460c41b6e12
 EBUILD libprojectm-9999.ebuild 1352 BLAKE2B 6edbdf10a3721fbd4a9aea76f4c7f5400ef0c422e26c61cbceae4c0f47930f9dd72f220932a569b54b251b1b059ca8c278e490d0fa3cee0f838ffd48c0ee6ef6 SHA512 321d2cfb92e76976aac1a5c96e7df2c9712f58a56017e06f218fbff44eddf4d531a6cbf3405f98966bbb2a663d081f52bdc52706f87058644aad94c1cada5504
 MISC metadata.xml 536 BLAKE2B 097c6a56c2e21ee9badc9f08053423f76341ade802b23ffc0ceb3c88c87daafbd5b8d614ffa7f2e4698211cc873412270ddc477ea58a33ffaed76b1f93012e00 SHA512 5f9fede51b40d834ba1078c410b1644f70c6b239b1ff8b1b343e13a0efe33f90464f9300ebe98c138bdf201014c6b6d22e90805efce2a80110007b00b99bdaa0
diff --git a/media-libs/libprojectm/files/libprojectm-3.1.3-bashisms.patch b/media-libs/libprojectm/files/libprojectm-3.1.3-bashisms.patch
deleted file mode 100644
index 8d84ece802cb..000000000000
--- a/media-libs/libprojectm/files/libprojectm-3.1.3-bashisms.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 8a522d975890a4512be0f04285f356c6db653a57 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Thu, 14 May 2020 11:46:50 +0200
-Subject: [PATCH] configure.ac: Avoid bashisms
-
-or else we end up like this:
-
-  ./configure: 18902: ./configure: Syntax error: redirection unexpected
-
-or
-
-  ./configure: 20152: ./configure: my_CFLAGS+=-DDATADIR_PATH=\""$(pkgdatadir)"\" : not found
-  ./configure: 20153: ./configure: my_CFLAGS+=-I$(top_srcdir)/vendor : not found
-
-Gentoo-bug: https://bugs.gentoo.org/714098
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- configure.ac | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5fa53eca5..ecf85e076 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -163,7 +163,7 @@ AC_PREFIX_DEFAULT([/usr/local])
- 
- AC_PROG_MKDIR_P
- 
--AS_IF([grep android <<< ${host}], [],
-+AS_IF([echo ${host} | grep -Fq android], [],
-   [AX_CHECK_COMPILE_FLAG([-stdlib=libc++], [
-                         CXXFLAGS="$CXXFLAGS -stdlib=libc++"])
- ])
-@@ -237,10 +237,10 @@ AM_CONDITIONAL([ENABLE_EMSCRIPTEN], [test "x$enable_emscripten" = "xyes"])
- AM_CONDITIONAL([ENABLE_PRESET_SUBDIRS], [test "x$enable_preset_subdirs" = "xyes"])
- 
- 
--my_CFLAGS="-Wall -Wchar-subscripts -Wformat-security -Wpointer-arith -Wshadow -Wsign-compare -Wtype-limits "
-+my_CFLAGS="-Wall -Wchar-subscripts -Wformat-security -Wpointer-arith -Wshadow -Wsign-compare -Wtype-limits"
- #my_CFLAGS+="-fsanitize=address -fno-omit-frame-pointer "
--my_CFLAGS+='-DDATADIR_PATH=\""$(pkgdatadir)"\" '
--my_CFLAGS+='-I$(top_srcdir)/vendor '
-+my_CFLAGS="${my_CFLAGS} -DDATADIR_PATH=\\\"\"\$(pkgdatadir)\\\"\""
-+my_CFLAGS="${my_CFLAGS} -I\$(top_srcdir)/vendor"
- AC_SUBST([my_CFLAGS])
- 
- 
diff --git a/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild b/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
index 9ae25fbd3aae..7795ea42bbf1 100644
--- a/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
+++ b/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/projectm/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 sparc x86"
 IUSE="debug openmp video_cards_nvidia"
 
 RDEPEND="media-fonts/dejavu
diff --git a/media-libs/libprojectm/libprojectm-3.1.1_rc8-r1.ebuild b/media-libs/libprojectm/libprojectm-3.1.1_rc8-r1.ebuild
deleted file mode 100644
index 39a52693e9db..000000000000
--- a/media-libs/libprojectm/libprojectm-3.1.1_rc8-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A graphical music visualization plugin similar to milkdrop"
-HOMEPAGE="https://github.com/projectM-visualizer/projectm"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/projectM-visualizer/projectm.git"
-	inherit git-r3
-else
-	MY_PV="${PV/_/-}"
-	SRC_URI="https://github.com/projectM-visualizer/projectm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-	S=${WORKDIR}/projectm-${MY_PV}/
-fi
-
-LICENSE="LGPL-2"
-SLOT="0/2"
-IUSE="gles2 qt5 sdl"
-
-RDEPEND="gles2? ( media-libs/mesa[gles2] )
-	media-libs/glm
-	media-libs/mesa[X(+)]
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtopengl:5
-		media-sound/pulseaudio
-	)
-	sdl? ( >=media-libs/libsdl2-2.0.5 )
-	sys-libs/zlib"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable gles2 gles)
-		$(use_enable qt5 qt)
-		$(use_enable sdl)
-		--enable-emscripten=no
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libprojectm/libprojectm-3.1.3.ebuild b/media-libs/libprojectm/libprojectm-3.1.3.ebuild
deleted file mode 100644
index 8a83145eb817..000000000000
--- a/media-libs/libprojectm/libprojectm-3.1.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A graphical music visualization plugin similar to milkdrop"
-HOMEPAGE="https://github.com/projectM-visualizer/projectm"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/projectM-visualizer/projectm.git"
-	inherit git-r3
-else
-	MY_PV="${PV/_/-}"
-	SRC_URI="https://github.com/projectM-visualizer/projectm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-	S=${WORKDIR}/projectm-${MY_PV}/
-fi
-
-LICENSE="LGPL-2"
-SLOT="0/2"
-IUSE="gles2 jack qt5 sdl"
-
-PATCHES=(
-	"${FILESDIR}/${P}-bashisms.patch"
-)
-
-RDEPEND="gles2? ( media-libs/mesa[gles2] )
-	media-libs/glm
-	media-libs/mesa[X(+)]
-	jack? (
-		dev-qt/qtcore:5
-		dev-qt/qtdeclarative:5
-		dev-qt/qtopengl:5
-		virtual/jack
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdeclarative:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtopengl:5
-		media-sound/pulseaudio
-	)
-	sdl? ( >=media-libs/libsdl2-2.0.5 )
-	sys-libs/zlib"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable gles2 gles)
-		$(use_enable jack)
-		$(use_enable qt5 qt)
-		$(use_enable sdl)
-		--enable-emscripten=no
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libprojectm/libprojectm-3.1.2.ebuild b/media-libs/libprojectm/libprojectm-3.1.7.ebuild
index 1dc01b435666..cd148676740c 100644
--- a/media-libs/libprojectm/libprojectm-3.1.2.ebuild
+++ b/media-libs/libprojectm/libprojectm-3.1.7.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	MY_PV="${PV/_/-}"
 	SRC_URI="https://github.com/projectM-visualizer/projectm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
 	S=${WORKDIR}/projectm-${MY_PV}/
 fi
 
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index 4d19961a11bd..54227ef1e0dc 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -1,7 +1,9 @@
 DIST LibRaw-0.19.3.tar.gz 1302745 BLAKE2B 3db3a07c5535a325c69d65ccc75e6a8c7d04e7b1c1d87506fd1c56a0d8f4a7c581467f6350922a4c62d4bc49372f31c86ae2a26a087c4ec11c3ab69763403a0b SHA512 e025695fb7f0016aeec76c0843a94387633457eee838cc48e65d1e84e703c8530b3fdd1e31d85dc322d3f2f6092b7c313fa6d1c3009fe1257c3d9411128b6fe2
 DIST LibRaw-0.19.4.tar.gz 1303047 BLAKE2B daa65c86ca81bee80ced5fcc3a048ef54cc5256b4b80bdda006a2b3d64c8c10436b906a238dd22c8623465288df5a86d65a4d6e2668ba5fc3ef3ad23c7e205d2 SHA512 e9f0b18b8be52119ff504d2645a011eca391a62bf651064dcbec4b6e16b3b09fda49e632453b051d3aae2ac3a8be021e5b71d7202913759ad1d61641d3318c4c
 DIST LibRaw-0.19.5.tar.gz 1303806 BLAKE2B 7ab6e30d88aa4aed2ed6825898f8de02f0d139eedec0756cd184822548a7aa69416f5f599542bb264a791f8b6284d6922a160063496f0e7b682333e847cc9b32 SHA512 4560045f75e6d2ab0d1d8686075f3a0e26a5d7ce693b48508110a2c31d19055d58983c24852da0abb64fa90db5e20f24b87aa7537ed04d958c38c8b265a7e826
+DIST LibRaw-0.20.0.tar.gz 1431412 BLAKE2B 455649b600926a6a53924e4cfea33143fdd8658804cc5c19f0bb6ff5bc4a0f73ce6e45385a0edd5c78e290c8a1e32a6e3cb5a2a4c53318c046b6c4c5e6476acf SHA512 98c1d61b01fd8d408297960f63ba56d23f170ca820db7cb2c2ad5f0c9494ce79d4d615d76a6835e046589e76031a553d6e1c692e7e3e66655bc96f4d4847d7ac
 EBUILD libraw-0.19.3.ebuild 1405 BLAKE2B 32da66b4f6550a70acb9229f0118ce592720e90a94a9d0a262a4e26a9c6f8fa29bb86625f4522e10839857d130a815bfd556becbe19ae83cdec80073712d9605 SHA512 98e4f79907e0edbe5d4052da27c24d08b95096c12f1f620a2618d20b066e903700ea1eba448e1aadb465dcc457656c0bb9a91e818c4f6a12a350571b44501d27
 EBUILD libraw-0.19.4.ebuild 1412 BLAKE2B 06bb6d87b38e4b45f5184bfe5a82beb34562d58d829933508cef9bab6a6434a4b13e3e81146ca2843368020df93ea0909e6f99d8fb0acddaec579dc81dbdfccc SHA512 29b2b405a6f22339afb37cbcd7eff2b99a3c1695873746a189553028d1ecbc20d399d3ef028e34043e7abb7279d949e44397fa17654e9838dabdec26119bbc99
 EBUILD libraw-0.19.5.ebuild 1412 BLAKE2B 06bb6d87b38e4b45f5184bfe5a82beb34562d58d829933508cef9bab6a6434a4b13e3e81146ca2843368020df93ea0909e6f99d8fb0acddaec579dc81dbdfccc SHA512 29b2b405a6f22339afb37cbcd7eff2b99a3c1695873746a189553028d1ecbc20d399d3ef028e34043e7abb7279d949e44397fa17654e9838dabdec26119bbc99
+EBUILD libraw-0.20.0.ebuild 1368 BLAKE2B 979877714fb974fe2709f07139130b77645c257b6e6bc89666c466d65a0a6a9ec12319ceb524079b949db64e60e678f14de6f13259702559225618bf8eb86359 SHA512 b41b27de05b7b4ca1565d5514fe8f488067879435dc68784b2e875525ad54431c9bac0c0489682c83a6d992e96ca367a34be4ce6b5097d4342b84c4fbd674416
 MISC metadata.xml 383 BLAKE2B 3e4195c6cba775cc80e977738b81f527ef45c4fdde631a9c0591b26500cbda7c09267e993d4a21b72b98ec681e1a80d7d99e3d6ce0e48d0d2870abbb1ae64add SHA512 710ff0b177c64460965225e90584cddbf3bc439aa5cc900bb5a3877207fd5ad8f275cca03330366357eff9e08b4effec9d29271e90fc1bdd7befac4eccf56c1b
diff --git a/media-libs/libraw/libraw-0.20.0.ebuild b/media-libs/libraw/libraw-0.20.0.ebuild
new file mode 100644
index 000000000000..16d3dcca644d
--- /dev/null
+++ b/media-libs/libraw/libraw-0.20.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal toolchain-funcs
+
+MY_PN=LibRaw
+MY_PV="${PV/_b/-B}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras"
+HOMEPAGE="https://www.libraw.org/ https://github.com/LibRaw/LibRaw"
+SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1 CDDL"
+SLOT="0/20"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples jpeg +lcms openmp"
+
+RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )"
+
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( Changelog.txt README.md )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-static
+		--disable-jasper
+		$(use_enable examples)
+		$(use_enable jpeg)
+		$(use_enable lcms)
+		$(use_enable openmp)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# package installs .pc files
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/librosprite/Manifest b/media-libs/librosprite/Manifest
index 10f834d8d804..f2b38bdec059 100644
--- a/media-libs/librosprite/Manifest
+++ b/media-libs/librosprite/Manifest
@@ -1,4 +1,4 @@
 AUX librosprite-0.1.2-Werror.patch 393 BLAKE2B dc5794093ac33e7b65ca42a9ab4dd967cc44b9c8e890d404021f995cbaf7fe83be2549377c503dc8d7b3dc692f3a48eeffcd1709d9cad840b4f9522b4b9fab15 SHA512 1f72277eadc2c958ff58c9a23e78bf5a8198c76502cba45e5619413f3dba4243e7a5f8650a11436cc87dd9e63257a874cf8b1805b4dcfe5f3db88733ff08e1fe
 DIST librosprite-0.1.3-src.tar.gz 32816 BLAKE2B 553f5046eac8b7de5940e812103a545ee1d599bcc30d4fd6bb14449e0718364132e76e3992b224d0d2dd3c7582100fe6d9e4d433f245a89b23e3f15542329e0e SHA512 ab039ab12df7f527a86a76247bc5cb70ebe550591f81a1b987abef73fb3c6bd25c9a36afe17bd6717f4f33b1a133d847bb5acad53057aa3c406efe4ebcdc601b
-EBUILD librosprite-0.1.3-r1.ebuild 743 BLAKE2B b62b2945f431eac4e868006d79a65cdf6d1008c5d52a10c04bc35287d52b3ef48a11d403a82ea14d5b31d1f51175370218b96fe7e706b1dc250a7f5f41093bf9 SHA512 ed8f6280b1979d901caa7e887daac7cd33ca3fd7a2fb062ce38f7accdeab0238a3f7b3985bf4af11549e03587c41d9dba71e4f7ea5171023e8ba1ca749400f83
+EBUILD librosprite-0.1.3-r2.ebuild 677 BLAKE2B 96625032829cce9f9ab6576a8231f13d00a73c01e89b0d90ea6522f00cd422ab0c588f73d1a55b6645c1353086dc4a49eb4a08dfccac28ebca957c1d1a9a6f0b SHA512 b5c1f29d857100f5d91f21b1640b11098be28d60efc9de0e027cbbb95607020f3fc3657b0b86a056250e82e885bc6febf67a1fb55ecf78c3d7a566c5386f9e9d
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-libs/librosprite/librosprite-0.1.3-r1.ebuild b/media-libs/librosprite/librosprite-0.1.3-r2.ebuild
index 480041a8993c..d412b3c188e0 100644
--- a/media-libs/librosprite/librosprite-0.1.3-r1.ebuild
+++ b/media-libs/librosprite/librosprite-0.1.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit netsurf
 
 DESCRIPTION="framebuffer abstraction library, written in C"
 HOMEPAGE="http://www.netsurf-browser.org/projects/librosprite/"
@@ -19,7 +19,6 @@ DEPEND="dev-util/netsurf-buildsystem"
 PATCHES=( "${FILESDIR}"/${PN}-0.1.2-Werror.patch )
 
 _emake() {
-	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
 	netsurf_define_makeconf
 	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
 }
@@ -29,5 +28,5 @@ src_compile() {
 }
 
 src_install() {
-	_emake DESTDIR="${ED}" install
+	_emake DESTDIR="${D}" install
 }
diff --git a/media-libs/libsbsms/Manifest b/media-libs/libsbsms/Manifest
index ffb65ddf68be..f02d036e92b2 100644
--- a/media-libs/libsbsms/Manifest
+++ b/media-libs/libsbsms/Manifest
@@ -1,4 +1,4 @@
 AUX libsbsms-2.0.2-cflags.patch 688 BLAKE2B f42728c599064927973f65a1eb3443cdf7a931f4f5d971a61d749ba4f0b990b34d8c47a2d52b08c5720202732e8409f006dae481b94634ba5b97a57f76bfdf40 SHA512 330a26e5b4b99f00546a2f625c4bae90f8a8645e855379e7de4f833a1c561c3c8e23f0faa954a989359f0de09a1310374ff93644d2f646bae3b9788293cfcd29
 DIST libsbsms-2.0.2.tar.gz 450170 BLAKE2B a9e75f1f2a3da2a407d21bd267fe842d2c2367f85e4cb588902ae34e56b76297c2f60968113ae7a08a6652e57bc20376f1a60e97d6d59863f9f1ae30589e0723 SHA512 8aaab3e191f3e10e559683ab4ebdcb8d951cf0e776390234f25675a98640d60d20aed872061ba72fdc3bd7827b7d46bc27225fe947cdd7fa4312f75cbdd78e6c
-EBUILD libsbsms-2.0.2-r1.ebuild 764 BLAKE2B a8f407dc9ea52251cb035151639395804c3d788bcc61e34a6d8c0b835c8c31aead4cfa56b5dadd2badb3a5f98c057240c016b4d0ce325cfd574c893b24250670 SHA512 ff3a1b04adc82b059b40b2fd021e75bdac8d53618bed61666c1c702d9a53aa8e3128958900dff819d20f01620d1615bcd4ff95f80dad7bbc5d846a7df6d4f547
+EBUILD libsbsms-2.0.2-r1.ebuild 771 BLAKE2B d0c6e2697e60d6ef663f0ce8bf7540ae481498e33574a195ddf38c9a40008de99886570cd855cadb38a5added0610710833b6a69c455ad063206f265530720e4 SHA512 1f6098dbcae9526cc17453f6633b565db8921de92c212548f5db0d4d36cd628884498fa8a56d4c5da86a01e829595b61950d8ec7afd8c043847d65a6054f0570
 MISC metadata.xml 334 BLAKE2B 27f96c580033502f5fae3be23efbde22dff9671695e36128f4e8aa1103d81383d718dd36225f1a966b0bf800a7566a89f735197aba72d4842f7162f3e7f06333 SHA512 0bdcb69cb01f3ee3734ee6374e72b0e2d6b413660067b0c63df773f61d13230d0e1b7af19ed5ffe8a31472a4f8e715c3da3b76bdb3e350cfbadab5dbb4d25a59
diff --git a/media-libs/libsbsms/libsbsms-2.0.2-r1.ebuild b/media-libs/libsbsms/libsbsms-2.0.2-r1.ebuild
index b4008daded6c..8c2ce6927e18 100644
--- a/media-libs/libsbsms/libsbsms-2.0.2-r1.ebuild
+++ b/media-libs/libsbsms/libsbsms-2.0.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/sbsms/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~mips ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~mips ppc ppc64 x86"
 IUSE="cpu_flags_x86_sse static-libs"
 
 PATCHES=( "${FILESDIR}/${P}-cflags.patch" )
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index 1916fc822276..3d21a7bb838c 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -7,5 +7,5 @@ AUX libsdl-1.2.15-joystick.patch 315 BLAKE2B e1adc864e4d660ef21ce2401f29c61c380b
 AUX libsdl-1.2.15-resizing.patch 2098 BLAKE2B 6f8e7832262384b1c710f8353b0b0654b0a951a83e198ef7c8781a5d6ad20c806677f99da93f14e2731b3330662ac4506d687c594116651a148c2833d803dc0b SHA512 afa82d81e03fe974b2c1a4f3c9ed48a15472784548c8e88f988bb03ea992e8ce86bbad74f7e5980dd1476139cf82180eda72e77041e065925cb373cda47c268b
 AUX libsdl-1.2.15-sdl-config.patch 780 BLAKE2B e62be7f44481b48ea226200f382dc8c20c5110997ed26672e5dcd8798e748529826b0951e3803e3fd5f30f8c3050a5fb298e5f880ab7e495dde9c0c8fff6cf1e SHA512 c79b0b5674a2a70862425150d8b481f1a0ed0bc400bc69835e53932422583bdde061d1f72da8d3ad0aaaa4499126bc2770f11941435e6c848bd4d90d040a0d03
 DIST SDL-1.2.15.tar.gz 3920622 BLAKE2B ecd4b82d7de6e4ca0de1317ad34bcd957a5a0d319e94c5b705f8b30aa53136ac08c88a6dcd90ad0ac84e607ba9483c2366921c4b25c8c53973cee62cfe97d204 SHA512 ac392d916e6953b0925a7cbb0f232affea33339ef69b47a0a7898492afb9784b93138986df53d6da6d3e2ad79af1e9482df565ecca30f89428be0ae6851b1adc
-EBUILD libsdl-1.2.15-r9.ebuild 4086 BLAKE2B c4af74cde55f18b5a4201088bfc3ab8ddf182b2759350d955dc2788b8fdf8c73073a2f0c6e0241b7577c7860aa25c251a66fdb1aab6d7b1be7fc896e81831a90 SHA512 63ae62e1a2e8ce3fbbf714ab71d20675241efab3e417655565cd891ff03b8c67eb12acf1e0b6bab855eba193de12da263b1f0b0804beda5a30921d1b401b16a2
+EBUILD libsdl-1.2.15-r9.ebuild 4085 BLAKE2B f94280485dbbd739bc9508aa91005264d7fe16ad7df719606a2539987c163f7a7f77a38b70d91159be8ff379cbfbe2ea64b3e7c2a6c2c91185710dad498f552e SHA512 64caca4c951a38f70085f3d1096cc0711b15c5536fbd7a06ef50ea7ebc30e041a5a29a76f6b20d2744d235ce6ce4a25edaa09a1f99e7b915f6c0d8572e88406e
 MISC metadata.xml 1415 BLAKE2B e1f07f85768757045a516c548dfb8c9a014e0291ca13d32b3e6164d38de389d718dc5d7e9dc4f98bc67cc16d043f92cafc2819fd02d18d72b17472500a8245dc SHA512 52c647d06adee1c595d45caf05e1781c692d700726c9c0ce182ce74796f2480fada765a2772d1679589dd7919d30edfcf5a0668e525cd8e30f78455c525d5446
diff --git a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
index af5d4bf883f5..e50406371f5f 100644
--- a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 # WARNING:
 # If you turn on the custom-cflags use flag in USE and something breaks,
 # you pick up the pieces.  Be prepared for bug reports to be marked INVALID.
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 399ce16a713d..8ca1c80df687 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -1,7 +1,8 @@
 AUX libsdl2-2.0.10-static-libs.patch 2388 BLAKE2B 84d6a6fe3a2630ca899aa01c6d16bfa5f43fdd82281e8022db62c30bfed671298f9011bbf2bbb59d6613dd9fe6e118ec71cb98b9d976c96c5d046fea46156d15 SHA512 bab5b6788b1f09f60a2686ce385496b31b6dcc4c5d76fb8abaeb5f2eb4d2fc6cdada8295e555c1f1527a70465452b0263ea54a0eea5f626f3faa266049b25119
-AUX libsdl2-2.0.12-static-libs.patch 2432 BLAKE2B 6ce884b4efee74ad4ac524b381d69bed8ad6ce27571803b23ead53bbc44e4037174c280920f9bc6dd14982d4b040c068eda0b25fdfed66f49ab56b5436276e80 SHA512 b70d23c427957c3abd561824251027379af9094eef77ea50bd9d8ad5fa4aa56edac44dc197b3da6a10f7f5da7244207768665b78e29cc56e585a89ca179491ca
+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
 DIST SDL2-2.0.10.tar.gz 5550762 BLAKE2B b51eb0b256da683586889a648f62363935f5c70b31172999aa9b80bac9f3e761bc34a3fc379c02f5dbc50734cde53743d297ca7f79d30b0272ddf0313c8752af SHA512 f49b869362699b3282f6e82920e59c7fac581bcbf955f18a81cc126293c08093a90df7fcb39517cc8bc32708d2213fe645a42b655d6d811c1386efebb3d3c798
 DIST SDL2-2.0.12.tar.gz 5720162 BLAKE2B 1e50d2d3060c38faadfc6610e3af7b0e54ce880101f8ca441b84431fb5f683cc6353402025be2eecbb8b9f85bb3982c9aea36e96067a97d079d39f9cd44964a0 SHA512 3f1f04af0f3d9dda9c84a2e9274ae8d83ea0da3fc367970a820036cc4dc1dbf990cfc37e4975ae05f0b45a4ffa739c6c19e470c00bf3f2bce9b8b63717b8b317
 EBUILD libsdl2-2.0.10-r1.ebuild 5322 BLAKE2B 7687d35d0c741bf72b64ec3ed3571e386ed9f15a210eccd18a97f65dea4c0808c40cba2e1e26bfba3b3e2e96b972b331db027a8a5f61f36767061ade72116681 SHA512 87ec70467329f2d0d41396628c538a4dc60e072b58398fd8cfbc9b79479654691932d1fc550cc36b48d8ce71c37e4fc8b80b0c8fceb8f4ef2a21f1addbed4d13
-EBUILD libsdl2-2.0.12-r1.ebuild 5517 BLAKE2B e81244895403f9f2810a035cdc7c1d808d91470ef3bdae217c0ee0a30a53324eeb60b30e68dbd054fc0aace6db4262199cc87c9518033ee6656d1a7c7bcba681 SHA512 6f82ea56826b361f7a051cbaf5f164540d39ba57d49c541c79ec99a90dd3818854ef51a643fe581e1550bbdbd038a29183d24dde6c4c676723ac6fae1662dd0a
+EBUILD libsdl2-2.0.12-r1.ebuild 5509 BLAKE2B f4dd277ea64d32fed4c241c11124d92d8ebbd183043bdcbd1956a174da8b80f0cd5adafc3926d1456f7313dd8610270ad3f6383446f63af36c2583a75a2c18cf SHA512 d61320d2b4708238d1c6a058484794127ed3a5f8964f8d51e9c64002aba28c9bc0ee9f50bbd9e5d3ae0a51342c348a146704066c53a8860a1b789d2d5bb3ba81
 MISC metadata.xml 1658 BLAKE2B 5c902cca2bed60d10864bd4d3524035b9472599f63a5a739348231c2471a01f40dd99ba49b63b710cffbfa51c870f06a1aa5a1d56a6a5dc6a2a3059550506443 SHA512 7c832d7bc52638ad658c4b53ffc1faf34486d551728240007b8af5f569dfa893a076df9b7ecc118c29795d1792b55e953401b2dbf81d831d002fc0cb0f28687c
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.12-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.12-static-libs.patch
index 595d8a51fd39..f80dc6c222ca 100644
--- a/media-libs/libsdl2/files/libsdl2-2.0.12-static-libs.patch
+++ b/media-libs/libsdl2/files/libsdl2-2.0.12-static-libs.patch
@@ -1,3 +1,7 @@
+Fix --disable-static.
+
+Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=1431
+
 --- SDL2-2.0.12/configure.ac
 +++ SDL2-2.0.12/configure.ac
 @@ -3751,7 +3751,7 @@
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.12-vulkan-headers.patch b/media-libs/libsdl2/files/libsdl2-2.0.12-vulkan-headers.patch
new file mode 100644
index 000000000000..717e5b5db38e
--- /dev/null
+++ b/media-libs/libsdl2/files/libsdl2-2.0.12-vulkan-headers.patch
@@ -0,0 +1,17 @@
+Fix building against the latest Vulkan headers.
+
+Bug: https://bugs.gentoo.org/721954
+Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=5227
+
+--- a/src/video/SDL_vulkan_utils.c      2020-03-10 21:36:18.000000000 -0400
++++ b/src/video/SDL_vulkan_utils.c      2020-06-14 21:49:15.780898839 -0400
+@@ -85,7 +85,9 @@
+     case VK_ERROR_INVALID_SHADER_NV:
+         return "VK_ERROR_INVALID_SHADER_NV";
+     case VK_RESULT_MAX_ENUM:
++#if VK_HEADER_VERSION < 140
+     case VK_RESULT_RANGE_SIZE:
++#endif
+         break;
+     }
+     if(result < 0)
diff --git a/media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild
index cae1b46a7eb3..9f707ba4274a 100644
--- a/media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+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 gles2 haptic jack +joystick kms libsamplerate nas opengl oss pulseaudio +sound static-libs +threads tslib udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
 REQUIRED_USE="
@@ -80,8 +80,8 @@ MULTILIB_WRAPPED_HEADERS=(
 )
 
 PATCHES=(
-	# https://bugzilla.libsdl.org/show_bug.cgi?id=1431
 	"${FILESDIR}"/${PN}-2.0.12-static-libs.patch
+	"${FILESDIR}"/${PN}-2.0.12-vulkan-headers.patch
 )
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index 56d8a7b52de2..19ee64a96381 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -9,6 +9,6 @@ AUX libsndfile-1.0.28-arm-varargs-failure.patch 1329 BLAKE2B d8a995e6596db880d21
 DIST libsndfile-1.0.28.tar.gz 1202833 BLAKE2B 102735766e2c22b5278fde43feaaa664598c08fadb5264d5130e4bf1e354bd4202948db38e2912d7487bd7f8c0b9faf1616c0873eed886a56b1d7f49452bf488 SHA512 890731a6b8173f714155ce05eaf6d991b31632c8ab207fbae860968861a107552df26fcf85602df2e7f65502c7256c1b41735e1122485a3a07ddb580aa83b57f
 DIST libsndfile-1.0.29_pre2_p20191024.tar.gz 720981 BLAKE2B 9f1dcf3d3669b66d8582d50b62ff863facd7125432a84a3e1e3fb0f817554f260f42948b4479371fb0967dcc75bedc6c49afffc6bee3f973a875d72d2e508210 SHA512 e37b385b90cadc97348db03b6c5ae7a8fcee17ded60f54d1508adddb8e2dc604ea44b60a0fe08627e81c0faa83997cdafb0b0ecf8574f901bf5e8a1819a63998
 EBUILD libsndfile-1.0.28-r4.ebuild 1869 BLAKE2B a2cd5a12dce29bb9fb19a1da246299b3d66eb06ea4867bd5bbb224a78e4e9b8324f45d8ad0c1cf1b982360210af08aed49432503a885e15098da4db806d14b7b SHA512 f9babe5df3082d394660f54872cbb13e7a03dbfdb86f24a247302aa72fa139874e6425455b0dc624eee8b87a7809aab7324b8e1802db27e0f801ee91b9e7f9ed
-EBUILD libsndfile-1.0.29_pre2_p20191024.ebuild 1666 BLAKE2B 966f72edf81507e87965af965952dcca80c9cf398c09d95d8832d80fd4d47a2571191da9f48dbc9b9a2ac34eb07b1d40895deceab17280c2c8bac2d4b2f18f0b SHA512 984cc4a61475efd61d495a78598e0c30e5038ba5256e53a22ee0db67e9b5f59d68f0dc019c6b2dc389f22d688badf7ecad690c8823ae0a07549f2da5522d96d5
+EBUILD libsndfile-1.0.29_pre2_p20191024.ebuild 1664 BLAKE2B 61aaac447069d3556d50efca587950f11e24672ad6342b7c646e7bf0623c9f90971c1b64f58b15f77f0d9e32590839167510cfc114e88e3b708524648e70e418 SHA512 d46c95bd3858a30c570f9cb8b9f103d9268de79a5aa914447a3f6e60fd53c8afea12eb727d2e5395bbe0218171cdf6e39cd7017b7cf1c6ea03360ccbb1a537be
 EBUILD libsndfile-9999.ebuild 1817 BLAKE2B 6750b63025de4d300724362b75e69b1a63a3c33961367fd807524d0e8d7446764bff203f0d5564604d54905a5b9767601cac86dad687ca67a26d08ce9dc3612c SHA512 b507722382cb7623de70a62463b67abfee3c974b9ede0cc90e679ff716ad0d1e643ab07dc1ce6738138a7ac4cdaa0a0b674494c4cf0013178d23c896c2b43285
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild b/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild
index c9272f7fa8e9..78c8d372dfbc 100644
--- a/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/erikd/libsndfile/archive/${MY_COMMIT}.tar.gz -> ${P}
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="alsa minimal sqlite static-libs test"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libsoundio/Manifest b/media-libs/libsoundio/Manifest
index ae601309771a..7d3c7b5030db 100644
--- a/media-libs/libsoundio/Manifest
+++ b/media-libs/libsoundio/Manifest
@@ -1,3 +1,3 @@
 DIST libsoundio-2.0.0.tar.gz 120387 BLAKE2B d4005667767633cf90fbf524cdf102c69e04e4e37cad55b4f9b1af7fb3f89f7b1a6ff47569c86bf5d86649fd34d9d080b8ed74d6da07c4155abadb3cad0797f0 SHA512 347a9be1789a41e778ea8d0efa1d00e03e725a4ab65e3aaf6c71e49138643f08a50a81bd60087d86a3b4d63beaeec617e47ba6b81f829ece8a3ac17418eb5309
-EBUILD libsoundio-2.0.0.ebuild 990 BLAKE2B a68c2be5c4ce51d18376e8a275f02517aac763b6bb1111facc1fbeffdea97de6cbca31d5787ab2a745d1cc2d008d26b1f07bb50b603c3d6f115517e2e7636b5c SHA512 4b45d9c082956e99319d24600a3e7262118de00d4f0890ea2d5b8386465ec45db511d821b51ef51a0d0c537ca1f2607415d0840858e2387621a858beac43d1a6
+EBUILD libsoundio-2.0.0.ebuild 988 BLAKE2B 7551d26be84375a57b51888b8fc72f575f5d04b44abd9e8d3280446ee1f1e9c1fd363a3ab8a7d304d096ff8a05525e61376785614559e202e5a4acccc2a20efa SHA512 619a8078913d0b4af32f9381e54aaadf5f35d74ef478f04e970763b503d9b932be9557a73b86a20ab4a943ce6a013e0be930657d99faadf6b159b86877c1e1bd
 MISC metadata.xml 901 BLAKE2B 8ef7fda2362a78865ad8321bb4724bd9caaf269ace631ada2bdb70fcfc6a8327637718fd1c0134445f51e127e1fe24a55a3527c8b319505bfee25e1e674b127d SHA512 156acbf89a915ba57049e365ef53abaf6c1c986d6ccb07e679bf1f7e39de8d708c8cc321aaf8588a7c529e878fea8b182f1eef60748c12287e4dd6ff16c77fb3
diff --git a/media-libs/libsoundio/libsoundio-2.0.0.ebuild b/media-libs/libsoundio/libsoundio-2.0.0.ebuild
index e82824872c93..a2ff792b5b8c 100644
--- a/media-libs/libsoundio/libsoundio-2.0.0.ebuild
+++ b/media-libs/libsoundio/libsoundio-2.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/andrewrk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa coreaudio examples jack pulseaudio static-libs"
 
 DEPEND="alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libsoundtouch/Manifest b/media-libs/libsoundtouch/Manifest
index 9130691e24a5..5cad6209ef12 100644
--- a/media-libs/libsoundtouch/Manifest
+++ b/media-libs/libsoundtouch/Manifest
@@ -1,3 +1,3 @@
 DIST soundtouch-2.1.2.tar.bz2 526281 BLAKE2B f15f004fd6abdf4cd6fdb842c650480c670a517c6d94365633a7cc4beb95447d7a8bee965d4b258da6c31630e370e3c1c1fc73abfe8568ace465ce41a87397cf SHA512 d45cb0f94e3df32e9c76722a148f201277b2ddc3e390394c1f4ae1263f13557c6b664e90301b5f62d7561d743ab4903a44a34ab7248880b343d581cebd5f0cd9
-EBUILD libsoundtouch-2.1.2.ebuild 1512 BLAKE2B 2a31449c063086520572e99aceab81c91fffe94eaeadf5183c3cbc4082cfeebd0ce019a2fde30c6a7653838d690f5cc324c36b2971942303a8d12d145dc641e3 SHA512 b6a871b18e0310e71f7a944813a2b06c75b94546ab545dcb3322c8636d4d8623647aaceb70517d6340998fbbfa0d8b2591ab19d8b00697cacf24f08c7669f5c2
+EBUILD libsoundtouch-2.1.2.ebuild 1519 BLAKE2B 64671d9619467f9961d0ed67043702c6da96ac7be8a3e1a7107ec449c8ec21d4634f939f4e90f257675192ffa03d69dda637a1e7d48b7910bb8344a6b094d469 SHA512 2d44591f900413402cdf3b0dc6760b6d5ed113cd561a7bd085501eea1d761ce257cceb178550f568a71a83d484837e104bf4f49fd580931fa6a9ee873af874bd
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/libsoundtouch/libsoundtouch-2.1.2.ebuild b/media-libs/libsoundtouch/libsoundtouch-2.1.2.ebuild
index 52aa7ea0a6e3..19a363b2ee95 100644
--- a/media-libs/libsoundtouch/libsoundtouch-2.1.2.ebuild
+++ b/media-libs/libsoundtouch/libsoundtouch-2.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/${MY_PN}/${MY_PN}/-/archive/${PV}/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1"
 # subslot = libSoundTouch.so soname
 SLOT="0/1"
-KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="cpu_flags_x86_sse openmp static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-libs/libsvgtiny/Manifest b/media-libs/libsvgtiny/Manifest
index dc95e4266fde..b690f76ace83 100644
--- a/media-libs/libsvgtiny/Manifest
+++ b/media-libs/libsvgtiny/Manifest
@@ -1,4 +1,4 @@
 AUX libsvgtiny-0.1.3-parallel-build.patch 406 BLAKE2B 1b7ef472490646196af762701b28636fcab2778ff4f77efc1e1c7d0736d73ca41703bf473333ee775e99df8eca24d4845e0bd03e117586e84b4a629af726b417 SHA512 1126b2985293432d9e8849ce85c27055d7fc96948657e9d8a35b41578ce1f014e6352798ccc605079b6ec4a1998899d91a240e7a338e277b092b83b4858d83d6
 DIST libsvgtiny-0.1.7-src.tar.gz 760963 BLAKE2B badf14e656e10a178a6b692659265644b636cc103ec92f89026638700293028e0b06b5e051c420911fd6c319a94bab68328b1d9f42cec69dc7926c2d31aeec67 SHA512 c13352325d32b6f41159b09607b12a373517672e9e4da6d26cbca9a7fb1896b6e5730aee53adaa51f0b49c35f7dd9e9ece6b1f0187a7f5494b5cc223acbe64ad
-EBUILD libsvgtiny-0.1.7-r1.ebuild 880 BLAKE2B 35ffdfe39c3f1678deb0a8c1a1a5efe89a779711716bd47b3faa8cf834ce6017ec65867fe454af15f699fe327d6e7f6566824c72cc23e788799d7ae8145328f4 SHA512 ac5b6d826e334d50194623ce08a8e66145bf4d2c269be73489f8dee73159a1abf141b35dd5e67db931db0ab792ceb48b1de360326b2313dcf88d0242c9fea78d
+EBUILD libsvgtiny-0.1.7-r2.ebuild 815 BLAKE2B 7a58fdf05eba0487a50d1facc9bbe29656ab92519f19ece3cbdb3b88e9b1b7216e2b0f4f0bbd97f3a076a5fb2ce61df7450222e39f37ff9fd4b67ecdb6666529 SHA512 fa27d6ed25c442e60324c89062a16db65a7828c9371be4e36e8a1f08a245798254d9e27a0b6e18131d141f224f0f204c77847d22916dbfaf42406608ae897cea
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-libs/libsvgtiny/libsvgtiny-0.1.7-r1.ebuild b/media-libs/libsvgtiny/libsvgtiny-0.1.7-r2.ebuild
index d236e41cfe65..062d7f57930a 100644
--- a/media-libs/libsvgtiny/libsvgtiny-0.1.7-r1.ebuild
+++ b/media-libs/libsvgtiny/libsvgtiny-0.1.7-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit netsurf
 
 DESCRIPTION="framebuffer abstraction library, written in C"
 HOMEPAGE="http://www.netsurf-browser.org/projects/libsvgtiny/"
@@ -25,7 +25,6 @@ DEPEND="${RDEPEND}
 PATCHES=( "${FILESDIR}"/${PN}-0.1.3-parallel-build.patch )
 
 _emake() {
-	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
 	netsurf_define_makeconf
 	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
 }
diff --git a/media-libs/libtgvoip/Manifest b/media-libs/libtgvoip/Manifest
index 9b20e933222e..7c6770b2d929 100644
--- a/media-libs/libtgvoip/Manifest
+++ b/media-libs/libtgvoip/Manifest
@@ -1,7 +1,3 @@
-DIST libtgvoip-2.4.4_p20200430.tar.gz 1481816 BLAKE2B 82bf6b880f28c9b63f547e473547298e25ea3b7e35b3a832a7375b0ae3a745ea3b5d55f5e635ec678e388a608532a14de85f50828da1dbc9ed77dc23be64b9e0 SHA512 f3130c50dfa7d3f710809bb72fb71d1b246bc91e9f8f413e704499011c8ff01f87a7226315f7cfd6edf2d2b8b6c875508185f516792ff5db74556aface33cdb4
-DIST libtgvoip-2.4.4_p20200525.tar.gz 1482357 BLAKE2B 9324165a2818f3d6907fb80403c8df83e196e7566161d781f5608c2bc4fc0f34a4b69883202ac1a9d20d783d363534c11436cedcd24fa93c092eaca97369734e SHA512 5c9fbbccde8fb7dbe8076cda53a3ec80f633493c9b3016627307463dca3426623703cd28ea7ad360bd9ff7c062edecd04787b9f8a32c439cc6622d8680d624c0
-DIST libtgvoip-2.4.4_p20200701.tar.gz 1090571 BLAKE2B e1e3bf129e124aa907e15afaefb1ea2ae44fcb7ab6670e7727ac388ef498c21978f668760022ec002fafecdf51b85d872364025f2282acc88532ef3b994c4e14 SHA512 44f650509d0c6d15adcb5bb5a4af66432c808fece5169844f37d4eb3fb25f729a1caa1c2cf68a6764d134e187b156a86e93b383984f2d4dd86a69cb3e9b2b888
-EBUILD libtgvoip-2.4.4_p20200430.ebuild 1039 BLAKE2B 21f3e2037b6d704070f183c1b21a7a82e772c1ee9119530a202063e7606244b9585e41dd39b82de347d6f72d6d4d88a92a4d96e928338a72b06b8f028db7e6c4 SHA512 76558155767123484954b131ff62e85b22f23cc40c4c867fd29aa2e010231ed03bde4dc617e3d2fb8104f3e8677b94faf48854b7912258bb1999a92368dcd1bc
-EBUILD libtgvoip-2.4.4_p20200525.ebuild 1098 BLAKE2B a5d7b79ab969443ec6e61dbcdcb5e5eee3cd97f6d9dd5e42879ab0884573584ee17b11f0e8667ff86c707741c22e27484edb36fb04d51d32ae1c626531c8227b SHA512 c23f91744a01ffccd74eb58fd28d5e048470b19565c903ad00dac2980367ff37251ab8acba3ed5df7aa48c4ecd42b959636e06b5218091a3eb18ba5d0e291e2c
-EBUILD libtgvoip-2.4.4_p20200701.ebuild 1098 BLAKE2B 74c6d20e2c0a77400a46c27e2e87ff608cd01a9050ed90c1c871f6243c3f8f45ab4323ec531bb1b1ec913a329ec7424dc1354cc522852660d70f66f4051d08af SHA512 8f21d2a4fb4b7fb3643ae0ee70942ad175e3197bb6c40f8842ebacb5ea1236b1ffa8addcc756a26dd935068742890637df8d043c0d6e74c979e868f7aafb3704
+DIST libtgvoip-2.4.4_p20200704.tar.gz 1090620 BLAKE2B 27880d296eef108613cb9330344bfc133efcd7b3fc82b7e793cf623187ff491f44021d1a47703949a0b830ae50106ed2d5b41e26cb6f5849b69b836a592112ff SHA512 ffff8ce9b991e03a2b0fb9b71e04311151081b7c682f728ae7d50a88a87470249d9f6841b24df3264245c5027a06da004d9022bf3652c4f11d03b2058e00d895
+EBUILD libtgvoip-2.4.4_p20200704.ebuild 1097 BLAKE2B 14c75c46236a47a6fc49212fa59b06cb5c5045198638f04e6185b0c338fe5faf4144ec1903d7869c6913fcd91befbe3c13e38ff16d3fbd972a65029f76ca1ea5 SHA512 1a969c3cdc30d773483d412e79fed3948b2145a739b7253070209b796ba64df8705dfc8b622d4a698bd8f879851c8ff1b0f70b125dba5b1ffbf5ebf665103189
 MISC metadata.xml 384 BLAKE2B 9eea01ea72a5894e8444fd48a7c20725acb60dec5cac6f7e2d6da2b5461890e099050c65d03df1ece80301b07fa2f93d99d7892c7e6742b7da5910f2ca5e98ec SHA512 e13630d4043b0a9067653ef75054cd339fb0b347b76ab7133fede4915f8c3eba858ffa4ab94527887c98db81788c662d2f050717c7ca790ba8071222a3fd2f89
diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20200430.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20200430.ebuild
deleted file mode 100644
index 3438d6218474..000000000000
--- a/media-libs/libtgvoip/libtgvoip-2.4.4_p20200430.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-EGIT_COMMIT="a045c9eea47b371c0c514c72c76172a211c894cb"
-
-DESCRIPTION="VoIP library for Telegram clients"
-HOMEPAGE="https://github.com/telegramdesktop/libtgvoip"
-SRC_URI="https://github.com/telegramdesktop/libtgvoip/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-IUSE="+alsa +dsp libressl pulseaudio"
-
-DEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	media-libs/opus:=
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="|| ( alsa pulseaudio )"
-
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-static
-		$(use_enable dsp)
-		$(use_with alsa)
-		$(use_with pulseaudio pulse)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20200701.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20200701.ebuild
deleted file mode 100644
index 65f68701687e..000000000000
--- a/media-libs/libtgvoip/libtgvoip-2.4.4_p20200701.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-EGIT_COMMIT="ad55e7403ab7f268304ae9045eddef479a574ae5"
-
-DESCRIPTION="VoIP library for Telegram clients"
-HOMEPAGE="https://github.com/telegramdesktop/libtgvoip"
-SRC_URI="https://github.com/telegramdesktop/libtgvoip/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-IUSE="+alsa +dsp libressl pulseaudio"
-
-DEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	media-libs/opus:=
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="|| ( alsa pulseaudio )"
-
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-src_prepare() {
-	default
-	sed -i 's/-std=gnu++0x/-std=gnu++17/' Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-static
-		$(use_enable dsp)
-		$(use_with alsa)
-		$(use_with pulseaudio pulse)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20200525.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20200704.ebuild
index 89791a76dd27..cd168857e579 100644
--- a/media-libs/libtgvoip/libtgvoip-2.4.4_p20200525.ebuild
+++ b/media-libs/libtgvoip/libtgvoip-2.4.4_p20200704.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit autotools
 
-EGIT_COMMIT="d2e63429ec94ee178a62b55be01f1cca98e9de83"
+EGIT_COMMIT="b98a01ea44916444cb1b9192f80b46f974d296a6"
 
 DESCRIPTION="VoIP library for Telegram clients"
 HOMEPAGE="https://github.com/telegramdesktop/libtgvoip"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/telegramdesktop/libtgvoip/archive/${EGIT_COMMIT}.tar
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="+alsa +dsp libressl pulseaudio"
 
 DEPEND="
diff --git a/media-libs/libtimidity/Manifest b/media-libs/libtimidity/Manifest
index 5156c4ffd001..e60fbce41617 100644
--- a/media-libs/libtimidity/Manifest
+++ b/media-libs/libtimidity/Manifest
@@ -1,3 +1,5 @@
 DIST libtimidity-0.2.4.tar.gz 421572 BLAKE2B b92a87ed0adbf00d74c482e17375fe42adbc86896435ebef858b87952f31f5bd4bcc61993aa03fca07f1f85367f57e227f5828f8cb5ff44561a11e5066e84b1b SHA512 185c4ae58a14f69873869a9586cc23a1f7c9b681c67bb7cc9fe3c4ce51f53600004970af6a0d76d3055d9f2cb82a7fd062699006b0c26f90340fb751cb976930
+DIST libtimidity-0.2.6.tar.gz 421927 BLAKE2B 1644608591510e83b3e0fd338ada3bb1ea1846d26f06ec455c58f2bc640a2c8fc182bbcecbcc0465ac0e5da921f26c2494e5aec89014a42b22820bc1f986075c SHA512 e913cdec619001f5deb98c5e50707b1c5c110eab5d14606a6a7385cba1c47844a5143bc848dec17329788c5e1caff2efeeeada9ad37ec9ef704c545bf0e29ee9
 EBUILD libtimidity-0.2.4.ebuild 656 BLAKE2B a7aa688be6f1788d6ae7d81c395267410280e13e2f73fbd07f2cf9377566a45974095212bba990434538cface1e8ffbbc6f071baa774e38272ff4476e6607d59 SHA512 a6083399cb5c29e617ec3b1badd5bcd52f0b0f29b9be7495f696cc300c9701ef239f559587a00c3456b886e751eea4f38592c433b281e762ff20b8dfcfb2f249
+EBUILD libtimidity-0.2.6.ebuild 823 BLAKE2B 35c1b98156bdb7a439c772f892d09dfbb9a010c1db42a1f474e9048f4c3263d03781703c33a22753415b0b47897ed53a74820d180e59a9220c114a414c6fba1d SHA512 ea7635e6fc615e1895ce013003740fdbea860794dd92766f2c1e4105d8980c6e2bc7ab487ee224d9465ddb2faf58a5d9c9ea82e1d6db2bc5fd63ed86889bebc1
 MISC metadata.xml 334 BLAKE2B dae2cde17ce0b3493754cd7984b7c74a937ac7694cbe125d6137fa00062fe5f8406e311502cc09400b720f0f11d233726c3061f1039408236651ebab1f1b449b SHA512 9b744ea46e81fa07fdbed4bd7b71840eeb1500bc35651e9c8461f91e8041e76567fd5b20472767d2b8ebb16967005ae025bb7a8165b14c2e33ec1a891770d91b
diff --git a/media-libs/libtimidity/libtimidity-0.2.6.ebuild b/media-libs/libtimidity/libtimidity-0.2.6.ebuild
new file mode 100644
index 000000000000..81f340f11800
--- /dev/null
+++ b/media-libs/libtimidity/libtimidity-0.2.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="MIDI to WAVE converter library"
+HOMEPAGE="http://libtimidity.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/2"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ao debug"
+
+RESTRICT="test"
+
+RDEPEND="ao? ( >=media-libs/libao-1.1.0-r2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( AUTHORS CHANGES TODO README README.timidity )
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_enable ao)
+		$(use_enable debug)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index ca6a32f572a9..b4bd205472fa 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -1,15 +1,10 @@
 AUX libv4l-1.16.6-gcc10-fno-common.patch 2423 BLAKE2B 6938e2b75b01e3bc3a1cfa03e2e95591848697e60742c4f65f342fa3ddfe5bddebba8d3bb17ab1de7d870592501f897c4e0aa5a6b2c8754bb0ae3c111df8942c SHA512 7b9fad4f640f14484cd0ab42812fb19392e0959a28511fc4343aff7185e181daf0f32c3460ba398dcd703c5ede9bdc00f1765ffb083cc34fdd8649801eec871f
+AUX libv4l-1.20.0-automagic.patch 1603 BLAKE2B f17cf8a132a96bf48abd33d8dab488c8acb58fe2fdba145c0457e331e0ab40cbc5710e11afb8443dcfd2bc752d8e331b36f4200886c32f9ddff56481633f5c67 SHA512 a603eae9b9bec5f45320cf66f8a6c8dfbc6070505bf0b250d1e4efa6530c7dce1656810c6bf63a83f20a0fd0e039c7150db13b2719947517505619e22b254c32
 AUX libv4l-1.6.2-sysmacros.patch 1821 BLAKE2B 9242ec9dccf2b14ab4d3ebc1246035ec3a1816d0b0389577638949cf8e493074132b7c13db6c1ca360ad5e2a2de271166126110d2f237d068185aeb2c3293c4b SHA512 ff6addf5d8e8da4f8502f1af8f21de60c9579da11b3aa3145d42030387bdcdd7c6263d5b6cdcba302ea8b8b3a578dbd17d75e11250d4074df2b6ca59d6de1d55
 DIST v4l-utils-1.10.1.tar.bz2 1352235 BLAKE2B 7ececae8ad5ebd999070b0c3626fdf5b0a4bc81562d2c2a712ff9625025d3e6c4ff664ba85998dedaa1ee77295d3cea39306305c20573c07156a07ec0ac8d10a SHA512 524bfd4e93e82f2dd55f0baa3e8be5850d4675b46fd0197b6d1287fc0d502c6b5c64bdf461af9630345f2d847d6aa5b6dc483693cee452da0b6729f156a5d98d
-DIST v4l-utils-1.16.3.tar.bz2 1894961 BLAKE2B 71c674abbb3415e592354998e1baa3eedbb4be21757bef80b463ea987e9fc231789e6b333b37d0d9916cb30729e04951dc9f1755ab00a82502fdc415b00cb9a2 SHA512 404672d18d94861c6957ea3a15a6a48f238d3859940810952a5a8cc33b57f1a360d1a19af28405c01b073c0ece90c5995a71dbe6544b30bdb8eace7daeb4bc0b
 DIST v4l-utils-1.16.6.tar.bz2 1893768 BLAKE2B f31cf794f6949fa2c1f45db8bae99a10a5fbc67af356889f636ab03cfd04011a82939a10f01145c56001b91655664530cfbda7d64c523752b8bb77159a1c80ab SHA512 f011218591e32b0ca3239373d9ea4739d7cfe3a6bef5f8a996253cea9b9d836ba488132e2a1b8f6f61cd69f1bcecc20e4b5c26f9c95a2a912e17c400b9fa9b58
-DIST v4l-utils-1.18.0.tar.bz2 1995506 BLAKE2B 35cd138c88960e5b02431c408a43905a73ea6a7650a939abc2250e1f219bda1437262a7083d90d8b4d39c5bd2cce5f6fc590b8dc09a8738fb5baf55266256b94 SHA512 749c804671f039d907bf782cba5d1c23fff48066f3b6d4a0249fb9b65c493ee3945b544ee2a306dda79973da04f0301278ee88775f798aba590e5d0f15226d49
-DIST v4l-utils-1.18.1.tar.bz2 1995211 BLAKE2B 853fd7390ea98bcb833ccf43a9408d2ab7212d87512351bf5f4cbb8e626f18e0b8224b953283eb57a93c4d4de5626ce1f9d896d1a9856623f6322ff2be5bb9a7 SHA512 2e9f77abc2fd65bd6a5508831185a941553441384719293f99ece7e6c53c37bb142eb3719532b11f1cef48df691667d2a4235d920338d672738d40659d499056
-DIST v4l-utils-1.6.2.tar.bz2 1148309 BLAKE2B 8153a1e3803b9e59eae064f2c88e4b865a56193788a8cb204dc34e9ae50e66794ba7f020ad4b0ff9af995f57d9b9a9e0225e0f8a09eeefae42d063131d7e549a SHA512 e14442e1b3660d0cb0844f1a5a88f855bc8532df9e72e1b2afd348a7c077ad25657f832d0fd47d3f567bfd399fd82c5a749d075ac9ecb911ea462685e31aa0b2
+DIST v4l-utils-1.20.0.tar.bz2 2030419 BLAKE2B 218082b88c42dcb9da3dbdd81b184c0e7402ca7ba35678a2905e16c11db1fe7065a19ec84b5fd57e2ed4718965c3e8097f8e8bdd04a38a485716efe3ec62e42a SHA512 179ca8dbbf7af5fa4870b70f17645d7834fe6ba52670ae6b58473efa257db0cd812ce14f16574cc4491c0bcb218835e4c29f1354882a151687eecec97852fc63
 EBUILD libv4l-1.10.1.ebuild 1400 BLAKE2B 0a109cf4ce02b5698a9eaa3021bb12b462f520ee22fbc3c56a3e4cb2831020db862759b0e0a1b43d2bbb36d89a6b31a3f097415e8939f34b350c263726888cc0 SHA512 2232d3dce5dfb8b2a2d4ffa368e20d920a9c438ed7cdfb850e8e0f1c4c5e20186b5f2f3e30be6d945c8e704d0734dc4dbb411582e8758e2f571841b9a1f23379
-EBUILD libv4l-1.16.3.ebuild 1356 BLAKE2B 0c7992fb2e53bac0255e9d80ad4b7aa3cf320544a48e891a4746001d9b3c69bdfb04ddde99f91b9aa0b5579185048c185f7baebd4acf8bc3e3aafccc9303529c SHA512 395082dc3461936632e96ce65f8eb563cac7741d30247ed7d1d564574b57004278a61f457eff1579215a6c19e3d677a1fb24d3d669bdfdd598eaa16450b75b9c
 EBUILD libv4l-1.16.6.ebuild 1462 BLAKE2B e494bb7c233a67b174834037f94b44473744d02e3f64c81221aa384353d36ab120ce1d84a331e2c833d04119d2d3a5a70982fd9f3fdfaf3d05d2c0d200a557a5 SHA512 026eb18799f282078f861a2f26f1ba81d7b3a6f3d80acfd20d93431c4507ea6f2815f976e625e84074da3f1b951c1b7335f48572d7bc0ad87436ad5eddbdb751
-EBUILD libv4l-1.18.0.ebuild 1465 BLAKE2B 288b6c2258790fd7de0ca36e02842227ba524f8a4d761767896681f2b3d5e791b35eb78042ed726fa005926b38bc8ff6b3b4c7834f691317efcd35665ef4314f SHA512 92c5f1aeb9cee88a219394a48c2eea7981787d255863f51134b24f3f105322392f5cb9d9b256dc0e68444a8c399b807eda5d3cdf77d6c982b668ecf3d93f0c02
-EBUILD libv4l-1.18.1.ebuild 1404 BLAKE2B 67207e0668e0b0eedab52f1cb817282455868047dd19aec889a2eddbae230b153c5c4c5c3da2494f1a07248e4f08e4cfdb4458d467bb0f747bd7c2d9033858e8 SHA512 da23bd79616d78f00aab92ac98142d5e029e5cea80c1a8470d1bd65b6c5695d1f1ebcfa2756f454fcb9c87297dc21f210748b45ffdf7b09ec8b4199c18e7317d
-EBUILD libv4l-1.6.2.ebuild 1371 BLAKE2B 43328abd8eb7cc182aa9c84de92dfc5b9e7635b876f1a662964f4be76aa3b9224f1bfd7a862e905bf4a95ddf3e7ffebaa0148f3ef459863ec9100c5b42b09e59 SHA512 777f7e6f18e9665d1753c0dc85358ffa9319497b077724a214e7388c2560bfeb1ae6dd7400baa947ed961fa6d551ecf441d3184283876609626da418343a50f5
+EBUILD libv4l-1.20.0.ebuild 1516 BLAKE2B 584560890dc0e683597d2911f896e10ba6dedbb550483f9dbfd464eea4f00a622d0451b7bce3375e19ec3709ac750b8ce8b47d877ad5e7bffe9e8e95a21f9eab SHA512 8d2342aaeded0fe008f4d6be287926fdea178961900ecfda56c6b7652b3e4768a72603ef4139240d15ef696399ef112326668233d6207c2ab8284597f4ffb485
 MISC metadata.xml 1116 BLAKE2B 0a5c579aaa12eda3c043a7684a41ef17b8c7ed7411c2639fa3c0df6466f34ad01fa9d18fff1edd65b2bb4b9bf429e1a7c0ef120d75cbae8ea9dcbdbaa5e4b372 SHA512 8bf11a27222e9672c3662a6d807cfda13b5935618289b7acc259db7bfd9a13095b57d881170b7354fa8e971a87e15592e92f8853be18415618df38672a684c41
diff --git a/media-libs/libv4l/files/libv4l-1.20.0-automagic.patch b/media-libs/libv4l/files/libv4l-1.20.0-automagic.patch
new file mode 100644
index 000000000000..017513bcb907
--- /dev/null
+++ b/media-libs/libv4l/files/libv4l-1.20.0-automagic.patch
@@ -0,0 +1,52 @@
+From e018720a49b96535613ca9173750ce2271608cd5 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sun, 23 Aug 2020 16:33:21 +0100
+Subject: [PATCH] configure.ac: Add --without-libudev option to avoid automagic
+ dep
+
+Signed-off-by: James Le Cuirot <chewi@gentoo.org>
+---
+ configure.ac | 27 +++++++++++++++++----------
+ 1 file changed, 17 insertions(+), 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d9f43ab5..e6134d08 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -291,16 +291,23 @@ else
+    AC_MSG_WARN(ALSA library not available)
+ fi
+ 
+-PKG_CHECK_MODULES(libudev, libudev, have_libudev=yes, have_libudev=no)
+-if test "x$have_libudev" = "xyes"; then
+-	AC_DEFINE([HAVE_LIBUDEV], [], [Use libudev])
+-	LIBUDEV_CFLAGS="$libudev_CFLAGS"
+-	LIBUDEV_LIBS="$libudev_LIBS"
+-	AC_SUBST(LIBUDEV_CFLAGS)
+-	AC_SUBST(LIBUDEV_LIBS)
+-else
+-   AC_MSG_WARN(udev library not available)
+-fi
++AC_ARG_WITH([libudev],
++            AS_HELP_STRING([--without-libudev], [Do not use udev library]),
++            [],
++            [with_libudev=yes])
++
++have_libudev=no
++
++AS_IF([test "x$with_libudev" != xno -o "x$enable_libdvbv5" != xno],
++      [PKG_CHECK_MODULES(libudev, libudev, have_libudev=yes, [])
++       AS_IF([test "x$have_libudev" = xyes],
++             [AC_DEFINE([HAVE_LIBUDEV], [], [Use libudev])
++              LIBUDEV_CFLAGS="$libudev_CFLAGS"
++              LIBUDEV_LIBS="$libudev_LIBS"
++              AC_SUBST(LIBUDEV_CFLAGS)
++              AC_SUBST(LIBUDEV_LIBS)],
++             AC_MSG_WARN(udev library not available)
++            )])
+ 
+ AC_SUBST([JPEG_LIBS])
+ 
+-- 
+2.26.2
+
diff --git a/media-libs/libv4l/libv4l-1.16.3.ebuild b/media-libs/libv4l/libv4l-1.16.3.ebuild
deleted file mode 100644
index f5aa891dab97..000000000000
--- a/media-libs/libv4l/libv4l-1.16.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit libtool linux-info multilib-minimal
-
-MY_P="v4l-utils-${PV}"
-
-DESCRIPTION="Separate libraries ebuild from upstream v4l-utils package"
-HOMEPAGE="https://git.linuxtv.org/v4l-utils.git"
-SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="jpeg"
-
-RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	virtual/libudev[${MULTILIB_USEDEP}]
-	!media-tv/v4l2-ctl
-	!<media-tv/ivtv-utils-1.4.0-r2"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-"
-BDEPEND="virtual/pkgconfig
-	sys-devel/gettext"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	CONFIG_CHECK="~SHMEM"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-multilib_src_configure() {
-	# Hard disable the flags that apply only to the utils.
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-static \
-		--disable-qv4l2 \
-		--disable-qvidcap \
-		--disable-v4l-utils \
-		$(use_with jpeg)
-}
-
-multilib_src_compile() {
-	emake -C lib
-}
-
-multilib_src_install() {
-	emake -j1 -C lib DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog README.lib* TODO
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/media-libs/libv4l/libv4l-1.18.0.ebuild b/media-libs/libv4l/libv4l-1.18.0.ebuild
deleted file mode 100644
index 7d3bcdb76785..000000000000
--- a/media-libs/libv4l/libv4l-1.18.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit libtool linux-info multilib-minimal
-
-MY_P="v4l-utils-${PV}"
-
-DESCRIPTION="Separate libraries ebuild from upstream v4l-utils package"
-HOMEPAGE="https://git.linuxtv.org/v4l-utils.git"
-SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="jpeg"
-
-RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	!elibc_glibc? ( sys-libs/argp-standalone )
-	virtual/libudev[${MULTILIB_USEDEP}]
-	!media-tv/v4l2-ctl
-	!<media-tv/ivtv-utils-1.4.0-r2"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-"
-BDEPEND="virtual/pkgconfig
-	sys-devel/gettext"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-1.16.6-gcc10-fno-common.patch )
-
-pkg_setup() {
-	CONFIG_CHECK="~SHMEM"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-multilib_src_configure() {
-	# Hard disable the flags that apply only to the utils.
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-static \
-		--disable-qv4l2 \
-		--disable-qvidcap \
-		--disable-v4l-utils \
-		$(use_with jpeg)
-}
-
-multilib_src_compile() {
-	emake -C lib
-}
-
-multilib_src_install() {
-	emake -j1 -C lib DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog README.lib* TODO
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/media-libs/libv4l/libv4l-1.18.1.ebuild b/media-libs/libv4l/libv4l-1.20.0.ebuild
index 19690840ac81..9c2ddcdbbd2e 100644
--- a/media-libs/libv4l/libv4l-1.18.1.ebuild
+++ b/media-libs/libv4l/libv4l-1.20.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit libtool linux-info multilib-minimal
+inherit autotools linux-info multilib-minimal
 
 MY_P="v4l-utils-${PV}"
 
@@ -14,21 +14,31 @@ SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1+"
 SLOT="0/0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="jpeg"
+IUSE="dvb jpeg"
 
-RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+RDEPEND="
+	dvb? ( virtual/libudev[${MULTILIB_USEDEP}] )
 	!elibc_glibc? ( sys-libs/argp-standalone )
-	virtual/libudev[${MULTILIB_USEDEP}]
+	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
 	!media-tv/v4l2-ctl
-	!<media-tv/ivtv-utils-1.4.0-r2"
-DEPEND="${RDEPEND}
-	virtual/os-headers"
+	!<media-tv/ivtv-utils-1.4.0-r2
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
 BDEPEND="
+	sys-devel/gettext
 	virtual/pkgconfig
-	sys-devel/gettext"
+"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-automagic.patch
+)
+
 pkg_setup() {
 	CONFIG_CHECK="~SHMEM"
 	linux-info_pkg_setup
@@ -36,7 +46,7 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	elibtoolize
+	eautoreconf
 }
 
 multilib_src_configure() {
@@ -44,10 +54,12 @@ multilib_src_configure() {
 	ECONF_SOURCE=${S} \
 	econf \
 		--disable-static \
+		$(use_enable dvb libdvbv5) \
 		--disable-qv4l2 \
 		--disable-qvidcap \
 		--disable-v4l-utils \
-		$(use_with jpeg)
+		$(use_with jpeg) \
+		$(use_with dvb libudev)
 }
 
 multilib_src_compile() {
diff --git a/media-libs/libv4l/libv4l-1.6.2.ebuild b/media-libs/libv4l/libv4l-1.6.2.ebuild
deleted file mode 100644
index 483f176ab6cc..000000000000
--- a/media-libs/libv4l/libv4l-1.6.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils linux-info ltprune multilib-minimal
-
-MY_P=v4l-utils-${PV}
-
-DESCRIPTION="Separate libraries ebuild from upstream v4l-utils package"
-HOMEPAGE="http://git.linuxtv.org/v4l-utils.git"
-SRC_URI="http://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="jpeg"
-
-# The libraries only link to -ljpeg, therefore multilib depend only for virtual/jpeg.
-RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	!media-tv/v4l2-ctl
-	!<media-tv/ivtv-utils-1.4.0-r2"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/os-headers
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	CONFIG_CHECK="~SHMEM"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-sysmacros.patch
-}
-
-multilib_src_configure() {
-	# Hard disable the flags that apply only to the utils.
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-static \
-		--disable-qv4l2 \
-		--disable-v4l-utils \
-		--without-libudev \
-		$(use_with jpeg)
-}
-
-multilib_src_compile() {
-	emake -C lib
-}
-
-multilib_src_install() {
-	emake -j1 -C lib DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog README.lib* TODO
-	prune_libtool_files --all
-}
diff --git a/media-libs/libvisual/Manifest b/media-libs/libvisual/Manifest
index 8ed35e42a06d..e6419ca2d951 100644
--- a/media-libs/libvisual/Manifest
+++ b/media-libs/libvisual/Manifest
@@ -4,5 +4,5 @@ AUX libvisual-0.4.0-conditions.patch 889 BLAKE2B 6c197b4d47249d341efa434165c9681
 AUX libvisual-0.4.0-detect_amd64.patch 431 BLAKE2B 2be06d4606c73867b44c62c154bd0a309e76545469fee02e2840f41be9271b17b1edd26717e16f74cc63af7d4627d7792270c5cf75e89f9a8f146fe318952b72 SHA512 b102f61acf60a7faa1495087c96c8cba893c250454ea1b5ed60c14ba0578d2fb794d2722f24e9d6b5bf37369fcf83bb2bba3929fcd49e24c4078f2a9fde317f3
 AUX libvisual-0.4.0-inlinedefineconflict.patch 1870 BLAKE2B 3c20d445a0f94d81361cd12429e2572a17656cb9049bb83a25f1fb12e17606a94c1a005582c08a90bf8cd10cf25adcf9f9420e48a561bdbcb84eeb3b15399957 SHA512 2951ca778e732685409911c05f24e8e85492e5af4d8eceb0558636b4ace53b8967250250712c5995239bc5f7af01d20774042f3ccc9f90b370ca3cff673bb0b7
 DIST libvisual-0.4.0.tar.gz 583386 BLAKE2B 277348dacae1382da7e9212f7338a9cbc8aa867637d7db10ee22551c5e33b2d09870e94437958379245acf609dd70d3fa85f9ac14b40413424a7a14ca09e7360 SHA512 ab2286de30d33582a92f16e46436fcbc44b74649952df6e94d96aedc2cabb18d3361496c0b8ab6f52f7178214bf735673c8f1820c3d149304787ba8407201b95
-EBUILD libvisual-0.4.0-r3.ebuild 1256 BLAKE2B f1d0fa2d929f93097d515ccbe14fb0def4b80007d22af3944d6a921231768ed56e1d1a79d575957451cc482e81fdf44848aa2a1d3f7f3595dd0f3fd35f7e5175 SHA512 efe5081ca7b4b7056387c619ecd969ab374246d75c51f756d4889110f058d53df09eb537c41134d805f5094ef07df99d3fc26436cd26cced79d6a9b5c6530b41
+EBUILD libvisual-0.4.0-r3.ebuild 1242 BLAKE2B d15f933d83a3d259f40203dfadeed3054d2089a90cd3700aa2d53f81c997d83d8dc59f05e9fe92fd8c8d83bbedcf4aad5b721ccc14e19dbf2376a3bf8ed7c389 SHA512 50fddaff8738fe44fc7d30a9d0b5784fbbd094b5832a0989c62eca54aaf9256a3df6c6fee730fa873d74d9c1525e01da4b99b98a9e0c0a4736a344759121c367
 MISC metadata.xml 332 BLAKE2B c29c386b29c500e0f8a7827985e0c26ee50f9f0465b92c42feed113b3b1fdceae581a6b8d7089ba2d304428f604b531d8e8833da12f2d44e8a1643d952b11445 SHA512 62db2eb31068dc2c0adf100ff0a9782bf9f92118fb2c2322fbde5fff6a22dfe16ff826b22218b44a86b7350ffbbc3e9fc6f0135f0a43feff8f83e3e6365b7288
diff --git a/media-libs/libvisual/libvisual-0.4.0-r3.ebuild b/media-libs/libvisual/libvisual-0.4.0-r3.ebuild
index cad7f9764d7e..bc2a53c276ad 100644
--- a/media-libs/libvisual/libvisual-0.4.0-r3.ebuild
+++ b/media-libs/libvisual/libvisual-0.4.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ AUTOTOOLS_AUTORECONF=1
 inherit autotools-multilib
 
 DESCRIPTION="Libvisual is an abstraction library that comes between applications and audio visualisation plugins"
-HOMEPAGE="http://libvisual.sourceforge.net"
+HOMEPAGE="http://libvisual.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/libvorbis/Manifest b/media-libs/libvorbis/Manifest
index f642d46aa34e..4b4987e07177 100644
--- a/media-libs/libvorbis/Manifest
+++ b/media-libs/libvorbis/Manifest
@@ -1,5 +1,7 @@
 AUX libvorbis-1.3.6-CVE-2017-14160.patch 738 BLAKE2B 799426d01cb7a55a79e518d4014a50ba0145987a7763a797ddb8d6e29eb51af29f435858dd01b3cc24dc31989037aa8e9efb0b2ec964a713134a7e5d6359a423 SHA512 a33e36b11e868063203771b62ded24f2dbb3fa83422687e5cda4cd1f75e9c1f2012de075b688f2604f5cfc85d082e32792505fd8993727c3c6d347947e1e1a45
 AUX libvorbis-1.3.6-CVE-2018-10392.patch 728 BLAKE2B 774165f3b0483924d464289bc6ae28b774e6307c3be7b388b33ff73d52f5e77d4180648af5644e28e23abce4561d09ae0e3fe8b548e06bd0c9138a77ea555676 SHA512 294de5e0c40b64d495df7f53196260be5ffaba11c75fc4a1a54ec0c058eeba4793c1ef685c8cf866195a2972c91a7a896df5f05f478b7f25a564abb3f82f331f
 DIST libvorbis-1.3.6.tar.xz 1195388 BLAKE2B 9fc1dd125fdecb95687ea159b75cd66eed21329ec0795a3050e52e6cc58e1aac7b084ca25c4e52ca6f251ff474f6d71a716c0fbb2367beda8eb6a51a8fa9049a SHA512 a5d990bb88db2501b16f8eaee9f2ecb599cefd7dab2134d16538d8905263a972157c7671867848c2a8a358bf5e5dbc7721205ece001032482f168be7bda4f132
+DIST libvorbis-1.3.7.tar.xz 1203792 BLAKE2B 849e3f1129313646471e2bb7e9beeb3766d6a121fe09984e39a353cae7dacd0a970900b0cb6f68b1d69e759515298d901fcc0cba1edb91dbc4bae4456f4bd6ea SHA512 bbf5f11f623d959b3ba98d6b52806521b0b918b59b867f0658c153ea1013293364eead4987e9e71f8798021379310860a2e548fcf89d10caf23d45e41aba45cd
 EBUILD libvorbis-1.3.6-r1.ebuild 1365 BLAKE2B 7cdee799c4b06c2daeb7773fb29ee92b5a7fcd1cedb3e6e8103d41063f2302d2e7e1ba52c59ea5c5781043e559d76c1cb8d93c812b284a9bb6a549a310d753fc SHA512 de1515d8caa692c3e2b60355a634429b5ad611fe72b40d7a9bf8f2b10ae9dd3fd659be69e87aaee2ce1cf4127854b25fd38b2c001d9a461039f8d3f34cbf878c
+EBUILD libvorbis-1.3.7.ebuild 1286 BLAKE2B 0c75be520a410e8b755e579ee9eb67f17e7b020477d4a3b43d0dfcb98f4762787fd23705bb97aee304d412a5aa19530864cb3fe7d9ce1909da660d090ae30ebc SHA512 bdee560c0ad2881be1b01d9ed9b36767765ae6eb3dce64c5241c23ec101fe21faa08668c493647de00345bd8b35b00d97cd6553c04392af611c3bbc514cd07d9
 MISC metadata.xml 329 BLAKE2B a6d5d9be9186aaf3d6735d864b6cb04bffa351cc1a1ddc13e469ca002502048e74ae672f4079626afcb89798faa4628b6b859d200b241c4d643b65ff9c23e6ca SHA512 2fde69847e03cd50deb51ecb44508c41ffbdada22e1838a4e4a6f8165f550aa107849705b666166fe5cd9b1372a76bc5c50eeadb560a76043563dfdc98ce14bf
diff --git a/media-libs/libvorbis/libvorbis-1.3.7.ebuild b/media-libs/libvorbis/libvorbis-1.3.7.ebuild
new file mode 100644
index 000000000000..a0af9300c241
--- /dev/null
+++ b/media-libs/libvorbis/libvorbis-1.3.7.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools multilib-minimal
+
+DESCRIPTION="The Ogg Vorbis sound file format library"
+HOMEPAGE="https://xiph.org/vorbis/"
+SRC_URI="https://downloads.xiph.org/releases/vorbis/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND=">=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]"
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/CFLAGS/s:-O20::' \
+		-e '/CFLAGS/s:-mcpu=750::' \
+		-e '/CFLAGS/s:-mno-ieee-fp::' \
+		configure.ac || die
+
+	# Un-hack docdir redefinition.
+	find -name 'Makefile.am' \
+		-exec sed -i \
+			-e 's:$(datadir)/doc/$(PACKAGE)-$(VERSION):@docdir@/html:' \
+			{} + || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable test oggtest)
+	)
+
+	einfo "Running configure in ${BUILD_DIR}"
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index 9be2f96808ec..89059e012227 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -2,8 +2,11 @@ AUX libvpx-1.3.0-sparc-configure.patch 406 BLAKE2B 02b1f0484a9659fdc90eb567db517
 AUX libvpx-1.7.0-CVE-2019-9232_9325_9371_9433.patch 8035 BLAKE2B 785a8769741e5af10ce0f18f6ef9f091d1335ca1c8515c9b653d3a177a620a8b3360b7df03f058b63e42259d6e4ccb6863e0ec9acd69886627a222ea3b8beb2d SHA512 b5af677b7f8fc6c61ea1c99c094103549cbe1a0163da70f51d4c34eec40b507a7bf8f84f97ee141a15c33bfaf2a6cb36c572a08465407fb17eb9b6a1364a3819
 DIST libvpx-1.7.0.tar.gz 2679797 BLAKE2B de7992adb517e375c5be2a9facf2b4a73174adcaef11185ed6d3102c2f6b73f378b0d415c5e3a4d915b3a6889bd8b31ba3e8c007a87a433a345ef7696a1dd899 SHA512 8b3b766b550f8d86907628d7ed88035f9a2612aac21542e0fd5ad35b905eb82cbe1be02a1a24afce7a3bcc4766f62611971f72724761996b392136c40a1e7ff0
 DIST libvpx-1.8.2.tar.gz 5312988 BLAKE2B 4d27eb457c20e70f5b68b589962692d4938cf69e889009cd6aa74cbefb3afd53ba2733420e5a8feb1388558969d95d5a26e1fc60b9b8ef6a0be8dade7d54ee0b SHA512 da2ab0775a28ddd78654bbe46886e833d4ef7ba91867fc1427dceced735b6177eff06b24f204c075c50c3a5cadc5be6a1fb213c44df189218a543b52554f3a38
+DIST libvpx-1.9.0.tar.gz 5326239 BLAKE2B 6403a5d8326235a8d27ca3727f45398556cbe72cd125ae358c22f729cc01d6a81917cca8a6e97ad0ed01e7fc04ca4212baf21f371323b93ccc8830c4a11acf91 SHA512 8d544552b35000ea5712aec220b78bb5f7dc210704b2f609365214cb95a4f5a0e343b362723d829cb4a9ac203b10d5443700ba84b28fd6b2fefbabb40663e298
 DIST libvpx-testdata-1.7.0.tar.xz 238790100 BLAKE2B 1d14e794341d35402eaf54d398ebed56b0983908e397ae677737e0f313ea0bfc9c4a39be91765b02a07a8eb9b55529d5f998efcc87b1b493b0e326e02193d982 SHA512 1556345e41674f0846a7419828972ec27c3c37fe270fa1deb45e03665f60ec088d79134aee0d2e27003b130636eeed4a15ea3f701c9d7014f3ca2785467767a8
 DIST libvpx-testdata-1.8.2.tar.xz 422945340 BLAKE2B 117c26e77b9cda30ca083382981fd88139905fec756e362c6c8497adee26796cd9adab752b197b1eedb9f5e26970100c08fd0e3bd42184fd3e12afe927acad3e SHA512 a1616d1c199983d47157c2e99b409e781df86804048f9a7345f2e682ffc2c6d79ab95f5cf3ccb01c0db498e79686086d9c7aa2c2c07e53cb7f642afd1e38ea35
+DIST libvpx-testdata-1.9.0.tar.xz 450868860 BLAKE2B aaed7f2ef4f70ff352e39be2630e3a5cd803e8d2408c4fd5c3e06e040a75d2f593a10bc267a497aa91eaceb64286e81f69e86ca0940160e4f34b62c08e91df7b SHA512 bcc89062a436d652d15d5852a842cb4985c4783855b943ab11667c022b5082887129fd9579b8da3af209a3031f95ff8dc625c380f79559db160501cd676736ea
 EBUILD libvpx-1.7.0-r1.ebuild 4053 BLAKE2B 3787d0620c70a248d22aa66f951eb4b39a86e5ac89af8e76e5e708185695c2aca818050027f5ff4e2e00f51d370ac90246a8c92bcf334e47d7c564273b63f2f9 SHA512 fe8d16a9ba74e96f9017b5b58113c8af86688d5600112382a23f809388590f3c39d7cdffe57c57358e67e2be01fa98ac870a31ef7d797b865b089cf20330a440
 EBUILD libvpx-1.8.2.ebuild 3436 BLAKE2B 5c78fa513348cad6d6a1560a72fc4d0c15c746ea6f52843182f3b30d8d71e1f76ee245c95291ba9356a147de1f73f65f5a7a147aa1cd6d861fdaf5831ec7fe62 SHA512 2fc98db752426b5530a3c42b9a4a03a4e38e79d2746d42be3d5ffce155c9aa5e49f6d17a28c2535bb5fbdae8bea31fd90e0e15fa74ee51dface9b90a2357ae1a
+EBUILD libvpx-1.9.0.ebuild 3464 BLAKE2B 0c9d235a33c0b764ebf7c5dac44cf78083d81d622ea6c939c897360850ec34fd0e46b24994d1a68e5daf7c1f89edcfb8fa31d3cd9d48d373bbab7900baf04595 SHA512 60595a1d6b225caa1e29ee4a22fd8064cf1e537b3610e1a016052c9fd4c1da2a603b7acb183ccf83ff23ef716ad052b8f88a2a9cc7aa11feca7eddf9070936c5
 MISC metadata.xml 664 BLAKE2B 78c866b8ee8a4b266156652bd6352d1ad0b7f28c88922dd31868623b1eca6530aab0a391c7264e5f1dffb9c1379adeb3b115846e99e1ab8a2ae1e58f527234ca SHA512 96644cef2185474da831eb928645cb7607216242097e8d1f1b887071817e282e22ae5646583208bfacf4467029b9dc2d3cfb888bba085bbf5b493dc98c3a7ef9
diff --git a/media-libs/libvpx/libvpx-1.9.0.ebuild b/media-libs/libvpx/libvpx-1.9.0.ebuild
new file mode 100644
index 000000000000..7505ae66f662
--- /dev/null
+++ b/media-libs/libvpx/libvpx-1.9.0.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+inherit toolchain-funcs multilib-minimal
+
+# To create a new testdata tarball:
+# 1. Unpack source tarball or checkout git tag
+# 2. mkdir libvpx-testdata
+# 3. export LIBVPX_TEST_DATA_PATH=libvpx-testdata
+# 4. configure --enable-unit-tests --enable-vp9-highbitdepth
+# 5. make testdata
+# 6. tar -caf libvpx-testdata-${MY_PV}.tar.xz libvpx-testdata
+
+LIBVPX_TESTDATA_VER=1.9.0
+
+DESCRIPTION="WebM VP8 and VP9 Codec SDK"
+HOMEPAGE="https://www.webmproject.org"
+SRC_URI="https://github.com/webmproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://dev.gentoo.org/~whissi/dist/libvpx/${PN}-testdata-${LIBVPX_TESTDATA_VER}.tar.xz )"
+
+LICENSE="BSD"
+SLOT="0/6"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc +highbitdepth postproc static-libs svc test +threads"
+
+REQUIRED_USE="test? ( threads )"
+
+# Disable test phase when USE="-test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="abi_x86_32? ( dev-lang/yasm )
+	abi_x86_64? ( dev-lang/yasm )
+	abi_x86_x32? ( dev-lang/yasm )
+	x86-fbsd? ( dev-lang/yasm )
+	amd64-fbsd? ( dev-lang/yasm )
+	doc? (
+		app-doc/doxygen
+		dev-lang/php
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/libvpx-1.3.0-sparc-configure.patch" # 501010
+)
+
+src_configure() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=384585
+	# https://bugs.gentoo.org/show_bug.cgi?id=465988
+	# copied from php-pear-r1.eclass
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/ #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+	addpredict /session_mm_cli0.sem #nowarn
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	unset CODECS #357487
+
+	# #498364: sse doesn't work without sse2 enabled,
+	local myconfargs=(
+		--prefix="${EPREFIX}"/usr
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--enable-pic
+		--enable-vp8
+		--enable-vp9
+		--enable-shared
+		--extra-cflags="${CFLAGS}"
+		$(use_enable postproc)
+		$(use_enable svc experimental)
+		$(use_enable static-libs static)
+		$(use_enable test unit-tests)
+		$(use_enable threads multithread)
+		$(use_enable highbitdepth vp9-highbitdepth)
+	)
+
+	# let the build system decide which AS to use (it honours $AS but
+	# then feeds it with yasm flags without checking...) #345161
+	tc-export AS
+	case "${CHOST}" in
+		i?86*) export AS=yasm;;
+		x86_64*) export AS=yasm;;
+	esac
+
+	# powerpc toolchain is not recognized anymore, #694368
+	[[ ${CHOST} == powerpc-* ]] && myconfargs+=( --force-target=generic-gnu )
+
+	# Build with correct toolchain.
+	tc-export CC CXX AR NM
+	# Link with gcc by default, the build system should override this if needed.
+	export LD="${CC}"
+
+	if multilib_is_native_abi; then
+		myconfargs+=( $(use_enable doc install-docs) $(use_enable doc docs) )
+	else
+		# not needed for multilib and will be overwritten anyway.
+		myconfargs+=( --disable-examples --disable-install-docs --disable-docs )
+	fi
+
+	echo "${S}"/configure "${myconfargs[@]}" >&2
+	"${S}"/configure "${myconfargs[@]}"
+}
+
+multilib_src_compile() {
+	# build verbose by default and do not build examples that will not be installed
+	emake verbose=yes GEN_EXAMPLES=
+}
+
+multilib_src_test() {
+	local -x LD_LIBRARY_PATH="${BUILD_DIR}"
+	local -x LIBVPX_TEST_DATA_PATH="${WORKDIR}/${PN}-testdata"
+	emake verbose=yes GEN_EXAMPLES= test
+}
+
+multilib_src_install() {
+	emake verbose=yes GEN_EXAMPLES= DESTDIR="${D}" install
+	multilib_is_native_abi && use doc && dodoc -r docs/html
+}
diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index d2866d9af5bf..d0e562e3bbe2 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -1,4 +1,5 @@
-AUX includedir.patch 403 BLAKE2B 27bf2e0e9dfb44bc62d518ac1282cc2b4d2c77a368c6b6ac7c1b09e24183eb8c40871f1c591000879c043ef322bde90c6ee2a6313d37ecb4fc9626f8a66717ab SHA512 c0aed82243a8a5a5155ba5b39e8283b9f24de498cd0a02e1f3907f5bd0c4b92e1dde9c8a7501784da49b3365ddca0fc0aa2d986119bc4543aa2aefeea46f27de
 DIST lilv-0.24.6.tar.bz2 541765 BLAKE2B fb3532b1a19c790207b894f88ea7d4f714bef8e9f743ca27f6eca36fe44da6e92bce47931791dfb0096e03f9efdf569b1f3f514debb1538c2727c65f61697627 SHA512 0cf89d7dac97727e744579d3f4f4b330f56cf72f1a30bd03abfd645233aaf04e9bbf2abf460a0e4b963ed40e1ae78ed5f36127553bdab16e3e7dd3e93b70cdad
-EBUILD lilv-0.24.6.ebuild 1744 BLAKE2B 8215ab36a46d5e44a2efe870e719efa061bdb6b9917981671ca6889685090cdbdd1922501c8dee394b55ed6ab54769a302f1436ab033085f5783e5cce646a330 SHA512 ee36be9929f9a1cd117acc52a9fcf9e399c4c68fc11c2c1759ffe46763c3d67814e8aea2fd1bb9042888d8b8d8c558d4fbddbf998a305a502b6db18172169bb5
+DIST lilv-0.24.8.tar.bz2 545545 BLAKE2B 606beb68d6e277dfea85e3d2e27b58adf22f0a47a91583e4f1cd85649f237e75fac9b397eb07be69b5a278d02346d58bdf35c4c8fb248e4899a4fc9b05288c23 SHA512 f2b2638372a8280041f6e88e2077f2109f89dad6feedb9d07a88c6b5a05c37b62112f5d03282da4335ddd0d14339cfb49ad96a3df3de310265a40c24718be192
+EBUILD lilv-0.24.6-r2.ebuild 1700 BLAKE2B cb5acdff832430616f13aec5b2396166d6480ef0c01c3e5b0595100cb32c5af06100bdfa9d40c083987367db579eb259b58a38d36da3e15bcbf855aa8f3cb663 SHA512 9bc6eeb31effdb6609052075b5991ec602c94ca8a0b4a0d29ff8508067716aa6140be9729ce5251808d1cf0ebe86a729153ec92163b7eb9137b55bdde561057c
+EBUILD lilv-0.24.8-r1.ebuild 1706 BLAKE2B bbcf8c9856d714b638caaf900be37c4f69f13ad4ee189b6edd0beae73af62d4abc1aa4831be8e2ab52c3188b6b386eea6e16410e2d7d359f0b8ea9d6bfb3ab4f SHA512 0eafa79adf988939890b8b56ff3d0e0899cbf7a6c5c705f1a2adc8b2eddc7ada325d086317371b1662b0caaad61c441af4666545135bea52e601d11e510250f2
 MISC metadata.xml 626 BLAKE2B 07ffc634a72982335c60d71732dca314e28b08ed40fe892f33514f0d13ac9e141fcb6a1d0507b6f35f4d6db963865ed87acb70aa8f2c1d20ff72eb4e62006841 SHA512 e2cd8e2459104889e6cc759146f86874a78784c07b966de2f6a18302098a028e7176270565922a44a72ada23eabbf5de919271296374d9547262684611ee74ce
diff --git a/media-libs/lilv/files/includedir.patch b/media-libs/lilv/files/includedir.patch
deleted file mode 100644
index f20357302b23..000000000000
--- a/media-libs/lilv/files/includedir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/wscript	2017-12-19 20:47:08.288722501 -0600
-+++ b/wscript	2017-12-19 20:46:46.932616417 -0600
-@@ -196,7 +196,7 @@
- 
- def build(bld):
-     # C/C++ Headers
-+    includedir = '${INCLUDEDIR}/lilv'
--    includedir = '${INCLUDEDIR}/lilv-%s/lilv' % LILV_MAJOR_VERSION
-     bld.install_files(includedir, bld.path.ant_glob('lilv/*.h'))
-     bld.install_files(includedir, bld.path.ant_glob('lilv/*.hpp'))
- 
diff --git a/media-libs/lilv/lilv-0.24.6.ebuild b/media-libs/lilv/lilv-0.24.6-r2.ebuild
index 58febaec1c0f..bfcd8e3ac70b 100644
--- a/media-libs/lilv/lilv-0.24.6.ebuild
+++ b/media-libs/lilv/lilv-0.24.6-r2.ebuild
@@ -33,8 +33,6 @@ DEPEND="
 	test? ( dev-python/unittest2 )
 "
 
-PATCHES=( "${FILESDIR}/includedir.patch" )
-
 src_prepare() {
 	default
 	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
diff --git a/media-libs/lilv/lilv-0.24.8-r1.ebuild b/media-libs/lilv/lilv-0.24.8-r1.ebuild
new file mode 100644
index 000000000000..9478c738d163
--- /dev/null
+++ b/media-libs/lilv/lilv-0.24.8-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-any-r1 waf-utils bash-completion-r1 multilib-build multilib-minimal
+
+DESCRIPTION="Library to make the use of LV2 plugins as simple as possible for applications"
+HOMEPAGE="http://drobilla.net/software/lilv/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc +dyn-manifest static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/serd-0.30.0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/sord-0.16.0-r1[${MULTILIB_USEDEP}]
+	media-libs/libsndfile
+	>=media-libs/lv2-1.16.0[${MULTILIB_USEDEP}]
+	media-libs/sratom[${MULTILIB_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-python/unittest2 )
+"
+
+src_prepare() {
+	default
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--no-bash-completion \
+		$(multilib_native_usex doc --docs "") \
+		$(usex test --test "") \
+		$(usex static-libs --static "") \
+		$(usex dyn-manifest --dyn-manifest "")
+}
+
+multilib_src_compile() {
+	./waf build || die
+}
+
+multilib_src_test() {
+	./waf test || die
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+}
+
+multilib_src_install_all() {
+	sed -i "/lv2jack/d" utils/lilv.bash_completion
+	newbashcomp utils/lilv.bash_completion lv2info
+
+	dodir /etc/env.d
+	echo "LV2_PATH=${EPREFIX}/usr/$(get_libdir)/lv2" > "${ED}/etc/env.d/60lv2"
+
+	python_optimize
+}
diff --git a/media-libs/lsp-plugins/Manifest b/media-libs/lsp-plugins/Manifest
index 9e28c6eceeee..9b93753fa127 100644
--- a/media-libs/lsp-plugins/Manifest
+++ b/media-libs/lsp-plugins/Manifest
@@ -1,10 +1,12 @@
 DIST lsp-plugins-1.1.10.tar.gz 53837323 BLAKE2B d890e80d2c6bf871053bd53994af597e653c19894b64df8396c54e1b70bd716adacb8ff7ce7946098d96ca64fe0e03aafc7d4d52af342b67b2551fb0dadaff42 SHA512 aedc6a6a421bfb1ad964f6963793cdb2616456044736745a1c3dc27e947b1d6395de1942c2525bc983e654df5335d35466eed16b8f31612119284b024bdce6c2
 DIST lsp-plugins-1.1.22.tar.gz 61694018 BLAKE2B 5c14140af797624cf67d61618d22a006c4b02232cef92533244f36b108b58461c56c28379cbdefc8d967de34c3bae91450bc787a0e6ab2ae41f53e4e431a17ff SHA512 6004136b55a990033d22e60af6c418a5ee708aaf0f4263fc3af8097876f7eea6e125a44392468ed8e30a92c0fa44eb65f40d80b25a5f243d3fd4f1c0f3af70d6
+DIST lsp-plugins-1.1.24.tar.gz 63809276 BLAKE2B 3d623d4a5b21f2b4dbd7263805b50c9cd9bf19733aeab774983d7a79695015d1e30201f3de46dde950adadcced347f878a272c1c3da9c5f0721c6effda05d9b4 SHA512 20a82594aec51877255ca2808b6c8af03fcfc2f393fdbc6ae6826dd0da17c4a5cb14f02658c1f102600477d7d4d4fc9e24ee3c6a6ef704afc443499a43bd65ec
 DIST lsp-plugins-1.1.5.tar.gz 51911033 BLAKE2B ec9b6f3715f1043537ebe35d14abda85b8dfe23d52d335c54c02eb2867753c9b256a5acd71537c95d6da273d054f0e0c9439fe2f81f6d6ced3087de93bfaef60 SHA512 42b9cd102247a0165a32f82a5a7ce05928a9703c80f215783ad67020d1f975d1c334af1f86c9f17e76bea3fd90bcf5c47fff5618875038b3655621880b60a699
 DIST lsp-plugins-1.1.7.tar.gz 52408312 BLAKE2B 1763d7aaff60c4bf3185325789925dc7e5ea1052907f0d1ee3af7c09d39d1f49dfdda537c29d1d2e1ed2bd041345fb3f32a444aa403521f6d4fbd7a952f9f7cb SHA512 e98000c98464abc1db75e044bc1b7adb535b94fbe1025a52baf0a2c92bcd21039c9b330e790f0607b4747356aff3f7d4ae20e666a9135108e875057c5459c8ae
 EBUILD lsp-plugins-1.1.10.ebuild 1039 BLAKE2B 64e776c1d6f85a46e5cd56ea13bf8ca83a02d32f18ca38a9e513debb2b12d4f57ef8e630f029cf9106d947d760fdad306edc959b31d2101ada7aa797cdb8c4ca SHA512 5eb65e6bed53b41f42528787a44100313064fee96b64309d8a12fe6563feb0280af9aeb8d70a1024b6fa4f51d1c375f9eaba8ff295dfdebc032038e97da44079
 EBUILD lsp-plugins-1.1.22.ebuild 1039 BLAKE2B 64e776c1d6f85a46e5cd56ea13bf8ca83a02d32f18ca38a9e513debb2b12d4f57ef8e630f029cf9106d947d760fdad306edc959b31d2101ada7aa797cdb8c4ca SHA512 5eb65e6bed53b41f42528787a44100313064fee96b64309d8a12fe6563feb0280af9aeb8d70a1024b6fa4f51d1c375f9eaba8ff295dfdebc032038e97da44079
+EBUILD lsp-plugins-1.1.24.ebuild 1060 BLAKE2B ef1bc5e9dd6e1c5cb9ac4db76fbb51ad50825a77137951782233d708a69e904c43ceff1545b3447dc30c6d70c0f892b731b282c9f53c6d6b713898efeed43aae SHA512 d9a30e986c92e0afded3abac9bb1340e53ba20412318f9c139170c911b3bb3d1cdde0241919728e7a79223a6720a9fbe5560bb07ff17bb9068e70cdf31340955
 EBUILD lsp-plugins-1.1.5-r2.ebuild 1260 BLAKE2B 31d54fbcb2d2a175e8ab93eff26535f9e62c151d4e9dd0d22f1092d7e83fccd11da864aa89a95df86da9eccd8434c623716b48d27cf6f3990d326e554543304e SHA512 2d09fc21ca51ddaf084461b664139a2855dc23a8863ea73c58da57e808fcd1d29a47054a0c83adbc4c10b0bff006239f5a426bacdf8b8bc1007262c2eeee2b8c
 EBUILD lsp-plugins-1.1.7-r1.ebuild 1037 BLAKE2B cd70d7c20ac3e6abc074780b15dc24a5c7f0f19eb8dbc54239e6ae4977fc5ac04ffdeb29f105cbf1b71975a029f5ffaefa182903820c8ae1f57754c2256dc7e1 SHA512 cb9256462b87742bc44663d6888f385fec69f4ac8776434574e305ef3526a0befcc8b737ca94d5d931b4337682195a2f4ee8990e86e4254266230896ff0a1a61
-EBUILD lsp-plugins-9999.ebuild 1039 BLAKE2B 64e776c1d6f85a46e5cd56ea13bf8ca83a02d32f18ca38a9e513debb2b12d4f57ef8e630f029cf9106d947d760fdad306edc959b31d2101ada7aa797cdb8c4ca SHA512 5eb65e6bed53b41f42528787a44100313064fee96b64309d8a12fe6563feb0280af9aeb8d70a1024b6fa4f51d1c375f9eaba8ff295dfdebc032038e97da44079
+EBUILD lsp-plugins-9999.ebuild 1060 BLAKE2B ef1bc5e9dd6e1c5cb9ac4db76fbb51ad50825a77137951782233d708a69e904c43ceff1545b3447dc30c6d70c0f892b731b282c9f53c6d6b713898efeed43aae SHA512 d9a30e986c92e0afded3abac9bb1340e53ba20412318f9c139170c911b3bb3d1cdde0241919728e7a79223a6720a9fbe5560bb07ff17bb9068e70cdf31340955
 MISC metadata.xml 492 BLAKE2B 6550b2fe0e0a6bc5bece22d51b36d920284f662f1da5dbe2551fbf82ebc3416262339436ce2eddf9efbee49e57d5a28139f6ac3f1f86e20b5a74e5c4fb3bc37d SHA512 681338f3f8abbd1c103ef72c176595e10ca6bc0e6ca309e2f4d39166309329d8176aa9025056685d67d708ec1732d023c773a1e2a4cce7f019945ea112ab8f84
diff --git a/media-libs/lsp-plugins/lsp-plugins-1.1.24.ebuild b/media-libs/lsp-plugins/lsp-plugins-1.1.24.ebuild
new file mode 100644
index 000000000000..51871cd000f5
--- /dev/null
+++ b/media-libs/lsp-plugins/lsp-plugins-1.1.24.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Linux Studio Plugins"
+HOMEPAGE="https://lsp-plug.in"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/sadko4u/lsp-plugins"
+	EGIT_BRANCH="devel"
+else
+	SRC_URI="https://github.com/sadko4u/lsp-plugins/archive/${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${P}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="doc jack ladspa +lv2"
+REQUIRED_USE="|| ( jack ladspa lv2 )"
+
+DEPEND="
+	dev-libs/expat
+	media-libs/libsndfile
+	media-libs/libglvnd
+	doc? ( dev-lang/php:* )
+	jack? (
+		virtual/jack
+		x11-libs/cairo[X]
+	)
+	ladspa? ( media-libs/ladspa-sdk )
+	lv2? (
+		media-libs/lv2
+		x11-libs/cairo[X]
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_compile() {
+	use doc && MODULES+="doc"
+	use jack && MODULES+=" jack"
+	use ladspa && MODULES+=" ladspa"
+	use lv2 && MODULES+=" lv2"
+	emake BUILD_MODULES="${MODULES}"
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${ED}" LIB_PATH="/usr/$(get_libdir)" install
+}
diff --git a/media-libs/lsp-plugins/lsp-plugins-9999.ebuild b/media-libs/lsp-plugins/lsp-plugins-9999.ebuild
index 3e66062b835d..51871cd000f5 100644
--- a/media-libs/lsp-plugins/lsp-plugins-9999.ebuild
+++ b/media-libs/lsp-plugins/lsp-plugins-9999.ebuild
@@ -25,6 +25,7 @@ REQUIRED_USE="|| ( jack ladspa lv2 )"
 DEPEND="
 	dev-libs/expat
 	media-libs/libsndfile
+	media-libs/libglvnd
 	doc? ( dev-lang/php:* )
 	jack? (
 		virtual/jack
diff --git a/media-libs/lv2/Manifest b/media-libs/lv2/Manifest
index 691a91ce783c..6b3fe3af015c 100644
--- a/media-libs/lv2/Manifest
+++ b/media-libs/lv2/Manifest
@@ -1,6 +1,3 @@
-AUX lv2-1.16.0-python3.patch 855 BLAKE2B 9b6e74afdca510e3f7e43cf99eff7168db2e738bf12697b435accb54037611f2e24cc842b06abe3789503a1cc0a1ca74f50edf55d26dd7712406ba817f4959c0 SHA512 756c794acbdb2941553a60d1966635a66b44ff7209019fc9516d66baffa6101071f0f412b675823d32ad48c47d533a29cbeadc56459e88435509032569d62fbf
-DIST lv2-1.16.0.tar.bz2 502116 BLAKE2B 00b364311f61b1a9f251d8eb3e27b66d4a59e313006df549dbb80fc6a1106b588bc59c7766910037ee093254d96e508f8538615666833b0c00c8282301bfe0e4 SHA512 ead6d590cded5dd7a548d6ffe0f2f9f8efadfa7bb9e8b4fa0aea6664ccdfbb3ca697514bddebe695a9442fba5b62714b5cd45c1bf7d0aaef12ffe50972c2d88c
 DIST lv2-1.18.0.tar.bz2 530172 BLAKE2B 2d9c7fe6e4de1d68762445061907873ff98871277fe0e423c34b0e9586cc8bfc7674787c020f3c01731204e80262a52902676f6cec8c8a6c18a97953cc626d3e SHA512 9e8dd9c1f30371260d21efc105b1d4d4ad03d9e332d4d3877d873f20b9527bcd0e917ff23fc6e0a9cc4337bda85882c742f225f7cf4fbc8a8a0964565c91f9d9
-EBUILD lv2-1.16.0-r1.ebuild 1376 BLAKE2B 3826579de7cbba3611dc893f9c192185fbdfca25f87f6add254c63088cc9c0e85f1e4331e56c233ace6295f050d0c857c3c78d44912132f9fe27eb70f1f2827c SHA512 420d21694ad738cf489f58bd271057ad8d33101df5a1be4b667b9716c827494f6153114d30586822cf54fe64ee127f9538eeabd9e62c8c18ea0c3891a58c0f0a
-EBUILD lv2-1.18.0.ebuild 1339 BLAKE2B c89e4c1c94f0489959bf7d08c8f109ed963a9d379a642515300d74f82f38e8563d976fe24f2018437cb326ff3773e1c2894b702f1b021864cee754ab284b9884 SHA512 b88bfdf0be6ee67179fd63b94a3c05d83a19bbda97c8886da6f075812b59237edc2f38cf3dbd9f013102b32db9df0c4ded96665b01308ffcbe75444643b8063b
+EBUILD lv2-1.18.0.ebuild 1366 BLAKE2B 2913c6e04ab202c62205851d54436b6f1f9394430749d98435333a9bc778e196b03aee4b337736b6cd4858dd07855d8de7367ad5db0fadff51b395c6817dfa25 SHA512 466a8b7937b4e43533784f03b4f919813d953f84be15b52783e3aeedd4d4d74247c7d5b190b055a50ea899a4be31ba93e0ea41c8201a3d10e1249ed65123c1a5
 MISC metadata.xml 340 BLAKE2B e8469f758a451316b9d89c286f2d47c82b62d57ff9d43a6f2f93da8cf0abb5579fa8e568d8e6422e5d144a368310ccdec6e89ce2672f53b9db149bbf838afa68 SHA512 a31345dfd0bb1ac92461cd26ffcd20197775288be0ee4a2d660e90b8655f5288166c9613ba42ef3eef6dff6c97d268ffc85af3429eb093ffb29ad9581a5fa33d
diff --git a/media-libs/lv2/files/lv2-1.16.0-python3.patch b/media-libs/lv2/files/lv2-1.16.0-python3.patch
deleted file mode 100644
index 330fc4cfcac7..000000000000
--- a/media-libs/lv2/files/lv2-1.16.0-python3.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/lv2specgen/lv2specgen.py b/lv2specgen/lv2specgen.py
-index ddd0ba5..224ace8 100755
---- a/lv2specgen/lv2specgen.py
-+++ b/lv2specgen/lv2specgen.py
-@@ -329,7 +329,7 @@ def getComment(m, urinode, classlist, proplist, instalist):
-         if have_lxml:
-             try:
-                 # Parse and validate documentation as XHTML Basic 1.1
--                doc = """<?xml version="1.0" encoding="UTF-8"?>
-+                doc = """<?xml version="1.0"?>
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN"
-                       "DTD/xhtml-basic11.dtd">
- <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-@@ -340,7 +340,7 @@ def getComment(m, urinode, classlist, proplist, instalist):
- %s
-   </body>
- </html>
--""" % str(markup.decode())
-+""" % str(markup)
- 
-                 oldcwd = os.getcwd()
-                 os.chdir(specgendir)
diff --git a/media-libs/lv2/lv2-1.16.0-r1.ebuild b/media-libs/lv2/lv2-1.16.0-r1.ebuild
deleted file mode 100644
index d7b0d73f20b1..000000000000
--- a/media-libs/lv2/lv2-1.16.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit python-single-r1 waf-utils multilib-build multilib-minimal
-
-DESCRIPTION="A simple but extensible successor of LADSPA"
-HOMEPAGE="https://lv2plug.in/"
-SRC_URI="https://lv2plug.in/spec/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE="doc plugins"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	plugins? ( virtual/pkgconfig )
-	doc? ( app-doc/doxygen dev-python/rdflib )
-"
-CDEPEND="
-	${PYTHON_DEPS}
-	plugins? ( x11-libs/gtk+:2 media-libs/libsndfile )
-"
-DEPEND="${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	$(python_gen_cond_dep '
-		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-		dev-python/rdflib[${PYTHON_MULTI_USEDEP}]
-	')
-"
-DOCS=( "README.md" "NEWS" )
-
-PATCHES=(
-	"${FILESDIR}/${P}-python3.patch"
-)
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	waf-utils_src_configure \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--lv2dir="${EPREFIX}"/usr/$(get_libdir)/lv2 \
-		$(use plugins || echo " --no-plugins") \
-		$(multilib_native_usex doc --docs "")
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${D}"
-}
diff --git a/media-libs/lv2/lv2-1.18.0.ebuild b/media-libs/lv2/lv2-1.18.0.ebuild
index a3daaf8fa595..bde6301c8816 100644
--- a/media-libs/lv2/lv2-1.18.0.ebuild
+++ b/media-libs/lv2/lv2-1.18.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://lv2plug.in/spec/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="doc plugins"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -26,7 +26,10 @@ CDEPEND="
 	${PYTHON_DEPS}
 	plugins? ( x11-libs/gtk+:2 media-libs/libsndfile )
 "
-DEPEND="${CDEPEND}"
+DEPEND="
+	${CDEPEND}
+	doc? ( dev-python/markdown )
+"
 RDEPEND="
 	${CDEPEND}
 	$(python_gen_cond_dep '
diff --git a/media-libs/lvtk/Manifest b/media-libs/lvtk/Manifest
index f25d08b3eeac..561857bfffe9 100644
--- a/media-libs/lvtk/Manifest
+++ b/media-libs/lvtk/Manifest
@@ -1,4 +1,7 @@
 AUX lvtk-1.2.0-boost-system-underlinking.patch 535 BLAKE2B 371119bce2f368e0ee5cb0db987dcf631da27b01db2a3883b1b0c4d6f9f4775bb2841a76cc540f60aea4149977eb8c304bc5788f5bae5da6c39900bdcdad7914 SHA512 80cbe3d091975120e0293c1aed26e26d579bed0ef51d4bbf30ac62d3f544a5501be01f01c24f374dab21d9c76e1d3fa64c9641a5d2b13edf136b8d8cca4bdeb0
+AUX lvtk-1.2.0-py3.patch 358 BLAKE2B 8ee7f4ba685e6327f261358bf637ae05598e8a06b417139d1513200436677bde04259b27d7f4317760196b4d22bf728bb26776fd4f76a6d7db2c965e97a37ad8 SHA512 982ebd8884d0633a5f7e4bedc970a76f390523ba5a2ef58c382dbf521d17fa05cc9b00825f35f04a515cf6ebccb612b16eb79142b04fbf6da9a0f05802cadf8f
 DIST lvtk-1.2.0.tar.gz 201146 BLAKE2B d6aa47f5d89e861393b95d60fe53a232f8047c77f8593dc7dcfc700c3933d2bc37e3e499d1d63a84854e0bcfc2232c170cc92b69fd8b01be30f0f581b216a4a9 SHA512 f193ec28103cb2f6353ff0f96f8790041baf1ae99472c5d04017c23b42d0179b1f5e1de6722e17080410311d0e7e1de4ca0ae9ab76fb3bf8a02d9dc1451d8db7
-EBUILD lvtk-1.2.0.ebuild 1445 BLAKE2B 0f29698da7296c17974eb97784471d8a440126022ae67906d8dd24d52dc3442e23d47445223e8e31952121d2e149edcbba44e00ff0bcbd01fd3d85361e384e7b SHA512 62310db51ba8e4cc1a01c55383996abfa312e44afe93881901958c13bdf153f872c5a479fbbc5c0b506d3ad7adac0d88df38de8a2f4e673cbeb05ec44f99b98d
+DIST waf-2.0.20 104725 BLAKE2B c9467b5205f596cd1b5d4b6ccb97806e9fa1f4d4eb9109d378a0978179ab49a029926cb86876ca2088878378f88eb292d899840b4a072e62fc6542b93bc2d894 SHA512 72de1c5a78eb353da4b4a6ea4fbf52d232ed6dd08e972872744e3727b952f813f44e47f0b47106bd6f05ce7fa137c4685ac313fb0b0d70e5fc85dc34918e66f0
+EBUILD lvtk-1.2.0-r1.ebuild 1662 BLAKE2B 34fafc56d5f52b316ffb4c181ecdf09e38f16bdc4dfcf298ed305edcc1f8403284b52efcaed4eb8ba7c819e8878a00eea8da7e88d424e874955140c61801f9d8 SHA512 4879b729e3c70155f796b7f809008aa6aa002700c53234caba1886673c6c46db07c9dc733caf4c3cbc0d5dbdcd3044caf62c06fcf671f89d6b703a7ee261ff00
+EBUILD lvtk-1.2.0.ebuild 1432 BLAKE2B 1df30c38ec5709ec5bd8d921ca064648d631e92ad35e8956e0863bec9d62fee0aba41604d16fce66b9185a61d22e0491d221397c49cbb17e760e585db7e22c3f SHA512 d288b6c258c07aa0527e651592e2a0657e25776cb0a6b4c2073a8297a93d03685cad34b9ff3e54f85b4e8448a50f1f03556aa41a1bc6224de1de7ce07804bfdf
 MISC metadata.xml 502 BLAKE2B d786aa20ddf92b3f0a61bc1df1774624e17a4028bcaad6bdbf220838e0fd834281bf9c08c53ed87d2b4fd7edfb6729a22bb529f563259860ce106e8ddd712f55 SHA512 7d4eca504306d8c96bb766728cdac0f5c61c72ffa784c5923364a16d3ae7c2b9fa89e57f1e00533dc8571d01d0bfa319445f0904373e453bd66970b893fdda45
diff --git a/media-libs/lvtk/files/lvtk-1.2.0-py3.patch b/media-libs/lvtk/files/lvtk-1.2.0-py3.patch
new file mode 100644
index 000000000000..a639c62f2256
--- /dev/null
+++ b/media-libs/lvtk/files/lvtk-1.2.0-py3.patch
@@ -0,0 +1,13 @@
+diff --git a/wscript b/wscript
+index e69c0e0..08ba66f 100644
+--- a/wscript
++++ b/wscript
+@@ -155,7 +155,7 @@ def build(bld):
+ 
+ def release_tag(ctx):
+     tag = git.tag_version(VERSION, "Release: v" + VERSION , "lvtk-")
+-    if tag : print "Git Tag Created: " + tag
++    if tag : print("Git Tag Created: " + tag)
+ 
+ def dist(ctx):
+     z=ctx.options.ziptype
diff --git a/media-libs/lvtk/lvtk-1.2.0-r1.ebuild b/media-libs/lvtk/lvtk-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..091d531606eb
--- /dev/null
+++ b/media-libs/lvtk/lvtk-1.2.0-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit python-single-r1 waf-utils
+
+WAF_VER=2.0.20
+
+DESCRIPTION="A set of C++ wrappers around the LV2 C API"
+HOMEPAGE="https://lvtk.org/"
+SRC_URI="https://github.com/lvtk/lvtk/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://waf.io/waf-${WAF_VER}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc examples +gtk2 +tools"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="media-libs/lv2
+	>=dev-libs/boost-1.40.0
+	${PYTHON_DEPS}
+	gtk2? ( dev-cpp/gtkmm:2.4 )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen
+		media-gfx/graphviz )
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-boost-system-underlinking.patch"
+	"${FILESDIR}/${P}-py3.patch"
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz || die
+
+	# we need newer version of waf to work with py3
+	cp "${DISTDIR}/waf-${WAF_VER}" "${S}/waf" || die
+}
+
+src_configure() {
+	local mywafconfargs=(
+		"--docdir=${EPREFIX}/usr/share/doc/${PF}"
+		"--lv2dir=${EPREFIX}/usr/$(get_libdir)/lv2"
+	)
+	use debug    && mywafconfargs+=( "--debug" )
+	use doc      && mywafconfargs+=( "--docs" )
+	use examples || mywafconfargs+=( "--disable-examples" )
+	use tools    || mywafconfargs+=( "--disable-tools" )
+	use gtk2     || mywafconfargs+=( "--disable-ui" )
+	waf-utils_src_configure ${mywafconfargs[@]}
+}
+
+src_install() {
+	waf-utils_src_install
+
+	# It does not respect docdir properly, reported upstream
+	if use doc; then
+		mv "${ED}/usr/share/doc/${PF}/lvtk-1/html" "${ED}/usr/share/doc/${PF}/html" || die
+		rmdir "${ED}/usr/share/doc/${PF}/lvtk-1" || die
+	fi
+}
diff --git a/media-libs/lvtk/lvtk-1.2.0.ebuild b/media-libs/lvtk/lvtk-1.2.0.ebuild
index f55c8072ffcc..62eaf591939f 100644
--- a/media-libs/lvtk/lvtk-1.2.0.ebuild
+++ b/media-libs/lvtk/lvtk-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,12 +9,12 @@ PYTHON_REQ_USE="threads(+)"
 inherit python-single-r1 waf-utils
 
 DESCRIPTION="A set of C++ wrappers around the LV2 C API"
-HOMEPAGE="http://lvtoolkit.org/"
+HOMEPAGE="https://lvtk.org/"
 SRC_URI="https://github.com/lvtk/lvtk/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug doc examples +gtk2 +tools"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -49,7 +49,7 @@ src_install() {
 
 	# It does not respect docdir properly, reported upstream
 	if use doc; then
-		mv "${ED}/usr/share/doc/${PF}/lvtk-1.0/html" "${ED}/usr/share/doc/${PF}/html" || die
-		rmdir "${ED}/usr/share/doc/${PF}/lvtk-1.0" || die
+		mv "${ED}/usr/share/doc/${PF}/lvtk-1/html" "${ED}/usr/share/doc/${PF}/html" || die
+		rmdir "${ED}/usr/share/doc/${PF}/lvtk-1" || die
 	fi
 }
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 89b864534faa..a7e05c712f53 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,8 +1,8 @@
 DIST mesa-20.0.8.tar.xz 12360736 BLAKE2B 19e3f8a40b34b5f17ed76077c5d92f728a134b2479c43d86674ed1818ab99639a9b732041f67488251df808564f6abe5b587d756ef9c7c13dcada87cd0fc05de SHA512 d906330c412899907dd05a84034a929107fccaf3044814c4b1f30ba5690cbcf1587b5f17534c6345111f3cb7cf292afd5984a60486643ff6f534b57cec615374
-DIST mesa-20.1.1.tar.xz 12683180 BLAKE2B de602430ea91076f93b66d1be6da31bd3c74bc194709d36834bac6767c8c2f6047b0930cc070a19293f89a041dc881855ae1f1adedf02284ee4ebc3682487d61 SHA512 a8ae02915305488e5e0d8c104da73df1cdd61ab0b5c5d27a6851c418d25a2c9beeea9cddf93a341afa63cec52d356fe68b194c8c36e78c26f66fa884fc27f147
-DIST mesa-20.1.2.tar.xz 12717604 BLAKE2B b7f41ed625a13c35b5dfed9b1c0919beb73a2dc578dc93d6bd43b936b4cabecdd26eb0841eacf910f0f21afccfad2047d7c4aa4a4c9aeae1d07fb20a4f79028f SHA512 467fc6a1cbfc1bc140ba2e6e90a14bd8d15d979b92ba14d084018b6cf22b172767575f5127c6edb5c3bdf12fe6696b27d9975826b3fbb5ad5909d258fc3b8433
-EBUILD mesa-20.0.8.ebuild 14906 BLAKE2B 6028e9a21a6a7953c705c930aab1097b9aa2336909e893174de4a96cbff442cc79110c04665cf44817e0dcf6103d9410a9ba3d530a2e6cb8327469fa1f3e2766 SHA512 89150f95c9bbf318ab327b637ba630d76e85d0e5d2c827d010744d536a581633aef5929f6b13585161a8f61acf0de38ee801da3e28665ccfbe3f76bf64ef6ca9
-EBUILD mesa-20.1.1.ebuild 14963 BLAKE2B 22006871378002e152a19853c37776d37576b644439836676ec21ac536a49c86f70b00bfd3815547ca5c2a967a40e9e7554589db69a75ded004d25b3aee64342 SHA512 7ff9297ebf9f9c68aa6d499824346f548e3369f17e585f63aaf5f0bb3dd235b2af9e210d60ad272a5e6261544e2818a32d7893e59123b13aa959864fe83592f3
-EBUILD mesa-20.1.2.ebuild 14963 BLAKE2B 22006871378002e152a19853c37776d37576b644439836676ec21ac536a49c86f70b00bfd3815547ca5c2a967a40e9e7554589db69a75ded004d25b3aee64342 SHA512 7ff9297ebf9f9c68aa6d499824346f548e3369f17e585f63aaf5f0bb3dd235b2af9e210d60ad272a5e6261544e2818a32d7893e59123b13aa959864fe83592f3
-EBUILD mesa-9999.ebuild 14944 BLAKE2B a895cfa89de0912183fe1df8beaf09e9f428b87d21896278ad545506611f824ff61230cf2ab4bda1ac819fc4e379893a2dac63a7e9c13dc51ba15cbc5111ce45 SHA512 a6e52ff996da72b1af1d963f790af370861bb0fd07af97267f48c9d999ed2dcf79f69c77bb38559350d9bd83306890fb9e3752dbfba2e272456c4035ccef325c
-MISC metadata.xml 1876 BLAKE2B 83fc9abae54194bb0c9794a5ac0e663b31919bd0054ae8a0b48f1cebb67c5af7c0c4e92cfecbe7e8f56890a97c6769b7412a705c41e33eeec590277aaf666f90 SHA512 7caa29712af56b9d9cd3ff81ea2afccf8703d7e3c47cab10310d04db35356c5e0955c1f6dfa45280b51169708d381d82470b142b974990446eb792c46aa9d8b1
+DIST mesa-20.1.6.tar.xz 12805724 BLAKE2B d652b59e4987436d2e05de9138f2e2fb4a8bf435c24d9c7ad08bcb82a3bf7c9c64bc71b15b4b6d334f8b574341719f372aa1b893283abc21191a4d71d9d30fee SHA512 5ef28334ecb7effaaf597ea3efe0406af62419e6fa629e835d843161ab8d83515626ec0f0495c4cc66af9e5669398ac96c16ca626e4965a9831e1704c995fb09
+DIST mesa-20.2.0-rc2.tar.xz 13528208 BLAKE2B 6505446829ec2c01c0de7a7d9c1187db874111402da5ffe2f9f5872df7b6a5e53a3b628c190172bb9a806851b3b85aa0e3b53a4fcfb40f99adfc48cc3876c9f5 SHA512 36d9a74db50335bd31a8d5c47f7c657f05eeda044530fe123c06c472ed27c9b5dff19716d11d95256449223e82dde38895547cf6ae60b7460d3b1e9ed440704a
+EBUILD mesa-20.0.8.ebuild 14701 BLAKE2B 0109666f0c0db0a7333dad36a01e7bedda6b03eafcc5c0a2061ec48047bdbb3793bcd643195de0a5db39217011c88a4b558a3b665109b1ed32feb62d97683d12 SHA512 5958cc5ed07cc4308eeba3d68ae537de8645564db15ea095cd1daa10453f950a6ca8caa60635cb18f9d66262f8732a94e3df2f721d9ff7376f4cb8ae53dc8c68
+EBUILD mesa-20.1.6.ebuild 14719 BLAKE2B ad71c0427076d83142f05791f1c5a580b6ab89b470ff093c7a951aa7a7e6cb76c070521d545a6d54a11ae4ebb2fc43fb414ad12c7293f1e45f4318be5501171b SHA512 b7eeff6340a2a85cb73145d603e02ef574474f71cfcc1d4133aaf0160e4856327c67b3ba667863f38a096136920901c48da86245f91d3ec6a938d4a9cd219ad4
+EBUILD mesa-20.2.0_rc2.ebuild 15004 BLAKE2B 81a3aae627e1890283c3e1763c281d7cd4be2dc044e53c9e5c88508ca38b53e3c17ced3d734580eb1ac0d067266b97ed2eba5220e7704a038fe2c1ce9920fe71 SHA512 2349dd90f1a500d5b42a96c7ebdc06cdaafbc422cb0d3298797657093384adeade8f2c793c071f568a3f9f7a11e5f7f0191068c46b0cb472b206519b70e00881
+EBUILD mesa-9999.ebuild 15004 BLAKE2B 81a3aae627e1890283c3e1763c281d7cd4be2dc044e53c9e5c88508ca38b53e3c17ced3d734580eb1ac0d067266b97ed2eba5220e7704a038fe2c1ce9920fe71 SHA512 2349dd90f1a500d5b42a96c7ebdc06cdaafbc422cb0d3298797657093384adeade8f2c793c071f568a3f9f7a11e5f7f0191068c46b0cb472b206519b70e00881
+MISC metadata.xml 1953 BLAKE2B 809b2ae05dadf1ef3b78c8c0353032c77aaba205530a51e6e099170d186bc9fdaf289b135e68984aef8f71f69970f9e63a38de816f04199dc2e9965e71e940d0 SHA512 09b322501feafc80de4b81c7a30e1d6f4565247069dc7d80218684382a68b285ca1b80733b6f3126bd15c777cc5a896062686f06fc1822039595b3fed9bcb9e6
diff --git a/media-libs/mesa/mesa-20.0.8.ebuild b/media-libs/mesa/mesa-20.0.8.ebuild
index 48dbdd650ef2..f8e02ddc8cdb 100644
--- a/media-libs/mesa/mesa-20.0.8.ebuild
+++ b/media-libs/mesa/mesa-20.0.8.ebuild
@@ -334,11 +334,9 @@ pkg_setup() {
 		ewarn "detected! This can cause problems. For details, see bug 459306."
 	fi
 
-	# os_same_file_description requires the kcmp syscall,
-	# which is only available with CONFIG_CHECKPOINT_RESTORE=y.
-	# Currently only AMDGPU utilizes this function, so only AMDGPU users would
-	# get a spooky warning message if the syscall fails.
-	if use gallium && use video_cards_radeonsi; then
+	if use video_cards_i965 ||
+	   use video_cards_iris ||
+	   use video_cards_radeonsi; then
 		CONFIG_CHECK="~CHECKPOINT_RESTORE"
 		linux-info_pkg_setup
 	fi
diff --git a/media-libs/mesa/mesa-20.1.1.ebuild b/media-libs/mesa/mesa-20.1.6.ebuild
index 00b4050b4e80..f50ead679471 100644
--- a/media-libs/mesa/mesa-20.1.1.ebuild
+++ b/media-libs/mesa/mesa-20.1.6.ebuild
@@ -151,7 +151,6 @@ LLVM_DEPSTR="
 	|| (
 		sys-devel/llvm:10[${MULTILIB_USEDEP}]
 		sys-devel/llvm:9[${MULTILIB_USEDEP}]
-		sys-devel/llvm:8[${MULTILIB_USEDEP}]
 	)
 	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
 "
@@ -334,11 +333,9 @@ pkg_setup() {
 		ewarn "detected! This can cause problems. For details, see bug 459306."
 	fi
 
-	# os_same_file_description requires the kcmp syscall,
-	# which is only available with CONFIG_CHECKPOINT_RESTORE=y.
-	# Currently only AMDGPU utilizes this function, so only AMDGPU users would
-	# get a spooky warning message if the syscall fails.
-	if use gallium && use video_cards_radeonsi; then
+	if use video_cards_i965 ||
+	   use video_cards_iris ||
+	   use video_cards_radeonsi; then
 		CONFIG_CHECK="~CHECKPOINT_RESTORE"
 		linux-info_pkg_setup
 	fi
diff --git a/media-libs/mesa/mesa-20.1.2.ebuild b/media-libs/mesa/mesa-20.2.0_rc2.ebuild
index 00b4050b4e80..01f47e9da290 100644
--- a/media-libs/mesa/mesa-20.1.2.ebuild
+++ b/media-libs/mesa/mesa-20.2.0_rc2.ebuild
@@ -29,7 +29,7 @@ RESTRICT="
 "
 
 RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost vc4 virgl vivante vmware"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
 for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
 done
@@ -37,7 +37,7 @@ done
 IUSE="${IUSE_VIDEO_CARDS}
 	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
 	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa xvmc +zstd"
+	vulkan-overlay wayland +X xa xvmc zink +zstd"
 
 REQUIRED_USE="
 	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
@@ -62,12 +62,14 @@ REQUIRED_USE="
 	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
 	video_cards_r600?   ( gallium )
 	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_v3d? ( gallium )
 	video_cards_vc4? ( gallium )
 	video_cards_virgl? ( gallium )
 	video_cards_vivante? ( gallium gbm )
 	video_cards_vmware? ( gallium )
 	xa? ( X )
 	xvmc? ( X )
+	zink? ( gallium vulkan )
 "
 
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
@@ -76,7 +78,7 @@ RDEPEND="
 	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
 	libglvnd? (
-		>=media-libs/libglvnd-1.2.0-r1[X?,${MULTILIB_USEDEP}]
+		>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
 		!app-eselect/eselect-opengl
 	)
 	!libglvnd? (
@@ -127,6 +129,7 @@ RDEPEND="
 		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
 		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
 	)
+	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
 	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
 "
 for card in ${RADEON_CARDS}; do
@@ -151,7 +154,6 @@ LLVM_DEPSTR="
 	|| (
 		sys-devel/llvm:10[${MULTILIB_USEDEP}]
 		sys-devel/llvm:9[${MULTILIB_USEDEP}]
-		sys-devel/llvm:8[${MULTILIB_USEDEP}]
 	)
 	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
 "
@@ -228,7 +230,6 @@ BDEPEND="
 	)
 	sys-devel/bison
 	sys-devel/flex
-	sys-devel/gettext
 	virtual/pkgconfig
 	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
 "
@@ -334,11 +335,9 @@ pkg_setup() {
 		ewarn "detected! This can cause problems. For details, see bug 459306."
 	fi
 
-	# os_same_file_description requires the kcmp syscall,
-	# which is only available with CONFIG_CHECKPOINT_RESTORE=y.
-	# Currently only AMDGPU utilizes this function, so only AMDGPU users would
-	# get a spooky warning message if the syscall fails.
-	if use gallium && use video_cards_radeonsi; then
+	if use video_cards_i965 ||
+	   use video_cards_iris ||
+	   use video_cards_radeonsi; then
 		CONFIG_CHECK="~CHECKPOINT_RESTORE"
 		linux-info_pkg_setup
 	fi
@@ -373,13 +372,16 @@ multilib_src_configure() {
 		fi
 	fi
 
-	emesonargs+=( -Dplatforms=$(use X && echo "x11,")$(use wayland && echo "wayland,")$(use gbm && echo "drm,")surfaceless )
+	local platforms
+	use X && platforms+="x11"
+	use wayland && platforms+=",wayland"
+	[[ -n $platforms ]] && emesonargs+=(-Dplatforms=${platforms#,})
 
 	if use gallium; then
 		emesonargs+=(
-			$(meson_use llvm)
-			$(meson_use lm-sensors lmsensors)
-			$(meson_use unwind libunwind)
+			$(meson_feature llvm)
+			$(meson_feature lm-sensors lmsensors)
+			$(meson_feature unwind libunwind)
 		)
 
 		if use video_cards_iris ||
@@ -396,39 +398,40 @@ multilib_src_configure() {
 		if use video_cards_r600 ||
 		   use video_cards_radeonsi ||
 		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vaapi gallium-va))
+			emesonargs+=($(meson_feature vaapi gallium-va))
 			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
 		else
-			emesonargs+=(-Dgallium-va=false)
+			emesonargs+=(-Dgallium-va=disabled)
 		fi
 
 		if use video_cards_r300 ||
 		   use video_cards_r600 ||
 		   use video_cards_radeonsi ||
 		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vdpau gallium-vdpau))
+			emesonargs+=($(meson_feature vdpau gallium-vdpau))
 		else
-			emesonargs+=(-Dgallium-vdpau=false)
+			emesonargs+=(-Dgallium-vdpau=disabled)
 		fi
 
 		if use video_cards_freedreno ||
 		   use video_cards_nouveau ||
 		   use video_cards_vmware; then
-			emesonargs+=($(meson_use xa gallium-xa))
+			emesonargs+=($(meson_feature xa gallium-xa))
 		else
-			emesonargs+=(-Dgallium-xa=false)
+			emesonargs+=(-Dgallium-xa=disabled)
 		fi
 
 		if use video_cards_r600 ||
 		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use xvmc gallium-xvmc))
+			emesonargs+=($(meson_feature xvmc gallium-xvmc))
 		else
-			emesonargs+=(-Dgallium-xvmc=false)
+			emesonargs+=(-Dgallium-xvmc=disabled)
 		fi
 
 		if use video_cards_freedreno ||
 		   use video_cards_lima ||
 		   use video_cards_panfrost ||
+		   use video_cards_v3d ||
 		   use video_cards_vc4 ||
 		   use video_cards_vivante; then
 			gallium_enable -- kmsro
@@ -436,10 +439,12 @@ multilib_src_configure() {
 
 		gallium_enable video_cards_lima lima
 		gallium_enable video_cards_panfrost panfrost
+		gallium_enable video_cards_v3d v3d
 		gallium_enable video_cards_vc4 vc4
 		gallium_enable video_cards_vivante etnaviv
 		gallium_enable video_cards_vmware svga
 		gallium_enable video_cards_nouveau nouveau
+		gallium_enable zink zink
 
 		# Only one i915 driver (classic vs gallium). Default to classic.
 		if ! use classic; then
@@ -491,15 +496,15 @@ multilib_src_configure() {
 	emesonargs+=(
 		$(meson_use test build-tests)
 		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=true
-		$(meson_use dri3)
-		$(meson_use egl)
-		$(meson_use gbm)
-		$(meson_use gles1)
-		$(meson_use gles2)
+		-Dshared-glapi=enabled
+		$(meson_feature dri3)
+		$(meson_feature egl)
+		$(meson_feature gbm)
+		$(meson_feature gles1)
+		$(meson_feature gles2)
 		$(meson_use libglvnd glvnd)
 		$(meson_use selinux)
-		$(meson_use zstd)
+		$(meson_feature zstd)
 		-Dvalgrind=$(usex valgrind auto false)
 		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
 		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 29a60e1a14fd..01f47e9da290 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -29,7 +29,7 @@ RESTRICT="
 "
 
 RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost vc4 virgl vivante vmware"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
 for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
 done
@@ -37,7 +37,7 @@ done
 IUSE="${IUSE_VIDEO_CARDS}
 	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
 	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa xvmc +zstd"
+	vulkan-overlay wayland +X xa xvmc zink +zstd"
 
 REQUIRED_USE="
 	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
@@ -62,12 +62,14 @@ REQUIRED_USE="
 	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
 	video_cards_r600?   ( gallium )
 	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_v3d? ( gallium )
 	video_cards_vc4? ( gallium )
 	video_cards_virgl? ( gallium )
 	video_cards_vivante? ( gallium gbm )
 	video_cards_vmware? ( gallium )
 	xa? ( X )
 	xvmc? ( X )
+	zink? ( gallium vulkan )
 "
 
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
@@ -76,7 +78,7 @@ RDEPEND="
 	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
 	libglvnd? (
-		>=media-libs/libglvnd-1.2.0-r1[X?,${MULTILIB_USEDEP}]
+		>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
 		!app-eselect/eselect-opengl
 	)
 	!libglvnd? (
@@ -127,6 +129,7 @@ RDEPEND="
 		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
 		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
 	)
+	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
 	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
 "
 for card in ${RADEON_CARDS}; do
@@ -151,7 +154,6 @@ LLVM_DEPSTR="
 	|| (
 		sys-devel/llvm:10[${MULTILIB_USEDEP}]
 		sys-devel/llvm:9[${MULTILIB_USEDEP}]
-		sys-devel/llvm:8[${MULTILIB_USEDEP}]
 	)
 	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
 "
@@ -333,11 +335,9 @@ pkg_setup() {
 		ewarn "detected! This can cause problems. For details, see bug 459306."
 	fi
 
-	# os_same_file_description requires the kcmp syscall,
-	# which is only available with CONFIG_CHECKPOINT_RESTORE=y.
-	# Currently only AMDGPU utilizes this function, so only AMDGPU users would
-	# get a spooky warning message if the syscall fails.
-	if use gallium && use video_cards_radeonsi; then
+	if use video_cards_i965 ||
+	   use video_cards_iris ||
+	   use video_cards_radeonsi; then
 		CONFIG_CHECK="~CHECKPOINT_RESTORE"
 		linux-info_pkg_setup
 	fi
@@ -372,13 +372,16 @@ multilib_src_configure() {
 		fi
 	fi
 
-	emesonargs+=( -Dplatforms=$(use X && echo "x11,")$(use wayland && echo "wayland,")$(use gbm && echo "drm,")surfaceless )
+	local platforms
+	use X && platforms+="x11"
+	use wayland && platforms+=",wayland"
+	[[ -n $platforms ]] && emesonargs+=(-Dplatforms=${platforms#,})
 
 	if use gallium; then
 		emesonargs+=(
-			$(meson_use llvm)
-			$(meson_use lm-sensors lmsensors)
-			$(meson_use unwind libunwind)
+			$(meson_feature llvm)
+			$(meson_feature lm-sensors lmsensors)
+			$(meson_feature unwind libunwind)
 		)
 
 		if use video_cards_iris ||
@@ -395,39 +398,40 @@ multilib_src_configure() {
 		if use video_cards_r600 ||
 		   use video_cards_radeonsi ||
 		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vaapi gallium-va))
+			emesonargs+=($(meson_feature vaapi gallium-va))
 			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
 		else
-			emesonargs+=(-Dgallium-va=false)
+			emesonargs+=(-Dgallium-va=disabled)
 		fi
 
 		if use video_cards_r300 ||
 		   use video_cards_r600 ||
 		   use video_cards_radeonsi ||
 		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vdpau gallium-vdpau))
+			emesonargs+=($(meson_feature vdpau gallium-vdpau))
 		else
-			emesonargs+=(-Dgallium-vdpau=false)
+			emesonargs+=(-Dgallium-vdpau=disabled)
 		fi
 
 		if use video_cards_freedreno ||
 		   use video_cards_nouveau ||
 		   use video_cards_vmware; then
-			emesonargs+=($(meson_use xa gallium-xa))
+			emesonargs+=($(meson_feature xa gallium-xa))
 		else
-			emesonargs+=(-Dgallium-xa=false)
+			emesonargs+=(-Dgallium-xa=disabled)
 		fi
 
 		if use video_cards_r600 ||
 		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use xvmc gallium-xvmc))
+			emesonargs+=($(meson_feature xvmc gallium-xvmc))
 		else
-			emesonargs+=(-Dgallium-xvmc=false)
+			emesonargs+=(-Dgallium-xvmc=disabled)
 		fi
 
 		if use video_cards_freedreno ||
 		   use video_cards_lima ||
 		   use video_cards_panfrost ||
+		   use video_cards_v3d ||
 		   use video_cards_vc4 ||
 		   use video_cards_vivante; then
 			gallium_enable -- kmsro
@@ -435,10 +439,12 @@ multilib_src_configure() {
 
 		gallium_enable video_cards_lima lima
 		gallium_enable video_cards_panfrost panfrost
+		gallium_enable video_cards_v3d v3d
 		gallium_enable video_cards_vc4 vc4
 		gallium_enable video_cards_vivante etnaviv
 		gallium_enable video_cards_vmware svga
 		gallium_enable video_cards_nouveau nouveau
+		gallium_enable zink zink
 
 		# Only one i915 driver (classic vs gallium). Default to classic.
 		if ! use classic; then
@@ -490,15 +496,15 @@ multilib_src_configure() {
 	emesonargs+=(
 		$(meson_use test build-tests)
 		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=true
-		$(meson_use dri3)
-		$(meson_use egl)
-		$(meson_use gbm)
-		$(meson_use gles1)
-		$(meson_use gles2)
+		-Dshared-glapi=enabled
+		$(meson_feature dri3)
+		$(meson_feature egl)
+		$(meson_feature gbm)
+		$(meson_feature gles1)
+		$(meson_feature gles2)
 		$(meson_use libglvnd glvnd)
 		$(meson_use selinux)
-		$(meson_use zstd)
+		$(meson_feature zstd)
 		-Dvalgrind=$(usex valgrind auto false)
 		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
 		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index d2020b8e602b..8aecc5f66080 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -26,6 +26,7 @@
 		<flag name="wayland">Enable support for dev-libs/wayland</flag>
 		<flag name="xa">Enable the XA (X Acceleration) API for Gallium3D.</flag>
 		<flag name="xvmc">Enable the XvMC acceleration interface for the Gallium3D Video Layer.</flag>
+		<flag name="zink">Enable the Zink OpenGL-over-Vulkan Gallium driver</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:mesa3d:mesa</remote-id>
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 7face3a14863..b752cd8a8b0e 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -8,6 +8,5 @@ AUX mlt-6.20.0-opencv-double-del-crash.patch 841 BLAKE2B 2527a09828578156815c6c6
 AUX mlt-6.20.0-opencv4.patch 1631 BLAKE2B 0b132e30f992bf0d9e19eb1d3946436c981e57c750ad49cac556436c3b74909d22cbb7a3b64071d3804548ab637d4afd69545d4a4a38b764b793bcc15cb561ba SHA512 fce81528abf733e4228fdecb983f0a888ec2712de5723c623f6a1ed083065b151e3f0fb009d488b6d60b577ddb0489ccd35c798c49e9e03f6faf511f40206ef6
 AUX mlt-6.20.0-qt-5.15.patch 1571 BLAKE2B a4d5c1a009399ac0ee4d85fdc8f9f603e69ded9d77320083511a46e1c1a2c7adfa1940a97ecfb6d2ad70dfa624b844260cb0f0249fca861ab25aed8b265e9333 SHA512 2eb8934ba6bca513f7851189428c997380da09b36ea8e27bc4b1a3f69c0feebd8b5d53dbf34658693261cae13dd69e60526b26e64ee56605b3972a79c561e295
 DIST mlt-6.20.0.tar.gz 1446137 BLAKE2B 50599c827be82ea5f5145297b41001e94b44519ec4c6344b8cfdc6fc92e6106de60ecd985296ab77d24e6a5b74ea8e859187935bd88f9394f3c108308afc68ac SHA512 939e837fb07ff0eace308987d83913e979f82c6eb156b40fde784f3f2b031b5f6896ac96dcde1627925cbb6fc76725f3fc4e5b2d0616fae11263648bcdbe82e3
-EBUILD mlt-6.20.0-r2.ebuild 5130 BLAKE2B a1660102cf36de424c98b13528814b3d0df0fd485f4eb5f5e67b7e6764249852e49c5591a73d7cb98634caca0d92d2894f5b78570887cc4b49a8559fe3588e48 SHA512 94b6675c75ae3abae1c06af0de79e280dc2cbb314f65e294510fce8a18b1ddc94931ed5464124190a0ec59361c466c661f025387c2ebc9855cf1d30045a8fefb
-EBUILD mlt-6.20.0.ebuild 5340 BLAKE2B c2db005fe50befb993f8154a5f53d8395adebe49e5df102fbd78ecd89f851be944cf16b69fee1b1cd44cfed239219bee3bcb5f5f4b2e184ed06ae32b39459617 SHA512 bdefec68b4a36be06655d5649ca5efd3d94ff501570e8e6a8c0e2fb42bf8907aeaf6727c884c6fb270b31f388bdbf1c8013f3ce784f3ee9c258a16cbf62e21d1
-MISC metadata.xml 1595 BLAKE2B 63b95c943ec9860db5c68d7ffcf683381bb0e859afe333263afc51f9e985a9f4263279aded8288ec03511d8d56d12415f5590529a4de0009ff21bb890bc1febe SHA512 7f7005732163a00fcd0ff1d21608c26296f87e0658fad912e35724b61c9072ceb67f1a515b0445159192f4959be87a63a01b717c8fe63a64aa8ceb3081cb11f8
+EBUILD mlt-6.20.0-r2.ebuild 5127 BLAKE2B e7800bc14ab226c976a6f4e0a1ce6e3bd70243eef28d8a478a9791089881725794223ea28cbeaefc7802c2e6b950575e2c74dd1205d4383ff43bc521bdd8a026 SHA512 75713657fd2c261c297716b612d8ef6027fe5eeade177d8b54c2fef7dff821e711c3c5827fa7934120fb4bc4f81a3ac440c90b96669285b8f6de43e079742182
+MISC metadata.xml 1539 BLAKE2B ce738031471a08f5d3969af421d214c79b8c8581daa3a40cd6bc0d04d5884d7c5c64551e18f3262ca0539663d63ea1a35e85e57bd5861816eea5c295c2430517 SHA512 2b9b1cdc067811cee0bb3a242fe3985217e223d8d2defeae9161fb187e50934e765c03d6899f121ad4a6fa86fcbdd01392ae875b65331efe2ab64f0c4f1ced61
diff --git a/media-libs/mlt/metadata.xml b/media-libs/mlt/metadata.xml
index 94e2b3de135a..dae5f6d74dd8 100644
--- a/media-libs/mlt/metadata.xml
+++ b/media-libs/mlt/metadata.xml
@@ -17,7 +17,6 @@
 		<flag name="opencv">Build motion tracking module using <pkg>media-libs/opencv</pkg></flag>
 		<flag name="python">Build SWIG bindings for Python</flag>
 		<flag name="rtaudio">Builds rtaudio consumer for native audio support on multiple platforms.</flag>
-		<flag name="ruby">Build SWIG bindings for Ruby</flag>
 		<flag name="vidstab">Enabled video stabilization with <pkg>media-libs/vidstab</pkg>.</flag>
 		<!--
 		<flag name="swfdec">Use <pkg>media-libs/swfdec</pkg> for reading .swf files (Macromedia Flash) instead of libavformat.</flag>
diff --git a/media-libs/mlt/mlt-6.20.0-r2.ebuild b/media-libs/mlt/mlt-6.20.0-r2.ebuild
index 2d15f57bfc5d..d2bb530035af 100644
--- a/media-libs/mlt/mlt-6.20.0-r2.ebuild
+++ b/media-libs/mlt/mlt-6.20.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+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"
diff --git a/media-libs/mlt/mlt-6.20.0.ebuild b/media-libs/mlt/mlt-6.20.0.ebuild
deleted file mode 100644
index 24cc72a14135..000000000000
--- a/media-libs/mlt/mlt-6.20.0.ebuild
+++ /dev/null
@@ -1,214 +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} )
-# this ebuild currently only supports installing ruby bindings for a single ruby version
-# so USE_RUBY must contain only a single value (the latest stable) as the ebuild calls
-# /usr/bin/${USE_RUBY} directly
-USE_RUBY="ruby25"
-inherit python-single-r1 qmake-utils ruby-single toolchain-funcs
-
-DESCRIPTION="Open source multimedia framework for television broadcasting"
-HOMEPAGE="https://www.mltframework.org/"
-SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~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 ruby sdl vdpau vidstab xine xml"
-# java perl php tcl
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-SWIG_DEPEND=">=dev-lang/swig-2.0"
-#	java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 )
-#	perl? ( ${SWIG_DEPEND} )
-#	php? ( ${SWIG_DEPEND} )
-#	tcl? ( ${SWIG_DEPEND} )
-BDEPEND="
-	virtual/pkgconfig
-	compressed-lumas? ( virtual/imagemagick-tools[png] )
-	lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
-	python? ( ${SWIG_DEPEND} )
-	ruby? ( ${SWIG_DEPEND} )"
-#rtaudio will use OSS on non linux OSes
-DEPEND="
-	>=media-libs/libebur128-1.2.2:=
-	ffmpeg? ( media-video/ffmpeg:0=[vdpau?,-flite] )
-	fftw? ( sci-libs/fftw:3.0= )
-	frei0r? ( media-plugins/frei0r-plugins )
-	gtk? (
-		media-libs/libexif
-		x11-libs/gtk+:2
-		x11-libs/pango
-	)
-	jack? (
-		>=dev-libs/libxml2-2.5
-		media-libs/ladspa-sdk
-		virtual/jack
-	)
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
-	lua? ( >=dev-lang/lua-5.1.4-r4:= )
-	opencv? ( >=media-libs/opencv-3.2.0:= )
-	opengl? ( media-video/movit )
-	python? ( ${PYTHON_DEPS} )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-		media-libs/libexif
-		x11-libs/libX11
-	)
-	rtaudio? (
-		>=media-libs/rtaudio-4.1.2
-		kernel_linux? ( media-libs/alsa-lib )
-	)
-	ruby? ( ${RUBY_DEPS} )
-	sdl? (
-		media-libs/libsdl2[X,opengl,video]
-		media-libs/sdl2-image
-	)
-	vidstab? ( media-libs/vidstab )
-	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
-	xml? ( >=dev-libs/libxml2-2.5 )"
-#	java? ( >=virtual/jre-1.5 )
-#	perl? ( dev-lang/perl )
-#	php? ( dev-lang/php )
-#	sox? ( media-sound/sox )
-#	tcl? ( dev-lang/tcl:0= )
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README docs/{framework,melt,mlt{++,-xml}}.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch
-	"${FILESDIR}"/${P}-qt-5.15.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
-	for x in python lua; do
-		sed -i "/mlt.so/s/ -lmlt++ /& ${CFLAGS} ${LDFLAGS} /" src/swig/$x/build || die
-	done
-
-	sed -i -e "s/env ruby/${USE_RUBY}/" src/swig/ruby/* || die
-
-	use python && python_fix_shebang src/swig/python
-}
-
-src_configure() {
-	tc-export CC CXX
-
-	local myconf=(
-		--enable-gpl
-		--enable-gpl3
-		--enable-motion-est
-		--target-arch=$(tc-arch)
-		--disable-kde
-		--disable-sdl
-		--disable-swfdec
-		$(use_enable debug)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable ffmpeg avformat)
-		$(use_enable fftw plus)
-		$(use_enable frei0r)
-		$(use_enable gtk gtk2)
-		$(use_enable jack jackrack)
-		$(use_enable kdenlive)
-		$(use_enable libsamplerate resample)
-		$(use_enable melt)
-		$(use_enable opencv)
-		$(use_enable opengl)
-		$(use_enable qt5 qt)
-		$(use_enable rtaudio)
-		$(use_enable sdl sdl2)
-		$(use_enable vidstab vid.stab )
-		$(use_enable xine)
-		$(use_enable xml)
-		--disable-sox
-	)
-		#$(use_enable sox) FIXME
-
-	use compressed-lumas && myconf+=( --luma-compress )
-	use ffmpeg && myconf+=( --avformat-swscale )
-	use vdpau && myconf+=( --avformat-vdpau )
-
-	if use qt5 ; then
-		myconf+=(
-			--qt-includedir=$(qt5_get_headerdir)
-			--qt-libdir=$(qt5_get_libdir)
-		)
-	fi
-
-	if use amd64 || use x86 ; then
-		myconf+=( $(use_enable cpu_flags_x86_mmx mmx) )
-	else
-		myconf+=( --disable-mmx )
-	fi
-
-	if ! use melt ; then
-		sed -i -e "s;src/melt;;" Makefile || die
-	fi
-
-	# TODO: add swig language bindings
-	# see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
-
-	local swig_lang=()
-	# TODO: java perl php tcl
-	for i in lua python ruby ; do
-		use $i && swig_lang+=( $i )
-	done
-	[[ -z "${swig_lang}" ]] && swig_lang=( none )
-
-	econf "${myconf[@]}" --swig-languages="${swig_lang[*]}"
-
-	sed -i -e s/^OPT/#OPT/ config.mak || die
-}
-
-src_install() {
-	default
-
-	dodir /usr/share/${PN}
-	insinto /usr/share/${PN}
-	doins -r demo
-
-	docinto swig
-
-	# Install SWIG bindings
-	if use lua; then
-		cd "${S}"/src/swig/lua || die
-		exeinto $(pkg-config --variable INSTALL_CMOD lua)
-		doexe mlt.so
-		dodoc play.lua
-	fi
-
-	if use python; then
-		cd "${S}"/src/swig/python || die
-		python_domodule mlt.py _mlt.so
-		chmod +x "${D}$(python_get_sitedir)/_mlt.so" || die
-		dodoc play.py
-		python_optimize
-	fi
-
-	if use ruby; then
-		cd "${S}"/src/swig/ruby || die
-		local rubydir=$("${EPREFIX}"/usr/bin/${USE_RUBY} -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')
-		exeinto "${rubydir#${EPREFIX}}"
-		doexe mlt.so
-		dodoc play.rb thumbs.rb
-	fi
-	# TODO: java perl php tcl
-}
diff --git a/media-libs/noise-suppression-for-voice/Manifest b/media-libs/noise-suppression-for-voice/Manifest
new file mode 100644
index 000000000000..c11ac75ad73e
--- /dev/null
+++ b/media-libs/noise-suppression-for-voice/Manifest
@@ -0,0 +1,4 @@
+DIST noise-suppression-for-voice-0.9_p20200705.tar.gz 207467 BLAKE2B d840ed8e8ec61438e582cedec4c20b8ab2358395857a23d655269cae1e82a0888d785ad364fccf619812ad3c92bd720a035b64bb986ab0c9375b727ce2451de0 SHA512 ccc1c3c2daa473bbeaf94aa460f7039863f883216cefb0185683001e8d8271b6a6785350c1b43f14349c9971fb7b74a05659bdd0a28010c54ab4310c94784877
+EBUILD noise-suppression-for-voice-0.9_p20200705.ebuild 830 BLAKE2B e8fd7ad9560e565fa11b03dc0adb2421075e7ac4cc6bfdc49082c9afb2732a7e6defa9ae76d4dc49b7ef83e6b5ea466b963effeae9359bbe0241b8f5181d3e3e SHA512 02dd2b16ac23c8e7b6d359e09ddf72869ea94c43ee51df4dbafd523f4a4a5434231b63c84c564f158045c23fb9069e50f79e5e484186eb864358aab3641674c5
+EBUILD noise-suppression-for-voice-9999.ebuild 772 BLAKE2B 84f165d5996613388cfba1bb6b39b57bd65f9bd0bb9e13be1dcf3bcf32632c49d0bdd2e7a5bfefb98a15445f655331b053a107f891854c0e99406157b95e622d SHA512 77d24993705b14c74fa44e6c2edd20a8932cc229899b7d3fcb87d1db7d5562cc343f95488e5be87930486291a376ab3872231893ec54aefe0b085a404dd61ace
+MISC metadata.xml 247 BLAKE2B 0f6116ad1a6532d4d062e4e8dadf00f3053ccd4408f030535d3adc5f0399e43ac1682b3786a1a321ba7dd8c1b448cebc5938207a5af59fc033e0e6cf4c654c40 SHA512 8111616dc98858617382132291d5d7a4900eb04643a2c67d4c2eae21dbd08e2fd5f73d533befaa5a0c6a074b04046f1e5bf7a139386ca10ffffef329825d0514
diff --git a/media-libs/ladspa-cmt/metadata.xml b/media-libs/noise-suppression-for-voice/metadata.xml
index f79bb67acbd9..f4c696b2c619 100644
--- a/media-libs/ladspa-cmt/metadata.xml
+++ b/media-libs/noise-suppression-for-voice/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>proaudio@gentoo.org</email>
-	<name>Gentoo ProAudio Project</name>
-</maintainer>
+	<maintainer type="person">
+		<name>Rick Farina</name>
+		<email>zerochaos@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-libs/noise-suppression-for-voice/noise-suppression-for-voice-0.9_p20200705.ebuild b/media-libs/noise-suppression-for-voice/noise-suppression-for-voice-0.9_p20200705.ebuild
new file mode 100644
index 000000000000..a2bd72819956
--- /dev/null
+++ b/media-libs/noise-suppression-for-voice/noise-suppression-for-voice-0.9_p20200705.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A real-time noise suppression plugin for voice"
+HOMEPAGE="https://github.com/werman/noise-suppression-for-voice"
+
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/werman/noise-suppression-for-voice.git"
+else
+	inherit vcs-snapshot
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/werman/noise-suppression-for-voice/archive/453a8af82a31a5361f6a13bf95c97686f0a2acd1.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_install() {
+	dodoc README.md
+
+	cd "${BUILD_DIR}"
+
+	insinto /usr/$(get_libdir)/lv2/
+	doins -r bin/rnnoise.lv2
+
+	insinto /usr/$(get_libdir)/ladspa/
+	doins bin/ladspa/librnnoise_ladspa.so
+}
diff --git a/media-libs/noise-suppression-for-voice/noise-suppression-for-voice-9999.ebuild b/media-libs/noise-suppression-for-voice/noise-suppression-for-voice-9999.ebuild
new file mode 100644
index 000000000000..e88a0d3eefb9
--- /dev/null
+++ b/media-libs/noise-suppression-for-voice/noise-suppression-for-voice-9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A real-time noise suppression plugin for voice"
+HOMEPAGE="https://github.com/werman/noise-suppression-for-voice"
+
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/werman/noise-suppression-for-voice.git"
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/werman/noise-suppression-for-voice/archive/v0.9.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_install() {
+	dodoc README.md
+
+	cd "${BUILD_DIR}"
+
+	insinto /usr/$(get_libdir)/lv2/
+	doins -r bin/rnnoise.lv2
+
+	insinto /usr/$(get_libdir)/ladspa/
+	doins bin/ladspa/librnnoise_ladspa.so
+}
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index a2b0e215b143..76d8d19e661c 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -8,6 +8,9 @@ AUX openexr-2.3.0-fix-build-system.patch 2381 BLAKE2B 37fd9c6ae5357ffb93fd473441
 AUX openexr-2.3.0-skip-bogus-tests.patch 1429 BLAKE2B fe9dcafb4ea5990cfcf36b16f377592dba1a6f9c31315e38596b67007b2cb67fa46a3217f335202b86b5aa8fb0498c5af5a0905a5a57b9af42b601da1bdae473 SHA512 ff13061b24f6477195e189c38e2bf855a46ab77461c8622dd2e2414a7d2103b260f5184735bb142275690e66fb469e6f6c1fbf626dd9c1c2afbc15b975eba78a
 AUX openexr-2.3.0-tests-32bits-2.patch 586 BLAKE2B 83d36040f751e07f30c5cc3be10f8ac43d62d91b87b87bc2735ecc22426401b3b671d0b397e6a9a1fba351ae66e022c9bb488f95d29a9fbcca479d3d70501eac SHA512 5ffc8bda7e476ce71ee103b519c76e630371e5cc005b04f99d2c054580e387cc2b3b9598cbe4442415c5dfe85b0de8ceedf87079c3f738b7ebb737ea23ea7729
 AUX openexr-2.3.0-tests-32bits.patch 1537 BLAKE2B 96cc98ef34a6c18102e5b96f4373f41b77d25aaf04f9a20d0d406eeae17988cc6f3eecf805f6bac1e42805b283f3123455ca1b069d7c0dc04628835ded2d8dec SHA512 58ad1d8f5dc28be60cdc290c7829d8b50708d26f3a769530e054c629170457f6b7e2b526455f6f86d2ee24931d8afdb61345ada99ae49897d926c0d50fb579f6
+AUX openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch 1357 BLAKE2B f236a339d6b35878c9a63a8468e7be6652447646fe0f2567223b20087b2d64d144c95ad71ee218a4542f61bf9c7a65ea8f0e10b02f75d85ee2d3e6b4addc8052 SHA512 6c9c10ab74a24e7213c565eb357683949193b45d0475c529f8cc24dc73deb9392db36f80d38757eee54eded1c260049339f575f96217c733243c4c6a863d5857
 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
-MISC metadata.xml 303 BLAKE2B 53fb5019bd6fe939d485f1eccb4a140ca9b7ce121b06744d8155842ccb6c5e1378ea39a9ae74c8d519be7b3926bd76040df4b8107137fcc2e25be97431e7a1be SHA512 0ab8d735dd7a8e0dc96b14cfde1ae06969d15cfbad956f4fda60b093660aee38fe98709376eedc9362a26858678d2f28eec795c1accb2560858fd804a11bb7ca
+EBUILD openexr-2.5.2.ebuild 1655 BLAKE2B 397022527e39e521613088db67de65d259cde315d12aa7b435798d840a151c788bc65fd1ababefe984e1e4bdd795c92f2fe5a8a203732b275fc06b2f0d8ce68a SHA512 881039da4a7f8cb7d9a842536ff53b20221cb6a099bb0fa92ca4b8fdca4b862d512b20e18cd6bd1dbf652013fd50342c3b58c4c450653b1ff575c604b7a633b6
+MISC metadata.xml 666 BLAKE2B 0faed6c1a1dfecdea8436ef7890af82b565dc9dd1bcc93b5e961ab53939cf6b62d6903e7f9a15ed6e8891de8e6f429cf5811cd2a2126105d71c9fbcc4fdadb2c SHA512 f81d6266a7af651a1e76aa60e3d40107b940548f6a34f4a47b08bc32e37aad32cff31a85d7c58c414b01d54835d224c2ca387f9a0dd1025e1bd5ddc7207281f2
diff --git a/media-libs/openexr/files/openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch b/media-libs/openexr/files/openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch
new file mode 100644
index 000000000000..a77705cb5a7d
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch
@@ -0,0 +1,40 @@
+From 866442b28b53f773efbb3690b6252d2e75bee137 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Fri, 3 Jul 2020 15:34:47 +0200
+Subject: [PATCH] IlmImfTest/main.cpp: disable tests
+
+Disable testOptimizedInterleavePatterns and testDwaLookup, which
+are not working on x86.
+For testOptimizedInterleavePatterns, see
+https://github.com/AcademySoftwareFoundation/openexr/issues/67#issuecomment-21169748
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ IlmImfTest/main.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/IlmImfTest/main.cpp b/IlmImfTest/main.cpp
+index 3245fc4..4ab45b1 100644
+--- a/IlmImfTest/main.cpp
++++ b/IlmImfTest/main.cpp
+@@ -228,7 +228,7 @@ main (int argc, char *argv[])
+     TEST (testExistingStreams, "core");
+     TEST (testStandardAttributes, "core");
+     TEST (testOptimized, "basic");
+-    TEST (testOptimizedInterleavePatterns, "basic");
++//    TEST (testOptimizedInterleavePatterns, "basic");
+     TEST (testYca, "basic");
+     TEST (testTiledYa, "basic");
+     TEST (testNativeFormat, "basic");
+@@ -255,7 +255,7 @@ main (int argc, char *argv[])
+     TEST (testDwaCompressorSimd, "basic");
+     TEST (testRle, "core");
+     TEST (testB44ExpLogTable, "core");
+-    TEST (testDwaLookups, "core");
++//    TEST (testDwaLookups, "core");
+     
+ 
+     //#ifdef ENABLE_IMFHUGETEST
+-- 
+2.27.0
+
diff --git a/media-libs/openexr/metadata.xml b/media-libs/openexr/metadata.xml
index fc9e500d69e1..f72a455316a9 100644
--- a/media-libs/openexr/metadata.xml
+++ b/media-libs/openexr/metadata.xml
@@ -1,10 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>waebbl@gmail.com</email>
+		<name>Bernd Waibel</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>media-video@gentoo.org</email>
 	</maintainer>
+	<use>
+		<flag name="utils">
+			Build several utility binaries for verifying and manipulating EXR files.
+		</flag>
+	</use>
 	<upstream>
-		<remote-id type="github">openexr/openexr</remote-id>
+		<remote-id type="github">AcademySoftwareFoundation/openexr</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/openexr/openexr-2.5.2.ebuild b/media-libs/openexr/openexr-2.5.2.ebuild
new file mode 100644
index 000000000000..bfa5b4c19ffb
--- /dev/null
+++ b/media-libs/openexr/openexr-2.5.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic toolchain-funcs
+
+DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
+HOMEPAGE="https://www.openexr.com/"
+SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+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"
+IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	media-libs/ilmbase:=
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${P}/OpenEXR"
+
+DOCS=( PATENTS README.md )
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/OpenEXRConfigInternal.h )
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Fix path for testsuite
+	sed -i -e "s:/var/tmp/:${T}:" "${S}"/IlmImfTest/tmpDir.h || die "failed to set temp path for tests"
+
+	if use abi_x86_32 && use test; then
+		eapply "${FILESDIR}/${P}-0001-IlmImfTest-main.cpp-disable-tests.patch"
+	fi
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DINSTALL_OPENEXR_DOCS=$(usex doc)
+		-DINSTALL_OPENEXR_EXAMPLES=$(usex examples)
+		-DOPENEXR_BUILD_BOTH_STATIC_SHARED=$(usex static-libs)
+		-DOPENEXR_BUILD_UTILS=$(usex utils)
+		-DOPENEXR_INSTALL_PKG_CONFIG=ON				# default
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_install_all() {
+	if use doc; then
+		DOCS+=( doc/*.pdf )
+	fi
+	einstalldocs
+
+	use examples && docompress -x /usr/share/doc/${PF}/examples
+}
diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest
index feeee81edf16..01e7fec6a45e 100644
--- a/media-libs/openh264/Manifest
+++ b/media-libs/openh264/Manifest
@@ -1,10 +1,5 @@
-AUX openh264-1.7.0-pkgconfig-pathfix.patch 1921 BLAKE2B 22d3ab7bd9cbe4c0ac638760a0c2b947eb6749a18d61cd3aca22ac84647af24d6dced048f9eae2ae9e9ee9b0813a255a6d1c8a1ff04e3e6ae2bdc1d508c82d7b SHA512 4545c9c2a696d9ceaf463fe74f391614ba41abc51ce00c32b285baf37e34d8e8bc55f2c3288309a2b44a4ff420ed7d1bc2aa26f2214abe65576d267488dd0849
 AUX openh264-2.1.0-pkgconfig-pathfix.patch 1949 BLAKE2B a3894b7cb65fcdb444d389ccf6644e404bb8375a910bd51bbe5e1b6b773e4d6890a17d2f1a09400d6d0cadc41be9321d86a09b93f861812f2d72a6c1c5e39fde SHA512 00c59bd1d6fe6355ce81ead4ba898f1f602e9f9c93e382c2ead3c353d5fd1f2bf3c46a30f3b248896c9a74d347a24e200644387ce3c70e886d941c115bb42088
 DIST gmp-api-Firefox39.tar.gz 16363 BLAKE2B dd92d851c4f09476f1e394fd42c5e40ea707ac6dcabc3ceee62400eb998f1c98c781fbde581253ddd8f45b7447a0c7fdc61e74ef60b6fc3397cd4bf8995154ab SHA512 da6f05c5f0540be8d4f48d25b947b21214d34a6eed365ee5fa4a38c69f77325add4be902e0dcd9d06be43914a3518ded7e4f2289dab034a24325f0bff201692a
-DIST openh264-1.7.0.tar.gz 38681895 BLAKE2B 2e0e88bd446fdbea29ea4e863eb391dce1cc271c289165233aa1375e10ce6e60f7be7307eeb7acedd459c3170b57fbc5c7a0e9b6bd0c355be6447fb036192f35 SHA512 3e30584d6adb69c162f5b044f49155c22d44ab8e399f6bf09194593df84475b49979406f3e461d25ef1e4422c2721b975c58bc64d40a143d8493d45380ad96aa
-DIST openh264-2.1.0.tar.gz 60239088 BLAKE2B 4941399476fb6184fc09b09d9bd496d9f3fa77a424199f6cb0d61d654d6cf88b49eecc32d748b656cec663c31844165b81b7962de163441f04e5a606a48879d5 SHA512 7a65f494e6a1b5a9d96115dcd15853ebb804f0ba259b20ddab01770afde31f370536d9e365b18a6f4168eae7f57351d9fc2d3d3a0c51bb21db7b4d5c48240848
 DIST openh264-2.1.1.tar.gz 60239654 BLAKE2B d541fa686b1eb8352dbb4088fc4ef508f947660815c86b2bb7db841c927b7b9f763d7fe793f0fa1511620dbdc506c20cd5ad52740140337aa12b8c31b857a8e6 SHA512 f9c2925fa902c6278da40f68b967d25e62db7ce3541e8f5e7a0ee174204b6ecc7026b5853885c361f48ca01d71bacd585fb5b91f01f0c054ece80943f1afcf79
-EBUILD openh264-1.7.0-r1.ebuild 2949 BLAKE2B 2085049cb86b5ac355e552acf9b0aedb363f6d9fd6ed806ce1bdf70e9da633b8a9657eef131af8dbc647e9e66e410190fe7c05ae99ff4311423b81ec4ceda08f SHA512 d5ed45707baa5a689b9060e0a1c784721b3f8be5632565bc0581acc9dec982666b54bed97aa7e04f0ecd429784e45aabf20c2fed88f7bf5d8e648308668c1140
-EBUILD openh264-2.1.0.ebuild 3015 BLAKE2B 2706d011a3f40bc4aa9580b42a17bf867f059d7a5c35f5cfa8a62c41d22a4b9a367b5d40796eeaa1a434091251efb02f48c9f14efb3163bd295db9d3fbc6f961 SHA512 3402b5d01047da3ea94c40223999c3be15d5f8ce34a2440b5ed807198d67c1ea1dfa532c0228385d0394b9bf2be13e9a12a321d6f504d59daf15da5a99b6a114
-EBUILD openh264-2.1.1.ebuild 3151 BLAKE2B 5f72a6b52cfc6d2483eb078f70d1eb5b197182d86c45acf1b35d69aa2a1528515d11036ecb0812d9a82386c1991b1dd1e5cb9c772fe5842c7d59ae8316e85304 SHA512 8d7dab0838b532243281c9c1e90c480a1394b00f169a958d925d7a0ddae62770dd554d143d49d3e775597868e6d4bcd1c9e199b99c54644a683e736e9fa05894
-MISC metadata.xml 595 BLAKE2B 9d5fd608235086cb070457016516be296db695e67d50e8b3c0958133bff3cfa24a87c9abb42c043d94d5d64ba6fb3e9d485b4c9d07042054a9eb25e6ee73ad4b SHA512 8fc3fa7f260a188f7ebf43d85da27a49a924a2ce0835fd37f0db356caa401102eee0ade0fa414303d8a0681ddb4b10abd4da5a9bb5cf79ea31f5b96199897220
+EBUILD openh264-2.1.1.ebuild 3306 BLAKE2B 430b9c0c23ac5e918a5b4c8701c7dc761fefd36c1d39f92c777decd56cae32a10141abed6e98b65f6bef21d0873e43cb7c5396c6be28bc6b805b4654a74956d7 SHA512 427ff6516341fd9d73e7c9089a15e76f223eb99fb3a9e427a5ed9148cc7b1392df140ad6deac87d1a28f8f38b5aeb2c110c39caf533d1810ee5522cb4052f8bb
+MISC metadata.xml 723 BLAKE2B cbfe3ee6a6d784293770d948a306c9dbefe11d78f1cad1fcf58a35a0c968c6c48f35e2e6f607bee6434629ac4bc4428f5cf4e195ebf800c77af414e6823170c0 SHA512 82762247dea80f68510db32609263501b20320abca844776176dc6f6439498d61b05f93a573829ebf7ca88e932cda812c296ceb351e071c401e2ea6647d55e88
diff --git a/media-libs/openh264/files/openh264-1.7.0-pkgconfig-pathfix.patch b/media-libs/openh264/files/openh264-1.7.0-pkgconfig-pathfix.patch
deleted file mode 100644
index b0813888477a..000000000000
--- a/media-libs/openh264/files/openh264-1.7.0-pkgconfig-pathfix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/openh264.pc.in	2015-10-19 21:49:05.000000000 -0400
-+++ b/openh264.pc.in	2016-02-17 12:17:03.792768147 -0500
-@@ -1,6 +1,6 @@
- prefix=@prefix@
--libdir=${prefix}/lib
--includedir=${prefix}/include
-+libdir=@sharedlibdir@
-+includedir=@includesdir@
- 
- Name: OpenH264
- Description: OpenH264 is a codec library which supports H.264 encoding and decoding. It is suitable for use in real time applications such as WebRTC.
---- a/Makefile	2017-06-16 00:20:14.000000000 -0400
-+++ b/Makefile	2017-07-14 15:15:51.461652524 -0400
-@@ -27,6 +27,7 @@
- DESTDIR=
- LIBDIR_NAME=lib
- SHAREDLIB_DIR=$(PREFIX)/lib
-+INCLUDES_DIR=$(PREFIX)/include
- PROJECT_NAME=openh264
- MODULE_NAME=gmpopenh264
- GMP_API_BRANCH=Firefox39
-@@ -282,14 +283,14 @@
- endif
- 
- $(PROJECT_NAME).pc: $(PROJECT_NAME).pc.in
--	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@VERSION@;$(FULL_VERSION);' -e 's;@LIBS@;;' -e 's;@LIBS_PRIVATE@;$(STATIC_LDFLAGS);' < $< > $@
-+	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@sharedlibdir@;$(SHAREDLIB_DIR);' -e 's;@includesdir@;$(INCLUDES_DIR);' -e 's;@VERSION@;$(FULL_VERSION);' -e 's;@LIBS@;;' -e 's;@LIBS_PRIVATE@;$(STATIC_LDFLAGS);' < $< > $@
- 
- $(PROJECT_NAME)-static.pc: $(PROJECT_NAME).pc.in
--	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@VERSION@;$(FULL_VERSION);' -e 's;@LIBS@;$(STATIC_LDFLAGS);' -e 's;@LIBS_PRIVATE@;;' < $< > $@
-+	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@sharedlibdir@;$(SHAREDLIB_DIR);' -e 's;@includesdir@;$(INCLUDES_DIR);' -e 's;@VERSION@;$(FULL_VERSION);' -e 's;@LIBS@;$(STATIC_LDFLAGS);' -e 's;@LIBS_PRIVATE@;;' < $< > $@
- 
- install-headers:
--	mkdir -p $(DESTDIR)$(PREFIX)/include/wels
--	install -m 644 $(SRC_PATH)/codec/api/svc/codec*.h $(DESTDIR)$(PREFIX)/include/wels
-+	mkdir -p $(DESTDIR)$(INCLUDES_DIR)/wels
-+	install -m 644 $(SRC_PATH)/codec/api/svc/codec*.h $(DESTDIR)$(INCLUDES_DIR)/wels
- 
- install-static-lib: $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX) install-headers
- 	mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME)
diff --git a/media-libs/openh264/metadata.xml b/media-libs/openh264/metadata.xml
index 4971276ef942..b3191d7ceff5 100644
--- a/media-libs/openh264/metadata.xml
+++ b/media-libs/openh264/metadata.xml
@@ -8,6 +8,10 @@
 	<maintainer type="project">
 		<email>media-video@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>mozilla@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
 	<use>
 		<flag name="plugin">Install the Gecko Media Plugin (GMP) for use with Mozilla packages</flag>
 		<flag name="utils">Install the CLI encoder and decoder utilities</flag>
diff --git a/media-libs/openh264/openh264-1.7.0-r1.ebuild b/media-libs/openh264/openh264-1.7.0-r1.ebuild
deleted file mode 100644
index 28a7fdd49087..000000000000
--- a/media-libs/openh264/openh264-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit nsplugins multilib-minimal toolchain-funcs
-
-MOZVER=39
-DESCRIPTION="Cisco OpenH264 library and Gecko Media Plugin for Mozilla packages"
-HOMEPAGE="http://www.openh264.org/"
-SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/mozilla/gmp-api/archive/Firefox${MOZVER}.tar.gz -> gmp-api-Firefox${MOZVER}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="+plugin utils"
-
-RESTRICT="bindist"
-
-RDEPEND="!<www-client/firefox-${MOZVER}"
-DEPEND="
-	abi_x86_32? ( dev-lang/nasm )
-	abi_x86_64? ( dev-lang/nasm )"
-
-DOCS=( LICENSE CONTRIBUTORS README.md )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.7.0-pkgconfig-pathfix.patch
-	epatch_user
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	ln -s "${WORKDIR}"/gmp-api-Firefox${MOZVER} gmp-api || die
-}
-
-emakecmd() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	emake V=Yes CFLAGS_M32="" CFLAGS_M64="" CFLAGS_OPT="" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR_NAME="$(get_libdir)" \
-		SHAREDLIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
-		INCLUDES_DIR="${EPREFIX}/usr/include/${PN}" \
-		$@
-}
-
-multilib_src_compile() {
-	local mybits="ENABLE64BIT=No"
-	case "${ABI}" in
-		s390x|alpha|*64) mybits="ENABLE64BIT=Yes";;
-	esac
-
-	emakecmd ${mybits} ${tgt}
-	use plugin && emakecmd ${mybits} plugin
-}
-
-multilib_src_install() {
-	emakecmd DESTDIR="${D}" install-shared
-
-	if use utils ; then
-		newbin h264enc openh264enc
-		newbin h264dec openh264dec
-	fi
-
-	if use plugin; then
-		local plugpath="usr/$(get_libdir)/${PLUGINS_DIR}/gmp-gmp${PN}/system-installed"
-		insinto "/${plugpath}"
-		doins libgmpopenh264.so* gmpopenh264.info
-		echo "MOZ_GMP_PATH=\"${EROOT}${plugpath}\"" >"${T}"/98-moz-gmp-${PN}
-		doenvd "${T}"/98-moz-gmp-${PN}
-
-		cat <<PREFEOF >"${T}"/${P}.js
-pref("media.gmp-gmp${PN}.autoupdate", false);
-pref("media.gmp-gmp${PN}.version", "system-installed");
-PREFEOF
-
-		insinto /usr/$(get_libdir)/firefox/defaults/pref
-		doins "${T}"/${P}.js
-
-		insinto /usr/$(get_libdir)/seamonkey/defaults/pref
-		doins "${T}"/${P}.js
-	fi
-}
-
-pkg_postinst() {
-	if use plugin; then
-		if [[ -z ${REPLACING_VERSIONS} ]]; then
-			elog "Please restart your login session, in order for the session's environment"
-			elog "to include the new MOZ_GMP_PATH variable."
-			elog ""
-		fi
-		elog "This package attempts to override the Mozilla GMPInstaller auto-update process,"
-		elog "however even if it is not successful in doing so the profile-installed plugin"
-		elog "will not be used unless this package is removed.  This package will take precedence"
-		elog "over any gmp-gmpopenh264 that may be installed in a user's profile."
-		elog ""
-	fi
-	if use utils; then
-		elog "Utilities h264enc and h264dec are installed as openh264enc and openh264dec"
-		elog "to avoid file collisions with media-video/h264enc"
-		elog ""
-	fi
-}
diff --git a/media-libs/openh264/openh264-2.1.0.ebuild b/media-libs/openh264/openh264-2.1.0.ebuild
deleted file mode 100644
index 486e6828d1b7..000000000000
--- a/media-libs/openh264/openh264-2.1.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs multilib-minimal
-
-MOZVER=39
-DESCRIPTION="Cisco OpenH264 library and Gecko Media Plugin for Mozilla packages"
-HOMEPAGE="https://www.openh264.org/"
-SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/mozilla/gmp-api/archive/Firefox${MOZVER}.tar.gz -> gmp-api-Firefox${MOZVER}.tar.gz"
-LICENSE="BSD"
-SLOT="0/5" # subslot = openh264 soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cpu_flags_x86_avx2 +plugin utils"
-
-RESTRICT="bindist test"
-
-BDEPEND="
-	abi_x86_32? ( dev-lang/nasm )
-	abi_x86_64? ( dev-lang/nasm )"
-
-DOCS=( LICENSE CONTRIBUTORS README.md )
-
-PATCHES=( "${FILESDIR}/${PN}-2.1.0-pkgconfig-pathfix.patch" )
-
-src_prepare() {
-	default
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	ln -s "${WORKDIR}"/gmp-api-Firefox${MOZVER} gmp-api || die
-}
-
-emakecmd() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	emake V=Yes CFLAGS_M32="" CFLAGS_M64="" CFLAGS_OPT="" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR_NAME="$(get_libdir)" \
-		SHAREDLIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
-		INCLUDES_DIR="${EPREFIX}/usr/include/${PN}" \
-		HAVE_AVX2=$(usex cpu_flags_x86_avx2 Yes No) \
-		$@
-}
-
-multilib_src_compile() {
-	local mybits="ENABLE64BIT=No"
-	case "${ABI}" in
-		s390x|alpha|*64) mybits="ENABLE64BIT=Yes";;
-	esac
-
-	emakecmd ${mybits}
-	use plugin && emakecmd ${mybits} plugin
-}
-
-multilib_src_install() {
-	emakecmd DESTDIR="${D}" install-shared
-
-	if use utils; then
-		newbin h264enc openh264enc
-		newbin h264dec openh264dec
-	fi
-
-	if use plugin; then
-		local plugpath="${ROOT}/usr/$(get_libdir)/nsbrowser/plugins/gmp-gmp${PN}/system-installed"
-		insinto "${plugpath}"
-		doins libgmpopenh264.so* gmpopenh264.info
-		echo "MOZ_GMP_PATH=\"${plugpath}\"" >"${T}"/98-moz-gmp-${PN}
-		doenvd "${T}"/98-moz-gmp-${PN}
-
-		cat <<PREFEOF >"${T}"/${P}.js
-pref("media.gmp-gmp${PN}.autoupdate", false);
-pref("media.gmp-gmp${PN}.version", "system-installed");
-PREFEOF
-
-		insinto /usr/$(get_libdir)/firefox/defaults/pref
-		doins "${T}"/${P}.js
-
-		insinto /usr/$(get_libdir)/seamonkey/defaults/pref
-		doins "${T}"/${P}.js
-	fi
-}
-
-pkg_postinst() {
-	if use plugin; then
-		if [[ -z ${REPLACING_VERSIONS} ]]; then
-			elog "Please restart your login session, in order for the session's environment"
-			elog "to include the new MOZ_GMP_PATH variable."
-			elog ""
-		fi
-		elog "This package attempts to override the Mozilla GMPInstaller auto-update process,"
-		elog "however even if it is not successful in doing so the profile-installed plugin"
-		elog "will not be used unless this package is removed.  This package will take precedence"
-		elog "over any gmp-gmpopenh264 that may be installed in a user's profile."
-		elog ""
-	fi
-
-	if use utils; then
-		elog "Utilities h264enc and h264dec are installed as openh264enc and openh264dec"
-		elog "to avoid file collisions with media-video/h264enc"
-		elog ""
-	fi
-}
diff --git a/media-libs/openh264/openh264-2.1.1.ebuild b/media-libs/openh264/openh264-2.1.1.ebuild
index b18de1c269b6..604607fa52b7 100644
--- a/media-libs/openh264/openh264-2.1.1.ebuild
+++ b/media-libs/openh264/openh264-2.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	https://github.com/mozilla/gmp-api/archive/Firefox${MOZVER}.tar.gz -> gmp-api-Firefox${MOZVER}.tar.gz"
 LICENSE="BSD"
 SLOT="0/6" # subslot = openh264 soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_avx2 +plugin utils"
 
 RESTRICT="bindist test"
@@ -28,6 +28,10 @@ PATCHES=( "${FILESDIR}/${PN}-2.1.0-pkgconfig-pathfix.patch" )
 src_prepare() {
 	default
 
+	sed -i -e 's/ | generate-version//g' Makefile || die
+	sed -e 's|$FULL_VERSION|""|g' codec/common/inc/version_gen.h.template > \
+		codec/common/inc/version_gen.h
+
 	multilib_copy_sources
 }
 
diff --git a/media-libs/opusfile/Manifest b/media-libs/opusfile/Manifest
index 557766870e94..e990930adfea 100644
--- a/media-libs/opusfile/Manifest
+++ b/media-libs/opusfile/Manifest
@@ -1,4 +1,6 @@
 AUX opusfile-0.11-libressl.patch 6273 BLAKE2B d4868792619ce83d01994c034f9605a86929e52879a22010c0cc00c512a5b8c5abe2261e406616c04475307b7f9d16a5bc57281304d9462b0317849e7ceda922 SHA512 1eeb55595a125bd43469f47073f78bf392bf70ff5e1f94192bf9a5cfad0fd3a3887d9b38b10290cd32d357d8c6c1e00feddc4f6fa14f652ec56a7d365280d812
 DIST opusfile-0.11.tar.gz 467420 BLAKE2B e3e6ee2d1d4c7030bdd5f7ec14503d46ebbfcbc4481ab4652a0be9171d45fe2e855e0f17801cf28fda66f44496ba9f9a2996af7e5aaf5b008e4c3b14263f3160 SHA512 ec3e282310cc4f25475c27b7bc8d1652dcb25d3ac6badf87bd1b4e5397fbe106a0dab81c60d88d198003a23d8a2c9bae8b661edc9b31433effeca438ce56a349
+DIST opusfile-0.12.tar.gz 471354 BLAKE2B d54d9b8ed011c018dc6de77afab524d2e47ba6cca69b911efacf361b41f3b59a31424cb15a778db14166815ba5e2352f33f8aa7987c30e5e14339c652558d18d SHA512 e25e6968a3183ac0628ce1000840fd6f9f636e92ba984d6a72b76fb2a98ec632d2de4c66a8e4c05ef30655c2a4a13ab35f89606fa7d79a54cfa8506543ca57af
 EBUILD opusfile-0.11.ebuild 974 BLAKE2B 23facf93877b58c8c7d2142bcd999a9417d5395b642dbf1834a9bc4e433a6aa9db2048be09310912028a4e5e8c7a95b05940a61546c8061bb58301e630b1d86f SHA512 eae0ec22a2aabd2839e45804776d5541bcfb7ae6578b497b698970736af76fd0ed8c32c9f60c6dcf451ea4a20ac227fee30565d47b275349fdeadd769bf7deb2
+EBUILD opusfile-0.12.ebuild 934 BLAKE2B 3fefb2db80db74773c3841d46e68abbfef0418515b814cb776ef4a4429433211cfdb08926cc36087f50bd1fefeee5540ac59541bfc32e0bcfb7175a051f3cef1 SHA512 f7b71e9d2a8a39ff8fea0fbec5e7c11d55a142a93cfac9e8bebab2cf4e1477f1fa33a9c8149ef6a7f55e1c1eaf03ec8a1915026f7207cabeea8e8255a06ca6a2
 MISC metadata.xml 574 BLAKE2B 67bceafd9042cb07a851772ca2b78b542783c6fd4e9bdd5e44643a36652e24907692465390b33ceddd44d37be297b096129ecb92940fe5d7ec5aedbd709c8cb1 SHA512 12eaea9edb76ed36ac8cd60af4b14cf395b4fcb81f4d3dabb1020a0139f05e05fe80bc800080913e66fcb967d4ed1de6b37238a7b0d72dad69de505354aa3830
diff --git a/media-libs/opusfile/opusfile-0.12.ebuild b/media-libs/opusfile/opusfile-0.12.ebuild
new file mode 100644
index 000000000000..18795c965e1c
--- /dev/null
+++ b/media-libs/opusfile/opusfile-0.12.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A high-level decoding and seeking API for .opus files"
+HOMEPAGE="https://www.opus-codec.org/"
+SRC_URI="https://downloads.xiph.org/releases/opus/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc fixed-point +float +http libressl static-libs"
+
+RDEPEND="media-libs/libogg
+	media-libs/opus
+	http? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+REQUIRED_USE="^^ ( fixed-point float )"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable doc)
+		$(use_enable fixed-point)\
+		$(use_enable float)
+		$(use_enable http)
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index f08f74a1678d..e0b8d68584f9 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,7 +1,4 @@
 AUX osl-1.10.5-fix-install-shaders.patch 1333 BLAKE2B daf7970a05ccc2b08139c385caf9c2a9291d2f7db30b2ed1dab99d1d8da25ad5487edc7961a62809811eca45066eaa4bfa0524d0e9c9daa25489fb84be2965b2 SHA512 bc7d5e2c1306fa540d51f425d4b1303c5ad9ab624ba7f44d03ed9d8df77f36a71c334b05049d0a880cabe068947f7936258e3e52479334987b7ae68f55631cc4
-AUX osl-1.10.5-upstream-patch-to-find-openexr-version.patch 3609 BLAKE2B 25951dd971f344d8c2233bb58d05f87ce77a12db182c19d16c346e41644c6cc64b4e20b631ab0e03b4a00a42de624693a61b04930beecea0fe0ed3dff1760fa6 SHA512 0c27bf26afbe5806565d3ad7617f35e66814695435e9c176e73faa09b5508830803709a040aea2901293a3fd2a2110b4daf622099a5c01e92fd2ee9d09b15cae
 DIST osl-1.10.10.tar.gz 13549066 BLAKE2B d91360d4cde0e8f70e01aa5cbf14bd6dc30be47ba96d4f2206adb75ef8f14af6af43b00f025cbf9b9c03cfcf117380ee9bb0a93129c314b249151cd97135757b SHA512 10371d9aefa786fefbae15cb9c71d7360bd903a36734840f7d0a960a615d48096b7170596bd934d10579b33d8f8398fc0e00471a10cd517c1a4a601169b2ca13
-DIST osl-1.10.5.tar.gz 13543151 BLAKE2B 3c67834d9ab6d4d725ecde622c402707593b9aaf25f1e94f9ed6b004c28fa9b7b90cfd0d320cb2898f77f8883ac14a71310abaf63a5b06704565c5a3bdea09b4 SHA512 d704b623836edca4c3fe9c18f33b8d76f4625036228fc977732c600e23e16da4cb4bf311607019b251d734b63a184bde0f7726f144ecd5bcd7866938d95bfdff
-EBUILD osl-1.10.10.ebuild 1904 BLAKE2B cdb76807d98edf4ea0233550aec7d28fd5689555a47c476f57cf8dbc92c1e9b4d747796c93ca0fc68adac92da0b91838aa817d1efcb409f0a5f448e229a53416 SHA512 9d59d15ffa88732628fad2d739a354c4a952c5f1aedfd51e559517e8edca0277e7376c54f7d8004fd01a216d373a2885701f893f2f955577601d62074b517e2a
-EBUILD osl-1.10.5.ebuild 2028 BLAKE2B 982a0542132c80ea6c30fe553215138a8d295174c9c22463a441d0c8504acc281fe1cba5bbf9ca361fc51cbbf314327f8464cdc15e3fac2fcdcca36628db8cee SHA512 ff72354c579fe82a12c524b9c3efa3af17b6fbc2ddf0967248da10bf050bb44582675f633d28dac03765332d1966bd1693729204b09fa79e7ff59910ed2df064
+EBUILD osl-1.10.10.ebuild 1903 BLAKE2B 80e44eeb35021b93feba3c9630e94da9167290691bccac7cef89f4df465cc6dc9e5d8e8a916fdd3fab623d60c5419a953f573458885022ee551019ad006549a3 SHA512 4ae380db765b81451e4f41c70a09aa5cbf9fb1017d98fcdd12010c25e8ef882b57ceda02edf0e4eb2ff8a8b7d1234ea8ca8a8c6dcdfaf4c5909c1a157d2e6fac
 MISC metadata.xml 810 BLAKE2B 85c4497ffc27bcf44682666135bebe083468c950618a5840fac008af4eca4dd902d371123d42f7ccfb3133e94dd2fbae22531d857e4e76bbafe10e55aa6b009b SHA512 cd69216183988e52c8224240263e162079510f264b7b277222dbc299316feb235dd51396351ca650298c4a890d8629ab38ab8ed75c198e8d60e117ed3a4a8b40
diff --git a/media-libs/osl/files/osl-1.10.5-upstream-patch-to-find-openexr-version.patch b/media-libs/osl/files/osl-1.10.5-upstream-patch-to-find-openexr-version.patch
deleted file mode 100644
index cc270ff52813..000000000000
--- a/media-libs/osl/files/osl-1.10.5-upstream-patch-to-find-openexr-version.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 9efdcfafcdfbb7666171b6016b725183a71fceb0 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Tue, 25 Jun 2019 19:44:14 +0200
-Subject: [PATCH] src/cmake/modules/FindOpenEXR.cmake: patch to find openexr
-
-This upstream patch (see
-https://github.com/imageworks/OpenShadingLanguage/pull/1022/files)
-uses pkg-config variables to get the correct versions for openexr
-on multilib installations.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- src/cmake/modules/FindOpenEXR.cmake | 20 +++++++++++++++-----
- 1 file changed, 15 insertions(+), 5 deletions(-)
-
-diff --git a/src/cmake/modules/FindOpenEXR.cmake b/src/cmake/modules/FindOpenEXR.cmake
-index 6c6b39c..4a9de4b 100644
---- a/src/cmake/modules/FindOpenEXR.cmake
-+++ b/src/cmake/modules/FindOpenEXR.cmake
-@@ -25,8 +25,12 @@ endif ()
- # Attempt to find OpenEXR with pkgconfig
- find_package(PkgConfig)
- if (PKG_CONFIG_FOUND)
--    pkg_check_modules(_ILMBASE QUIET IlmBase>=2.0.0)
--    pkg_check_modules(_OPENEXR QUIET OpenEXR>=2.0.0)
-+    if (NOT ILMBASE_ROOT_DIR)
-+        pkg_check_modules(_ILMBASE QUIET QUIET IlmBase>=2.0.0)
-+    endif()
-+    if (NOT OPENEXR_ROOT_DIR)
-+        pkg_check_modules(_OPENEXR QUIET OpenEXR>=2.0.0)
-+    endif()
- endif (PKG_CONFIG_FOUND)
- 
- # List of likely places to find the headers -- note priority override of
-@@ -60,7 +64,11 @@ find_path (OPENEXR_INCLUDE_PATH OpenEXR/OpenEXRConfig.h
- find_path (OPENEXR_INCLUDE_PATH OpenEXR/OpenEXRConfig.h)
- 
- # Try to figure out version number
--if (EXISTS "${OPENEXR_INCLUDE_PATH}/OpenEXR/ImfMultiPartInputFile.h")
-+if (DEFINED _OPENEXR_VERSION AND NOT "${_OPENEXR_VERSION}" STREQUAL "")
-+    set (OPENEXR_VERSION "${_OPENEXR_VERSION}")
-+    string (REGEX REPLACE "([0-9]+)\\.[0-9\\.]+" "\\1" OPENEXR_VERSION_MAJOR "${_OPENEXR_VERSION}")
-+    string (REGEX REPLACE "[0-9]+\\.([0-9]+)(\\.[0-9]+)?" "\\1" OPENEXR_VERSION_MINOR "${_OPENEXR_VERSION}")
-+elseif (EXISTS "${OPENEXR_INCLUDE_PATH}/OpenEXR/ImfMultiPartInputFile.h")
-     # Must be at least 2.0
-     file(STRINGS "${OPENEXR_INCLUDE_PATH}/OpenEXR/OpenEXRConfig.h" TMP REGEX "^#define OPENEXR_VERSION_STRING .*$")
-     string (REGEX MATCHALL "[0-9]+[.0-9]+" OPENEXR_VERSION ${TMP})
-@@ -93,6 +101,8 @@ set (GENERIC_LIBRARY_PATHS
-     /opt/local/lib
-     $ENV{PROGRAM_FILES}/OpenEXR/lib/static )
- 
-+# message (STATUS "Generic lib paths: ${GENERIC_LIBRARY_PATHS}")
-+
- # Handle request for static libs by altering CMAKE_FIND_LIBRARY_SUFFIXES.
- # We will restore it at the end of this file.
- set (_openexr_orig_suffixes ${CMAKE_FIND_LIBRARY_SUFFIXES})
-@@ -114,14 +124,14 @@ foreach (COMPONENT ${_openexr_components})
-     # First try with the version embedded
-     set (FULL_COMPONENT_NAME ${COMPONENT}-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR})
-     find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME}
--                  PATHS ${OPENEXR_LIBRARY_DIR}
-+                  PATHS ${OPENEXR_LIBRARY_DIR} $ENV{OPENEXR_LIBRARY_DIR}
-                         ${GENERIC_LIBRARY_PATHS} NO_DEFAULT_PATH)
-     # Again, with no directory restrictions
-     find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME})
-     # Try again without the version
-     set (FULL_COMPONENT_NAME ${COMPONENT})
-     find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME}
--                  PATHS ${OPENEXR_LIBRARY_DIR}
-+                  PATHS ${OPENEXR_LIBRARY_DIR} $ENV{OPENEXR_LIBRARY_DIR}
-                         ${GENERIC_LIBRARY_PATHS} NO_DEFAULT_PATH)
-     # One more time, with no restrictions
-     find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME})
--- 
-2.22.0
-
diff --git a/media-libs/osl/osl-1.10.10.ebuild b/media-libs/osl/osl-1.10.10.ebuild
index e37aeee77342..1b2d7c3168e0 100644
--- a/media-libs/osl/osl-1.10.10.ebuild
+++ b/media-libs/osl/osl-1.10.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 X86_CPU_FEATURES=(
 	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
diff --git a/media-libs/osl/osl-1.10.5.ebuild b/media-libs/osl/osl-1.10.5.ebuild
deleted file mode 100644
index b5c979d4f309..000000000000
--- a/media-libs/osl/osl-1.10.5.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake llvm toolchain-funcs
-
-# check this on updates
-LLVM_MAX_SLOT=8
-
-DESCRIPTION="Advanced shading language for production GI renderers"
-HOMEPAGE="http://opensource.imageworks.com/?p=osl"
-SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-X86_CPU_FEATURES=(
-	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*}"
-
-# >=clang-3.4 is needed, but at least llvm:5 if both are installed
-RDEPEND="
-	>=dev-libs/boost-1.62:=
-	dev-libs/pugixml
-	>=media-libs/openexr-2.2.0:=
-	>=media-libs/openimageio-1.8.5
-	>=sys-devel/clang-5:=
-	<sys-devel/clang-9:=
-	sys-libs/zlib:=
-	partio? ( media-libs/partio )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-upstream-patch-to-find-openexr-version.patch"
-	"${FILESDIR}/${P}-fix-install-shaders.patch"
-)
-
-# Restricting tests as Make file handles them differently
-RESTRICT="test"
-
-S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
-
-llvm_check_deps() {
-	has_version  -r "sys-devel/clang:${LLVM_SLOT}"
-}
-
-src_configure() {
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd} ]] && mysimd=("0")
-
-	local gcc=$(tc-getCC)
-	# LLVM needs CPP11. Do not disable.
-	local mycmakeargs=(
-		-DENABLERTTI=OFF
-		-DINSTALL_DOCS=$(usex doc)
-		-DLLVM_STATIC=ON
-		-DOSL_BUILD_TESTS=$(usex test)
-		-DSTOP_ON_WARNING=OFF
-		-DUSE_PARTIO=$(usex partio)
-		-DUSE_QT=$(usex qt5)
-		-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
-	)
-
-	cmake_src_configure
-}
diff --git a/media-libs/portmidi/Manifest b/media-libs/portmidi/Manifest
index 4365b9c1b557..cfc4f6af589e 100644
--- a/media-libs/portmidi/Manifest
+++ b/media-libs/portmidi/Manifest
@@ -1,5 +1,5 @@
 AUX portmidi-217-cmake.patch 13905 BLAKE2B faa559f25b1acec63f17a6b6dcbd228eff2cb50447ba72ea4108c86f36b8142fac54c90e5480d74278e0fa0b28bad68f4f1bfac192434840893dc9039243284f SHA512 b60da799041d6dc4a1bf82981d904cf9bbbaed021397cd2235dc25b18b7c830576ecce8fa0c6992249e03ab84579eff795ae33a8e0d091dcda8ee856491420d4
 AUX portmidi-217-r4-python.patch 1540 BLAKE2B a5fe8c48e8d312cead822fc8893f8a610bf5cf280dd2445da04ab42ed13a5a121174afa2e8874dcf3f7a7b89cd60894a819404438c6d5cb2b99a8e2ae6f3aba8 SHA512 d7ded737346f9756450ff3eaf35daf33da941a109d7db07598ea57593ef3272213b889a9ab33bed71bead4583cb080439813bf7fc4a6d1a6cbb84ed4cd25b51f
 DIST portmidi-src-217.zip 1030830 BLAKE2B ab197c7f9a5c2b4d2740d56841459fbac97d510e4d12e5d0cd7cecc0ba6035929b6596140d42c575a9513862a66127d19253dbee1d3a7b7b84b69c88fec7fcae SHA512 d08d4d57429d26d292b5fe6868b7c7a32f2f1d2428f6695cd403a697e2d91629bd4380242ab2720e8f21c895bb75cb56b709fb663a20e8e623120e50bfc5d90b
-EBUILD portmidi-217-r3.ebuild 3217 BLAKE2B 25de5d11bb29868c38937d2f510ba6c5c5356c324b6ea50b154ce05e6c872c8671274d4d6f27360b243f21a69e513adcd218bda1da568bb3108224f38ea8a1bd SHA512 aeb1d390f9c021b1533cbcdbf8a9329e01fc7fe8712c6916faaa102125d9958324b7a6605bb0fc05ef60f1e075b66147e7c05bb1a56b7babdcb78b56ded00923
+EBUILD portmidi-217-r3.ebuild 3213 BLAKE2B 891e8efebef6a6ff0cf0f4b0d477755e1a00d6bbf365d2066bf5edb229e3a73c20264123b38bae25c394fd6200d5dca1afb94d3fde08724c7597f36c143cd40c SHA512 904eec671d0a018310393f907509c3c88e6e44b1a97dba51db131864ceaf54ab12435b5e6595167733b1401b9211439995b38b7c3cfb2a0150083517a4db0127
 MISC metadata.xml 436 BLAKE2B abc47a4c2597048c3e2037006db7811d99cb1ce5c35d83dec30fc415f6d419344bf283d580c153309bb7934b6a12fae878cd480f6c12be76deb52bd5494e2c5c SHA512 a7f6997ff7647e20526181189d5d38ebd944648a508a90ab42ada4dfec84f5165a25b07f5738880a9dcbf424e2b74ac7c3224f6b8d47d9c8a7f3fa7c02c02cbc
diff --git a/media-libs/portmidi/portmidi-217-r3.ebuild b/media-libs/portmidi/portmidi-217-r3.ebuild
index e76daed343ba..341ec7f779d0 100644
--- a/media-libs/portmidi/portmidi-217-r3.ebuild
+++ b/media-libs/portmidi/portmidi-217-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/portmedia/${PN}-src-${PV}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ~ppc64 sparc x86"
 IUSE="debug doc java python static-libs test-programs"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-libs/pulseaudio-qt/Manifest b/media-libs/pulseaudio-qt/Manifest
index 1bc0fca725f7..92f5a1f16fa1 100644
--- a/media-libs/pulseaudio-qt/Manifest
+++ b/media-libs/pulseaudio-qt/Manifest
@@ -1,3 +1,3 @@
 DIST pulseaudio-qt-1.2.tar.xz 30748 BLAKE2B f6f61eaad122795d6833934edd69e2c9b2f79b458b61a240f07f80b17e2f02fd46bfa639932e2824f2d19c782dc394d6b9e30b69c75f9c0da0c2d9ce3530c3c2 SHA512 20bddc4db80310bf46b37a1a386f714bfa3dc2a58871bdd0c0085675c43b42e24792d05cbe5543135a341588e17738525f03ccb08adbc73e1c65967039b35dc7
-EBUILD pulseaudio-qt-1.2.ebuild 682 BLAKE2B 82674bb678033fc75f72d4a6d408633d2865f94e5bf6500c72f39edc4129279523f286bcac0952623d127030c3698903a8b7b6e1101eb6570412d88453236bf2 SHA512 32a38922b7c1f770d539cc1b06e5c351f94a0dd1512641a46bc0cb2959b6e1faf2eafa95658399c33ba05468f58d297a3cf06155272af71fb34c9284cee80f97
+EBUILD pulseaudio-qt-1.2.ebuild 681 BLAKE2B 61b8aff86bf771e55c27ce650cc3b1d329b03415090038c7b6adda64329d42b5173ca75ab7be962735e1b145a0733a0b30d780a2db9d30d562f717824270686f SHA512 bbbe9c8d88d2f485b00a78f612505d90dc634196a0b9f9c9b24079057d1c5428af9059a3339304cb86490ed947d21ccb6653165d9c02c5f4ae2f9d17e5503c7c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/pulseaudio-qt/pulseaudio-qt-1.2.ebuild b/media-libs/pulseaudio-qt/pulseaudio-qt-1.2.ebuild
index 4aa20d60c53c..97af20162ec9 100644
--- a/media-libs/pulseaudio-qt/pulseaudio-qt-1.2.ebuild
+++ b/media-libs/pulseaudio-qt/pulseaudio-qt-1.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/libraries/pulseaudio-qt"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/pymemphis/Manifest b/media-libs/pymemphis/Manifest
deleted file mode 100644
index aa4e7bc11efa..000000000000
--- a/media-libs/pymemphis/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pymemphis-0.2.1.tar.gz 128848 BLAKE2B fe48cb4e33a7402e02fea007667401b77c38f0fc4f47d5ed61e8fa074a21700db008afd7a6d7ad8bdb34dd9ce3d42f416ceb8f41edb9e551b971077b87969a12 SHA512 0eb2d5112956673e115575b7d6601dd56708f02da2a67a67a0d54dd2fe53654d07e99265092c67834a07eaf8f353a643e7d2a6aa50efd38d5761ac349de1813a
-EBUILD pymemphis-0.2.1-r3.ebuild 817 BLAKE2B 49e6d8eee752db39b39fa55cbbf4d368398f607c81c163ad9ac1632594400841e50957f558e0e151dd9473210bd57f138f794a2ef1b94e23b1ec621efc3bc777 SHA512 2c8eaad6832eaccb91b7ab9751b802768c8f5c04cb75834e8dd86c6ce4bf1ffc6c42409fa17d7d69c1ad1d2c22ddaf9b6dd81e01ec2da274bfe3aa21cd62ca4d
-MISC metadata.xml 265 BLAKE2B 65aa3f55bbf6646be50460d7fa19c2336d7ab4a88906ef67da5051ef514d3fd7123b17123620457ce87ebac3cdd3f7060c2931905cffd3025a9704824ca879d7 SHA512 c08402155a91423d29d281e4adcb3bcb057a61def37efc13bbaf8ea03c147e258352fcc9d6ef12c935ed65078743d79a5191d72d7838429a80cadee42b32cb8f
diff --git a/media-libs/pymemphis/metadata.xml b/media-libs/pymemphis/metadata.xml
deleted file mode 100644
index 1c984f64751f..000000000000
--- a/media-libs/pymemphis/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>sci-geosciences@gentoo.org</email>
-	<name>Gentoo Geosciences Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-libs/pymemphis/pymemphis-0.2.1-r3.ebuild b/media-libs/pymemphis/pymemphis-0.2.1-r3.ebuild
deleted file mode 100644
index 5239a296f165..000000000000
--- a/media-libs/pymemphis/pymemphis-0.2.1-r3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-AT_M4DIR="build/autotools/"
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Python bindings for the libmemphis library"
-HOMEPAGE="http://gitorious.net/pymemphis"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="LGPL-2.1"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
-	')
-	media-libs/memphis"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${PN}-mainline
-
-src_prepare() {
-	default
-	eautoreconf
-	sed 's:0.1:0.2:g' -i pymemphis.pc.in || die
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/raspberrypi-userland-bin/Manifest b/media-libs/raspberrypi-userland-bin/Manifest
index 2aa2496a9887..c8bcebd06447 100644
--- a/media-libs/raspberrypi-userland-bin/Manifest
+++ b/media-libs/raspberrypi-userland-bin/Manifest
@@ -3,4 +3,4 @@ DIST raspberrypi-firmware-1.20170303.tar.gz 118888867 BLAKE2B d90fc012d4371a797e
 DIST raspberrypi-firmware-1.20190709.tar.gz 158835870 BLAKE2B 4e63b3308adcd75f69f66966f1c927449aa8dc65211e6ca5a27dd2a0ed6ed32cc85ad42221308f4fb3a852d9f278400cfe4f723f306abe102341568408027174 SHA512 6a0610c97db47441ede8e4f8436958899f678bf065a0fbde06de7945a1ac4d5f754a0e10d928d77759ba1cbf82654d85d9cb9c91b970c3fe9590560267033522
 EBUILD raspberrypi-userland-bin-1.20170303.ebuild 980 BLAKE2B bbb6e6844a73c96d9cf58a2addaf12dd884897b82240c0619ba31ffdacaa2c7d30608f168cfcea0ae1f2beeccb3f9f2d87e671095fcdb81042abfa0dc653daf8 SHA512 ef356c392cea33c03d98990004235b6ba3bd5d8c50883b91a6568c0beaaba23313d1b0edcf29f6fbbc53d3f6feae1901088d541b3dfaf3dc1b048f775a5e2f48
 EBUILD raspberrypi-userland-bin-1.20190709.ebuild 879 BLAKE2B 312786fded4a752e8d2a7252f9fa487e52a1bd8954a213c5e864ed4e7ba6cd76e06e1c2439afaa30bca89c084565fbffc2241ed067f9b69ddc2eeb64eff8ea4f SHA512 f453b77801bc519f69b2a332f0a029a3b9345878c63ac13b5ebe818bf90b16738cc001b4a5a01fa02f423e868d4603f30e8b298081d00877d2db19a4b5ba6842
-MISC metadata.xml 401 BLAKE2B 50e313c1b4af550c8e4547e399a105ad7d36cf028a4a5ef1ede4a52ca47ca0358d8b1a171785748959726683c0b53eedb9f9b40e13ba2a204bc4f6f7fdc3c9a8 SHA512 ce7de7cb51da21dfcb681edbdb01f49982f5885edddffb958b4a4e1f66de40c8b293fac49c0c37756f4848477736566b810d6420bddb102b8bc4aa84b981bb10
+MISC metadata.xml 389 BLAKE2B d3577d29c94a74d9cc3cbf749fe2cdc46e37ffc5aeed828e280e04fec248f71a1dcbea5aee4c1e178c9699771c88bbb03228aba956069be5f07818d21ea65a67 SHA512 83074595bc89f763ca63b370aeaf44ca973ddfe6cd411de09dc89bc90f986078a7e2af98354f5ed7442a2b526d41851e8312d6b70e131d13377a69daf32e4f54
diff --git a/media-libs/raspberrypi-userland-bin/metadata.xml b/media-libs/raspberrypi-userland-bin/metadata.xml
index 7e9cc8e5385a..59f566c541eb 100644
--- a/media-libs/raspberrypi-userland-bin/metadata.xml
+++ b/media-libs/raspberrypi-userland-bin/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>andrey_utkin@gentoo.org</email>
-		<name>Andrey Utkin</name>
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
 	</maintainer>
 	<use>
 		<flag name="hardfp">Use armv6 hardfp ABI</flag>
diff --git a/media-libs/raul/Manifest b/media-libs/raul/Manifest
index c36a2514c7b2..54bb008fd4e7 100644
--- a/media-libs/raul/Manifest
+++ b/media-libs/raul/Manifest
@@ -1,5 +1,5 @@
-AUX ldconfig2.patch 366 BLAKE2B 03262a8edcbc1a597fa2472c8b140755c80d00abd9418e55ff844b569d61efd101b3a0ec2118a9383b383a44081eca9e51ef2685a9adef341d3350eb6022fb14 SHA512 008c6699afadc123139e66736588f83612a9d301870726178782a58807951f2231891e4968ce83d6eb72f38388e2e8df78deec25a352d754a801b63b2541775e
-AUX raul-0.8.0-gcc47.patch 1466 BLAKE2B b0952da4adaac185e4517944d51861040dd957263f9a0c69d5a3920d82bd4df7075baad920e62e011f586cae3289452bd079b4ef5ca419d66881534bcff321b9 SHA512 6056c680136bade273cf5b061591556b6f1e6d0045b6afc6b3f950e9a37def4a22356d45dccea52a29bd6b9c455744ac60ba51cccabb5965fdc31c67452344b7
-DIST raul-0.8.0.tar.bz2 155450 BLAKE2B 9347e0b3505452ebdcfef89a25ab2b134f9c65d0c3ed0d1c456c309fa073cf81f1f1f901d7e2728f08d481fdefec26e57227923a75946e7b35d4c902c2fe8832 SHA512 7ad48c551945aad104309448bcdb86a4a2ca07c44af53b37492e7cddce6a093529f1e1e75c4b27cb8e292ec46424969cdea270883d44b2f1badc48df8943a0a1
-EBUILD raul-0.8.0-r1.ebuild 1229 BLAKE2B 0ff9c3829663d8380d7988a5339bd0e49e6be80aaa2eea8d6f368aeac833f98b911f1ad3b13975f287903b2594a4d871673efb084b1c00056b7a06ed1d8886ea SHA512 a3270389b41eaf2b514bf945b324f43586d5548bab6728b780c55bfcdd8efa5fac758a63de1ad705a279d2261c7ca8bce4a6e2385ff8091f2bb2b1454f499176
+DIST drobilla-autowaf.tar.bz2 305372 BLAKE2B 1457ceed5e80c5077ddacbfe14ef565865997440795800e1fe2dc9af0be9aee89f3a452de1af8c46d8b0e87475592417bf94b1ce1e1004dab7ee4b3b88ba36aa SHA512 324b0e431ee905619ff85d4f3b3c3ba644bb7c10abf89cc2b27af2f871f454c8010326d0c6cd9e7d72538d32a608f10dea5951ff29a8dde2aa9ba5c2e0567d87
+DIST raul-1.0.0_pre20200718.tar.bz2 58775 BLAKE2B 3383c5c2a1c4f1156137c90807bc70d0fb05d5d271855ea1490bc216df8f2036049aee0fc49309b22db9a82f19670eb2ec29900bb9766d0270f5ba0db60324d8 SHA512 33de61b47bb0bf9cd8ccc15ad3249ec76f3fe3ae9e0cb9af6a45ef6385b2b777af6f775abc00a1f7f7ad930291529a48cebddd455e54b8fe5887749dfb0b47a4
+EBUILD raul-1.0.0_pre20200718.ebuild 1473 BLAKE2B 39f25140f9bebfa6e2051f219ea0c0f1ea657e40b36fc3b415f88f4d926dc2c5e18f446cf120d72ed59973f67b4a2359d2e315b19cef808dc7b97fd88cfb9e6f SHA512 db6eff9ff1c635d0a2eeeca26fdc1114e88a562806eb5d4820724c4cfe945178af1ec2acc15d21310ed1f400b4bc7c11ca590726f641a07616ae396372c094f1
+EBUILD raul-9999.ebuild 1070 BLAKE2B 1622b081c0615bc512cc7c77feb0105af0f4672eeb8b6f9b085325a96f5e59e48af2ec40319da20fd75a8b71e1f476f09f1b6ace512f3d89f4c383ecb916e06c SHA512 207525f55ca8ba5b59aaade29fa2924b275f7616b7d4979f9dc5c21516d8ba5744a6e54bcd0e0e1c5b94ed6de26d581f63c9633ae1da283f29540f3da0ac3cde
 MISC metadata.xml 415 BLAKE2B 602cc66e3d57378c7e2b62d3104dfc85e1d058832f93008d2f1e93a43421f1598a93cd82b5a636f143e0c3ef9e555c2340abc9d43e8a04e8242a6e77f506555d SHA512 88de311ef1dc5590377c173508b1ad36346f9c69d518e8705c89af8cb3642fd9f838038489fe6f0a429370417db013b3df5f89e97ba9a67ff1f34df0ac4b359d
diff --git a/media-libs/raul/files/ldconfig2.patch b/media-libs/raul/files/ldconfig2.patch
deleted file mode 100644
index 7676ae0781f9..000000000000
--- a/media-libs/raul/files/ldconfig2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: raul-0.8.0/wscript
-===================================================================
---- raul-0.8.0.orig/wscript
-+++ raul-0.8.0/wscript
-@@ -153,7 +153,5 @@ def build(bld):
- 	# Documentation
- 	autowaf.build_dox(bld, 'RAUL', RAUL_VERSION, top, out)
- 
--	bld.add_post_fun(autowaf.run_ldconfig)
--
- def test(ctx):
- 	autowaf.run_tests(ctx, APPNAME, tests.split())
diff --git a/media-libs/raul/files/raul-0.8.0-gcc47.patch b/media-libs/raul/files/raul-0.8.0-gcc47.patch
deleted file mode 100644
index c9cb2d080931..000000000000
--- a/media-libs/raul/files/raul-0.8.0-gcc47.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=425274
-Build with gcc 4.7
-
-Index: raul-0.8.0/raul/PathTable.hpp
-===================================================================
---- raul-0.8.0.orig/raul/PathTable.hpp
-+++ raul-0.8.0/raul/PathTable.hpp
-@@ -37,13 +37,13 @@ public:
- 	typename Table<Path, T>::iterator find_descendants_end(
- 			typename Table<Path, T>::iterator parent)
- 	{
--		return find_range_end(parent, &Path::descendant_comparator);
-+		return this->find_range_end(parent, &Path::descendant_comparator);
- 	}
- 
- 	typename Table<Path, T>::const_iterator find_descendants_end(
- 			typename Table<Path, T>::const_iterator parent) const
- 	{
--		return find_range_end(parent, &Path::descendant_comparator);
-+		return this->find_range_end(parent, &Path::descendant_comparator);
- 	}
- };
- 
-Index: raul-0.8.0/raul/TableImpl.hpp
-===================================================================
---- raul-0.8.0.orig/raul/TableImpl.hpp
-+++ raul-0.8.0/raul/TableImpl.hpp
-@@ -249,7 +249,7 @@ Table<K, T>::cram(const Table<K,T>& rang
- 	assert(is_sorted());
- #endif
- 
--	return make_pair(iterator(*this, insert_index), true);
-+	return std::make_pair(iterator(*this, insert_index), true);
- }
- 
- 
-@@ -339,7 +339,7 @@ Table<K, T>::operator[](const K& key)
- 	if (i != end()) {
- 		return i->second;
- 	} else {
--		std::pair<iterator,bool> ret = insert(make_pair(key, T()));
-+		std::pair<iterator,bool> ret = insert(std::make_pair(key, T()));
- 		return ret.first->second;
- 	}
- }
diff --git a/media-libs/raul/raul-1.0.0_pre20200718.ebuild b/media-libs/raul/raul-1.0.0_pre20200718.ebuild
new file mode 100644
index 000000000000..d95d82839705
--- /dev/null
+++ b/media-libs/raul/raul-1.0.0_pre20200718.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit waf-utils python-any-r1 eutils
+
+COMMIT="496e70e420811c7d744a8bcc44a2ac1b51b676b5"
+COMMIT_AUTOWAF="6c6c1d29bfe4c28dd26b5cde7ea4a1a148ee700d"
+
+DESCRIPTION="C++ utility library primarily aimed at audio/musical applications"
+HOMEPAGE="http://wiki.drobilla.net/Raul"
+SRC_URI="https://gitlab.com/drobilla/raul/-/archive/${COMMIT}.tar.bz2 -> ${P}.tar.bz2
+	https://gitlab.com/drobilla/autowaf/-/archive/${COMMIT_AUTOWAF}.tar.bz2 -> drobilla-autowaf.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/boost
+	dev-libs/glib"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+RAUL_TESTS="array_test build_test double_buffer_test maid_test path_test ringbuffer_test sem_test socket_test symbol_test thread_test time_test"
+DOCS=( AUTHORS NEWS README )
+
+src_prepare() {
+	default
+	rm -r "${S}/waflib" || die
+	ln -s "${WORKDIR}/autowaf-${COMMIT_AUTOWAF}" "${S}/waflib" || die
+}
+
+src_configure() {
+	waf-utils_src_configure \
+		$(use debug && echo "--debug") \
+		$(use doc && echo "--docs") \
+		$(use test && echo "--test")
+}
+
+src_test() {
+	cd "${S}/build/test" || die
+	for i in ${RAUL_TESTS} ; do
+		einfo "Running test ${i}"
+		LD_LIBRARY_PATH=.. ./${i} || die
+	done
+}
diff --git a/media-libs/raul/raul-0.8.0-r1.ebuild b/media-libs/raul/raul-9999.ebuild
index 9989f107c4ff..3c51df5ccbca 100644
--- a/media-libs/raul/raul-0.8.0-r1.ebuild
+++ b/media-libs/raul/raul-9999.ebuild
@@ -1,41 +1,35 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE='threads(+)'
 
-inherit waf-utils python-any-r1 eutils
+inherit waf-utils python-any-r1 eutils git-r3
 
 DESCRIPTION="C++ utility library primarily aimed at audio/musical applications"
 HOMEPAGE="http://wiki.drobilla.net/Raul"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+EGIT_REPO_URI="https://gitlab.com/drobilla/raul.git"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS=""
 IUSE="debug doc test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/boost
-	>=dev-libs/glib-2.14.0"
+	dev-libs/glib"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
-RAUL_TESTS="atomic_test atom_test list_test midi_ringbuffer_test path_test quantize_test queue_test ringbuffer_test smf_test table_test thread_test time_test"
-DOCS=( AUTHORS README ChangeLog )
-
-src_prepare() {
-	epatch "${FILESDIR}/ldconfig2.patch"
-	epatch "${FILESDIR}/${P}-gcc47.patch"
-}
+RAUL_TESTS="array_test build_test double_buffer_test maid_test path_test ringbuffer_test sem_test socket_test symbol_test thread_test time_test"
+DOCS=( AUTHORS NEWS README )
 
 src_configure() {
 	waf-utils_src_configure \
-		--htmldir=/usr/share/doc/${PF}/html \
 		$(use debug && echo "--debug") \
 		$(use doc && echo "--docs") \
 		$(use test && echo "--test")
diff --git a/media-libs/rlottie/Manifest b/media-libs/rlottie/Manifest
index 0d57fe48bbdb..91d01b24cb45 100644
--- a/media-libs/rlottie/Manifest
+++ b/media-libs/rlottie/Manifest
@@ -1,7 +1,6 @@
-AUX rlottie-0.0.1_pre20190920-disable-werror.patch 420 BLAKE2B 3b3173c4514227de44f1f953678dcce871b3df07ccbb617d0f8a18763f66dadf584fdacd8eeb31a8391a5b8a8a1c00a05137790ad09662e093eb7888f8f0bb4d SHA512 893b5a658a63e8fe4f62e72e967d9e89eaef8184680c1b753fbc0c0893078bbf963967dd4dadff6a94150b7b15c0b6c7ee7cd54631b6874aa3cf3d21989746ed
 AUX rlottie-0.1-disable-werror.patch 381 BLAKE2B 26afddff05d0cfda88617473ec4affca4a721f081e393c31b409fc6a3e73efe73e4e661caf13aeaf5394f31533390b1439492e066ad19087d76b984b6304f421 SHA512 2363100f6b0ab09f3ad9ae46dd02dffd2a5ca2124ae1b4f3791c88b3b7563e9cafd68da4ee719f9460d781aab80b4a83f21f0d788db2eefa5cd9d2cab0ab69ce
-DIST rlottie-0.0.1_pre20200424.tar.gz 3371620 BLAKE2B cdfc89f66e7aec736029416decf76777f22b4cb8293bed74e647088480faed4c6ffd03a29a967ac532f9e747858fdd93fa552eb974085f7cf1701a12fe3a2c38 SHA512 1a05b835c083337a80b32ea8c1e201d1d2356c58e314b791f74f95504303f3ef46d3951abf2a7467daaeae462c1fe2cf793d9fb2402639b279ca6ea6367cdda7
 DIST rlottie-0.1-1.tar.gz 3370181 BLAKE2B 7ba580af961f2af7b92c40b4640f8b515c21a354ef5e639c5f00b0ea26fd3e2929dbf2e926b58d39ad3f48228511ba42a42a24d4b7bb914389a7e43df810d667 SHA512 ab9b913d9e0bc938a878a6847851cd6965dc61efbf8ef71761b83d6ff577479cf0c0b214c36e58ddd6a29927a1954c3d3db9db427779b5a2d472c8962cd45ff1
-EBUILD rlottie-0.0.1_pre20200424.ebuild 1009 BLAKE2B 8961c52e46ad05d16f96a04620373a950b8a6164b2dee685cda2079b96e466edfb5049c4f8f551f327b5a6f16d31ddb061aa88c8dfe3b6ced9e0f828b088cac0 SHA512 54bf08e1a2781a80b4c190bb0c86245dbc267a6d4bbd4e14e6bc83538c237819be1275737085ea25ae926d639397c26a7026ea93156649444a74f4ba42738ebd
-EBUILD rlottie-0.1-r1.ebuild 938 BLAKE2B 81089ca22c2eecf141786f318bc3e9e0e695ffdc4ed813fe21a4d4aa797149140f1fb3112e6b62c5c20c390ecec2fa01ba35fffb316737dc22b966bfe31b4f2f SHA512 4ad3a001804d54da606f857a22350a82acb34479f0a937a8925c42fee361ea85897251879dfe8a03ef6bdaa286ca08dc78092ea9fefd70b40570b3935eaa94de
+DIST rlottie-0.2-1.tar.gz 3516947 BLAKE2B d5f6b643c910e0b831be223be4fcff3d42cde8239b01d413f2805eeccf2665abfbd209ee6877358c2434d3bc82ea7c5b3849f4dca1d0796436e47ffa6bcfed64 SHA512 1f645ae998ddbe83e4911addf28ec24ae3ff33f6439a9fb6c1e56986b46ac17dba155773ab02a59712e781febb31709a99075a3fbcda6136a0cb43dbd7c753de
+EBUILD rlottie-0.1-r1.ebuild 936 BLAKE2B f72f77bd577b7b548591f23fc041d06f11a11e800ed3d4d24118ee3e7e559d2039f1c6cb6728a5375884ff680228d4e6e3cf68d8865e979cc402096b8a89f6a6 SHA512 d33157089ec5d865ae0d67d0889d18df3c4119f4191658fa72d65367183c7931e36d05f307d706f6ef723ee066d1fcad26d3e594600660257937b3cddf18dd10
+EBUILD rlottie-0.2.ebuild 874 BLAKE2B a30fabe786b1ae03f2b5310c510231595d81f5d9166b63bbc43f351d3bc5ddccc03f73f3d91dde2b4efc6713af2d616e2e1a115c30bce529f5fbb7d7e9fd93c2 SHA512 b0b37628d325cf11ab457ca71352a354def3028c08e22316398100eab6bdc159a8b1933a8e106a022b633b5faf2ac62932c29b1c3ff9030ad1447a0fe888138a
 MISC metadata.xml 901 BLAKE2B 0f2b146bafcbff57e44a91a21176114d15c9d81a076cc42f3d57e3849d1b3af3d46eb45bc74cf6e524679677b5394f440dc762c87ddc3652d0b754ebd62907b5 SHA512 f7e80a3946b2462a3718f508be57cdbbc3c85c632778b58393f467cfa5c4e80b96f3f264251d9fbb9ce4cf26e4907e534ee758c77661504f05f73577c4c06fab
diff --git a/media-libs/rlottie/files/rlottie-0.0.1_pre20190920-disable-werror.patch b/media-libs/rlottie/files/rlottie-0.0.1_pre20190920-disable-werror.patch
deleted file mode 100644
index 60676f7f8e32..000000000000
--- a/media-libs/rlottie/files/rlottie-0.0.1_pre20190920-disable-werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur a/meson.build b/meson.build
---- a/meson.build	2019-09-28 08:38:12.810010842 +0300
-+++ b/meson.build	2019-09-28 08:38:47.812649483 +0300
-@@ -1,6 +1,6 @@
- project('rlottie',
-         'cpp',
--        default_options : ['warning_level=3', 'werror=true', 'cpp_std=c++14', 'optimization=s'],
-+        default_options : ['cpp_std=c++14', 'optimization=s'],
-         version : '0.0.1',
-         license : 'Apache')
- 
diff --git a/media-libs/rlottie/rlottie-0.1-r1.ebuild b/media-libs/rlottie/rlottie-0.1-r1.ebuild
index 5aafb5241279..c3825364a0c3 100644
--- a/media-libs/rlottie/rlottie-0.1-r1.ebuild
+++ b/media-libs/rlottie/rlottie-0.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Samsung/rlottie/archive/v${PV}.tar.gz -> ${P}-1.tar.
 
 LICENSE="BSD FTL JSON LGPL-2.1 MIT"
 SLOT="0/0.0.1"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="debug examples test"
 
 RESTRICT="!test? ( test )"
diff --git a/media-libs/rlottie/rlottie-0.0.1_pre20200424.ebuild b/media-libs/rlottie/rlottie-0.2.ebuild
index 04dfd80aa4c6..c5da30c238e1 100644
--- a/media-libs/rlottie/rlottie-0.0.1_pre20200424.ebuild
+++ b/media-libs/rlottie/rlottie-0.2.ebuild
@@ -5,34 +5,30 @@ EAPI=7
 
 inherit meson
 
-MY_COMMIT="607998b9f7e03b05dceed8784207bd0b704f62d4"
-
 DESCRIPTION="A platform independent standalone library that plays Lottie Animations"
 HOMEPAGE="https://www.tizen.org/ https://github.com/Samsung/rlottie"
-SRC_URI="https://github.com/Samsung/rlottie/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/Samsung/rlottie/archive/v${PV}.tar.gz -> ${P}-1.tar.gz"
 
-LICENSE="BSD FTL JSON LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="test"
+LICENSE="BSD FTL JSON MIT"
+SLOT="0/0.2"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug examples test"
 
 RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-cpp/gtest )"
 
-S="${WORKDIR}/rlottie-${MY_COMMIT}"
-
-PATCHES=( "${FILESDIR}"/rlottie-0.0.1_pre20190920-disable-werror.patch )
-
 src_configure() {
 	local emesonargs=(
 		-D cache=true
-		-D cmake=false
-		-D dumptree=false
-		-D example=false
-		-D log=false
 		-D module=true
 		-D thread=true
+
+		-D cmake=false
+		-D example=false
+
+		$(meson_use debug dumptree)
+		$(meson_use debug log)
 		$(meson_use test)
 	)
 
diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest
index faf7f027d41b..20be50d0a22c 100644
--- a/media-libs/rubberband/Manifest
+++ b/media-libs/rubberband/Manifest
@@ -1,3 +1,3 @@
 DIST rubberband-1.8.2.tar.bz2 182232 BLAKE2B 991debac51e0a5516a35e1d063d5ea2c51b9d193b6a183200b0869a6743e184fe4296168d6caaea7b811a4022d25c08ca7909f05491a0e91cfe7dda532ed29cb SHA512 da677f9a843711c44c52c0153faa62e587ac7c010569523ef4fef7ce941b9d292e566f46147700e496f6cfff4c9f22f9901dcc93f2d701fdb9de152ddac0c3a6
-EBUILD rubberband-1.8.2.ebuild 1353 BLAKE2B 6bf7b0f6abeba4dcded8c6f347ef0b51186f4296d60ee24b92ca829457d0cb33a805dd20c68bfb7cd5c97fa435766bc6bc50c5ae989cee20fe4b23462f0c1cb4 SHA512 36114d43da1ce0706bb414d2a4f5819af447bc2a21a038eb099bc1b84f5aa265a7985fcbecb430716228e468cdf044f9ed3c3a773852e5350054a030bb58cb9f
+EBUILD rubberband-1.8.2-r1.ebuild 1480 BLAKE2B fae62ef316e3f342bc3b860378913a3e079a8d5a9c51489ac1fc5d5ef8e2db05bb9d2c300f48a09d44e7f83fc5330307cc6d554b096909ac0be66706963d7fae SHA512 00aca9daf40563191ad1771fcc7941eacca21112f4d70fcbc8059c149906c416fdca45e404586606229a1f4549c02f34a62dde0bbeba3e5b6bba1d525f6c91c2
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/rubberband/rubberband-1.8.2.ebuild b/media-libs/rubberband/rubberband-1.8.2-r1.ebuild
index 110eff937ed0..6d957814fa31 100644
--- a/media-libs/rubberband/rubberband-1.8.2.ebuild
+++ b/media-libs/rubberband/rubberband-1.8.2-r1.ebuild
@@ -37,6 +37,9 @@ src_prepare() {
 }
 
 multilib_src_install() {
+	# fix libdir in .pc file
+	sed -iE "s%/lib$%/$(get_libdir)%g" "${BUILD_DIR}/rubberband.pc.in" || die "Failed to fix .pc file"
+
 	emake INSTALL_BINDIR="${ED}/usr/bin" \
 		INSTALL_INCDIR="${ED}/usr/include/rubberband" \
 		INSTALL_LIBDIR="${ED}/usr/$(get_libdir)" \
diff --git a/media-libs/sdl-image/Manifest b/media-libs/sdl-image/Manifest
index 9ec8df7f324a..87ed89146814 100644
--- a/media-libs/sdl-image/Manifest
+++ b/media-libs/sdl-image/Manifest
@@ -1,3 +1,3 @@
 DIST SDL_image-1.2.12.tar.gz 2231074 BLAKE2B 0d63e0b2207d1d347ec882e610eb37a625811febc215f089eb00dddec92b1a9fe026d2ab7823677c46e595585f3b5e176c35f9ac1f9ec2debf430ecc3ea950a6 SHA512 0e71b280abc2a7f15755e4480a3c1b52d41f9f8b0c9216a6f5bd9fc0e939456fb5d6c10419e1d1904785783f9a1891ead278c03e88b0466fecc6871c3ca40136
-EBUILD sdl-image-1.2.12-r2.ebuild 1556 BLAKE2B 397a9d4638a7e0a6a7d2395049d0199f2f7a3a36f65dccfe9e0c20fd37d2ac0c0da6cbe6d6931385b12ff5e32e9d0a7f251e6dff8ed0e46f4ef6e0144b493743 SHA512 72500336f6b5e5ec1cc37e1fb3f2330fa8f07a28c5bda8b4c6648611984b1abacbada4dd0a7cde9c8c433182e9b414f961e9869b217ec522f0dcd0a6529e56bc
+EBUILD sdl-image-1.2.12-r2.ebuild 1555 BLAKE2B 48dcc45420194590c592e1aef1d1b5af022889d8495d078aee40e76305ac4e5ea0e0dfdf21989452ff0dfe3c5d41f21be3bf324767200c2c0db35366a42a5018 SHA512 dc8b6eb3d834d898e859b5e9f525b481738b7f6ce6b11f4f0d643338e8ea76e58227fba134bbdb65369892a2b2d0fe03542ab361538b011db319ed796250eb32
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild b/media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild
index b36388c1a9d4..dddcac22bc62 100644
--- a/media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild
+++ b/media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_image/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="gif jpeg png static-libs tiff webp"
 
 RDEPEND="
diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index e9b607bb1965..6e22e493c995 100644
--- a/media-libs/sdl-mixer/Manifest
+++ b/media-libs/sdl-mixer/Manifest
@@ -4,5 +4,5 @@ AUX sdl-mixer-1.2.12-mikmod-r587.patch 1416 BLAKE2B b353de5432714f3968c5f69ff439
 AUX sdl-mixer-1.2.12-mikmod-r588.patch 1128 BLAKE2B cc6ff884b3e157064a583d64adf978a091c7786a3c5417c5efd911f80407d30c866c527400122866bcffea25ab645533ae8e972834a2085a4bd8563ef5e8607b SHA512 36bbc5d10a63a73b7860a6f381a88849cc465dcabbfe3db21d6bd156110eb01e03e8369f0ed234f72f0227566919f5f823d0350d431575f0ae0f2a4b244cf704
 AUX sdl-mixer-1.2.12-wav.patch 796 BLAKE2B a0b310db2b789d24fd60927d23859582a8ab1449ba0934e10abdd1361a0d92fb5925625d9c3a0885f812dde12af9931cbae06c652b51e76d18759db03cacfc2a SHA512 9fed330d6bcae546752434a0ea29168e2a8fa432c8670d7290e70905f3431746b15126e5ce05820e4dd4dd09c982c880a6ce901ab9b3cff298e7f2c8d6a8b491
 DIST SDL_mixer-1.2.12.tar.gz 3707781 BLAKE2B b2fa822204fdaad860ff30307120bff7badbcc042d0b891563973794f715099aa961983e0dbf7e3d936179cbc615517c268f01f4619fcdcd48f18ff66dc49bd1 SHA512 230f6c5a73f4bea364f8aa3d75f76694305571dea45f357def742b2b50849b2d896af71e08689981207edc99a9836088bee2d0bd98d92c7f4ca52b12b3d8cf96
-EBUILD sdl-mixer-1.2.12-r4.ebuild 3221 BLAKE2B dc50855a7c84672e6fa954c326c77445e736d1858862de9af75a14e437ed6feaf2999d21b8990d797037e9d76bc5ab4e7fa2a7d68df374deb8602dec8a8abe07 SHA512 2330e9cde1ec8598066b93ea9c12eda17b7ddb3b1d0ff325dc342afbc051015ba636876bffba77093ef53c007a18fb89868e9c856be68d2b3ef27774a76f3044
+EBUILD sdl-mixer-1.2.12-r4.ebuild 3218 BLAKE2B e40b9c972ac73006dd472e18bbf82a8301d4225d97f3e08bf3ca18c8c5093147233d68ebebd9ef1296972720bdfc85a0ad2de90f7b3b321b91ca0cfbc88461e5 SHA512 1808522f11d931ba69dbd3b098581b4f5cdd4b6d779d0b7dbbebed550ac3b8d148722bcde7dc99f01c9696d97d25a3ddf746e085d7a8d2aaa9e2f4bf7f5d5868
 MISC metadata.xml 663 BLAKE2B 5d86fe5c016f831f870da2f9b3d0192b6719bc6a98c0101c06c382d62e6100af314f46980ad5c246c8bea9db8ea99e9cd47afe2e5aee5b7887f5f6d529dddee2 SHA512 16a16403ac93fe964330da05038a0e904d0c6e895413994db9ef587170eaf7161f3cc2ce7fb0fe13ded675306b489837d96e837c1002f216b8ffe72d6fd49591
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
index 653af1e96bfb..a677f855c5cc 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav"
 REQUIRED_USE="
 	midi? ( || ( timidity fluidsynth ) )
diff --git a/media-libs/sdl-ttf/Manifest b/media-libs/sdl-ttf/Manifest
index 9b3d39b03d93..8fb5269f8c98 100644
--- a/media-libs/sdl-ttf/Manifest
+++ b/media-libs/sdl-ttf/Manifest
@@ -1,5 +1,5 @@
 AUX sdl-ttf-2.0.11-freetype_pkgconfig.patch 1229 BLAKE2B 79ee75681d33ba925a29066b818cd32409c1eff159cd827606c6ea893a739eb698586d8cc292b1d3c21b3963112a26f5685aba532b47d1e83bc21fcce6995253 SHA512 abb3fd400c5d44789b891bad53124ca135ea3125affb95621623ab22fc43f5fbfeb79c63a97648936faf4698180837f76ca57143ee401610106d08741610e937
 AUX sdl-ttf-2.0.11-underlink.patch 244 BLAKE2B 2eb1782f89a72c94a1d90e4560895aafc9beda72a1537d41186de0e2816b6d37486b1211ac274d72c1b369f82d2b977c173443145a4a49b9592379e667881d32 SHA512 22495819ad0972183d850496acdcae1358bd37d25191e62c293f8d5fc50c617507631a202d46bd1ec380c70d89c61d050763919d48912b9a527908e8ad1ef1ac
 DIST SDL_ttf-2.0.11.tar.gz 4053686 BLAKE2B 3a78eeec91d7f6983b851cdd52925890c168cdf85dd34c7722183cc5a8848dab530c0c2d76493e0a380aa7e4f81967eeefd7cb34dc74faafc40497ffcb0e577b SHA512 64e04d1cd77e525e0f2413ad928841e5d3d09d551c030fc577b50777116580e430cb272b2aeb6191dfcc464669cf2f7a5a50d10e7c75637a3b1e8c8fca7fc78b
-EBUILD sdl-ttf-2.0.11-r1.ebuild 1240 BLAKE2B de43a12e9b4e63184b7bb82dec86ea75f6418ce975da42b27114601c10bdc92cd115c222289505a6f8cbd3af329bea524a4fc3b7d91038f71310b86ae04641ef SHA512 a58820604ef9745455fd60dc26fa896323c0326321836008281efe6ed981a90d2fe0acf3764b4cfabb546ad2634e10cabb063c22f4c36e9971e252c2e7a001a9
+EBUILD sdl-ttf-2.0.11-r1.ebuild 1238 BLAKE2B d70ebe277b493ea193a62fc728962aec587d994d4afc68cdd117e14ea54f04477476292702ca1571fac00e25aa631f195f87099e03a12c16c835ad2ee755669c SHA512 c7c88b863b1a194d2886a926ddbce7dca7b3e4d40fa360ff8092c89cf6820b4f2fe7ca7a9d321f77a03b5a4f0d20257ba70c64ec5b564a472ec01f53e80281a2
 MISC metadata.xml 487 BLAKE2B 95ce74adcba0d3325dbcbf132d27ec7e09a56bb5043d44ced349f0a8318f7a7ba6a3f77cf164292af4f789c4c058b6825a733338245d9434f689ce3c84060565 SHA512 8da59a1be8aa7ca22c2f8b14e4c4fd288a9bc4b508157bb38b0cbb8f1f5f7dce3904861e419b8a6b40a0b895e8866c53b677c1467c0531b9615d70806bdee360
diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
index abfc1f01aa8a..7770cdaccff0 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="static-libs X"
 
 RDEPEND="
diff --git a/media-libs/sdl2-net/Manifest b/media-libs/sdl2-net/Manifest
index 1dce7ca1cc16..319c881ec8ce 100644
--- a/media-libs/sdl2-net/Manifest
+++ b/media-libs/sdl2-net/Manifest
@@ -1,3 +1,3 @@
 DIST SDL2_net-2.0.1.tar.gz 347436 BLAKE2B 9c7bb46cf97581f75543b9e2695e4ce87b78c66dada3ac1a3ddf7b8e6eeaf2540532aece3e7a6dc7f6dfcfd3ecf5148d5bfb9a84bc2775e57f68b3adf32e5828 SHA512 d27faee3cddc3592dae38947e6c1df0cbaa95f82fde9c87db6d11f6312d868cea74f6830ad07ceeb3d0d75e9424cebf39e54fddf9a1147e8d9e664609de92b7a
-EBUILD sdl2-net-2.0.1.ebuild 799 BLAKE2B 59a91a43ca7436b57b578170a3d172494c533fc210156a15ced4e4e10d9a268dfde258f102b490595339847926f0bb4b48eff878960a7280f1d24599fc4e758d SHA512 48f2d1dd78368f707b05d95fcbf332699d0f3259b3eb41c1af886d6d850a23d0d05575867b5c55c514992a6332b6895c915178b403e4e4e43f02b3e2428c8f6b
+EBUILD sdl2-net-2.0.1.ebuild 806 BLAKE2B eb4e811ab802d5391a6dd13cdbe9b067d491be08ce66ed3b2aef982722ff7c9d5656a6c23f8264523f06908d4f02b6d28d3802010fe8ff876b5f118510986543 SHA512 66f2791901f2be6c27de3929969ddf5bbfc082c6d87727a527a59c2d4c307915c71c99b2031ca863fbabf3756b25b95d4a5bb335e0af1ebfa5ed387a1f57340d
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/media-libs/sdl2-net/sdl2-net-2.0.1.ebuild b/media-libs/sdl2-net/sdl2-net-2.0.1.ebuild
index c7e2ceacda43..5777ab54ca27 100644
--- a/media-libs/sdl2-net/sdl2-net-2.0.1.ebuild
+++ b/media-libs/sdl2-net/sdl2-net-2.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_net/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 IUSE="static-libs"
 
 RDEPEND=">=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index ee005e92b2b8..87fbe422d00a 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -5,7 +5,9 @@ AUX shaderc-2020.1-fix-build.patch 960 BLAKE2B 1124ca1dce0ea480e2af0fd44da957b99
 DIST shaderc-2018.0.tar.gz 206013 BLAKE2B b45fb6e959f621566817f8e31b1947e479b6ea392eb64f334dca9ad24cc4e8b736dd236e634de3f96342f48d8138722a2b769efb9db65025def5ed59bf5b911b SHA512 7a420fde73c9f2aae3f13558d538a1f4ae43bba19e2b4d2da8fbbd017e9e4f328ece5f330f1bbcb9fe84c91b7eb84b9158dc2e3d144c82939090a0fa6f5b4ef0
 DIST shaderc-2019.0.tar.gz 232620 BLAKE2B 53fd0967fe22e5a89783fccb485dc07c31a18eb328c6cf7244349714c6774d1877c1fbae0b8ffcf47d189f1e0c5f2d501f027ff3aa05bdd59950d49a4084e9b5 SHA512 c76887ad0a96145211b6550b0dfe63091df9e1463f9a3140aba2d1982c33e98ad14fb4bcf9ce2281433fc77626fc892c268d0636b9f348a159dd06e3f41b461a
 DIST shaderc-2020.1.tar.gz 276137 BLAKE2B 06466db46b244001c36523ccf218b0485a46864465eda4c605889f65e3acbbbae9f1f7e30c183352f39fb09b1d2b2e87bde26092f1c415de3c55f9d5dde839d2 SHA512 3f53b0be4a15b5b3da0778f2275c7f69579482ee8253b77b4127c4db13a94fbf1e39b3daabafc8642b2d3351acdceed45996af6cbfe310cfaa6cea3a666d828e
+DIST shaderc-2020.2.tar.gz 278161 BLAKE2B 8c8eaf610eb4b6ee44ecf2535eaefe6cca6b39e084293981f1ba50677d8e9d0ee5a88371ccb94696746c830246fac7b48d25568971ee40e504cc4aef57f69320 SHA512 1316445d3310db75b3513ef9cd3012485d945c4b775c29b74d29bb7b7ccad9b2c80dcb4a904eaa6854a3273c569349b186bed8dcc70bc33d6caacfd4c0e12d97
 EBUILD shaderc-2018.0.ebuild 1972 BLAKE2B 59ff84898d5eb429e0cf2ca5eb102cfd0fe652c4a7b6b44409a245509bbbc99ad69e18d65672b6a53ad5eb6b09f8f987a7f538880f4772c2bcfb785f982939a0 SHA512 0665f70683a796084e2da406c6e650ff3632aacf5318e078eb2de50f3d9b123b14b8b04095186bde791cfadc51befcd7abf3805e87d633b777c893234b81e716
 EBUILD shaderc-2019.0-r1.ebuild 2092 BLAKE2B 6b8a0b3eda40a6de6ca1bd4ab98fcddd6e1fb18e642c0a92d45b776b8f10a802c02d5ce0e4962c8d0e7c00b5f465cd6f2e2f86c8319fb9bc53384507d2e785cf SHA512 7d71e75785b4348976aae21e482e14fab20730cd1b882bcea56206e6c10804b655c80208fb73283007cf625e7f3b72fa3fbbfc9cc40a27eed03d8abc74955098
 EBUILD shaderc-2020.1.ebuild 2011 BLAKE2B 75cc8aebf8d3bdba61d554892a5a9365385e897b4f11c69b142f7d861e3e981f45c2b5feeb86d0d7617d4467eaf60ee291da07b5578a99c0b24611f909d03865 SHA512 3adbcba356cb30e0b42ab804d6ea96ba6e4b901be83c0214f0c7f233405a55df96177c9f3a788832c1e50bb7f4e321d6885ee0c5e4e239502c458e8231673cee
+EBUILD shaderc-2020.2.ebuild 2012 BLAKE2B c99e5c0c92f3e584b62c10d3b99a0d6b52c1d4fc5e70e921d29d32caa4ffd78ca9d6a16f9766492d12c0201c2c3fb0d038a80fa5eae61d06ebc4455945413304 SHA512 c91256889f973a62e234527931f401706848dfc5900e5cd1ee6dd3149c6df1011a026db7343a03230c1dc9d4fe0d11013e9483bcf3c2b79efe2f8619acc57eae
 MISC metadata.xml 335 BLAKE2B 295aaacdd867834ddc93fd5f52a7d5c50b14a63936e4f97f5cba62d7ddc47fda07dc620203f6e27adf01d8df13b5d9c2b0f5621a0d21bb53f8b846b78023ddfa SHA512 f9b82e65002f90c0e253b712ac3a11c483a3d7bb1750d46f3d8bf4de577927421e6e1cb3c3403afb89a8168e02e9b3736cc21adf6994827a17a82b237a8973a5
diff --git a/media-libs/shaderc/shaderc-2020.2.ebuild b/media-libs/shaderc/shaderc-2020.2.ebuild
new file mode 100644
index 000000000000..c58c861b64fd
--- /dev/null
+++ b/media-libs/shaderc/shaderc-2020.2.ebuild
@@ -0,0 +1,89 @@
+# 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} )
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib python-any-r1
+
+DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
+HOMEPAGE="https://github.com/google/shaderc"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-util/glslang-8.13.3560_pre20200404[${MULTILIB_USEDEP}]
+	>=dev-util/spirv-tools-2020.3[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-util/spirv-headers-1.5.3
+	doc? ( dev-ruby/asciidoctor )
+	test? (
+		dev-cpp/gtest
+		$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
+	)
+"
+
+PATCHES=(
+		"${FILESDIR}"/${PN}-2020.1-fix-build.patch
+)
+
+# https://github.com/google/shaderc/issues/470
+RESTRICT=test
+
+python_check_deps() {
+	if use test; then
+		has_version --host-root "dev-python/nose[${PYTHON_USEDEP}]"
+	fi
+}
+
+src_prepare() {
+	cmake_comment_add_subdirectory examples
+
+	# Unbundle glslang, spirv-headers, spirv-tools
+	cmake_comment_add_subdirectory third_party
+	sed -i \
+		-e "s|\$<TARGET_FILE:spirv-dis>|${EPREFIX}/usr/bin/spirv-dis|" \
+		glslc/test/CMakeLists.txt || die
+
+	# Disable git versioning
+	sed -i -e '/build-version/d' glslc/CMakeLists.txt || die
+
+	# Manually create build-version.inc as we disabled git versioning
+	cat <<- EOF > glslc/src/build-version.inc || die
+		"${P}\n"
+		"$(best_version dev-util/spirv-tools)\n"
+		"$(best_version dev-util/glslang)\n"
+	EOF
+
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DSHADERC_SKIP_TESTS="$(usex !test)"
+	)
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi && use doc; then
+		cmake_src_make glslc_doc_README
+	fi
+	cmake_src_compile
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" )
+	fi
+	cmake_src_install
+}
diff --git a/media-libs/smpeg/Manifest b/media-libs/smpeg/Manifest
index 05eadf1e3ded..edbc9ed69cb2 100644
--- a/media-libs/smpeg/Manifest
+++ b/media-libs/smpeg/Manifest
@@ -12,5 +12,5 @@ AUX smpeg-0.4.4-missing-init.patch 266 BLAKE2B 6476eed877a31ff26ff83936e137da8d9
 AUX smpeg-0.4.4-mmx.patch 352 BLAKE2B 02e060104c7fa0a817a9929c8a9911b24dd1ae131b26939edc7a1ac752a181e1db3cd0539d33d1548d1766f0a9ca2ecac31f6d0408711f54f04e6ed9ca5a35c5 SHA512 f83a04a6a8edb008dee9b76d96ad45b76e8ffcbb3086e6d97b64ee05ad400778bab97890811548274521504f502a904bc2f13598dfca33a872e6fb8800c0d974
 DIST smpeg-0.4.4-gtkm4.patch.bz2 3894 BLAKE2B 0ea9258a057108a462d9c4b9d9bcb21cdff71714507a3d09538f56817b206ec54681b3d2546b64c07f239ea3381f3644d26234853a239a2fe49353ba1c9b2759 SHA512 30370e0edd41767ce260d10de515be0087f47b479ec0085ec186506c93be0b2a404c1bcb1626f9a6a1f575160d9c382708d2769dddfe6dca6236fe0eaa58602d
 DIST smpeg-0.4.4.tar.gz 315054 BLAKE2B 16a7b87a207874deaaad64b5233964d4b0e244d35cc475cf0ed37302529ca4eb044393777fc98c202b5965de420f75bc5fb398ecc3eb0f97992d90e365f8a039 SHA512 d566bb68b0caacecdf61cd766b26e003fd4e153c243d873f7aae33ab69919202bd121bb9c10f494bd9530267ddec2a9e018eb46ee8bb9d502a29cd2de2f1bbfb
-EBUILD smpeg-0.4.4-r10.ebuild 2068 BLAKE2B 9a71512f0fc89d38ae980e8c3287a7928e0c16f278dfddf1546e98104b038a82b3388947d6a9994aa6eac6c50a698627e271f5f2d6ce8e7fd095a1b3ea151bf0 SHA512 5035b86fcf1b579c7f024b26ebc904cdae19de9d4b010a8b6066276617f9eeeb66a198d2ab54b31ce8f60bb0335b4ec2de14a074b7c29c9e0982e385e9f63857
+EBUILD smpeg-0.4.4-r10.ebuild 2066 BLAKE2B 6ebfa4596f30540d8dced9b86a0f394c36ddf9f9b8f590a42b4662023acdb244ead0e3607e332bb72c239b8ae0156461043b7a0590fd48560d42dfed7b14bf58 SHA512 885182fb55638396cde587a539d262cb98b80324485c39da93510f0ecca06a250b2154e29011c23b63eb3bd1c1d558fd0e9f6aedd957fd3b1a30f6c3dd7141f3
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/media-libs/smpeg/smpeg-0.4.4-r10.ebuild b/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
index a80e314ac3b5..0669c52959c4 100644
--- a/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
+++ b/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.lokigames.com/pub/open-source/smpeg/${P}.tar.gz
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="X debug cpu_flags_x86_mmx opengl static-libs"
 
 RDEPEND="
diff --git a/media-libs/stk/Manifest b/media-libs/stk/Manifest
index 1b46be9e2cf1..14ccb9fdf64a 100644
--- a/media-libs/stk/Manifest
+++ b/media-libs/stk/Manifest
@@ -2,5 +2,5 @@ AUX stk-4.5.1/010_all_removeForcedFlags.patch 269 BLAKE2B a02fe10d9d3573e063174a
 AUX stk-4.5.1/020_all_noExamplesOrDemo.patch 1029 BLAKE2B 8ea62554a8a609a1365cbaf42cbfedb8fa257fcd531a01bd014cb41da80c98dbec9f74b9f45b400f2aa6a02dcfb3d58662fea4bf8584e760f5d66827f9760db6 SHA512 546851ad25e842b67a2a441e4e4d27295993a1cfeb659a620a6ebfaeb66c9cfe779c8f1ee506bb93a31bfea9687fbd378a881f11e5ffbe182d1d2b0eb478bbc0
 AUX stk-4.5.1/050_all_cxxflags.patch 306 BLAKE2B 58708b9f0aded3069be8150407d877c97406fe941da895c3e7d7ededeccbbdeeb5dc2c10ef5e1a4b262943cdc147b66605764d58876aeb931e73e86fa8474b72 SHA512 36ecc6f6a03b9df258affd92079d3da06a5506a5e53ddc98934c47401c5b6745de7d0cb82b241c0dffda3d3baea9a32a7462292f1079fffba88425158562fa7f
 DIST stk-4.6.1.tar.gz 2593348 BLAKE2B 2cb269b8fb5732d55a394d5b8842c380b6a3e82e7338e972c6d22baf5ba1edee3f03ed699b9950d4a92a7ae3102bbb54f844ffd728c6478ebfb36328a1b89f2a SHA512 2a22078cdb630f7c014a5ab38070fd6a6d1e9aa719401e3190a040cb06b61003cd3095fe1a8890eff59e4fc42594fe893b4c0a8327175e1701c75de7537e1830
-EBUILD stk-4.6.1.ebuild 1364 BLAKE2B b998c93647a5f0b2d257cfb25def730c496ef0492fa374247160d4f5b5119e63f2feb225aa5c08894e0feefa950851ea23603dadc465f726dfeff3e083867eed SHA512 066d65a7f2cca336977b68d0f1d36caafc0d95284e08e2c01a404f4c944178a6310b0544f25f011b496d933d4871c98ee514a89f2b670485108774e94369f646
+EBUILD stk-4.6.1.ebuild 1362 BLAKE2B 09add9614f9da7e45b8bc6850069ab55d70c7578824ab786ce6e6b84a6698ada3870de4b1af28bf9e2edeb555853bf67bddab480f54de1cf8ad9df35f9c53bc8 SHA512 6d040c30472a90c5f54c6b250a622d25da5d5abbfa99a6c3156181857dc4e66dd842df49a9337ee33374e506cfbc740541ddefa9d5219f178e0648e8ba78b7bd
 MISC metadata.xml 365 BLAKE2B a10b2261fdb56826dfdeb96a89f678dbebd332f99fafe31a5be95ca0db2593b3a14f69b856cda7ca5b3b6edd93f45661118a0c1fa6d6fe2ad7e4c449c579bd9b SHA512 48da9b52d54138bf4d271d39390a78b38641a4accf4f9cff2a0ce4a3954b45805d3a834f5aab0cdd13710e12ec36b5421be6c8a54db8698ae7bcf665c6866012
diff --git a/media-libs/stk/stk-4.6.1.ebuild b/media-libs/stk/stk-4.6.1.ebuild
index 12eb50caa5f9..7f4e3b6ed7c8 100644
--- a/media-libs/stk/stk-4.6.1.ebuild
+++ b/media-libs/stk/stk-4.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ccrma.stanford.edu/software/stk/release/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa debug doc jack oss static-libs"
 
 BDEPEND="
diff --git a/media-libs/suil/Manifest b/media-libs/suil/Manifest
index 6e3d43af6009..ac0b5236ed34 100644
--- a/media-libs/suil/Manifest
+++ b/media-libs/suil/Manifest
@@ -1,3 +1,3 @@
 DIST suil-0.10.6.tar.bz2 347615 BLAKE2B 667379c6290c4c1e03168911fa58b991e95bbc7c7477606e42ba39d33645f4580ea09051d294f24cdbb3b2df9ed1d415b73eda3ec1f593fed2e7f2d9ff2a85c3 SHA512 b23ffe0c0ae25467b2cd60117a2efa8c13132c8e5612619e4c9ad2cc228b835f1c7fd384db62b74d4a327e3708f189b6a91f972756fcafe501308adb732c3b36
-EBUILD suil-0.10.6.ebuild 1023 BLAKE2B 169254c78e5787f54165093592565771c48e2c0c86c9fd782a1f91239b617cfb55daafa8529fef632e8d48636f6af8129e64b31319fd4f4b957b0dec8d2c2f4c SHA512 ae2783d0cdc545108b62f27d047fd35ed410672a0b5543c17bf16402bb2413ed5eaf85d42b6a01d036ace191d699ea07c8b7d552e3d91fc5279edf621f355741
+EBUILD suil-0.10.6.ebuild 1030 BLAKE2B 6b29233f9dddba1eaa3f0c6531ac45ab17971d3d02b97623991ddbac542e2c5e301d9f64d43b6752b79982dc861f42b986c16752ce4daafc23e6d7c1fc81d6ad SHA512 b6ef39b7212539ca8b5da7089366482388acd22ae37b06bbbe2636d98455b09121a67d2bb5643ddccdf5aca1cc3e07d88068c1e4ea8508faee7f2f757aac1abe
 MISC metadata.xml 491 BLAKE2B 8d423d4bd56c2fc586cac7dfeef9ba125799795a02f8f7303d1e657e83181ad68eae5e20cc75806fefbe1296f0eabc632fee3824b9b36e7ccef0a22e04fe4081 SHA512 c56784f3b84159aaa284b5b04ce4d2110d78acb536ea9dd60d5043199a061171dfd0272f4d810e7ac68025fb906cc021b36f099ea966bc87e0de8f57464a88c3
diff --git a/media-libs/suil/suil-0.10.6.ebuild b/media-libs/suil/suil-0.10.6.ebuild
index b99f7141370b..0e8f63852de0 100644
--- a/media-libs/suil/suil-0.10.6.ebuild
+++ b/media-libs/suil/suil-0.10.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc gtk qt5"
 
 BDEPEND="
diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest
index c3f7eed3dda3..24c2977e26d8 100644
--- a/media-libs/svgalib/Manifest
+++ b/media-libs/svgalib/Manifest
@@ -13,6 +13,6 @@ AUX svgalib-1.9.25-vga_reset.patch 747 BLAKE2B 73e459c902be26584bc727bdb4c48398e
 AUX svgalib-1.9.25-wrapdemo-buf-overflow.patch 516 BLAKE2B 504bdd01a0bde6858648f5e640fda34f337e6cef3f08f46b77fa453741fd556964fc09b48f494cf30b644fc1ff416c9728750d1c58502811d292d9b96ad415cc SHA512 e4e58a065f721f3c71d13f9ba0ffecf35ff32b25c6e46217eb9a0184b012e5be13c96c597df153ad7a27a5e41cc5a845cecae04d2d6c3dc6771bc238f8c75232
 AUX svgalib.udev.rules.d.2 44 BLAKE2B 513532c74e5172a5f2882df1912508f12adf1347c3af1bf0a44f66781d139a28b7aa332f5a5e630d099b381b9a94931ba0b7ad787393228bf694878f442279ab SHA512 41336ddd1fc2a033c684dee1a442ee20ed58fdd1395346913502e4b0c5f798ad0e4cffe69de3dcdfa993dc8b480910c422d38e0483eacfea8f8ad24c41060c82
 DIST svgalib-1.9.25.tar.gz 987084 BLAKE2B 0ca81483d754796d8c96abef2940c506dd8c6f69ac015f0b34995a81db91c0540f405271f3c9e337ead551c783e9d6a336ef53bfb1531481115bd1228b679ea8 SHA512 697e417e6fb4fc3c41f47945a87bd0252f33b565ac1b20d98f984168c6b3ac0f04887e929fbf912ef7bb7b0a3b0a1763cc7cf3e316b62235cc926ca4b1ed96f7
-EBUILD svgalib-1.9.25-r5.ebuild 3564 BLAKE2B 34169bab844e25a70e0872a767dc50b44efe2af788b8a2f6aa4c707d01e3e2c015c7fb25db1aaa45ee0617930251b83bf15618438fba26dd7e8195310b8c8368 SHA512 c32cd1636355ef7cba7572e894ab7d83c35becaaa999db1849535b8b179a800a34be5afda2a416ef54cb09fa37045d53c290dc909ecb6d04372d72b17b93f21d
-EBUILD svgalib-1.9.25-r6.ebuild 3419 BLAKE2B 1f7f87fc20a728f90540974cc5691ea5d123f86359fa1918e55debf393fb593d831eb2c1a6fecb42a848c2d2ddd1902bc587349c32243a3c8ce0d54b0f5f2fd5 SHA512 67d8565d4d99dc67da5ec0ca3a5188f098045ebf4b82080ea644f88c9d58c58418bcae365d8f877a116c266dd6fd3d0ea094c4b96c8e46627dca8768dae8fd23
+EBUILD svgalib-1.9.25-r7.ebuild 3561 BLAKE2B 1bcc24d53ddf425a5dc0a2c46889f584933be7cb9be7b1db175ef81c91c691dd263d1fde43a0ad2ae1d565df6f3c5afb9f18cbbbfb372ce8a8cf8516fbd5a024 SHA512 f8912ee94857c5bf31a4b1ed59b1db81aa40c3a0be8cb1720634493b67d54140adf51e537e84a541300d365c13f8ec627ebcdc3572a62acd6f72043732546a9e
+EBUILD svgalib-1.9.25-r8.ebuild 3419 BLAKE2B 1f7f87fc20a728f90540974cc5691ea5d123f86359fa1918e55debf393fb593d831eb2c1a6fecb42a848c2d2ddd1902bc587349c32243a3c8ce0d54b0f5f2fd5 SHA512 67d8565d4d99dc67da5ec0ca3a5188f098045ebf4b82080ea644f88c9d58c58418bcae365d8f877a116c266dd6fd3d0ea094c4b96c8e46627dca8768dae8fd23
 MISC metadata.xml 325 BLAKE2B eee2dcb0d80f8fa891865f3074139f3a9db2af0339f342f0f82512dc1195e7a95616a36ae9917e8724d12f15c1b5c056c3c5d242c32e989c354b39a7d6fbd5da SHA512 7d2874207eaab21b41da8bd8b9afb5cda10351e3c88fe09ae1856664115b3c86d13362a82695a016911390e5ff6762a86409b437a3d76b077e01ac0ff6662d5d
diff --git a/media-libs/svgalib/svgalib-1.9.25-r5.ebuild b/media-libs/svgalib/svgalib-1.9.25-r7.ebuild
index 54c070fe7ef7..d6e517631e72 100644
--- a/media-libs/svgalib/svgalib-1.9.25-r5.ebuild
+++ b/media-libs/svgalib/svgalib-1.9.25-r7.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/svgalib/svgalib-1.9.25-r6.ebuild b/media-libs/svgalib/svgalib-1.9.25-r8.ebuild
index 55f0bb10ddab..55f0bb10ddab 100644
--- a/media-libs/svgalib/svgalib-1.9.25-r6.ebuild
+++ b/media-libs/svgalib/svgalib-1.9.25-r8.ebuild
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index e799f3549d7f..9aa6f6cd35b0 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -1,3 +1,3 @@
 DIST tiff-4.1.0.tar.gz 2421581 BLAKE2B 1f9b92d08dc95633bb005a635bbcecd8fa5e4f30c14f059b42aafbb4a52b4fb1b84b1e97cea33f3102f5808cb28f93bc8fcbae2b041c6227c97f90b4f9b8e631 SHA512 fd541dcb11e3d5afaa1ec2f073c9497099727a52f626b338ef87dc93ca2e23ca5f47634015a4beac616d4e8f05acf7b7cd5797fb218758cc2ad31b390491c5a6
-EBUILD tiff-4.1.0.ebuild 2090 BLAKE2B 8d644e032744c6958f22c1bc5e54889d16adc9c836866ac570cc262aa600871fef24d94f0dacb28dbc0333ab6b00d68f61ceb29e3891db291f1bceb50b74b1b7 SHA512 c872ff1ab47fada244d3dba7dc1638ba5b199c840cddf526d9bd0e7ecf1f26d24a6ecb2ff9cd0dce51774dff965d9d2840c64f62989f13c59a414a7de291c893
+EBUILD tiff-4.1.0.ebuild 2078 BLAKE2B d2e050f9cd2d476534d583b920405d64bdaf0ed8dbca65f34cbcbee76f4a402ffe70bb10683bd2e26381d6d42e88e606bc80a285a25e71491e74bf45eda28019 SHA512 e87617f33a745bc88675157a77622525a7c78c7527d6e67744217320a3111eaf1dd3b37f2d2125b5de9f9416703621d8a690368fe7f9c7ef02a6568d07bc8d68
 MISC metadata.xml 473 BLAKE2B 1e6cf7ddd4b5f23d1f11e098c81805c11db03233e32e870634184f7635e19455cf978e6f4fa032952210c83bb18c96af57b64c0b73507dce95f70f876e4651fb SHA512 ed81ec631fb4f136d6ed8da3f8159c11760150314e2b8150aa7d087ad865b4e6eb823708cd37de3423597e5bef023e464ead76e7f56a33432d87956e1cb11016
diff --git a/media-libs/tiff/tiff-4.1.0.ebuild b/media-libs/tiff/tiff-4.1.0.ebuild
index 9675c414fee6..987f758314ed 100644
--- a/media-libs/tiff/tiff-4.1.0.ebuild
+++ b/media-libs/tiff/tiff-4.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/libtiff/${P}.tar.gz"
 
 LICENSE="libtiff"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/vamp-plugin-sdk/Manifest b/media-libs/vamp-plugin-sdk/Manifest
index 8a7056e31f15..7a6aeba967b4 100644
--- a/media-libs/vamp-plugin-sdk/Manifest
+++ b/media-libs/vamp-plugin-sdk/Manifest
@@ -1,3 +1,5 @@
+DIST vamp-plugin-sdk-2.10.tar.gz 316165 BLAKE2B ba206443d4a6f94f56c1e3b7e8f47b7c8f893d2df6601f9d26a613d56bf58fee7d0a4a996964aa0690ecf69fd1d686db28165e73a0d37880a7891c67ecaaae5f SHA512 67a71e5396eab5ce9503e9111b4cfc16fc9755cf6ae2d8dfc99ed29fd91e75eaf0de9a9c55ce8f7751f04c235eb86430856eff18f02adde54f1850a87c917ef0
 DIST vamp-plugin-sdk-2.7.1.tar.gz 306956 BLAKE2B d8e765f54cb3544efcca4b08241afc070026adeaa4c0273cc01dae26e0ad60a976bc443184cc83413c6e32f4cf6fbee6590954e7ab12872993abb78c2541653f SHA512 91dd7cae72334718dcbdac06b1ffa3f3ba76e977b82b928ab634d9982aa15ca4e30978a7778215753c61e56831077d7634d24e65e468ab6a8a87a5957fb09bf3
-EBUILD vamp-plugin-sdk-2.7.1.ebuild 1555 BLAKE2B ba37a9314ad0660d867ed2c37a13173d49ee82875e658b7676cd4e189f0994e4c5e0818d1eb3af28c8311a552754141ca0a9f13be2d35cfd2fc3c879d15244c1 SHA512 52abde64627d143aee0f6f4b706e4ffddcd751c5380be34f06d4c8ea4c542e6ae3700cde18fe5370e9f637b3150af5895c479d8744fda110de8845b99670d195
+EBUILD vamp-plugin-sdk-2.10.ebuild 1713 BLAKE2B cc11a402cb0e3eb625169d76557dbe26860b28dffeb21ee3c7562e89fc0e00cf3addf1f2f09b79a97aa40e830db5e256324852f47744f7e421f9b226786dfe21 SHA512 caf7175502d7f6579fd66e5fa0d0e942a86ff76d341700350effc10552fb928f30e69992d371abff68839abd658713642875719e74307c4d89a61b68657bc05c
+EBUILD vamp-plugin-sdk-2.7.1-r1.ebuild 1647 BLAKE2B 4b08eb7d49ea76bc132e3ee90e9f71be68c453978356fa89eadf7381b4a3d143861a2ec6409c1472cfa24bbed1269bac1794833aa31ae8dc1e83a6dbc694fdbb SHA512 cc59376395f69f3b7615f2484803f6b9f8b0d673ddf349e0ebc79784766f055aee09f69f0350a956e593500419c6b00da32926eca0a954c660ffa6640cdf5418
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.10.ebuild b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.10.ebuild
new file mode 100644
index 000000000000..9e72385ee23e
--- /dev/null
+++ b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.10.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="Audio processing system for plugins to extract information from audio data"
+HOMEPAGE="https://www.vamp-plugins.org"
+SRC_URI="https://github.com/c4dm/${PN}/archive/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND="media-libs/libsndfile:0=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+S="${WORKDIR}/${PN}-${PN}-v${PV}"
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# multilib for default search paths
+	sed -i -e "s:/usr/lib/vamp:${EPREFIX}/usr/$(get_libdir)/vamp:" \
+		src/vamp-hostsdk/PluginHostAdapter.cpp || die
+	econf
+}
+
+multilib_src_compile() {
+	emake \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)"
+
+	if multilib_is_native_abi && use doc; then
+		cd build || die
+		doxygen || die "creating doxygen doc failed"
+		HTML_DOCS=( "${BUILD_DIR}"/build/doc/html/. )
+	fi
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_SDK_LIBS="${EPREFIX}"/usr/$(get_libdir) \
+		INSTALL_PKGCONFIG="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \
+		INSTALL_PLUGINS="${EPREFIX}"/usr/$(get_libdir)/vamp \
+		install
+
+	# fix .pc files
+	sed -Ei "s/lib$/$(get_libdir)/g" "${D}"/usr/$(get_libdir)/pkgconfig/*.pc
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# don't want static archives, #474768
+	find "${D}" -name '*.a' -delete || die
+}
+
+pkg_postinst() {
+	elog
+	elog "You might also want to install some Vamp plugins."
+	elog "See media-plugins/vamp-*"
+	elog
+}
diff --git a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1.ebuild b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1-r1.ebuild
index 02b99f969116..47ba03d2c003 100644
--- a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1.ebuild
+++ b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1-r1.ebuild
@@ -49,6 +49,9 @@ multilib_src_install() {
 		INSTALL_PKGCONFIG="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \
 		INSTALL_PLUGINS="${EPREFIX}"/usr/$(get_libdir)/vamp \
 		install
+
+	# fix .pc files
+	sed -Ei "s/lib$/$(get_libdir)/g" "${D}"/usr/$(get_libdir)/pkgconfig/*.pc
 }
 
 multilib_src_install_all() {
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index 8c57be194f43..0044b9f8d126 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -1,10 +1,11 @@
 AUX vigra-1.11.1-boost-python.patch 930 BLAKE2B dc791871c9a51bd98a7666c64733d7929147f54433ff140cc255e0b4a6c2ff0be9905e82a628a91d6ff9c2674d76422d0d97a2a149be22ae7a95c943fb10d76a SHA512 246596b5ea323d2e69489646afa3574fc385dc88e0a0e936b1fc508b58943d25c41e466e182aec8d8ca5793d88af7471bfcbf1ac9eb55ac034b6906c7b82d62a
 AUX vigra-1.11.1-cmake-module-dir.patch 673 BLAKE2B 9dcd11f5754c59bee64d4a4ead62da0e0cb5cde74923871a377ca06a0f639be3a63d6b1769258d09da474e4110ad499a5402660912d8bb07ac0d5bbe199bc36c SHA512 9ab597ea7413d276b22d3cc46ac4179748b98bbaaa44234f71145d69e987b5162d38f87c3317d9bb863cabbcef7c1f3d77f727d19576df7892b2df7272055ce4
 AUX vigra-1.11.1-fix-incorrect-template-parameter-type.patch 7890 BLAKE2B 523eec06ad9a5ef07d852e6ec8633ed480a82224a16a3028ae7f35b31518f537af94a4fa0b90ff52dc8400649928526ad391b4731aeaa948622c186d72e0a2e9 SHA512 7ea26793457eabced61470c4b25b5409cbc961443639d6c126ea479727884baf1c8b3c9808e126ae11b43675de75c510c4272e8c51fd4df111c75e88d1b24b33
+AUX vigra-1.11.1-gcc-10.patch 1506 BLAKE2B d61312f7cc082b81dc72003a1425a0c4b73670da4069c7ffd5426f83666a163ecb20d71250ea30aac200ab129458ae090cd844c50e66741c72cc8b74d2c7c52a SHA512 166b0eceb0509dff80c9ca172601926398ffc3b0f780058b8f5dede4a914aeecfe259b3c31469ce01b317af675c62e33bbe5bbe56b922b74ffdd4e0b5655845e
 AUX vigra-1.11.1-lib_suffix.patch 1032 BLAKE2B ce1b73b89c4d10c3b2ef3185a3c9a7ca791f58efe85eb205bb5f4e638ddc18d171bb7f4a9487670bb1a276c998f0e5096e2efa4fee0f167907d3d02df01bcb42 SHA512 c1cb242eb2ebdf398c81e16acc5a493312b310836caa7f25717dd20d23e885800beeef9ca0589c75ec3a0bd1ba2d879b1e999094cfef3956134e0d6d13f25d0f
 AUX vigra-1.11.1-python3.7.patch 1254 BLAKE2B 24e23db29992efa86154edb402e250c782160ba5208fd7b2dd1c1eb0526b51633014cd488b5f8abd808bb2fc54b20866111281447fc45683d70a9a8bd93f0854 SHA512 9cbaacf2b6e3bd892b930c48d2371fe96b9cfecc69c8d0c982972c412f1157a73648672f42e73df1cd5ce0753c69907faaca38e35bdd54952a753af7054e17fe
 AUX vigra-1.11.1-sphinx.ext.pngmath.patch 1411 BLAKE2B 6ffdd2f40ac982d693a6e71a89754d453202ba70e6ae65b3b45d64add3d2cc7a9710773e94b0604cb67dadb53ea27912ccce7fe844e6264f7c989bb96149cbcc SHA512 4e0ade84985ecc9c7c45afd949671b9cbc041db486c29732b17c1b62eadfdf6e299396a18686c03c3ed4e2b3ac6d830a8e224c56e3b8d20361c2f5e5fcc14650
 DIST vigra-1.11.1-src.tar.gz 55119047 BLAKE2B c67dc61515075843faacb4ee054f3e28b4edd033dc6cb89d3c591827309eafa697b839ca85ff7c68d6aff9d7e08b1d3db73d50e6c3b065a5210b64a90e242444 SHA512 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3
-EBUILD vigra-1.11.1-r3.ebuild 3552 BLAKE2B 6cecccf5e100dc69847f312815f084813d7feb57c88daba2a45e49c0e3224e2216b0971d006e1643e1a85fc34734656e70ad7a3ad216129e699890766dce6f60 SHA512 d9f070361ebb08de2b9b50d7bb80469d66dd96724b1012965e8c999fa8af88c260b1fde18d32128b87c6ebee24e707402ab5d957e311379f284acf99ed6da25c
+EBUILD vigra-1.11.1-r3.ebuild 3556 BLAKE2B 223936590be67ab4e1f65849b32ae8088f96a826545e1e6335cf8ee32f8151bea532aa7c4bc04e3f4c1ba0158ad146fea881a1054e899bcec9c5cd27ed3f3091 SHA512 534f2bf41aa9882d03382bbfd4d41d821dc194d218f20872cace7fecc3a47fb412743fbf04617f3633006855eb41331fd2fc4206d0620b38a4508e85ce5fea82
 EBUILD vigra-9999.ebuild 3907 BLAKE2B a428dac82f37a2d526cbe757da1363dd9a968c2e970bf91fecd3f8d3ed1204f5344df2f3b29ce7a370e8801f9d5fa6480b75adb113bc0dd41c65f7fc49869ac4 SHA512 f539813b694eda28dd26b4fca29e6f1b0c3daf3b04eac13ac1c71406632ee0b9f1f066ce26f7a067b74cbb624a9396ba3c71196f6802c422dabe45dee25ca0c2
 MISC metadata.xml 413 BLAKE2B 985f005fa338d566dddb20126e0a83cb8e9ec5aa4ac9ed2d5ec6a42743eeb92f521375b74f8caaa94500c42450d68d0a4bf5c036c9a2909e13c922f50896824a SHA512 e5c2a32f7495cfceffc8da8464131b918134b7255fbcde9a10175a24698f5a6aff17630436935c6cda7d8a3cd8b182c299845a24528f3a9c40dff1022dce4f71
diff --git a/media-libs/vigra/files/vigra-1.11.1-gcc-10.patch b/media-libs/vigra/files/vigra-1.11.1-gcc-10.patch
new file mode 100644
index 000000000000..2433ba41712a
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.11.1-gcc-10.patch
@@ -0,0 +1,46 @@
+From dc730be49fc8def4304a651fa525e43b7754955e Mon Sep 17 00:00:00 2001
+From: Ullrich Koethe <ullrich.koethe@iwr.uni-heidelberg.de>
+Date: Tue, 16 Oct 2018 19:26:17 +0200
+Subject: [PATCH] fixed noexcept declaration
+
+---
+ include/vigra/separableconvolution.hxx | 6 +++---
+ include/vigra/stdconvolution.hxx       | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/include/vigra/separableconvolution.hxx b/include/vigra/separableconvolution.hxx
+index 7ee33c09d..8fd120602 100644
+--- a/include/vigra/separableconvolution.hxx
++++ b/include/vigra/separableconvolution.hxx
+@@ -1409,10 +1409,10 @@ class Kernel1D
+         {}
+ 
+         ~InitProxy()
+-#ifndef _MSC_VER
+-            throw(PreconditionViolation)
+-#elif _MSC_VER >= 1900
++#if _MSC_VER >= 1900 || __cplusplus >= 201103L
+             noexcept(false)
++#else
++            throw(PreconditionViolation)
+ #endif
+         {
+             vigra_precondition(count_ == 1 || count_ == sum_,
+diff --git a/include/vigra/stdconvolution.hxx b/include/vigra/stdconvolution.hxx
+index 76d61a53f..657247259 100644
+--- a/include/vigra/stdconvolution.hxx
++++ b/include/vigra/stdconvolution.hxx
+@@ -792,10 +792,10 @@ public:
+         {}
+ 
+         ~InitProxy()
+-#ifndef _MSC_VER
+-            throw(PreconditionViolation)
+-#elif _MSC_VER >= 1900
++#if _MSC_VER >= 1900 || __cplusplus >= 201103L
+             noexcept(false)
++#else
++            throw(PreconditionViolation)
+ #endif
+         {
+             vigra_precondition(count_ == 1 || count_ == sum_,
diff --git a/media-libs/vigra/vigra-1.11.1-r3.ebuild b/media-libs/vigra/vigra-1.11.1-r3.ebuild
index 93a26b7b05e2..c9dfc49eed8e 100644
--- a/media-libs/vigra/vigra-1.11.1-r3.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="threads(+),xml"
-inherit cmake-utils python-r1
+inherit cmake python-r1
 
 DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
 HOMEPAGE="https://ukoethe.github.io/vigra/"
@@ -62,6 +62,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-fix-incorrect-template-parameter-type.patch"
 	"${FILESDIR}/${P}-boost-python.patch"
 	"${FILESDIR}/${P}-python3.7.patch" # bug 701208
+	"${FILESDIR}/${P}-gcc-10.patch" # bug 723302
 	# TODO: upstream
 	"${FILESDIR}/${P}-lib_suffix.patch"
 	"${FILESDIR}/${P}-cmake-module-dir.patch"
@@ -80,7 +81,7 @@ src_prepare() {
 		fi
 	}
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	vigra_disable fftw fftw3
 	vigra_disable fftw fftw3f
@@ -110,7 +111,7 @@ src_configure() {
 			-DWITH_VALGRIND=$(usex valgrind)
 			-DWITH_VIGRANUMPY=$(usex python)
 		)
-		cmake-utils_src_configure
+		cmake_src_configure
 	}
 
 	if use python; then
@@ -123,7 +124,7 @@ src_configure() {
 src_compile() {
 	local VIGRA_BUILD_DIR
 	vigra_compile() {
-		cmake-utils_src_compile
+		cmake_src_compile
 		VIGRA_BUILD_DIR="${BUILD_DIR}"
 	}
 	if use python; then
@@ -135,17 +136,17 @@ src_compile() {
 
 src_install() {
 	if use python; then
-		python_foreach_impl cmake-utils_src_install
+		python_foreach_impl cmake_src_install
 		python_optimize
 	else
-		cmake-utils_src_install
+		cmake_src_install
 	fi
 }
 
 src_test() {
 	# perhaps disable tests (see #390447)
 	vigra_test() {
-		PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake-utils_src_test
+		PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake_src_test
 	}
 	if use python; then
 		python_foreach_impl vigra_test
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index b0dcab0d8eb9..47a2f55d4afc 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,4 +1,4 @@
 DIST vulkan-layers-1.2.141.tar.gz 2046629 BLAKE2B 03f334b365e39d3e89c3896e1eb407876c4f56841e64f25b267c66e37478825519b41599d228a4d65b89a49ecf806c92270d43016c40d562c0ec4ea053f78f2c SHA512 482594bdcd780276f9b7b42256951c143b798f2de2be8e54515aece30fd94fc0f913fc52f5b5cc6d8a9b5f38eb345b941a1853532df9d3e6c686fa6f79e8a5ac
-EBUILD vulkan-layers-1.2.141.ebuild 1394 BLAKE2B 0bc514b37bc413915c23d0d5abc9c9675c877511aa2a266f331c3bda918a786a6684541dc258f449d13922055d8372463eaaa0f87b6bdd9972ca106ef7c0257d SHA512 5f81dd5433106c4eea8b5f2d6568513a9c155b9b1d6ae5a9f0b499721d0e06ad12b05ed4ad994d20d1f1c1fe4377c5b380c066ffa160de59d9ed15016ebc8fcd
+EBUILD vulkan-layers-1.2.141.ebuild 1411 BLAKE2B 8fc7557c693d0e7adaff3009b961e45d3491c677cdd402b440bc440d5afa2026f92d59d1f7c22b27e5c5dda9209bb5e2ca2b8c216c036877a12648fe4fc082f9 SHA512 5804a0e8d01b6b76513b3e6612142fe63a9b1ffe86e61d6ca05a269a641f4b2cd4be71de23c9410f549515aaf53bfd19f2415427029a37620d1410504b72f44f
 EBUILD vulkan-layers-9999.ebuild 1406 BLAKE2B 6777687928575283d4a4158e3ec0420b28a787c354128dcefaf8256acf98b2129277684de4fbc05bda6a9114a18cc852e8fa3a53fb461a915fc568ce44622d1b SHA512 2787784a813412464c2e28573062fb5a36cb950ed66e31f7dda6b80abe04049dae6c69ef934279e55bdba06b0641e3e5d3384a63522e68a369576112377aa7eb
 MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.141.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.141.ebuild
index 45245cfdabcb..d9be98b4afb0 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.141.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.2.141.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index eb6ec54cb3eb..9537c0519761 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,6 +1,4 @@
-DIST vulkan-loader-1.2.137.tar.gz 1407611 BLAKE2B 32762198b4a71d14c9f487c28a728067a81c8607df2174688cbe3dc575fc5655e22ff7840b516d7dc5d1eaf291d098c26d927ebfa9c80e49e702735af98bca02 SHA512 8ada45a79fed7c99bb7b35d8d2f15a69086aca30a1175469a6a2be31a418828abd16d1695ce36c0df305a6d0395e65008115a82aede8b31313edd745314b4796
 DIST vulkan-loader-1.2.141.tar.gz 1410381 BLAKE2B a52c384cdda41083705008b0a00f820482d5f7cb16aeb347ebb1b0dfa55e1bc5851e60275728e0d73272a2c4335bbd5efe5aaaed21c0ac9cbd3d5fb76e73cc24 SHA512 251cc617693d651feba887a737ff724631160b172577cd3365d1a93e9c17ee87719d7aa78efa6570ee4f17fa15feb4e39bee1c706f7c12c6f96617348bdd8f26
-EBUILD vulkan-loader-1.2.137.ebuild 1710 BLAKE2B 3427e40938c277700720bc50df5b0583f10ccfed19025bf0a6e7ed0cfae364ab8e3e1b420a0b2266f832c5ef7b0f574d03efee3658420771ff147698e11f3576 SHA512 f5923a57cfa7e80052e26eb3645771c7f9c506e638075d32186cc00ddd7e42c8e5c5f033554d7a8c624faff6a6dfd3ca9a78e2a4333d62e7f669c0df142d4ba0
-EBUILD vulkan-loader-1.2.141.ebuild 1710 BLAKE2B ace0b28fd303ae99b0ed7b4878ac2538534863f89f4a1442473db1508e570cfc5ebf0bd1a9b8d3e0bdc4d7f5a0c803ddd4ce02a0f62d13e4e17d3e00918b6978 SHA512 8004d2d27090080f0ee60f9d708ad0d51ee5335aa6301c92126a1972d692ebd85e0361c7779dd1cb0698eed7f6babccbde8628f264ab1c0ae54c5b63fbf520a1
-EBUILD vulkan-loader-9999.ebuild 1711 BLAKE2B 8a7cfcd2603391ba298c407b8fc5eff6bc6364bd650ffa6e07637ccfad00aea16ea813c81d6855fa6b84049f59e8eca039967a1cf89d8a2ddaaaa1ed4e8153df SHA512 f561c79296a73545c3cbca97d1807e57549869c9bff4f81aaa017d8846a3b28cd85208f1956af8b51982896411aea2c7f94ff6b77f97026a7da2d77ac5ec092b
+EBUILD vulkan-loader-1.2.141-r1.ebuild 1728 BLAKE2B 0ebf14b0acede3f370ac139c69ff2f92c354de9145aa8d96a1ea0ef23e2251e3827f23e231010c77e8663ba8a0f46cba1ecb6d937acdb04e9d004bab27195f37 SHA512 fc789bb294e1d99e5609c8db8e97c6765e83ac92ca70bb683ba35a9df6754d2835cef2ca1e52a02d7707e4fa90c36d2d55a7ea6ec674df9e6325a88bbb949474
+EBUILD vulkan-loader-9999.ebuild 1712 BLAKE2B 357fc2e387a06a491ed88d020fe49cfb711207746d8efb1399540295d433c3a146402ba922b21af6d7972b31b23b78a6e0e4a59b2ea8161c70a49fbea6494316 SHA512 2c549cad68ca8363b97c4cd9354398b458789eb80fb724f79b40be7ad05bd076df003f00b19035e7f43a953d33e434b9bdee7070d0a2fd6ee8f17204d5a04067
 MISC metadata.xml 414 BLAKE2B 53100d7021d8350e960e2b087bba612ee99f6ce960b63964aa2ba50b1172f5b9fe13fb9addb069ae74cc03292b92fc88838b41eac1083c8779dcb8e0e480d1dc SHA512 6328c52f607ed4ea3ba31430f63df84e942ea3e6726b5107c8840e3869725bd7407b446d4f905765a0c6d6dd04fda643bd2b5e06681f6ac771bbb4fbc8d4c417
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild
deleted file mode 100644
index 0246966ff47f..000000000000
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Loader
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit flag-o-matic cmake-multilib python-any-r1 toolchain-funcs
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc64 x86"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="layers wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-DEPEND="${PYTHON_DEPS}
-	~dev-util/vulkan-headers-1.2.137
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
-
-multilib_src_configure() {
-	# Integrated clang assembler doesn't work with x86 - Bug #698164
-	if tc-is-clang && [[ ${ABI} == x86 ]]; then
-		append-cflags -fno-integrated-as
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_TESTS=OFF
-		-DBUILD_LOADER=ON
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr"
-	)
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	keepdir /etc/vulkan/icd.d
-
-	cmake_src_install
-}
-
-pkg_postinst() {
-	einfo "USE=demos has been dropped as per upstream packaging"
-	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
-}
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.141.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.141-r1.ebuild
index 71f3ce8b1cf8..1d88e48af04f 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.141.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.141-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
@@ -49,7 +49,7 @@ multilib_src_configure() {
 		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
 		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
 		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr"
+		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
 	)
 	cmake_src_configure
 }
diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index f6e5a7abb270..c09d888cf7a6 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -49,7 +49,7 @@ multilib_src_configure() {
 		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
 		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
 		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr"
+		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
 	)
 	cmake_src_configure
 }
diff --git a/media-libs/webvfx/Manifest b/media-libs/webvfx/Manifest
index d9c17d5a9d6a..a85060f7a546 100644
--- a/media-libs/webvfx/Manifest
+++ b/media-libs/webvfx/Manifest
@@ -1,3 +1,5 @@
 DIST webvfx-1.1.0.txz 1163312 BLAKE2B a948c967ee8a21f91086b76ac2737a855d6a6a0c576471d9844a7587ee45c8f42553b57b8f5e989dae696924e67c341317c541eef87f28e9a49ff25e8e0aed29 SHA512 f88726ef8ae779f238fe6b784bc53ef47ef67a8d7b524f2c465fdf5de57f37bd388d81ac52b0a7abc30a1c836f801a8b9df0ef183e2507b229dd6431d38c8768
-EBUILD webvfx-1.1.0.ebuild 1255 BLAKE2B 7ca0283f6a4a1197e37b020c1b7c1fc7a245b2b311e1b82cb858c41059e85de912f970fbb4b5fb96a9e9929bee762ce13f85745c0c3bcbf7c9fbd4359c45f649 SHA512 0787d2f779b896fd1e59871ff596c1769e34179d5a88e9a099fcc164581b9e1b408c8ce771e27d7ef99a61ab75462f2e5172efcbbd9c56ecd5c83dd1af2d1ab8
+DIST webvfx-1.2.0.txz 1178880 BLAKE2B 7ef08f791b291897f39e170f0572db2fb98c78bced9ed3560b1b94cfe48bedf0af3af5e57381bd039f6cf3dc1d558fb07a6a959b28f1c6a380d0dd0f1bfc64fd SHA512 84473df90553d2d85e1860eb98326fc65ebca02f1cbd8415b83e02ea032442d2aa42c000e366b6ca217bb59526b2b4409d85b169cc7e60d86443b79a1ff5614a
+EBUILD webvfx-1.1.0.ebuild 1255 BLAKE2B 90befb16c2e812f590d110f4e98a8755cff1af65fd4d3d38bca9be28fc0b5992bfe8690d6bd2e421f7e8d28349372cfbfde8d45485976c1c1546dfa608ed7522 SHA512 a1e4fef0c703554b0ef66cd5c773a36d8d9ca9808ad06f3573fa3acd4ccdf0b6d19abf5eb6963f8a2e4acb07fad6da5462e6a4c124e5ee7ff16a5abc37731e80
+EBUILD webvfx-1.2.0.ebuild 1255 BLAKE2B 90befb16c2e812f590d110f4e98a8755cff1af65fd4d3d38bca9be28fc0b5992bfe8690d6bd2e421f7e8d28349372cfbfde8d45485976c1c1546dfa608ed7522 SHA512 a1e4fef0c703554b0ef66cd5c773a36d8d9ca9808ad06f3573fa3acd4ccdf0b6d19abf5eb6963f8a2e4acb07fad6da5462e6a4c124e5ee7ff16a5abc37731e80
 MISC metadata.xml 531 BLAKE2B b433d295dd15a81b40b288e8d311f5219709d467a1a23169d2f85831d12500b34b50f03d274e44e9347caa3b964750d04bdd0df8f935f649118b94fc974ab8bc SHA512 d722ad1ef255c1a02a4b7dd9f58f08aebb32dc84ff2034db48d76ec0ad3ae1641c8be969e9b9dabdfaffaf71eaf35557f839fcef84c8b0262efb9243886ebb8d
diff --git a/media-libs/webvfx/webvfx-1.1.0.ebuild b/media-libs/webvfx/webvfx-1.1.0.ebuild
index 114f397f1412..bdc28125efe1 100644
--- a/media-libs/webvfx/webvfx-1.1.0.ebuild
+++ b/media-libs/webvfx/webvfx-1.1.0.ebuild
@@ -7,7 +7,7 @@ inherit flag-o-matic qmake-utils toolchain-funcs
 
 DESCRIPTION="Video effects library based on web technologies"
 HOMEPAGE="https://github.com/mltframework/webvfx/"
-SRC_URI="https://github.com/mltframework/${PN}/releases/download/1.1.0/${P}.txz"
+SRC_URI="https://github.com/mltframework/${PN}/releases/download/${PV}/${P}.txz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/media-libs/webvfx/webvfx-1.2.0.ebuild b/media-libs/webvfx/webvfx-1.2.0.ebuild
new file mode 100644
index 000000000000..bdc28125efe1
--- /dev/null
+++ b/media-libs/webvfx/webvfx-1.2.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic qmake-utils toolchain-funcs
+
+DESCRIPTION="Video effects library based on web technologies"
+HOMEPAGE="https://github.com/mltframework/webvfx/"
+SRC_URI="https://github.com/mltframework/${PN}/releases/download/${PV}/${P}.txz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtquickcontrols:5[widgets]
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	media-libs/mlt
+	virtual/opengl
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtnetwork:5
+"
+
+src_prepare() {
+	default
+
+	find -name "*.pro" -exec \
+		sed -i -e "s/\(system.*\)pkg-config/\1$(tc-getPKG_CONFIG)/" {} + || die
+
+	sed -i -e "s/\(target.*path.*PREFIX.*\)lib/\1$(get_libdir)/" \
+		webvfx/webvfx.pro || die
+
+	sed -i -e "s/PROJECT_NUMBER=\`.*\`/PROJECT_NUMBER=${PV}/" \
+		all.pro || die
+}
+
+src_configure() {
+	append-cxxflags -Wno-deprecated-declarations
+
+	eqmake5 PREFIX="${EPREFIX}/usr"
+}
+
+src_compile() {
+	emake
+	use doc && emake doxydoc
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	use doc && local HTML_DOCS=( doxydoc/. )
+	einstalldocs
+}
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index af41ed210e05..5d6a174e798a 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -1,8 +1,8 @@
 AUX x264-0.0.20190903-STRINGS.patch 1531 BLAKE2B 293a9efebca3914e9f03f5e6a9e8c22efc30e47a71e0ad2abb1206df937e989398a9426d772daa73a852383e1eee5c6a31dd76583e4571e2636a26be2bd85735 SHA512 7ff25afade4e1a47bb4cc17bd7a2da902eac554b3af29dbc50706ac876ae846665cb1d06a1293c0359e515f1b9cd08a0971ab197f06eb3eac4309893014aaceb
 DIST x264-snapshot-20190214-2245.tar.bz2 770462 BLAKE2B d90a3bafb88febe12526b225617616a62c32fa3d3eacf410267e1fbd7e0fafaadca7c146172c08fc525bce8791d81c7d87dc27b06d61a6a44bf2ad92f6c1def6 SHA512 c8b1b46d4e6c0ef653dab35083a454c635ebf72c6a5255ce30bbb5d9d6bb8e23fca0e6cc197ea99f3c702fbfec096587df6fa82dec338d8bd45e35fa89c43039
 DIST x264-snapshot-20190903-2245.tar.bz2 774515 BLAKE2B 0b19fc1d3cedea32bfac9c5247bce7b3c04dead35458d61f3b5c0694040dc852b0110b620faf4118ed265a5605aafce3c49d468d38fb91e4c515b2860c486920 SHA512 c357c9025ffdf653c974eb7ccc2e9a4de86c02881372a6a8270ae59ce948c284da48a2aba37763bd29359d2a6dfc76ea56a52fed6082f8483912c8f948488a2d
-EBUILD x264-0.0.20190214.ebuild 1795 BLAKE2B 4d2433753d997269c78f88b91f6342a077f31cc5d57b29282a21761016291771468898f49a34120d3a118bad45810226b077188f19c4f72a1f75b9bdb7743c93 SHA512 07df0bbe58003cabbad08363ec4f0f36223d9b6fa6fca69aa865099a8860994ff0fd89cf7ab0583f03fe7c1c71c2b0332fd4fc6974b0039b659370685a65c256
-EBUILD x264-0.0.20190903-r1.ebuild 1905 BLAKE2B 032fee7109566d43c7f1df5b27b48634b8beb8418c6f00d684bf7cc401c562473bb5332998aa662ac7504fc4e5312594f3458a879ac81183ea87123eab924985 SHA512 ba68920936237b2be3be0c8602db57c567e27d2a19701cfe933e5891d60c17170879179e2325b4cc71cef519410112fc60bb3701330f7ba6891a3d1acaa09c5e
-EBUILD x264-0.0.20190903.ebuild 1830 BLAKE2B 8c3dc73bf37e830e0c8601aa15acf60d87b209ebedf7de0e2c0cdbe11f1744f8ad061578fafb349704ec40bf8b2229533fbe4de753b4cabd063d88accbbdc0a5 SHA512 658c2e9cf82118b19628822d97430d1ae93a00fbd62a6c505c8d7aaa02603de71ed4b6d559288a621a26629ea44ac2ca9c4cba10ae2709c16b219fc21a31b2a0
-EBUILD x264-9999.ebuild 1861 BLAKE2B 3abe3cfb710f96322a627d82f162105f28a0ae9cc9303462d7b584a147311568832d7b7e4f241c4df42eac5505a9b69196f10433bebab71365259019b633f003 SHA512 64f801345cf2f61f531448de4cda105b5cd1559a80bcda84a86a8699156c58f80cd8ed8807ebf7acf0ca95bf3a4cb1ec0695908eb126dec73f6c6a43e2f4da20
+EBUILD x264-0.0.20190214.ebuild 1784 BLAKE2B d1b980321b3cf9a8b808e948a4b092374d469885771c291e8e3278bb709d4c33ce82ad7dfff764358b67dc303bbbf1e77d2b1096609c6786c007adf13bc7ff24 SHA512 7f3570ac7cefdb6dd0c49015d64cf983d1630430daa5a07e2353f3b7d1d7e9ce81cc6dccc55a996b69d0d4259c9cbed2d7626d1ac67af8f703e7915a6ee49b5c
+EBUILD x264-0.0.20190903-r1.ebuild 1894 BLAKE2B 3154e281cc7b88a981015d010e37c0c6c3e0203f0e31915c324cd38810ee66705060162c27eae1ef9789b7d51043da284107fd4af9db28130e50fc7f3d1d1b29 SHA512 4fe43e4e01ba3b37e308a8e3e6f9b28416ebe12590ea54298dd10bef56b2fc64ff1c1d48a29a79c5577d98e4ad46bb63d9dc6bf7578bfa96b742d9529bc25303
+EBUILD x264-0.0.20190903.ebuild 1819 BLAKE2B c6cf2d6b07310e9fefd1efa12e5992e7b976c8ed74522acc6ce7f9d082d11c8335157d2dde221a1d652624ff96c09559700a674337945242b74fbbfa7b509570 SHA512 648e79e4d379fd258bd11c6bb4db44b53842c9614b08c2805edec11f39969bc46604b29f1bacebcda018239db8bf1f98bdee0110e9ae634c154c0d4ad7e87fb6
+EBUILD x264-9999.ebuild 1850 BLAKE2B f11513a79811a4804a4e5d7932dc63b42bd8982e4092f08d9443b953ad20ffec704eefc3ef26a707808dba26e0bdfe721cacc4a06f1c610991d5434c467bc4b2 SHA512 082fd856da64ee0702f6c5c2b3a3964d471a936aacaa0241c28e13da5dbe0b74cdfad98984aedd0c1f853fbf0a930d2f9d02b5e1d50fc549699d8ca3b855d000
 MISC metadata.xml 488 BLAKE2B 3e6982e1bbd45194bb664ddb4b34e307ef4030f4fba9905d0a292c8a5ce73e27bc1c687758cc4fb18d38cc2c93ed21b64dfa35b2aaa63dc6fbd1110b9e1daf1f SHA512 2dc9d360de31770d2e8eebc3bab9662a00ad328ba41380052c3e7502a4da85c7b0ce29cf229670d917c93d7b508282dd9f1694a718da65f1110c785a2bc68394
diff --git a/media-libs/x264/x264-0.0.20190214.ebuild b/media-libs/x264/x264-0.0.20190214.ebuild
index 179cdadadfb8..a181239df0dc 100644
--- a/media-libs/x264/x264-0.0.20190214.ebuild
+++ b/media-libs/x264/x264-0.0.20190214.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_P="x264-snapshot-$(ver_cut 3)-2245"
 	SRC_URI="https://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/media-libs/x264/x264-0.0.20190903-r1.ebuild b/media-libs/x264/x264-0.0.20190903-r1.ebuild
index 452ddd0f1835..e65caa445b83 100644
--- a/media-libs/x264/x264-0.0.20190903-r1.ebuild
+++ b/media-libs/x264/x264-0.0.20190903-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_P="x264-snapshot-$(ver_cut 3)-2245"
 	SRC_URI="https://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/media-libs/x264/x264-0.0.20190903.ebuild b/media-libs/x264/x264-0.0.20190903.ebuild
index 505ad4d2ed4f..920c68806131 100644
--- a/media-libs/x264/x264-0.0.20190903.ebuild
+++ b/media-libs/x264/x264-0.0.20190903.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_P="x264-snapshot-$(ver_cut 3)-2245"
 	SRC_URI="https://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild
index 6aca6aa96dd3..83de5d6c78bb 100644
--- a/media-libs/x264/x264-9999.ebuild
+++ b/media-libs/x264/x264-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_P="x264-snapshot-$(ver_cut 3)-2245"
 	SRC_URI="https://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index 370c882cf893..483588482817 100644
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -1,4 +1,4 @@
 DIST xvidcore-1.3.5.tar.bz2 698846 BLAKE2B c65c90a2a51d993af65becd760364b495ca1714f888c640b577ee3cb509afc5dbe56d1f536aa710a5322106ca65bed4ad162ad97440e9c14deeabbcbe00984b5 SHA512 3297243400ce9ed2d0083559ee15fdfa422e585114c4e92c72fe702f43fea4af9fe4e9e794630959c220222379fa329452c4163a395f4ba1998c9be03a2e9441
-EBUILD xvid-1.3.5-r1.ebuild 1760 BLAKE2B 7d1cfb8ed445438cb2a1ffa9c64c05b831be2ab006745b184268a5f6b65e9e26e00366ac97477b5ee2b187607f68e4bc9b211175bc9f65ea80837cc190db891d SHA512 51ea38ffcabd1e7978f687edd80c8da390cf8e2f2b5dfe18a703c3e2053a6d972b7799eab714fd0ea2fbadb88a6d023ccbf3c8baea7aa495de4a255103f8decc
-EBUILD xvid-1.3.5.ebuild 1681 BLAKE2B a27d1d57f4100db991e0c95f5e644f54a859223b0b7ab7015152e14bc3f63c772a05a40e1e5e92f3120d12207d257c10de21535abd8edd431e83c359a33935ac SHA512 5d6ed5b7b5e8731bb52c7b985a9c0701397ebb11e2fa7b4d2d75f9a78a9bef43b042862a389fcf88f3d3b3b2e66429295d24dadcc27a3746b2c83ce143d2398f
+EBUILD xvid-1.3.5-r1.ebuild 1749 BLAKE2B 524b85ade8e5b1102227cc13912f6162e78a43e4ba91d17dfb4240e5bb2db8762dd9ecb9605ed02121936038ad716f497b2a85b4fa78d6f894d881f413143c97 SHA512 3be60bb77595d630dc186942bd9786653871b175473c4fba5809f6804db45bc5394e2ea4827d3cfd25ff5cb77a2369b168df623a0c28e3b3e7e6e25927a7f3ee
+EBUILD xvid-1.3.5.ebuild 1670 BLAKE2B ce06176a07776e33b5a34b1774b1a2aafd0678ad85e5bc9f9e12611449aeda401440244679d8a00d40975d0adc9206d644798a86d2fa3c6b90fe2dcdb8d4707c SHA512 4b81bf15e6599c3feb608e1a7fece487c9e1f531cdb02cb3ca2a36af6516f7b94fe7f970ad7a02c63e32b40836031a0a827b7096c1d7dfa855c54838a9a7f653
 MISC metadata.xml 321 BLAKE2B cb6de1ddc565513350b010042d99dd2cb34c0cfa80d26d1324266b6621bea5fe50f4e9233348d0c5d9b9c214d48b9c94e8fc4b08f9c0b43c779b238a65559c03 SHA512 640a21ce70c9b74f86e27bca3153b920ad7ad8313f3f5d6032e41791ab99f7463718f99bfc7fd15613e682769be6fe322c15d3bc841f674bc0322afa130c8b98
diff --git a/media-libs/xvid/xvid-1.3.5-r1.ebuild b/media-libs/xvid/xvid-1.3.5-r1.ebuild
index 72652b0f4a5f..4f98d5f3a9d1 100644
--- a/media-libs/xvid/xvid-1.3.5-r1.ebuild
+++ b/media-libs/xvid/xvid-1.3.5-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.xvid.org/downloads/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="elibc_FreeBSD examples pic +threads"
 
 NASM=">=dev-lang/nasm-2"
diff --git a/media-libs/xvid/xvid-1.3.5.ebuild b/media-libs/xvid/xvid-1.3.5.ebuild
index 3885e20e99a9..d8aad26db4b8 100644
--- a/media-libs/xvid/xvid-1.3.5.ebuild
+++ b/media-libs/xvid/xvid-1.3.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.xvid.org/downloads/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="elibc_FreeBSD examples pic +threads"
 
 NASM=">=dev-lang/nasm-2"
diff --git a/media-libs/zita-alsa-pcmi/Manifest b/media-libs/zita-alsa-pcmi/Manifest
index b1764469a911..5ff78e55022e 100644
--- a/media-libs/zita-alsa-pcmi/Manifest
+++ b/media-libs/zita-alsa-pcmi/Manifest
@@ -1,4 +1,4 @@
-AUX zita-alsa-pcmi-0.3.2-Makefile.patch 787 BLAKE2B d2658d2d051c10a37909c54aa03f45ef7e51c574036a2e116c12071d73ba78751c7f48e40749e1dcc8d30e2317a4603d5020e1b447e1694b20733a2d6ccf7c5f SHA512 52e55cb02f9cf60a71b601665263c3943e58dca1691959b52c223e2ac995ed3de43261786d70a63c267e6aa7ef9b42fbf0f8e92603a57515f56295c5d31b29e0
+AUX zita-alsa-pcmi-0.3.2-Makefile.patch 789 BLAKE2B b6105b972818ed184ef1e3d4963885d34b3d52e4ec0bbf397d85d03c67ea22f82f6c2f8ef0c2e1e7f5e1f19b2adb5372f9c56cb60597dfe94623414ff9edf9a7 SHA512 aa9cae5d9d8fb7567b1723ce8334880bbdef1bf0f361ff5cdb8b1932316ed531e410b32e20d919cd1c7b0c24647e810f4cec754360d72c99c18dee9bb9894483
 DIST zita-alsa-pcmi-0.3.2.tar.bz2 21480 BLAKE2B dfd37f3cee647b7100ff1cb9f696ba7968bec4e6f11165955de67f38f48838f17c2efc0936780ce30ca0e2d7438b78ddd8a27960f6c54e7a8a5e87b1f9b50044 SHA512 9d6040d0ec636ebcf02a033cdc017105bbed8e0ddb99584890d8e027402a85791e0983a1a9cd677dc6f1da0ced530afb5e65a8e863329a5e785ef09e0b7124f0
-EBUILD zita-alsa-pcmi-0.3.2.ebuild 882 BLAKE2B 1dabedf1df2e0f5e13a13c26bf396c0f05d4239b13561cb411b1277ce407d6384d50bbda99a13d519983d8e721c79d030955edb26b06b330d4d39a9ba9618f4c SHA512 6a65e7c7fe4fc3641168cbf5b77b0d3951aa35c0d8b3d86fa479305f383e4fab5096ff61e2c26d0aa550ed61db21b4e1c8a39d9e2334d3639860e8e56276c252
+EBUILD zita-alsa-pcmi-0.3.2.ebuild 888 BLAKE2B 22db8247196a48216928787f3796f35aa46019a13c6627071926c4854f4a64ec86aabc85145938af9c529f37a09542c7f0cc85cc6b302131f127c56ec97a3e8d SHA512 d82047422743e616cb0c290a318bcbe8e6e9230188998cf8293584f9319339ef1253b896f68ac873646dff13616d788467b2bdd81bb1a5662c579c8afeac84cf
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/zita-alsa-pcmi/files/zita-alsa-pcmi-0.3.2-Makefile.patch b/media-libs/zita-alsa-pcmi/files/zita-alsa-pcmi-0.3.2-Makefile.patch
index 22b820ec0a81..e0170170eca6 100644
--- a/media-libs/zita-alsa-pcmi/files/zita-alsa-pcmi-0.3.2-Makefile.patch
+++ b/media-libs/zita-alsa-pcmi/files/zita-alsa-pcmi-0.3.2-Makefile.patch
@@ -1,17 +1,18 @@
 diff --git a/source/Makefile b/source/Makefile
-index a99c5a3..f549ad9 100644
+index a99c5a3..fc61764 100644
 --- a/source/Makefile
 +++ b/source/Makefile
-@@ -30,7 +30,7 @@ MINVERS = 3.2
+@@ -30,8 +30,7 @@ MINVERS = 3.2
  VERSION = $(MAJVERS).$(MINVERS)
  
  CPPFLAGS += -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
 -CXXFLAGS += -O2 -Wall -fPIC
+-CXXFLAGS += -march=native
 +CXXFLAGS += -Wall -fPIC
- CXXFLAGS += -march=native
  LDLFAGS +=
  LDLIBS +=
-@@ -53,8 +53,8 @@ install:	$(ZITA-ALSA-PCMI_MIN)
+ 
+@@ -53,8 +52,8 @@ install:	$(ZITA-ALSA-PCMI_MIN)
  	install -d $(DESTDIR)$(LIBDIR)
  	install -m 644 $(ZITA-ALSA-PCMI_H) $(DESTDIR)$(INCDIR)
  	install -m 755 $(ZITA-ALSA-PCMI_MIN) $(DESTDIR)$(LIBDIR)
diff --git a/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.3.2.ebuild b/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.3.2.ebuild
index ba25be31b16d..2a4405f62b4f 100644
--- a/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.3.2.ebuild
+++ b/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.3.2.ebuild
@@ -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="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~ia64 ~ppc ~sparc x86"
 IUSE=""
 
 CDEPEND="media-libs/alsa-lib"
diff --git a/media-libs/zita-resampler/Manifest b/media-libs/zita-resampler/Manifest
index b8b179d0db8f..6dc595b156aa 100644
--- a/media-libs/zita-resampler/Manifest
+++ b/media-libs/zita-resampler/Manifest
@@ -1,4 +1,4 @@
 AUX zita-resampler-1.6.2-makefile.patch 3036 BLAKE2B 595ebbae53d4c0ec344d02f4602eec599e9d301a308384f3a4d3c99a9e64111f7b183ccee92c9f7e069a00275f3304712b9644409bbe23030961aeeadf9c8b52 SHA512 a7bb5621c761ab36502303053872782cf275e55b248f0387765c1251ab43c58577862c5fc2b321f6746fd7ec0a8e7c7766bcac290cb204f2e94947aa27cb1992
 DIST zita-resampler-1.6.2.tar.bz2 125539 BLAKE2B d2e04fb5e0efbde3432ce973df59a11d2a184146d124b662712a5de2d9c243f6564899f190f7a7b68a9e01bcaab05c92b91ebcbf942473134a12a85e4e08c603 SHA512 d547419dd222c8a399d8f196efa1ec88a3f781275b696ae2fe1bb6e2fc329285affb8aace85972c304ad256becc4a155534dd5ef4ce3c57cbc9dcca0122b670c
-EBUILD zita-resampler-1.6.2.ebuild 863 BLAKE2B 41a5b1b4e8be9edaf741a212c53d5b3f005ae481f79cdae4676fe53c1df1a15b7ffca160e3787d7b21a92ff49c33b4ea62c902083e85f462e37e01d8b35840d8 SHA512 9490dd14cfe852bf23e2feec038119b44b08751176bbaf069e8b68dde3fe592b3bce0a4d809d12d7cdf0d8e253476e4a7b3ff67251c146a8e06f790598fa1b4c
+EBUILD zita-resampler-1.6.2.ebuild 876 BLAKE2B 34979cfb4c808790acbfe9bdfd14f55c7e54bc948df6882d44a3208a4707abeb0b471f030953a1419bcae2582503cdaa7c18204392faad799ff4c39d291aace5 SHA512 bf9c38af1391783995f2cf558b1903042f33be5bec672559d7e443e3bc38ea3122faf71b25e2da0c9fd17ff700dff7abe0beffcf3d1f676981c0228765b3d9de
 MISC metadata.xml 692 BLAKE2B fad59853ee366f99db8e9c0dfa932c564eb0d8194808b809182ce64f286d39de2a363eb86f192d124adbbc92b1e7801a9fa5be0752fad1725f147d468484f589 SHA512 be926699e99357b49f5fe90a78c60b0fd701229fd603dca5988b40611ae5bb0c271a6a346469e0ebaff62bdc718c400954491ccc2557e5799a4fba08c67207cf
diff --git a/media-libs/zita-resampler/zita-resampler-1.6.2.ebuild b/media-libs/zita-resampler/zita-resampler-1.6.2.ebuild
index 8632095fbd83..09846040cd2a 100644
--- a/media-libs/zita-resampler/zita-resampler-1.6.2.ebuild
+++ b/media-libs/zita-resampler/zita-resampler-1.6.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="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0/1"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~ia64 ~sparc"
 IUSE="tools"
 
 RDEPEND="tools? ( media-libs/libsndfile )"
diff --git a/media-libs/zxing-cpp/Manifest b/media-libs/zxing-cpp/Manifest
index 1c7571f4ea25..8f4662562128 100644
--- a/media-libs/zxing-cpp/Manifest
+++ b/media-libs/zxing-cpp/Manifest
@@ -1,5 +1,9 @@
 AUX zxing-cpp-1.0.8-pkgconfig.patch 302 BLAKE2B 9b1588b618a1ddd829c2bbc8ed9f8a19c2d69e1e7a2c7903a190d36e4672f8ff0979e8d6afd7f3ebecccf06e86421e2a7ff35120e1090620277210cacda446b9 SHA512 f43ed72a23d955d3e621e261c80ec409538b80bb2b046dcf24c37e09ecea1b4208f3d4227afbfbfeda9764f23b69cf87363a3a85a3057fef40f1a7199e1f69ac
 AUX zxing-cpp-1.0.8-version.patch 671 BLAKE2B f44f0b4a3f253f8f856d6c4b957ee8a636b0d8caaf567e6e4587005c50119db64fc7a0f1a62537af8a394f3268c4a82aca516fb3a3ba1779c63f8dec6b98cc20 SHA512 ed8fae42db39c49eaaac7a352aa6832d0b493c5a6c40a8acb36863222dce2232a545004f600b007d5f61abcfd6142f238773f30c7d476323809eebced1de202d
+AUX zxing-cpp-1.1.0-pkgconfig-libs.patch 632 BLAKE2B 27367f7dad02ec2189b3dc61caf455753eda158aef4db62b040199e489a3b721856997032b4ab4c253278656bde883c0133d73a6eb918177e309266cf9d19aa2 SHA512 07f73599203ab2c025279ac1efaeb7edf305a4ddbf6d3a25a92a2b2c4f462d6d16206f9c550f5882b874d36560c02057384dd56ec408cbb05c86f0fb8e6ee1ef
+AUX zxing-cpp-1.1.0-pkgconfig-version.patch 293 BLAKE2B 272ee10ff2db01e76a13da2b7f6a05cd1005f54dc8892939af2134e2670510f9b2f927ab95b9b592e493e62b8dcfc89077e5c24c4515864d71ae45f4d093eebd SHA512 2205f78792ad5d7b4a3d5de4fc38281eb882de052d83c91bac81e5c3a047628ab50e2311038cb8fde70f54dacdb768f5fcedfc3316fe8645992fd2fc50cdce0d
 DIST zxing-cpp-1.0.8.tar.gz 128506816 BLAKE2B 5f9e70c5cd123c27ee779a955cc112449094069c5be3defac57a906ea6a301e8f04886c7cb51b79007456e517db06f9f61c39228f8d8bb6a520602cac70aa7a4 SHA512 0749b3bd4d810ef024f2d8045ecf3024bba6d1816be3f5baeb3325724ac5a7359bec72b4070f8e34fbc1bc5ba2636e488b17cc8b35578b0703352d448c9d22f6
+DIST zxing-cpp-1.1.0.tar.gz 128856890 BLAKE2B 4ef93efc9e5d81c222b008b2dc7991cdb2dd38c297970b7bcaa7095323581445c32890bd20c9a3ad02013b41d0de5aaab6038b8aff892236c327bb27f922dc84 SHA512 8ae6d0c2bd21de0af99c1baa470afcdd8b0375eb1d4166bb20ad67632c39ef63e1ea07b8a691cf0bc076c87d73a8d8b0ca05007c65a09bc79697aa294dc1f44f
 EBUILD zxing-cpp-1.0.8-r1.ebuild 501 BLAKE2B 0eae08515984a7afa9fc1034fd7513f5a7b14198eba294f07ed87e98352a13eeee385a9d69f89245b8624e9e0f7c109db5b11170483b931b3589bb5230362051 SHA512 3ca7f943c841043d95f7bfd100f8f1f36e447265791307154f40dc2628123cb5a9115c5fb4c36c87390a1daed210808d3b831071242bc62fb85cc8501bfc2e1b
+EBUILD zxing-cpp-1.1.0.ebuild 519 BLAKE2B c13098e538dabcf6ad635d5b2d54f876ce4ce34dc8c1f1dcad7aaf3ea3396cba63c6ef4f36809588a34c5c492ca902345ab110c38af4255f4e57f65d744599cc SHA512 9f9e093e002b02cd31e5093386205ca865daf5487ec14b41480eb6107afe8de247e422bdad18025d309a25724d4f7f18261be58cc0f0812577ec584f081a4bd9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/zxing-cpp/files/zxing-cpp-1.1.0-pkgconfig-libs.patch b/media-libs/zxing-cpp/files/zxing-cpp-1.1.0-pkgconfig-libs.patch
new file mode 100644
index 000000000000..48d6e814ad04
--- /dev/null
+++ b/media-libs/zxing-cpp/files/zxing-cpp-1.1.0-pkgconfig-libs.patch
@@ -0,0 +1,20 @@
+From 877b6db1613ddae58e570801920f089c0f64b97f Mon Sep 17 00:00:00 2001
+From: Axel Waggershauser <awagger@gmail.com>
+Date: Mon, 3 Aug 2020 08:48:58 +0200
+Subject: [PATCH] Fix regression in pkgconfig file generation
+
+---
+ zxing.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/zxing.pc.in b/zxing.pc.in
+index b62fd15..3f429f4 100644
+--- a/zxing.pc.in
++++ b/zxing.pc.in
+@@ -6,5 +6,5 @@ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+ Name: ZXing
+ Description: ZXing library set
+ Version: @VERSION@
+-Libs: -L${libdir} -l@TARGET_ZXING@ 
++Libs: -L${libdir} -lZXing
+ Cflags: -I${includedir} -I${includedir}/ZXing
diff --git a/media-libs/zxing-cpp/files/zxing-cpp-1.1.0-pkgconfig-version.patch b/media-libs/zxing-cpp/files/zxing-cpp-1.1.0-pkgconfig-version.patch
new file mode 100644
index 000000000000..c448d00a3094
--- /dev/null
+++ b/media-libs/zxing-cpp/files/zxing-cpp-1.1.0-pkgconfig-version.patch
@@ -0,0 +1,10 @@
+--- a/zxing.pc.in	2020-04-09 11:43:22.494219440 -0400
++++ b/zxing.pc.in	2020-04-09 11:49:03.884867034 -0400
+@@ -5,6 +5,6 @@
+ 
+ Name: ZXing
+ Description: ZXing library set
+-Version: @VERSION@
++Version: @PROJECT_VERSION@
+ Libs: -L${libdir} -lZXing
+ Cflags: -I${includedir} -I${includedir}/ZXing
diff --git a/media-libs/zxing-cpp/zxing-cpp-1.1.0.ebuild b/media-libs/zxing-cpp/zxing-cpp-1.1.0.ebuild
new file mode 100644
index 000000000000..3441bcd60098
--- /dev/null
+++ b/media-libs/zxing-cpp/zxing-cpp-1.1.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="C++ Multi-format 1D/2D barcode image processing library"
+HOMEPAGE="https://github.com/nu-book/zxing-cpp"
+SRC_URI="https://github.com/nu-book/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}/${P}-pkgconfig-libs.patch" # git master
+	"${FILESDIR}/${P}-pkgconfig-version.patch" # bug 716818
+)
author	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
commit	3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree	c513fe68548b40365c1c2ebfe35c58ad431cdd77 /media-libs
parent	05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)