gentoo resync : 30.05.2020

116 files changed, 1389 insertions, 975 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index ed1304a15214..6ecd14c89e89 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/compface/Manifest b/media-libs/compface/Manifest
index bdc442c280f7..b717296c101a 100644
--- a/media-libs/compface/Manifest
+++ b/media-libs/compface/Manifest
@@ -1,4 +1,4 @@
-AUX compface-1.5.2-fix-build-system.patch 899 BLAKE2B e9bc5c7e6194ff77967ba5ff700771015f8a29612f2c28f32853de06871e30e4f8f4211ae035efbc739326a0b0460aedf0cd859644741cfcf8920f71c485d0ee SHA512 b42ce74af078598f58bca042d820a3d40077447091de111a5d15eddf83ed6c409c330ef79398304998b7e9057b753398b1d84e6318d42a8acb1556eb030c190c
+AUX compface-gentoo.patch 1415 BLAKE2B cac49f8b6cb2680df1ef46a811a3dfaf1f7c170b69f3eeb91daa784e885fd75925169a85e6716944056b9f0fa4d29df96c795c3d16f1a1b89d54468faf555c17 SHA512 e966f02c7566a657751ad4ecd30805c5cb77e9fd76a458d639ff3291d0bd3c4e886bfc37106a755b1387c5ceee331eee1921595249e07175918bb218cd449a10
 DIST compface-1.5.2.tar.gz 46970 BLAKE2B d26c25a35b3a2e63ddfb50feace61930fa3be9f4150ad8f8c96a3820ccebf1422fda5703628d58ad646f1d1eeaccc5f2f08ed5f2e74b845f5d7328f2829e63d6 SHA512 0da9ee4c5fb2b5c712466d9fa6170e5687b23c038e6304baa42d7ede6d9bd50a1b84da416eb853a420c01a6b9eccd5e7d92a4ebc26295714b85254c05c9e3360
-EBUILD compface-1.5.2.ebuild 552 BLAKE2B da0b8399455a3c6c94ec67fc87d042d0f67ea860e0bfbe545a0a2c686f58f6fd4550e2283ef4b738d66fe78218f3e2d366e78f6d9899c048d17c99cc84625dde SHA512 07ddcbb5a977a80ed59647640160b14313ab6d3bf534ea357132bcf9bdd95290149773c1b2f406d22d90283bda8f8fb2a08da7a570898383170bf114ca7ec9b1
-MISC metadata.xml 221 BLAKE2B 6fb71e3c82061054a0c2d88c1ce8e591d5742628fe53032c9efd2c371ce1e8b0135b00ac91fa1905df39a507d5faa5871fb3a30d167dd46cec581682ba17c8ff SHA512 a11e9bbbabc9ac96985c5dc247e601b065fa762f12bce74224896c27aee34eb908187622bfc849c39c6c722a8ef8ee72b248afc84da1b0eb72f1ff5eeb13bbf0
+EBUILD compface-1.5.2.ebuild 605 BLAKE2B 6906a5ab5cf3b0289c64e3e5de891861d9df1507529dff3fc81aed1452537f207a957cfb0884b5320aaed5aa9c8ac9315a788b7b9bcd722f966d41f3a14c664f SHA512 55a6b92feebdb1280b0d814378c35b724da7db237b1e79df859aade31273ff8c779b26b2671333ac559d19f9077a3e87338864a7d390df7f3937f487baec5b69
+MISC metadata.xml 248 BLAKE2B e581d975884f924f92f81a803547379276565617c24d86f893c0186a4793c1167a36cbd8083261a10ce99839b9e5b5dd29f237bebb644eaef29ced562c9c6310 SHA512 62ab121be05f0603fe52b26ac612943b049bc527ff73401e6ed427622fcfd7f07cf3fabae90ac9e30297692ec4188b1a8bdc1f9104e30d6ed4032a96ffd77cf2
diff --git a/media-libs/compface/compface-1.5.2.ebuild b/media-libs/compface/compface-1.5.2.ebuild
index db2924ec06c1..d82aa2010964 100644
--- a/media-libs/compface/compface-1.5.2.ebuild
+++ b/media-libs/compface/compface-1.5.2.ebuild
@@ -1,7 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
+
+inherit autotools
 
 DESCRIPTION="Utilities and library to convert to/from X-Face format"
 HOMEPAGE="http://www.xemacs.org/Download/optLibs.html"
@@ -13,7 +15,12 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x8
 
 RDEPEND="dev-lang/perl"
 
-PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
+PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_install() {
 	default
diff --git a/media-libs/compface/files/compface-1.5.2-fix-build-system.patch b/media-libs/compface/files/compface-gentoo.patch
index 2cfea742c981..d8754fd3d60b 100644
--- a/media-libs/compface/files/compface-1.5.2-fix-build-system.patch
+++ b/media-libs/compface/files/compface-gentoo.patch
@@ -1,6 +1,6 @@
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -1,10 +1,10 @@
+@@ -1,15 +1,16 @@
  prefix          = @prefix@
  exec_prefix     = @exec_prefix@
  srcdir          = @srcdir@
@@ -15,7 +15,22 @@
  
  @SET_MAKE@
  
-@@ -77,10 +77,8 @@
+ RM              = rm -f
+ LN_S            = @LN_S@
++AR              = @AR@
+ RANLIB          = @RANLIB@
+ INSTALL         = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -52,7 +53,7 @@
+ 		$(CC) $(LDFLAGS) -o $@ uncmain.o $(LIBNAME)
+ 
+ $(LIBNAME) :	$(OBJECTS)
+-		ar rc $(LIBNAME) $(OBJECTS)
++		$(AR) rc $(LIBNAME) $(OBJECTS)
+ 		-$(RANLIB) $(LIBNAME)
+ 
+ lint :
+@@ -77,10 +78,8 @@
  		$(INSTALL_PROGRAM) -d $(BINDIR) $(LIBDIR) $(MAN1DIR) $(MAN3DIR) $(INCLUDEDIR)
  		$(INSTALL_PROGRAM) $(srcdir)/$(NAMEEXE) $(EXECUTABLE) 
  		-chmod 0755 $(EXECUTABLE)
@@ -26,3 +41,13 @@
  		$(INSTALL_DATA) $(srcdir)/$(NAME).1 $(MAN1DIR)/$(NAME).1
  		cd $(MAN1DIR) && $(RM) ./$(UNNAME).1 && $(LN_S) $(NAME).1 $(UNNAME).1
  		$(INSTALL_DATA) $(srcdir)/$(NAME).3 $(MAN3DIR)/$(NAME).3
+--- a/configure.ac
++++ b/configure.ac
+@@ -8,6 +8,7 @@
+ AC_PROG_RANLIB
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
++AC_CHECK_TOOL(AR, ar)
+ 
+ dnl Checks for libraries.
+ 
diff --git a/media-libs/compface/metadata.xml b/media-libs/compface/metadata.xml
index 21dc8fdf43ff..7ffc4339bc56 100644
--- a/media-libs/compface/metadata.xml
+++ b/media-libs/compface/metadata.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>hattya@gentoo.org</email>
-  </maintainer>
+	<maintainer type="person">
+		<email>hattya@gentoo.org</email>
+		<name>Akinori Hattori</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-libs/dav1d/Manifest b/media-libs/dav1d/Manifest
index 3218617bba3e..3a2ecb5ad484 100644
--- a/media-libs/dav1d/Manifest
+++ b/media-libs/dav1d/Manifest
@@ -1,20 +1,6 @@
-DIST dav1d-0.1.0.tar.bz2 351745 BLAKE2B 302680ddfdc8d5a3eff90541ed156e820c3322bfb93316da1b2deabeac40062103af19e99dfa810678e62ad668c4aed944ac9bf8160afb301b100063919ed2a1 SHA512 5893ad40af7c4f5c3678ecc604ad360b5d1cd3fadaa16f7183d638745097fed091aeb3456540db61a2f4f0fc8bb93f2a20f428c76a7976d3fd186cc8b8baed53
-DIST dav1d-0.2.0.tar.bz2 408361 BLAKE2B 2c5f4d7777d85ab1453a744335ee5047b2e108a70e884c5116d8d1a56b81c1f852c93666bd0bb3f4d5105f2220bbc6c92f893848f0cf1bfc0bce1ee1f551287c SHA512 378060ed6762f9f6baf7addfa7382cb0873bbc606f0389eee4ed7537dcfc851f5b159a34af0f15d9f8d345a9b2a950f38078a419144b0458aa3464e54ea5d490
-DIST dav1d-0.2.1.tar.bz2 412003 BLAKE2B 51520f355f51f7fdc8c6e7981fd29f8d5339c2c72058ea05dff6bf0c3b191cf3c077fee1b46813f229d1bee16d1b884e834a5d61bf78459d83113aafe63bca89 SHA512 38d0a9e639579bf2046d3afd7ba0d4205081d8e26955be0216acc84ee2adcc81c790c858932009965b61a66fc3df66ed6b14da9d0e61e2505418c17bc4b75004
-DIST dav1d-0.3.0.tar.bz2 435690 BLAKE2B 57124b2a5bcde8a2de8e4ee8155ec736d2f4c13dc7347029c517d70495de1943feef7f0c7ce1d1051304fe9f3141775fbe07ceec0733fdca3dca166cbab6c417 SHA512 bc0933bbc7064555e8973c82390e414aca8f52a14c5de7ee3ff92c263722d5c9cc472ba5f1f8d1dd60c4ce9ab0ed880c8b4a53b3d33d3aff24bc8e7fb18b0b84
-DIST dav1d-0.3.1.tar.bz2 438676 BLAKE2B f51c997fb95abc5b2721d67feb2023daf6bdab8d725b2b52b6c25440dcfab637b8543b8622c18da678eff20bbed155e86da9c9040a98160e5b9381ba7ab5ecf8 SHA512 b810c993a2a262f75ea0d4404428bc5660ac0d4c4d41aa311bc2180abecc40b36e73858f436b27372f4a1a0b7c700df4f8cc535130c663d6bfba2206d549e0f2
-DIST dav1d-0.4.0.tar.bz2 493854 BLAKE2B 8ae022054ab9827306f6e8501e0bfbc03a04e280a3e155c12ae2dfef474eab976097ce3ed990bd5cdbc3ac79018138a156f0701973ac40357224feb75149332a SHA512 7d2ad9959649321e86f9d0dcf44b274251c103fce9f02964d898b6d9da69e38e93bbed86a7ea217c93e0ee89e1ad43bc31dc217535c4b1cc37761191a6585fc1
-DIST dav1d-0.5.1.tar.bz2 548584 BLAKE2B 407188a57c469124db4863bc78dbca8b31879ed8836503ba584d4781e5f956c9f0a4661a4f47729bde74f1dd393c08db98a4cb49103f99c0f76720bc148b53a9 SHA512 2d1e7888fa9c138903b4209647e907803d2444fc2afb219b9a45dcc4c75098128b299950750bd68970004ea413ad88933d4d651a3e4e0e1557506598a15cee3b
 DIST dav1d-0.5.2.tar.bz2 554192 BLAKE2B 29305d0bb20a3de0048d102789fe1fdb1a030596213a1e2f025918ac6bb37c92c8c5f8078320487702ed66b16d4d63234823b5475d84bdea853b92e76be4c70e SHA512 37da9138a1dba68b9e723ba48b23eab567f839308132fc5a28727c131280f2eca3e160b074982f5265c914dcad0e4029af9ce23909b32bb9ec60f235c623e384
-DIST dav1d-0.6.0.tar.bz2 594994 BLAKE2B 37b2ecefcaacc45fe0439b996ff906191e262b660065cf62b5570c2ef8b4f1eabb1c6f8e1a5b5515c57eaeef1b4a05c63b9661f0dda7cb658dd288e15c4422b7 SHA512 ea4897d890aadd17370909d5bed3a8e93e40dbdc131808adf0e0ecfdc36d46fd1c31efaa12a58e11ac632bc99beef3d1760c7ca4ba757aaaa7946057530ac2f5
-EBUILD dav1d-0.1.0.ebuild 1128 BLAKE2B 20202e1f79289bf576003933bfae0e417974df92f810c2a6ed873e1143af297c2af37918fed3ead030206a4d96fe22722a943b11f2b66a8e1dce210256f7f2c1 SHA512 d25a735d98e03391640d290669a69fe225d28ec3a8a3a1137919d4cd47e97e11f03e1c30f0f2123153b4c0a34f6e8539da94b100a05c0c42e98247b1aabb2d38
-EBUILD dav1d-0.2.0-r1.ebuild 1135 BLAKE2B 081253071832f93fd96b216169ea0a1f29a2608ec058eebb41c1eb47922ae64134c3c027005abb56549d7b8e66d0831defc07eb95d963c37de07e730384c42d6 SHA512 35a638950d61cb3a79391f959fc8da3240dbf191f6db0ec55b8d80f08287a8ec1eefc9a611196e70449a89b0ec87aca4f304cd4ed46d6911d72e9343ec612ed4
-EBUILD dav1d-0.2.1.ebuild 1135 BLAKE2B 081253071832f93fd96b216169ea0a1f29a2608ec058eebb41c1eb47922ae64134c3c027005abb56549d7b8e66d0831defc07eb95d963c37de07e730384c42d6 SHA512 35a638950d61cb3a79391f959fc8da3240dbf191f6db0ec55b8d80f08287a8ec1eefc9a611196e70449a89b0ec87aca4f304cd4ed46d6911d72e9343ec612ed4
-EBUILD dav1d-0.3.0.ebuild 1147 BLAKE2B fbceacf787e296094352daa0382eba35447e6c09aa5fa087cc25102a846537f08852fb86f1592fb06aa23a36acfab93ac6b40fd0af86f305663322076d4b1016 SHA512 50524008230f23b520ae3401af3ce65822b238c3300a4a3715034ac5f584bf76a3f1fd4e1591a539ca07f4f3005564b22bcbe07c30b4ce809ef928bfa00d6a82
-EBUILD dav1d-0.3.1.ebuild 1161 BLAKE2B 102cd9d3e438f66ad960b9542650acf2f1171d47c9c321d16dec7a6ffee4662820ced2732087a50b2faf706e891e7c707f8c3f4d163442bddb94db45848faa05 SHA512 610cfdd81df7f852c5fcbe0691e0274a11e1fabd37d51eea85c875ae36905eb54991b8bcf930378b2c640f93e6c175543d8d68ab3ed4e866ddac8cd6331dd05a
-EBUILD dav1d-0.4.0.ebuild 1190 BLAKE2B 4fe099fcc58984942b8a82d7b63396a24e90848acabfcdc8765225afdf708345ddf56529daa4babfccf90b66b9c250b9190b083bc545ccd220b41048ced780c7 SHA512 01fa672b164a9a3ec00c9a591d1511ab182c2d21987af8317636c829890f0cce32633a12818bbd9be7940392ca23bb96fc9b00c3da3664bcb2dbf3a0b392fe87
-EBUILD dav1d-0.5.1.ebuild 1181 BLAKE2B 9ced3e650729cb29eba911bbbfb326170a227ce23a449dab56034d2c978808d591161fc016f298f4817c7d990f16670b84de47016286bfc5e7e7634978ac5897 SHA512 8667a407ba4b026c476933d144363d86862d8a764805b1715abf15e610ff7f62b3f5435629851a218fdf200a63efe91b8ca33284219da42897944dff127788cb
+DIST dav1d-0.7.0.tar.bz2 613106 BLAKE2B e41dcf4c597da437c0840753eedb3d4c8c7e53494376128f7c0cabf9fe00038fbe676f093f4bce079233934c9f78def0b98b4f09a464c6bd162b7b2fb9f88410 SHA512 2ee1de4c29db6a5cbba0a1db669fb1143f3bae26595c4ea3f17c555fdccbaabc814b7af5caf738cf4dbffd22c690cfe869d33cd830533e24990679b7b9cb4b8b
 EBUILD dav1d-0.5.2.ebuild 1175 BLAKE2B 8be48906d6eb61ba878631fda7fd52868d936b7a662237d15ef0e0607223bdefaded31334536d4bf7d06e57ae4d784e44b3e2c7c6484076faefe28303ecff521 SHA512 8e4d96a829b824eb3ab63d391e63aabaf1685ce65bedd1a28e6984bf6322f7a77054b8317450378bfbc0c97da142d2c1daa03d0c5b46120844519942000873f8
-EBUILD dav1d-0.6.0-r1.ebuild 1181 BLAKE2B 837ad26ff0cc9530b85c0e5eac541b626d61cfc38ab032bfaa5e851862dd8a963925e1260805a50c5beb7471aecb5545431cef060aa644256b30151ef103614d SHA512 a3b3862f75cd13dc89e7a5171c5f27cfe311a60ed9f81e9c4ad910de8aedf4aef8f6f8c13cdf53e36b15bc0a2b13590698ef1015dac1a5c13d226bca8b7d6235
+EBUILD dav1d-0.7.0.ebuild 1181 BLAKE2B e26b5781df9273443f32f8c913e8ad9254ab2eb70eef5fc302aef333a2477cba4f02b04dd7d3dfa9e355791b58bfdd59fae940dc640c4743959ca41699e884c6 SHA512 c08db9034f18ca6d6ccc830fdb499ae7818de86b430697bba337e9d4b18078f21306ef84cb06c58c86ac3db11b4f57acdd2d3d8d17b05323d752be0ae0e09e93
 EBUILD dav1d-9999.ebuild 1181 BLAKE2B 0e249792fe05fd2d7c9734b25f88e9116eccd34cfe5c959822070f9f5a2653fed974be6c2ebf7e579ff6eabf0c013237b2076b9297a9acde53e203d90a5d2db4 SHA512 6ee1ec6338b474090ba936710359a7e1fc97d78b52f0e6f2dc76dc8e392cb3f9c0bc202098d702dfe636f776f36aa5cd6818a81403268bf49a7398fa95b95f65
 MISC metadata.xml 536 BLAKE2B 40ec2224aed078ad4748d3182defb6813cdd34a614d40db2fbbbeb8b63e24a59ba1cbe9d458fec17516c328a89f77927d9fbeb9a1e4a2b8c296b7de7235b1af4 SHA512 74e6595ce441bb313364f375a8afa9b2a0179f350e30d075ecf99e058874450e15f4005a0712e20a4feb047d57799dffacb3903af00a3c5a8d059f7025e49de6
diff --git a/media-libs/dav1d/dav1d-0.1.0.ebuild b/media-libs/dav1d/dav1d-0.1.0.ebuild
deleted file mode 100644
index 8b2a1f361334..000000000000
--- a/media-libs/dav1d/dav1d-0.1.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SCM=""
-if [[ "${PV}" == "9999" ]]; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
-fi
-
-inherit ${SCM} meson ninja-utils multilib-minimal
-
-DESCRIPTION="dav1d is an AV1 Decoder :)"
-HOMEPAGE="https://code.videolan.org/videolan/dav1d"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="+8bit +10bit +asm"
-
-ASM_DEPEND=">=dev-lang/nasm-2.13"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	asm? (
-		abi_x86_32? ( ${ASM_DEPEND} )
-		abi_x86_64? ( ${ASM_DEPEND} )
-	)"
-
-DOCS=( README.md doc/PATENTS )
-
-multilib_src_configure() {
-	local -a bits=()
-	use 8bit  && bits+=( 8 )
-	use 10bit && bits+=( 16 )
-
-	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_x32 ]]; then
-		build_asm=false
-	else
-		build_asm=$(usex asm true false)
-	fi
-
-	local emesonargs=(
-		-D bitdepths=$(IFS=,; echo "${bits[*]}")
-		-D build_asm=$build_asm
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	eninja
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
diff --git a/media-libs/dav1d/dav1d-0.2.0-r1.ebuild b/media-libs/dav1d/dav1d-0.2.0-r1.ebuild
deleted file mode 100644
index 361df4a791a4..000000000000
--- a/media-libs/dav1d/dav1d-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SCM=""
-if [[ "${PV}" == "9999" ]]; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
-fi
-
-inherit ${SCM} meson ninja-utils multilib-minimal
-
-DESCRIPTION="dav1d is an AV1 Decoder :)"
-HOMEPAGE="https://code.videolan.org/videolan/dav1d"
-
-LICENSE="BSD-2"
-SLOT="0/1"
-IUSE="+8bit +10bit +asm"
-
-ASM_DEPEND=">=dev-lang/nasm-2.13"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	asm? (
-		abi_x86_32? ( ${ASM_DEPEND} )
-		abi_x86_64? ( ${ASM_DEPEND} )
-	)"
-
-DOCS=( README.md doc/PATENTS )
-
-multilib_src_configure() {
-	local -a bits=()
-	use 8bit  && bits+=( 8 )
-	use 10bit && bits+=( 16 )
-
-	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_x32 ]]; then
-		build_asm=false
-	else
-		build_asm=$(usex asm true false)
-	fi
-
-	local emesonargs=(
-		-D bitdepths=$(IFS=,; echo "${bits[*]}")
-		-D build_asm=$build_asm
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	eninja
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
diff --git a/media-libs/dav1d/dav1d-0.2.1.ebuild b/media-libs/dav1d/dav1d-0.2.1.ebuild
deleted file mode 100644
index 361df4a791a4..000000000000
--- a/media-libs/dav1d/dav1d-0.2.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SCM=""
-if [[ "${PV}" == "9999" ]]; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
-fi
-
-inherit ${SCM} meson ninja-utils multilib-minimal
-
-DESCRIPTION="dav1d is an AV1 Decoder :)"
-HOMEPAGE="https://code.videolan.org/videolan/dav1d"
-
-LICENSE="BSD-2"
-SLOT="0/1"
-IUSE="+8bit +10bit +asm"
-
-ASM_DEPEND=">=dev-lang/nasm-2.13"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	asm? (
-		abi_x86_32? ( ${ASM_DEPEND} )
-		abi_x86_64? ( ${ASM_DEPEND} )
-	)"
-
-DOCS=( README.md doc/PATENTS )
-
-multilib_src_configure() {
-	local -a bits=()
-	use 8bit  && bits+=( 8 )
-	use 10bit && bits+=( 16 )
-
-	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_x32 ]]; then
-		build_asm=false
-	else
-		build_asm=$(usex asm true false)
-	fi
-
-	local emesonargs=(
-		-D bitdepths=$(IFS=,; echo "${bits[*]}")
-		-D build_asm=$build_asm
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	eninja
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
diff --git a/media-libs/dav1d/dav1d-0.3.0.ebuild b/media-libs/dav1d/dav1d-0.3.0.ebuild
deleted file mode 100644
index cd21f300fe0f..000000000000
--- a/media-libs/dav1d/dav1d-0.3.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SCM=""
-if [[ "${PV}" == "9999" ]]; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
-fi
-
-inherit ${SCM} meson ninja-utils multilib-minimal
-
-DESCRIPTION="dav1d is an AV1 Decoder :)"
-HOMEPAGE="https://code.videolan.org/videolan/dav1d"
-
-LICENSE="BSD-2"
-SLOT="0/1"
-IUSE="+8bit +10bit +asm"
-
-ASM_DEPEND=">=dev-lang/nasm-2.13"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	asm? (
-		abi_x86_32? ( ${ASM_DEPEND} )
-		abi_x86_64? ( ${ASM_DEPEND} )
-	)"
-
-DOCS=( README.md doc/PATENTS )
-
-multilib_src_configure() {
-	local -a bits=()
-	use 8bit  && bits+=( 8 )
-	use 10bit && bits+=( 16 )
-
-	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_x32 ]]; then
-		build_asm=false
-	else
-		build_asm=$(usex asm true false)
-	fi
-
-	local emesonargs=(
-		-D bitdepths=$(IFS=,; echo "${bits[*]}")
-		-D build_asm=$build_asm
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	eninja
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
diff --git a/media-libs/dav1d/dav1d-0.3.1.ebuild b/media-libs/dav1d/dav1d-0.3.1.ebuild
deleted file mode 100644
index fc970d5a3543..000000000000
--- a/media-libs/dav1d/dav1d-0.3.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SCM=""
-if [[ "${PV}" == "9999" ]]; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
-else
-	KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~sparc x86"
-	SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
-fi
-
-inherit ${SCM} meson ninja-utils multilib-minimal
-
-DESCRIPTION="dav1d is an AV1 Decoder :)"
-HOMEPAGE="https://code.videolan.org/videolan/dav1d"
-
-LICENSE="BSD-2"
-SLOT="0/1"
-IUSE="+8bit +10bit +asm"
-
-ASM_DEPEND=">=dev-lang/nasm-2.13"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	asm? (
-		abi_x86_32? ( ${ASM_DEPEND} )
-		abi_x86_64? ( ${ASM_DEPEND} )
-	)"
-
-DOCS=( README.md doc/PATENTS )
-
-multilib_src_configure() {
-	local -a bits=()
-	use 8bit  && bits+=( 8 )
-	use 10bit && bits+=( 16 )
-
-	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_x32 ]]; then
-		build_asm=false
-	else
-		build_asm=$(usex asm true false)
-	fi
-
-	local emesonargs=(
-		-D bitdepths=$(IFS=,; echo "${bits[*]}")
-		-D build_asm=$build_asm
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	eninja
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
diff --git a/media-libs/dav1d/dav1d-0.4.0.ebuild b/media-libs/dav1d/dav1d-0.4.0.ebuild
deleted file mode 100644
index 1bfd1838576c..000000000000
--- a/media-libs/dav1d/dav1d-0.4.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SCM=""
-if [[ "${PV}" == "9999" ]]; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
-fi
-
-inherit ${SCM} meson ninja-utils multilib-minimal
-
-DESCRIPTION="dav1d is an AV1 Decoder :)"
-HOMEPAGE="https://code.videolan.org/videolan/dav1d"
-
-LICENSE="BSD-2"
-SLOT="0/2"
-IUSE="+8bit +10bit +asm"
-
-ASM_DEPEND=">=dev-lang/nasm-2.13"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	asm? (
-		abi_x86_32? ( ${ASM_DEPEND} )
-		abi_x86_64? ( ${ASM_DEPEND} )
-	)"
-
-DOCS=( README.md doc/PATENTS )
-
-multilib_src_configure() {
-	local -a bits=()
-	use 8bit  && bits+=( 8 )
-	use 10bit && bits+=( 16 )
-
-	local enable_asm
-	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_x32 ]]; then
-		enable_asm=false
-	else
-		enable_asm=$(usex asm true false)
-	fi
-
-	local emesonargs=(
-		-D bitdepths=$(IFS=,; echo "${bits[*]}")
-		-D enable_asm=${enable_asm}
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	eninja
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
diff --git a/media-libs/dav1d/dav1d-0.5.1.ebuild b/media-libs/dav1d/dav1d-0.5.1.ebuild
deleted file mode 100644
index 2d5b991ec5d9..000000000000
--- a/media-libs/dav1d/dav1d-0.5.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SCM=""
-if [[ "${PV}" == "9999" ]]; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
-fi
-
-inherit ${SCM} meson ninja-utils multilib-minimal
-
-DESCRIPTION="dav1d is an AV1 Decoder :)"
-HOMEPAGE="https://code.videolan.org/videolan/dav1d"
-
-LICENSE="BSD-2"
-SLOT="0/3"
-IUSE="+8bit +10bit +asm"
-
-ASM_DEPEND=">=dev-lang/nasm-2.13.02"
-BDEPEND="asm? (
-		abi_x86_32? ( ${ASM_DEPEND} )
-		abi_x86_64? ( ${ASM_DEPEND} )
-	)"
-
-DOCS=( README.md doc/PATENTS THANKS.md )
-
-multilib_src_configure() {
-	local -a bits=()
-	use 8bit  && bits+=( 8 )
-	use 10bit && bits+=( 16 )
-
-	local enable_asm
-	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_x32 ]]; then
-		enable_asm=false
-	else
-		enable_asm=$(usex asm true false)
-	fi
-
-	local emesonargs=(
-		-D bitdepths=$(IFS=,; echo "${bits[*]}")
-		-D enable_asm=${enable_asm}
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	eninja
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
diff --git a/media-libs/dav1d/dav1d-0.6.0-r1.ebuild b/media-libs/dav1d/dav1d-0.7.0.ebuild
index 66afaa7d1510..b5737f217f03 100644
--- a/media-libs/dav1d/dav1d-0.6.0-r1.ebuild
+++ b/media-libs/dav1d/dav1d-0.7.0.ebuild
@@ -21,7 +21,7 @@ LICENSE="BSD-2"
 SLOT="0/4"
 IUSE="+8bit +10bit +asm"
 
-ASM_DEPEND=">=dev-lang/nasm-2.13.02"
+ASM_DEPEND=">=dev-lang/nasm-2.14.02"
 BDEPEND="asm? (
 		abi_x86_32? ( ${ASM_DEPEND} )
 		abi_x86_64? ( ${ASM_DEPEND} )
diff --git a/media-libs/elgato-streamdeck/Manifest b/media-libs/elgato-streamdeck/Manifest
new file mode 100644
index 000000000000..6aac3033d2b7
--- /dev/null
+++ b/media-libs/elgato-streamdeck/Manifest
@@ -0,0 +1,4 @@
+DIST elgato-streamdeck-0.8.1.tar.gz 2552919 BLAKE2B 505a7ad71b04473b3eb2c719304c224829ebf5abc366bea0d38daf882099d92308b1099815435ac03f65542bdb908a2cafbdc96f10168351fd06644050b69f06 SHA512 c65b90ab0ee5c6e17a6f7af670c54a12c96b705ef4bec359a51ba6671a3908626a9658f5a5829266102fa249628b82ee04c525db995f4984f26f802620598e6c
+EBUILD elgato-streamdeck-0.8.1.ebuild 678 BLAKE2B 27bcf7be0cb80a4a5e0bf7dd6d53eb1cf0b5dbeca0af5881fe13de907fa86cb3c1759d65a6c2b59148310e6d35bb8b40c63ee86fea1e52a23297fa249261d0f1 SHA512 780bff4e526982e83803b69d9dc4809dcc589c3aeaded440c10bdaaec4f13a9658f4ef18b9cc0b8cada02e3defc9a549331d6d6d7354f3dd30e8f8b817c20968
+EBUILD elgato-streamdeck-9999.ebuild 678 BLAKE2B 27bcf7be0cb80a4a5e0bf7dd6d53eb1cf0b5dbeca0af5881fe13de907fa86cb3c1759d65a6c2b59148310e6d35bb8b40c63ee86fea1e52a23297fa249261d0f1 SHA512 780bff4e526982e83803b69d9dc4809dcc589c3aeaded440c10bdaaec4f13a9658f4ef18b9cc0b8cada02e3defc9a549331d6d6d7354f3dd30e8f8b817c20968
+MISC metadata.xml 348 BLAKE2B cb56a80dd311cb9182715619ad17b40dc832adbc3800410aa788684b39890f164eccc98025616ea42ed6098cb7bdf5de2b074d04cd8ed89a71ba7a9b427b63e2 SHA512 95599f43d0440d499b92acb9fe90f1e93514672aec977f7be692e1957be3b255c18a3b0e54eebfa1b80868fd34c1141376a2ff10316e371fe4c55c2cdad0d60e
diff --git a/media-libs/elgato-streamdeck/elgato-streamdeck-0.8.1.ebuild b/media-libs/elgato-streamdeck/elgato-streamdeck-0.8.1.ebuild
new file mode 100644
index 000000000000..07a7469b980d
--- /dev/null
+++ b/media-libs/elgato-streamdeck/elgato-streamdeck-0.8.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Python library to control the Elgato Stream Deck"
+HOMEPAGE="https://github.com/abcminiuser/python-elgato-streamdeck"
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/abcminiuser/python-elgato-streamdeck.git"
+else
+	SRC_URI="https://github.com/abcminiuser/python-elgato-streamdeck/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/python-${P}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-python/pillow[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/media-libs/elgato-streamdeck/elgato-streamdeck-9999.ebuild b/media-libs/elgato-streamdeck/elgato-streamdeck-9999.ebuild
new file mode 100644
index 000000000000..07a7469b980d
--- /dev/null
+++ b/media-libs/elgato-streamdeck/elgato-streamdeck-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Python library to control the Elgato Stream Deck"
+HOMEPAGE="https://github.com/abcminiuser/python-elgato-streamdeck"
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/abcminiuser/python-elgato-streamdeck.git"
+else
+	SRC_URI="https://github.com/abcminiuser/python-elgato-streamdeck/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/python-${P}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-python/pillow[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/media-libs/elgato-streamdeck/metadata.xml b/media-libs/elgato-streamdeck/metadata.xml
new file mode 100644
index 000000000000..06283887ab24
--- /dev/null
+++ b/media-libs/elgato-streamdeck/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">abcminiuser/python-elgato-streamdeck</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 603527e70619..b5add7294aa7 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,7 +1,9 @@
 DIST Image-ExifTool-11.93.tar.gz 4799548 BLAKE2B 29867c0407bed7568d92a4b8a0df1ea1377ad9ea54ea9496d09b5b76d946999db312247d6044c179cb064471f888c50c31bc85ddd44475a78a122eb413d73bba SHA512 e8d9dd34710e3346788e10a3b50e4d2a4ba1aeef1969efeec1ddcb7507378b313554e00587cda9c71a325f7d4d7238c91f743c67051d9cef8a012798551dcc59
 DIST Image-ExifTool-11.95.tar.gz 4802010 BLAKE2B c1486ed0c84d6837b9bcdbdee31af5c4c3038442cac8a516b6b7f079bdfb28858ddee18284fa3a88925cdea70a87c1cd444e35fa99ce1b201af03bf1c084d796 SHA512 9def56bde479312584c60ec847338aa55fb3697b6c0e8f894291f6cd67cd16440b563a3982bcec3d787860ba35046f73089f90065891f6f6d93d46243a08c485
 DIST Image-ExifTool-11.98.tar.gz 4804406 BLAKE2B 86bf7fdcc9781fa22e379e3f04ec01b43451978ae33f1c811796ba820198ca417a9ca94b634a8c39acb01604bc8004f47c20e747e6b19f5b4833d29c5cee8fb1 SHA512 d992173a16679b0c3b9fcc466713d5c208e7b161c542535e88088f9695ec14f0ff76ae5fa46d0d6065a8ee366464d0602783170438e2f8fe02d21e458365bbb0
+DIST Image-ExifTool-11.99.tar.gz 4806946 BLAKE2B bec63b26674d551b12965d984610776ea70ff8a4969d83e26677f860af418a792bf26546daa4d487adb521a77da64298907fb3b203c20c827b1197ce9e24b34b SHA512 e8d7d9dcf57b71553cf894bb26997e4b5b79e23bb0ccb2b496e1ed7e39a0c65933492a01ec164f53cb9633457721c6bc938002bfc1f81bb020a455b080b1d1fd
 EBUILD exiftool-11.93.ebuild 543 BLAKE2B d445606330f27e933b1c4b98e141b9aeb22a5ef53c866abed26fdef9b858c833d9ba4ada11b01c6384d6e5248fe4f12413d4abf7e5bf8c49593436e219f6e945 SHA512 e53b79e6f457d0f004ba8d12a994934746d1f14382e41350c317eeb61dd1518e01ccb437b2aeac503676d8de4908290bec6d35e3f249c6675e9e2242d0e8a1b0
 EBUILD exiftool-11.95.ebuild 548 BLAKE2B 9c445a8b1392e1479a5b207a2d5bf27dc49933ffef2ff6d1cd60d2d0db74ca7334dafbd378e4fa584cb76c38aba1499acc0bb6c89184b2509f609794ca53b619 SHA512 0e2d98eaabc1d5eeb821bb6d96abe38a14297140d01b8f07fcd8533b6b5a03eb0e25e86291452eec8f7763e6ed4fbb5d2d4d9bd44c4851de063f99c264c78d01
 EBUILD exiftool-11.98.ebuild 548 BLAKE2B 9c445a8b1392e1479a5b207a2d5bf27dc49933ffef2ff6d1cd60d2d0db74ca7334dafbd378e4fa584cb76c38aba1499acc0bb6c89184b2509f609794ca53b619 SHA512 0e2d98eaabc1d5eeb821bb6d96abe38a14297140d01b8f07fcd8533b6b5a03eb0e25e86291452eec8f7763e6ed4fbb5d2d4d9bd44c4851de063f99c264c78d01
+EBUILD exiftool-11.99.ebuild 548 BLAKE2B 9c445a8b1392e1479a5b207a2d5bf27dc49933ffef2ff6d1cd60d2d0db74ca7334dafbd378e4fa584cb76c38aba1499acc0bb6c89184b2509f609794ca53b619 SHA512 0e2d98eaabc1d5eeb821bb6d96abe38a14297140d01b8f07fcd8533b6b5a03eb0e25e86291452eec8f7763e6ed4fbb5d2d4d9bd44c4851de063f99c264c78d01
 MISC metadata.xml 10159 BLAKE2B 3b879f3679b07864e8e32d0223d1512919d56ede4b51bc5a550a83694c8c956c6e6e60a92309ceafef61ed738ccd0b5a6817094b4132be013560d3d7830f6349 SHA512 88662e634877bf2b67144fd37a862626e247f7df5daa82ed8d7a91a00611290d3976687221b5f58b78111a8894d45d55c8999966436f621baebf1bc7b3561484
diff --git a/media-libs/exiftool/exiftool-11.99.ebuild b/media-libs/exiftool/exiftool-11.99.ebuild
new file mode 100644
index 000000000000..58ee12770a1c
--- /dev/null
+++ b/media-libs/exiftool/exiftool-11.99.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_NAME=Image-ExifTool
+inherit perl-module
+
+DESCRIPTION="Read and write meta information in image, audio and video files"
+HOMEPAGE="https://exiftool.org/"
+SRC_URI="https://exiftool.org/${DIST_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+IUSE="doc"
+
+SRC_TEST="do"
+
+src_install() {
+	perl-module_src_install
+	use doc && dodoc -r html/
+
+	insinto /usr/share/${PN}
+	doins -r fmt_files config_files arg_files
+}
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index dfad333c3859..52b82e5f0930 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1,6 +1,3 @@
-AUX faad2-2.8.5-libmp4ff-shared-lib.patch 539 BLAKE2B 3ee6b86534612e6c96bc884e71559521c0ed464a66a07217caef0959eca0e2a0bdc5ef28367340d07d5ca1ab1686408b4c98c7ef718d4bcb0fa3d827c11074d3 SHA512 b5889dec7850ffcffa707a8594ef74f1e33848c22d2eb5e1a397ca57884b984633610f37f111b534724f2d8f0331e40ed90b01c9acf22c34053f740703e33fa4
-DIST faad2-2.8.8.tar.gz 1069044 BLAKE2B 3e22e695d89cce0ecb673caec73dd3115b2249d18daf6d0c8cf2b5cc90086889c9da733e037bc8b58c0bdc145c66bd4218b9b5e237adb7ad1c6f0caf0d97d304 SHA512 3275d292b2a9fe984842962f4d81202894bddd17033f7cd6df95466554cc968dfcbf2890ae8b1df37da0cd25d645cca0a687f07e39b9fc37dd004fd5956a82af
 DIST faad2-2.9.0.tar.gz 802390 BLAKE2B 8cd68f96a48fefcc4d75901ae67607ec4cc4c4a76efae490dcfb3330b384ff91049894af9fccae0b41ca9fd4ef22cdff35c36f11cea1baab4cc96fe1e54749ae SHA512 1756b2672f9e438a56b11160ddc77fc721d85860eaa325a3ff01b51a2524baf4c1c61068a97cbc4e99d47e7643f10e1d6afb997eede3295b44551fe4661fb5dc
-EBUILD faad2-2.8.8.ebuild 1218 BLAKE2B 54bbb1e04a73ec1b1ce4cc93b5af13b07e2ab56cf023d5975793fb205d360f5d65fe74d7271cfb8a47bd066ccd988171b43f38904a1b6f0c21b29f2c686e931d SHA512 c2423816d983e8419817e5cef36798b7b354ddc1e0e2661b299ac4ffeac572df57eef294c1c994806eb2c230d7d92fdc63063d9be310332fb8274fad7ffe1eb8
 EBUILD faad2-2.9.0.ebuild 1238 BLAKE2B 92be2a701af77f07abbbcd765080f2f8e823153cb9fda5f2e019691c818e2320f062de5bf5f429cc7bf34aca3d59d66fe7baa1aa940ec349e2b9f79e3cb725ce SHA512 3d78a589987f0e3e3c9b996cbc1eb23584975249862e55f1943ceb0c59af3c6e4a606500716fad32d52e58a4871137fd97277e50999abff48bf32f409e8d2cf7
 MISC metadata.xml 619 BLAKE2B 3eb4a78c845f019f564e15c8aecc41bac00aa7a814f761a6f6b4b5810e245c4645149defb09c998a615c8e3ba551e569373475e7dd8ebb5f8656e6ac6b2992dc SHA512 b62370a9ce905bb0e96001422baee1b75af853080d9ef795148e56ed8c2b8dca9c7eae3a3ff29869dac4e9af5835327649eafa20bc7831b14bec07cb901960fd
diff --git a/media-libs/faad2/faad2-2.8.8.ebuild b/media-libs/faad2/faad2-2.8.8.ebuild
deleted file mode 100644
index 986d9c873828..000000000000
--- a/media-libs/faad2/faad2-2.8.8.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
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="AAC audio decoding library"
-HOMEPAGE="https://www.audiocoding.com/faad2.html"
-SRC_URI="mirror://sourceforge/faac/${P}.tar.gz"
-
-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="digitalradio static-libs"
-
-RDEPEND=""
-DEPEND=""
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-PATCHES=( "${FILESDIR}"/${PN}-2.8.5-libmp4ff-shared-lib.patch )
-
-src_prepare() {
-	default
-
-	sed -i -e 's:iquote :I:' libfaad/Makefile.am || die
-
-	# bug 466986
-	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--without-xmms
-		$(use_with digitalradio drm)
-		$(use_enable static-libs static)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	# do not build the frontend for non default abis
-	if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
-		sed -i -e 's/frontend//' Makefile || die
-	fi
-}
-
-multilib_src_install_all() {
-	find "${D}" -name '*.la' -delete || die
-	einstalldocs
-}
diff --git a/media-libs/faad2/files/faad2-2.8.5-libmp4ff-shared-lib.patch b/media-libs/faad2/files/faad2-2.8.5-libmp4ff-shared-lib.patch
deleted file mode 100644
index 68b21a966be3..000000000000
--- a/media-libs/faad2/files/faad2-2.8.5-libmp4ff-shared-lib.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- faad2-2.8.5/common/mp4ff/Makefile.am
-+++ faad2-2.8.5/common/mp4ff/Makefile.am
-@@ -1,7 +1,8 @@
--noinst_LIBRARIES = libmp4ff.a
--noinst_HEADERS = mp4ff.h mp4ffint.h
-+lib_LTLIBRARIES = libmp4ff.la
-+include_HEADERS = mp4ff.h mp4ffint.h
- 
--libmp4ff_a_CFLAGS = -DUSE_TAGGING=1
-+AM_CFLAGS = -DUSE_TAGGING=1
- 
--libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
-+libmp4ff_la_LDFLAGS = -version-info 0:0:0
-+libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
- 		     mp4tagupdate.c mp4ff.h mp4ffint.h
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index b7a9d9394b7d..2da80b80400f 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -11,5 +11,5 @@ DIST libgd-2.2.5-php_bug_75571.dat 1731 BLAKE2B 4b5d3f258b73e8089ede1b2c9f538855
 DIST libgd-2.2.5.tar.xz 2594092 BLAKE2B 222a7e012fbf9924ac391ee96c7cd3dec96afd78c6d43dfb680b33e7143e7df87fe6be75bbfe8fb93e916302d7daf08271214c84da28712e93a36465566cb2bd SHA512 e4598e17a277a75e02255402182cab139cb3f2cffcd68ec05cc10bbeaf6bc7aa39162c3445cd4a7efc1a26b72b9152bbedb187351e3ed099ea51767319997a6b
 DIST libgd-2.3.0.tar.xz 2539188 BLAKE2B a90f48be959d1bb6774ec44960e191b8be134ff3e74401eba4cbf9b165c72665f3dffe3beaaf92fa6069e0ef79533be5d57a5946a1839f55446072fa322ed808 SHA512 5b201d22560e147a3d5471010b898ad0268c3a2453b870d1267b6ba92e540cf9f75099336c1ab08217e41827ac86fe04525726bf29ad117e5dcbaef9a8d0622a
 EBUILD gd-2.2.5-r2.ebuild 3143 BLAKE2B 7566cefe70ef129bafc17ed928b0e7c1ccb5b1b05d25b7c6016e08f62ea680ef96e9a9a7a48ed8e0e49b4d3e87e8dbf90810b1b992a4ce0f52bbb703cec9af86 SHA512 581529ce33b146df1711422a3b916d1af1c74e85669d274e8639acaa881f56404f0c4afd62886688d77439a2467c6c9045864413b50b47452742b26b3da1be24
-EBUILD gd-2.3.0.ebuild 2574 BLAKE2B c80be170ccd5e7a17ddb0e6c793833c05aa2703090b1b6e774284e04f1fc4caebdfdd49907d72bd0e8b458fb99ab22628042995894ad930a7a9920c169fda4c0 SHA512 4d5fbcb78a88d0942daa7320da23dd5aca7d0093883d8f1a5224b3d26aff037b346c19c0b1c3b69b41a04b435289b44e25f4db6516ca976de75073f95b142fb3
+EBUILD gd-2.3.0.ebuild 2573 BLAKE2B 3d5dac353d6a0bdc83a6c1f206788022796bf89ce5ce0e5a8b2da46c6136c2d7c2f62e70d777906603d6322860da9f429e0c244a750f8c8a8e29567740f79f21 SHA512 f886f05814a55492f0af93649c3177a4cadd20dfb653c4cdf2528ffa9184cdfcb5c9c59171ec41b787b050e8f04c130779567f634523b06f85e5a12be44cb0ad
 MISC metadata.xml 1507 BLAKE2B 34dbcbc70165ebe74ea14e6394e2691bda7523e4c848b13a512de8f0707c194a7da3de41a8fe483d7a8b2aa1af8f0d164ea210605ae76480dbf22b976b53d2f5 SHA512 0ac3c1ca25c190333e7f97dbb05e197e62e76abeaa045966fa3024dbeb22d541d78794df08d450e887591909a25dfb6a4fef861ed62f7f055b129e17b1329919
diff --git a/media-libs/gd/gd-2.3.0.ebuild b/media-libs/gd/gd-2.3.0.ebuild
index c4adf18cf67e..eca394038242 100644
--- a/media-libs/gd/gd-2.3.0.ebuild
+++ b/media-libs/gd/gd-2.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz"
 
 LICENSE="gd IJG HPND BSD"
 SLOT="2/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_sse fontconfig jpeg png static-libs test tiff truetype webp xpm zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index cefec69cb8b9..b179be201775 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -24,6 +24,6 @@ EBUILD gegl-0.2.0-r6.ebuild 4873 BLAKE2B 5bc1189a195da303ebbb13e7e211743cdd71156
 EBUILD gegl-0.3.34.ebuild 5295 BLAKE2B a6fc62fd62139fa40fadb7e14ff1160c408e21a5b9e383fa79ddf4232452856c7235e2b74cc5a330ed38f4910b9223225ffaf8efc59f54fdc73c38036a66ac06 SHA512 58fc9363a644ce358c29217783c1beb0b2291605af9f507adcc34f8cff15a582087e03817398dc9c4d442e624a98035c46a27b9d7a440c97f6125286bb36128b
 EBUILD gegl-0.4.16.ebuild 4785 BLAKE2B a5a4eee532e7454cd5c154d2067a339a268d6cb5f2bcf58b602f853ba50f7e64beeeb8dfcb9145b888806e651778dd20c4419bd8885176dde8cbbd000978c38f SHA512 c351367b7445dc6bb360bea700638e1a23026abe8fd4707612325b2ac7096155b10941d8947976eefb76367f0b6b1695c209fb9f188736a4ec4eb3dfd63ae54a
 EBUILD gegl-0.4.18.ebuild 4815 BLAKE2B 071fdd84d129cbe18bb3c01a613d8286aaf5d464ce46e04b39b13368bd9eceba2400ece71a6b2becaece62e7933ea3737f1db58abde220ac6b3addf2d79e3057 SHA512 fe41c1f229eb5c34b0413bce192bd5ca03f2f94fad1a99928fad2e603b5bcbe0e9996b966a05a2f200b2eb2a1f2a29246086993276b8a1d29af471847e06eb51
-EBUILD gegl-0.4.22.ebuild 4775 BLAKE2B 25962f26ff1f60793abcba81873081b6cacc44f2ca4346ce1191428177f1158959d51569f48095fac3d4a373197898ca2f3581a354be58e0748cbcc22032fad7 SHA512 447fefb927f80775160f64d7b814e88c283835d530f99f50387b3f738e1db3b28fa5bf6dee3036bf3f7cb0f9a624e706898b16c9d34ba1378a13128b2a8185f0
+EBUILD gegl-0.4.22.ebuild 4774 BLAKE2B 7d220b64f490ab65dbe3a87cafb7d1b55dae285b4d03179939479431eca4b44fd11edcc4eb3d31c1aee979cc6d3122b71c60b5ec9d980a8c2b8911f5497ede7b SHA512 5d321f47fd284e67f748115dbc87591fd4fe18463df747d43b54e8aac07fe763a9ece2e0eea1bc31481806c58bc58dbf84ec8c1b8c44ff39d0eb08b9fcf2df5b
 EBUILD gegl-9999.ebuild 4403 BLAKE2B dee34aa59338d92ca82042cb2ac1e2bb1d0f0297387c3aeb553f6d4ff6f64b9bca320c4d48f45e4126b484801337b9391caf18fa77ab090fd28145d5360ec265 SHA512 04bfd2589e01b4ada8e57a0878e3f3a2ef8f0b6c4716b3232f8cf07aa592e70a0049d1518e40c344fcc52466d58270f73530c3079a1151b027156688cacaf838
 MISC metadata.xml 550 BLAKE2B 8afb3a5aa69ba6b3139f3183ed013cd0797edad0865b0aebcd2824a31549f4968e938017adb85506fea2e60c18ea1278fd3bce0ce1cf9be0efb74b1f0b020470 SHA512 8c5637454afcab249f671518153067a99cac9d60d8e9108688b4328a19ea653de21948a63c7e680585d208c0b3230fd2fb87c2d8a0a7266d31bc328342a47016
diff --git a/media-libs/gegl/gegl-0.4.22.ebuild b/media-libs/gegl/gegl-0.4.22.ebuild
index b831adcb4064..b97e0c511394 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 ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/giflib/Manifest b/media-libs/giflib/Manifest
index f6930fd9c352..79e60774248c 100644
--- a/media-libs/giflib/Manifest
+++ b/media-libs/giflib/Manifest
@@ -1,7 +1,5 @@
 AUX giflib-5.1.9-gentoo.patch 200 BLAKE2B 0d3e9e349b8ef00a09743ac1424c0f53d293573cfbc80a1105f65041d201a0231cb7e69791b8441a5b286841b507ad6b908f4fe0a514a79b8ba6546385f2fa70 SHA512 2d899722238eecd8bdfa7412cf5778c42c58d2e93c9e02e458b5dc636933f7765fd39ceb7906200425039a6c908b47403ec306dc3c79e1402f3824a351a17081
 AUX giflib-5.2.1-fix-missing-quantize-API-symbols.patch 920 BLAKE2B a559e326851cc937977f7b91295b218b444deddb8d03350406be706722139005a01160be6f558064239ef6f245b6dbfbb9836899dc72cc1c3106d7900234cabc SHA512 5de1e8724f5221fa3637b4e6a482f650f7608673e2c9200233290018ec8a0bf1beea049b3979b5f57dbf2b2a5fda409324e636e9af10582fd01c71d92d4de3b3
-DIST giflib-5.1.4.tar.bz2 639703 BLAKE2B 5176fbd94c37a86a7f7a3964b6b5f2637d76ba5d40e594a0db52a3a09e22b915a0388fc9bd2f1446dcf66b3b9c0d76741583e4d5d3f7362fa3997e8b26503fc4 SHA512 32b5e342056c210e6478e9cb3b6ceec9594dcfaf34feea1eb4dad633a081ed4465bceee578c19165907cb47cb83912ac359ceea666a8e07dbbb5420f9928f96d
 DIST giflib-5.2.1.tar.gz 444187 BLAKE2B 8c1e105bbb65dc7ab103976caed70834356440f381ec5118311882fb1c558bb65f6c1081e5767f9835087860de44df5dfcd2826f89744dded548d535736f27f0 SHA512 4550e53c21cb1191a4581e363fc9d0610da53f7898ca8320f0d3ef6711e76bdda2609c2df15dc94c45e28bff8de441f1227ec2da7ea827cb3c0405af4faa4736
-EBUILD giflib-5.1.4.ebuild 1370 BLAKE2B 1bbf764ae60228d856ee245a757184d7dce81d078f75595c9441e1afcba90e958a283a5d1afc2bea640e8ee36a3609358f520bc00062f34c023b4f7542818cb0 SHA512 fb4ec425cc918e89d20de47fc343b0a02eeeae3d628f537fc72c88fc8e4d35275ea92e164c55dd2c9d0dba084d47f816cfa06d9d03d08a7654a080130704e294
 EBUILD giflib-5.2.1-r1.ebuild 1916 BLAKE2B bf0c0d58865b5ec9292946a8ec558bcaeb852c570a88645ff521a4ecb5933e9798e359c2ec572a3adefb9d103bdfd3261b13cbd65f2ce26b8766707fb0600110 SHA512 67f496e3d5c2566d61892e881cae18f275d571e05d56722df9b30f211a68143d73c9de5bc55b0311eb9b81b36ac4b9c5d44bd11c1e0fd8308edc24e147d73f05
 MISC metadata.xml 345 BLAKE2B 86b96e35605026c5c83878ee105a1f90aa5f8fb32c11af81a8a8ec42b89e0a82d321898ca714087d4c1c8c123718f97b2a8c0ac77edaff0f2bd9f52427032cf2 SHA512 0a21a308b86cd075e436bb61f42a7bbc40eb069f2704cfe44b4c13f1e5dc124294d614be0130af66d60214b75989acb17510bfc44943a585277bffb5feda767d
diff --git a/media-libs/giflib/giflib-5.1.4.ebuild b/media-libs/giflib/giflib-5.1.4.ebuild
deleted file mode 100644
index 08aa93e2df8f..000000000000
--- a/media-libs/giflib/giflib-5.1.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils libtool ltprune multilib-minimal
-
-DESCRIPTION="Library to handle, display and manipulate GIF images"
-HOMEPAGE="https://sourceforge.net/projects/giflib/"
-SRC_URI="mirror://sourceforge/giflib/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0/7"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs"
-
-DEPEND="doc? ( app-text/xmlto )"
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		# No need for xmlto as they ship generated files.
-		ac_cv_prog_have_xmlto=no
-
-		$(use_enable static-libs static)
-	)
-
-	ECONF_SOURCE="${S}" \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if use doc && multilib_is_native_abi; then
-		emake -C doc
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	# for static libs the .la file is required if built with +X
-	use static-libs || prune_libtool_files --all
-
-	if use doc && multilib_is_native_abi; then
-		docinto html
-		dodoc doc/*.html
-	fi
-}
-
-multilib_src_install_all() {
-	doman doc/*.1
-	docinto
-	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
-	if use doc; then
-		dodoc doc/*.txt
-		docinto html
-		dodoc -r doc/whatsinagif
-	fi
-}
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 001011051372..4135f2450a2e 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,7 +1,8 @@
-AUX harfbuzz-2.6.1-gcc-9.patch 468 BLAKE2B 5f0b42d7a834f5b59c79adcbc2fb67e9aa1fa97fb6e6e135c7c88d20780d0a75ad8784c5ed3473cad8a1bb5f1c6f3c8475e7984e555eef1720ac9de387f95b83 SHA512 8dec55d5cb97c3aae2e6885cddc06db9629e6e5336ffc1b3cc263c8ad88e499833570210868dfb6e42c0dbf0326f239d1ac4ee1914f6f84712d1f93350da1912
 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
 EBUILD harfbuzz-2.6.4.ebuild 3031 BLAKE2B 6dc0820449927f7323cedcdb16c843b7d548695f53bb40aa1a57a994897e6cc79d86cd4205c67796a5d3ab07ae7dc42ac215bdf9e33ebb2a62f7e9f33aaf3d73 SHA512 163e5e15ab58531d6ed13484315435a35ae8227366f9f8074519384cfee804aa76d1fd14184efb67ed38aadcf0ff1a7f86faf73d42dc756e5d55b14c8c52f0e3
-EBUILD harfbuzz-2.6.5.ebuild 3044 BLAKE2B df15ff0e57d48fdc44db6816a0272a17896cd2eddd4cc0e44c81d5c1b51935b4f8bdba3467458191e747d4438cb30f85013984aabff42d54295f854caced5fb4 SHA512 f8367c08012cba2e08ae349932b59bfb203572d09391e58ddcdc266c3edd22c74ca68e5cd1a933996161453ed6eb8aa4ee39fb4b82f201725a0bcc73eb0806d4
+EBUILD harfbuzz-2.6.5.ebuild 3041 BLAKE2B aaf6b49d40236c3423fa960a38418e881e1e7e1553729f2007758c330cfc64c2817038632be9b7a0dd7e0b070d4bebf3a341edc8727acd16669cadb0b8bccd1b SHA512 275c8ccac579d4e58f45f634a44eca38f24471f7435c7df2aff85d1ed01470d544e7917346415ca939fb646c69197429c288df98065bd40db8c588f0ec2f7129
+EBUILD harfbuzz-2.6.6.ebuild 3044 BLAKE2B df15ff0e57d48fdc44db6816a0272a17896cd2eddd4cc0e44c81d5c1b51935b4f8bdba3467458191e747d4438cb30f85013984aabff42d54295f854caced5fb4 SHA512 f8367c08012cba2e08ae349932b59bfb203572d09391e58ddcdc266c3edd22c74ca68e5cd1a933996161453ed6eb8aa4ee39fb4b82f201725a0bcc73eb0806d4
 EBUILD harfbuzz-9999.ebuild 3044 BLAKE2B df15ff0e57d48fdc44db6816a0272a17896cd2eddd4cc0e44c81d5c1b51935b4f8bdba3467458191e747d4438cb30f85013984aabff42d54295f854caced5fb4 SHA512 f8367c08012cba2e08ae349932b59bfb203572d09391e58ddcdc266c3edd22c74ca68e5cd1a933996161453ed6eb8aa4ee39fb4b82f201725a0bcc73eb0806d4
 MISC metadata.xml 739 BLAKE2B df7724d5cef26b569f76d41c808f99a1ecf44631f0bae96fbc2a9b4f5981061b55c60d69b1b64d966897f223a3d3b5cc4325a3ac780599ed76591fc2044b4988 SHA512 192f7abc191044f267bddb4db7d91f9b78926f4a361802f607bfe4635d7cf63398c289bc52009ad4d3bc6f92684cafd8b40e48f1e0f8cdaef9a4e27f538e7dbd
diff --git a/media-libs/harfbuzz/files/harfbuzz-2.6.1-gcc-9.patch b/media-libs/harfbuzz/files/harfbuzz-2.6.1-gcc-9.patch
deleted file mode 100644
index c16fedd6d9d6..000000000000
--- a/media-libs/harfbuzz/files/harfbuzz-2.6.1-gcc-9.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix build failure on gcc-9. It's a slightly less invasive
-version of upstream's commit 2dce85ed06a8cc7ca
-("[icu] Remove HB_ICU_STMT (#1993)")
---- a/src/hb-icu.cc
-+++ b/src/hb-icu.cc
-@@ -53,7 +53,7 @@
- 
- /* ICU doesn't do-while(0) around their statements.  Ugh!
-  * https://unicode-org.atlassian.net/browse/CLDR-13027 */
--#define HB_ICU_STMT(S) do { S } while (0)
-+#define HB_ICU_STMT(S) do { S; } while (0)
- 
- hb_script_t
- hb_icu_script_to_script (UScriptCode script)
diff --git a/media-libs/harfbuzz/harfbuzz-2.6.5.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.5.ebuild
index 085525d97eed..12dfabc26074 100644
--- a/media-libs/harfbuzz/harfbuzz-2.6.5.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.6.5.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	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"
diff --git a/media-libs/harfbuzz/harfbuzz-2.6.6.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.6.ebuild
new file mode 100644
index 000000000000..085525d97eed
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-2.6.6.ebuild
@@ -0,0 +1,111 @@
+# 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://github.com/harfbuzz/harfbuzz.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+
+IUSE="+cairo debug +glib +graphite icu +introspection static-libs test +truetype"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	test? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+"
+# eautoreconf requires gobject-introspection-common
+# ragel needed if regenerating *.hh files from *.rl
+if [[ ${PV} = 9999 ]] ; then
+	DEPEND+="
+		>=dev-libs/gobject-introspection-common-1.34
+		dev-util/ragel
+	"
+fi
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+		# on Darwin/Solaris we need to link with g++, like automake defaults
+		# to, but overridden by upstream because on Linux this is not
+		# necessary, bug #449126
+		sed -i \
+			-e 's/\<LINK\>/CXXLINK/' \
+			src/Makefile.am || die
+		sed -i \
+			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
+			src/Makefile.in || die
+		sed -i \
+			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
+			test/api/Makefile.in || die
+	fi
+
+	[[ ${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}" -type f -name "*.la" -delete || die
+}
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 9a2dd51e9ae7..f2a43b081e73 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,3 +1,3 @@
 DIST imlib2-1.6.1.tar.gz 1038614 BLAKE2B 89751ea5548e86b810d621cbcd5b3d37c7ddbedc9e634095f61d91779c1e96d50f87842136687e2b9cefa249b17fc98df61d07b368c7c4f466687ed38f2ed70f SHA512 0c6d874973c46c7e96e49fc391d463ec8c7c5ce9de682600cb4e28ca81ff0366a02055cbec2a2b743204051243d20b2316ab602b98df9d03dcf319297f7e6a13
 EBUILD imlib2-1.6.1.ebuild 2275 BLAKE2B 06fa9966bc91ebd279d1c3d2066934aa4cf6b116de2dcc273b607061fc35ce26513b31afc9ace51b1f38e69ef2532b1202441b88b7ec19317971275ccf600b7d SHA512 3c4a341c524684e6ccb73e0640e999c54cbfdbdc47bf3db0ec1128d75d2b5a28e1af37e024e1505ae6a80b115abee5d43a33a133e2681a09ef67bad31c994598
-MISC metadata.xml 3005 BLAKE2B 1b67eed4da7c73ed10d37bc2d5706c09e6457d1c8be4420758afe8906771f0cbba1f8ccb21a2bb5988d5271e794c0460019cba7c1241572443c8f6219db4f003 SHA512 dee85662dd1ef54784c0af882ff76581e3ce6f7d67ae6015801fcaa57e6e05b6ce2e67b408e1f66177a19e0519efc9ddc84b01c208e6f397129768d470a0c424
+MISC metadata.xml 2922 BLAKE2B b79d10aeace227cd55be0bfa26085fcb96fbc3272d4a529ce787bfceb9c88284b5e4a39744576b801d818c8b0247acf67cc94f2a07eee3f917552645e7504594 SHA512 e3eb78a927ec99b3dca515c66f927813082158b9269ecf18577cae1ae390eaf45adc41d655934f332410933e7287ca7173f951a245de5f3e2138fddef7596dd7
diff --git a/media-libs/imlib2/metadata.xml b/media-libs/imlib2/metadata.xml
index 043e8ff987f4..51aeb95e5cab 100644
--- a/media-libs/imlib2/metadata.xml
+++ b/media-libs/imlib2/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>juippis@gentoo.org</email>
-		<name>Joonas Niilola</name>
-	</maintainer>
+	<!--maintainer-needed-->
 	<use>
 		<flag name="X">Use the X window system</flag>
 		<flag name="bzip2">Bzip2 loader support</flag>
diff --git a/media-libs/libcdr/Manifest b/media-libs/libcdr/Manifest
index 214a559635b5..345f73157bb4 100644
--- a/media-libs/libcdr/Manifest
+++ b/media-libs/libcdr/Manifest
@@ -1,6 +1,6 @@
 DIST libcdr-0.1.5.tar.xz 612252 BLAKE2B d23c7ae0d0f5cbdb535bfba4dff4ad40e8b0633115cbc8c5b3a40343d941eaeafbffafe99ba2107640eafdd8181ab6eed7917095d05644a43f2b11cfcc66f8f1 SHA512 e985389b0cbad65dbfa9f59d7f9dba55f1684f63e852f9acca9abb863cdaab17072e761b48dca690673360d643686b5e9bc9878530f0a3a8b5b98d917f892cf0
 DIST libcdr-0.1.6.tar.xz 612068 BLAKE2B ec5226a28f101472ea3044e9e5b87dba57b584fc813dfda29e00281182d067126bf8a5740c32bc5cb545f230f6f96163aac2fdf08879ec64379b7845839bc88a SHA512 629d55da71c7333f41f60a32e2880deffcf80088096af1bbc8c572b80ef21d851102fdebce56f77245ed60822ca98e02c0867b192abef496a2313fde54a97bb6
 EBUILD libcdr-0.1.5.ebuild 1186 BLAKE2B 9d1625bb05adb07a2f90cf20b1ea16a23da8b821c34294ccd28de0ef1698d7e8b3b301bf41f6793de65393d7c28838ea2cc0cd871c42a7703b94ab86fd87738b SHA512 7252f07c3e3e383f9d7801003415a5ac4e4e2643eb6c2e0f53e343f46298d4a78f669b3913dda80e7165e13dbf784250e10144ea6609b614adc73c96642efa96
-EBUILD libcdr-0.1.6.ebuild 1127 BLAKE2B 74fb23765b40c9dfd07e08ddd36a4c24f8faeb95b0832f14f9f6d82c23df1ba2e19a863aa20efa7ecb2e95b4c40136a12fa79283fe03bb927376d40a6f600e17 SHA512 8ade7a79f4e57083628dab0b914484c7d083f37fa2fefa3a10488e71cb7ee5c777cf8a22776e83bfd653dd71e8af96ee9a574ce17c4ccf9ea612975cc98f9a97
+EBUILD libcdr-0.1.6.ebuild 1125 BLAKE2B 7a07b971e4019de09f4d3deaf5f14d2aac47b4f6ea4d0f64f7f230ac2df64a60c7ce961465d8e1e3725783e768520d2130ff77ee68d88729405ed273a429ee79 SHA512 38de41ad48b70d653650916b56cf8cc1d3a6e61e108286fe9e847d38ddf3985d0dab6ee4511ba85a63e321b1ac0a7512289549b1dfb89e54fabc8cdc2f4212b4
 EBUILD libcdr-9999.ebuild 1127 BLAKE2B 74fb23765b40c9dfd07e08ddd36a4c24f8faeb95b0832f14f9f6d82c23df1ba2e19a863aa20efa7ecb2e95b4c40136a12fa79283fe03bb927376d40a6f600e17 SHA512 8ade7a79f4e57083628dab0b914484c7d083f37fa2fefa3a10488e71cb7ee5c777cf8a22776e83bfd653dd71e8af96ee9a574ce17c4ccf9ea612975cc98f9a97
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/media-libs/libcdr/libcdr-0.1.6.ebuild b/media-libs/libcdr/libcdr-0.1.6.ebuild
index 3397e4658eb6..600f064a6c0e 100644
--- a/media-libs/libcdr/libcdr-0.1.6.ebuild
+++ b/media-libs/libcdr/libcdr-0.1.6.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://dev-www.libreoffice.org/src/libcdr/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Library parsing the Corel cdr documents"
diff --git a/media-libs/libdvdnav/Manifest b/media-libs/libdvdnav/Manifest
index dcca3bc9e6d1..8ecb2e3ca9fb 100644
--- a/media-libs/libdvdnav/Manifest
+++ b/media-libs/libdvdnav/Manifest
@@ -1,8 +1,8 @@
 DIST libdvdnav-6.0.0.tar.bz2 369605 BLAKE2B 911b786f1cf37d32b0516df9f3ae3c388ad352206e67f73f758984795459ced7507f1454747a205b64c2d1f42922ee26ee9d434499ceaf05053dfbeb4d7e52c7 SHA512 89d1e976d8f1cc92692e86e793403759b4d705682ba7418dcfd7dd3c38861238cead303fe4baa2059ebd7e9b82a77bbdbf32e50b20848e78939ee9e75d1b96d4
 DIST libdvdnav-6.0.1.tar.bz2 378491 BLAKE2B 1baccf42bab3185584d1abc455f5b972115f1cf74a2b465b41c4858ccb26b351168b565b2dcdd5a15532fbbc090a233ab8e7fa5a3f7f77cbe9de5b22b4d31e11 SHA512 83a015821dacea702eb34abb7a940b9a263918a66fe711fe9a817754f25c2aa0afae3543b4d93673d1c93d3e7914e1b776c10ce50465516f4e3a3d419c15ad9f
 DIST libdvdnav-6.1.0.tar.bz2 370145 BLAKE2B c0bd54d94e58eeddcc422e24ef1b400775f28c0eff516db3cd13a5dfcfe103a122fca59734d73e83784b4f0b7ebebddaacf89709991f1485b55f897bf8de7fc7 SHA512 40ea50d818067a3178b4b09e4b95b0cc67d5ff88dbff2cbeee943d086c5f59a71a7aecc425ba35d7dbe5285d8b1ea099a439c0c80c5dca280687ac0cbdc57c71
-EBUILD libdvdnav-6.0.0.ebuild 1150 BLAKE2B 80f8afd10491a987ef3d478b07bef5b20c750a47772c71434439476aabd9e183d771d2bf74028d409ee286ad37c379140f0188bb9ccef945e44ec0fc71f215ee SHA512 5c100a56027ff7b7a53e570ab26820c7ad53dd161dcd4bb7fbfaf181541b847c7745dcc87adc7abc1a2655ec989869382e7409b3f7327291b719521927fb207d
-EBUILD libdvdnav-6.0.1.ebuild 1177 BLAKE2B 5eefb46001ad2f9e63c32ae559a8a3ed03eae7a17127945ac8f0b3f3005346b15b183a0cec002839bf515e7c5ae778ed3b2ade3e0618000eaf5b325835ca52c0 SHA512 f3bfeae4504208ddeb5aa5f4f66a218b581f2353e919b531e2c5a400b2c08ee8a9582cd7b82b73b08d51d598327922a074542a2311ad2878cb392d41a5c35e9d
-EBUILD libdvdnav-6.1.0.ebuild 1177 BLAKE2B 5eefb46001ad2f9e63c32ae559a8a3ed03eae7a17127945ac8f0b3f3005346b15b183a0cec002839bf515e7c5ae778ed3b2ade3e0618000eaf5b325835ca52c0 SHA512 f3bfeae4504208ddeb5aa5f4f66a218b581f2353e919b531e2c5a400b2c08ee8a9582cd7b82b73b08d51d598327922a074542a2311ad2878cb392d41a5c35e9d
-EBUILD libdvdnav-9999.ebuild 1177 BLAKE2B 5eefb46001ad2f9e63c32ae559a8a3ed03eae7a17127945ac8f0b3f3005346b15b183a0cec002839bf515e7c5ae778ed3b2ade3e0618000eaf5b325835ca52c0 SHA512 f3bfeae4504208ddeb5aa5f4f66a218b581f2353e919b531e2c5a400b2c08ee8a9582cd7b82b73b08d51d598327922a074542a2311ad2878cb392d41a5c35e9d
+EBUILD libdvdnav-6.0.0.ebuild 1152 BLAKE2B f2e7ca059a0bd8b545b2fb857e555827c3b5eee4f479c0bd75e4bc189b71025f628bd57b20d394fff6e55e585b96829a2ff9c31a33d1816a0488e844953f4e0f SHA512 8486624d1b0dcc2c80f9bf1acca8447c039741b225fe59e7d71bb94b63645b4ab2c1b7af733cf05df872d904334919363faa13121271f4074484d4684a25cd2b
+EBUILD libdvdnav-6.0.1.ebuild 1179 BLAKE2B 25485ab612b158f77c9428015d1438493386dfc156be9d14c257e3d5e77b7883b1055926dc226d6f4a956f79f4a9389e1040c6ea2e80c3706199e25658e8fe34 SHA512 89016a1a394878a6b6b07e938fe2207aa9620f0f3e20c49f763bc47944ea18480d5d569bca1fa880d9e25c92a1fd120026432adbb6c72eb879954a0c18e146bd
+EBUILD libdvdnav-6.1.0.ebuild 1179 BLAKE2B 25485ab612b158f77c9428015d1438493386dfc156be9d14c257e3d5e77b7883b1055926dc226d6f4a956f79f4a9389e1040c6ea2e80c3706199e25658e8fe34 SHA512 89016a1a394878a6b6b07e938fe2207aa9620f0f3e20c49f763bc47944ea18480d5d569bca1fa880d9e25c92a1fd120026432adbb6c72eb879954a0c18e146bd
+EBUILD libdvdnav-9999.ebuild 1179 BLAKE2B 25485ab612b158f77c9428015d1438493386dfc156be9d14c257e3d5e77b7883b1055926dc226d6f4a956f79f4a9389e1040c6ea2e80c3706199e25658e8fe34 SHA512 89016a1a394878a6b6b07e938fe2207aa9620f0f3e20c49f763bc47944ea18480d5d569bca1fa880d9e25c92a1fd120026432adbb6c72eb879954a0c18e146bd
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild b/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild
index 4d42ef140d4f..a3904ad125eb 100644
--- a/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="static-libs"
 
-RDEPEND=">=media-libs/libdvdread-5.0.3[${MULTILIB_USEDEP}]"
+RDEPEND=">=media-libs/libdvdread-5.0.3:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig" # To get pkg.m4 for eautoreconf #414391
 
diff --git a/media-libs/libdvdnav/libdvdnav-6.0.1.ebuild b/media-libs/libdvdnav/libdvdnav-6.0.1.ebuild
index 945ffe1f209c..4d90610679df 100644
--- a/media-libs/libdvdnav/libdvdnav-6.0.1.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-6.0.1.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="static-libs"
 
-RDEPEND=">=media-libs/libdvdread-6.0.0[${MULTILIB_USEDEP}]"
+RDEPEND=">=media-libs/libdvdread-6.0.0:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 # To get pkg.m4 for eautoreconf #414391
 BDEPEND="
diff --git a/media-libs/libdvdnav/libdvdnav-6.1.0.ebuild b/media-libs/libdvdnav/libdvdnav-6.1.0.ebuild
index 945ffe1f209c..4d90610679df 100644
--- a/media-libs/libdvdnav/libdvdnav-6.1.0.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-6.1.0.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="static-libs"
 
-RDEPEND=">=media-libs/libdvdread-6.0.0[${MULTILIB_USEDEP}]"
+RDEPEND=">=media-libs/libdvdread-6.0.0:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 # To get pkg.m4 for eautoreconf #414391
 BDEPEND="
diff --git a/media-libs/libdvdnav/libdvdnav-9999.ebuild b/media-libs/libdvdnav/libdvdnav-9999.ebuild
index 945ffe1f209c..4d90610679df 100644
--- a/media-libs/libdvdnav/libdvdnav-9999.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-9999.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="static-libs"
 
-RDEPEND=">=media-libs/libdvdread-6.0.0[${MULTILIB_USEDEP}]"
+RDEPEND=">=media-libs/libdvdread-6.0.0:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 # To get pkg.m4 for eautoreconf #414391
 BDEPEND="
diff --git a/media-libs/libdvdread/Manifest b/media-libs/libdvdread/Manifest
index c3e28f0baa34..01b869ad134d 100644
--- a/media-libs/libdvdread/Manifest
+++ b/media-libs/libdvdread/Manifest
@@ -1,10 +1,10 @@
 DIST libdvdread-6.0.0.tar.bz2 394627 BLAKE2B 08007113d726f96d2b179aadd2e5737ab9eeee2a52864eeaab3d2633993c66ca076559c920bd291033de794f2037d7480e4ad6f704822303f5c5b29db6b8d7cd SHA512 b07179f2f665adf6ddd7bf8b7c48cd279f3f413c5719b8ca8467e53c7cd0cac02a40101f3717186dc0e4e69e5d9c7ac6bf98a76901412d74150b9fc7bfdd2479
 DIST libdvdread-6.0.1.tar.bz2 404512 BLAKE2B 7db1d9ef6b728ba732d9f3c9e5aef6da5b8a70ee0ef95902c8de231ad64c7ad39a9ff1d01169688d197094b2755e34b1416b9f2d063566cc89984cfd86483a26 SHA512 550c01f6afcaca217d8852fdd9f4a54790239b674a45bb7c1c23a58fb5dec009e3028049a54f0904c08f15f5ad994e66bd6bea9cc8d5a8808e8b638ff8e27c4b
 DIST libdvdread-6.0.2.tar.bz2 405298 BLAKE2B 912e9a6731b142efc11a8814163061d3aeb7620aa955a822a505ac3556f82b0cf065a996ed9fab23ba95e6dcde27077ae6439ca259e712219969fb3108b10368 SHA512 e8831a67bbf1a144e9298b59e5462889c8b0197592a3c169523b5d84d9b9c1aaa719ccde2aa98c490e04f2a94c3fa7244b286e8faed674ae8c70400a0ece9c6c
-DIST libdvdread-6.1.0.tar.bz2 391316 BLAKE2B 98a701b467c1f42aa54189ee16c786c6c87623e6dad3d43078f53b0fe16bf5e371f882a0afbd157b4ab622f1e65b84954f79c7186fbc781c53877da01cb1c7f6 SHA512 f34d039d1fbe74076cb3073a3dc6a9f3377e3bd05231a04869ca5faeb96e737750c8e019b908da89e83c14a2df38950a2d61a7c7a6c44c988b710fa875b236b5
+DIST libdvdread-6.1.1.tar.bz2 392134 BLAKE2B 42c7eb2f83b215714e24a7d4748b60fd9eee9fbf7a09b3a9f28974fb5f2a3bb44c80c865348b051f099421159ad87ac3359a299c1d259a79cc51063b9d957bb3 SHA512 f02c2d33ec3e79a4efd0b4ed9172935b092c9f827eb6810ed354328c34b5206ee4ffd646239ce50b9401cab1758f1a746113e004461b20df4f44bc7fa6bc2278
 EBUILD libdvdread-6.0.0.ebuild 1120 BLAKE2B af5b9cf20d17d56f243d0c02d1b02a0e73138a88b021dd2ae7f8763edadb7d42a091bd713f9a3c0ea83ffaf35fb8074562017778ef9caf87321c264a12829018 SHA512 a54038c46bfbf00875e5b578d58c169a8db493777034a0fa819c5bbb804ea200e0b7a23ccefbe9a10e68a039c408c9659b88e0e41f2965c6a00fd6cb481b9507
 EBUILD libdvdread-6.0.1.ebuild 1136 BLAKE2B 33c4c015352f6022e0af35590067fb3c4e28fef3f46ee1459775b478600b3d15ab294d97e8cffa23340c96b94aaa0bba0be05fabfdb603a5167a27bc829f412e SHA512 537d8d40bd7c93f872e97c603ecf72d550aa7b2c00268a1cbc3ef070ef16f0d50193138e5ab937dd2c6fba82113787e249b42e3160e2c438c76968c3a9fa0553
 EBUILD libdvdread-6.0.2.ebuild 1170 BLAKE2B 714e13022a3f57401a0e76d8fe38b3b71e5d7e668342f11e80eb6663fdbeb819ba1a25fcd591f162ca396864b60b5a99120546b281005a4f7b426c11d680c66f SHA512 974f980525a044be87e43494a7a489784009fb71a24367ed8de6134d706c42057479b415abdbe436e31aaf4d0c8e6549bee5c227545460b7b41c44d36b0d6e0c
-EBUILD libdvdread-6.1.0.ebuild 1170 BLAKE2B 714e13022a3f57401a0e76d8fe38b3b71e5d7e668342f11e80eb6663fdbeb819ba1a25fcd591f162ca396864b60b5a99120546b281005a4f7b426c11d680c66f SHA512 974f980525a044be87e43494a7a489784009fb71a24367ed8de6134d706c42057479b415abdbe436e31aaf4d0c8e6549bee5c227545460b7b41c44d36b0d6e0c
-EBUILD libdvdread-9999.ebuild 1170 BLAKE2B 714e13022a3f57401a0e76d8fe38b3b71e5d7e668342f11e80eb6663fdbeb819ba1a25fcd591f162ca396864b60b5a99120546b281005a4f7b426c11d680c66f SHA512 974f980525a044be87e43494a7a489784009fb71a24367ed8de6134d706c42057479b415abdbe436e31aaf4d0c8e6549bee5c227545460b7b41c44d36b0d6e0c
+EBUILD libdvdread-6.1.1.ebuild 1170 BLAKE2B b1d522ff8819614362dc66d43c911f57955164692f93b197e7350177e154c860c8b84a5ae08273c3745d5a4e65f1665a523c6e97d898d24739e9387bee8321ba SHA512 daa7b0fc6c4b83604cda58d6c4e1737dc2423f99ab89652a965f65320865ddf80a8f6609c0871a3f6a302518b96f40f04a40f9af3d3b79bcac7fc35e10b8e2b6
+EBUILD libdvdread-9999.ebuild 1170 BLAKE2B b1d522ff8819614362dc66d43c911f57955164692f93b197e7350177e154c860c8b84a5ae08273c3745d5a4e65f1665a523c6e97d898d24739e9387bee8321ba SHA512 daa7b0fc6c4b83604cda58d6c4e1737dc2423f99ab89652a965f65320865ddf80a8f6609c0871a3f6a302518b96f40f04a40f9af3d3b79bcac7fc35e10b8e2b6
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libdvdread/libdvdread-6.1.0.ebuild b/media-libs/libdvdread/libdvdread-6.1.1.ebuild
index b35ac186b9a4..1f271a77fb76 100644
--- a/media-libs/libdvdread/libdvdread-6.1.0.ebuild
+++ b/media-libs/libdvdread/libdvdread-6.1.1.ebuild
@@ -16,7 +16,7 @@ else
 fi
 
 LICENSE="GPL-2"
-SLOT="0/7" # libdvdread.so.VERSION
+SLOT="0/8" # libdvdread.so.VERSION
 IUSE="+css static-libs"
 
 RDEPEND="css? ( >=media-libs/libdvdcss-1.3.0[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/libdvdread/libdvdread-9999.ebuild b/media-libs/libdvdread/libdvdread-9999.ebuild
index b35ac186b9a4..1f271a77fb76 100644
--- a/media-libs/libdvdread/libdvdread-9999.ebuild
+++ b/media-libs/libdvdread/libdvdread-9999.ebuild
@@ -16,7 +16,7 @@ else
 fi
 
 LICENSE="GPL-2"
-SLOT="0/7" # libdvdread.so.VERSION
+SLOT="0/8" # libdvdread.so.VERSION
 IUSE="+css static-libs"
 
 RDEPEND="css? ( >=media-libs/libdvdcss-1.3.0[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/libemf/Manifest b/media-libs/libemf/Manifest
index 2074d08aa89a..40d7416c8fa4 100644
--- a/media-libs/libemf/Manifest
+++ b/media-libs/libemf/Manifest
@@ -1,6 +1,8 @@
 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
+EBUILD libemf-1.0.12.ebuild 640 BLAKE2B 49046404955696d85a43ae8802d50477cd1b5ac973356aa2007874f212f34d3d6a342cee8653168345006e0e37550a2ec6c7fb2bb594d413466ad1ac6fccd228 SHA512 b9dbd4738771f7631cdd76c491b142a5536e23bcad89b6382149afb347ed1f549d50a7f41117d40b9ee984c7ddb72a4169c492ec1960a78cd9003cfbcc38504b
 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/libemf-1.0.12.ebuild b/media-libs/libemf/libemf-1.0.12.ebuild
new file mode 100644
index 000000000000..c4e2a96b965d
--- /dev/null
+++ b/media-libs/libemf/libemf-1.0.12.ebuild
@@ -0,0 +1,25 @@
+# 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/libinsane/Manifest b/media-libs/libinsane/Manifest
index ce99f778f8b8..bbf7f67958db 100644
--- a/media-libs/libinsane/Manifest
+++ b/media-libs/libinsane/Manifest
@@ -1,10 +1,4 @@
 AUX libinsane-1.0.1-meson_options.patch 2038 BLAKE2B b14ba254604f214c2cd1a15e705ea361b635bac7faae4995811477456ea8a8d8bf969fefb4330b3b6f05cd498cd2f01b8b065c2f8f3c88e21e62ea6ef204de15 SHA512 c0d5d3ce5d763d04327ea500229c9f26d989aa8072dec569adb3766c70e0cab9e00629e3099c5ab8bd4e3c84b86925ad108fe78eeae9066164de1302e2226572
-DIST libinsane-1.0.1.tar.gz 706575 BLAKE2B 32ae63c275e6e9c709aefd0c6ed2237df70ad027626cf6ded2009071c74ce925d50ab730bd36b677915d2bd6e606d6337e890cfcc3e8bf4a1f281e026140537a SHA512 1b7091b207b8ea559f21084aa8231c62f34dfa6043e9f358d55708006989c50ee131011dbe5bd03bcd1212cd0219ae9d65a544e57cf3a71c4c2f65e5d89257bc
-DIST libinsane-1.0.2.tar.gz 712366 BLAKE2B 5be68792b3a89718308a180b1ca9383e7aebbd2f4e3420376ffecbc7d9b32d16b2fdcf060760708f8ef8f125c4d4caf2f41c6c15da53506e46302dc4155038be SHA512 d65c3fdcc8f64be473a7ff8078b5c9cbfa65ebbf44184fb76c12b40eedc87742167c8fa720683d83d5d29292664c6e311a2c12f45dff35306f60ac7612e63d97
-DIST libinsane-1.0.3.tar.gz 715603 BLAKE2B f6e97fc62c38a3481675671c5bed90d2c9c9db0ce9bf36e66f49f94726ce708300157484107e16b8e5f5a2c86fdd456418998a4b5566391246eeb213bf95f79f SHA512 2508347554cbcfc122dd8be16e60d7357a2fb7876ee044ba6024a4e564378d3748d1b267bd3b63cb0a2f6f9bb8daf748be72d3901d8f6e36961cf0849ff4ceb4
 DIST libinsane-1.0.4.tar.gz 950729 BLAKE2B c09257646b21421eea6312748284456bd7b6f3eb1b64b831e15ae02b519e13d8bb39e2447186f44c6345190bf5e6a38640d9b95a73cbc899ece7c669c3650760 SHA512 2a042fa55874f108b4b1a2cdb88ce60e771f6789cb5704298ce60c4373b4b60e6461e7cf2a96652e1e06a481c02dc6cf9d6aae12c97ad5ac484de815419af5be
-EBUILD libinsane-1.0.1.ebuild 901 BLAKE2B a2f67af896828a3526f5494b508148d16ebef09c42afe67253fa40533bdba236ed0e34d069977994cef1953ff99ce2148ef85accf3498b86fc62481c877a76b9 SHA512 8c10f60d79fa4852442545c5b16ac7c240875dddd7e7ac0b0dda162cf8194976f7c7b2581d817324a32525e0327509b7f0cc0e096104fa786611693f27e0ab9e
-EBUILD libinsane-1.0.2.ebuild 907 BLAKE2B c7aaead31e64e3c4803c3984668ee8ebd35623092bb232b55cf3304a001231cc8eb9912b35c23b4b31b507eb0dd186754825f7e989b6610e0ec14772f0a3aa8f SHA512 4bbb9a14eefbbffec2e9a759919cc7c72f65785690b5d7c0ab22a03cff71266ffd4c9434473bd4e9acb7917aeff8cbae9cb8cc331c636eac73d4ca316fca39f0
-EBUILD libinsane-1.0.3.ebuild 928 BLAKE2B dd9554523c3bffa9ca5ea7a8ddbfac667deafe06c1a3a77f466190a27db22338e46f02edc53835eac24d8e8c1448aa6ec4fe7ebbe0cd8e4327d5348e2552a113 SHA512 51ffff6e9c1a33d548842084289ee31a4f8a59f0913e989e7850e50512fefa82b0199c47c18101eddf75545a7635f7a8a9b9297b68f0dc77e2ac507ef4e45391
-EBUILD libinsane-1.0.4.ebuild 928 BLAKE2B 7b2ccef70e9d7e3e5914c6e50b4690d0cff22be5aa8c5008cf76f90043450f115e412a0d3d1308ebcb12fe7d54b59f46fbd9c3a5772e9cbbb3ca455edfc8d19b SHA512 2f74bd9a53f2e622d7c5664252b94f12049c8cd3251d3129cfd5e78ff02feed7218e2bb64e6b34652865d86519ed1dbdd0f34a1038b2210edf83c1e6e8ce46ee
+EBUILD libinsane-1.0.4.ebuild 960 BLAKE2B 6fa16cdc8918b2e3f1617205fe1995188f21082d381be0057bd72e28b90b2c5e82eb3229a84ef1642579e87f374147b6f5b3b860a9f52e2b7728e1fefa66a8e3 SHA512 d62c4504db9a6f0cd58f12a293f4fb4f23d36d9f20c82da9193f50b2a670d3771f6925719727d0d2f1f653a4d955d6837769b3f2570ec72f2a397bf51f067aad
 MISC metadata.xml 1015 BLAKE2B 2e8221fd55bcf22db23935d2150a4832c32c8e7b7703b7305797da9f63eda012261a8dbd25a00a92964a2b4e3fc22b9e2252133431582ae27964f091161d1176 SHA512 2de5a23ff82cc957941ac4e21d1261743a7f4f36a13ff6402224989eb613fa3a5138b3a464b79017e1c17cc4b7bd553e16e3cb5d9f575b57a362ab4c7d2d1fc9
diff --git a/media-libs/libinsane/libinsane-1.0.1.ebuild b/media-libs/libinsane/libinsane-1.0.1.ebuild
deleted file mode 100644
index a2d1169ab994..000000000000
--- a/media-libs/libinsane/libinsane-1.0.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit meson vala
-
-DESCRIPTION="Crossplatform access to image scanners"
-HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork/libinsane"
-SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/libinsane/-/archive/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gtk-doc test"
-
-RDEPEND="media-gfx/sane-backends"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		dev-util/gtk-doc
-	)
-	test? (
-		dev-util/cunit
-		dev-util/valgrind
-	)"
-
-BDEPEND="virtual/pkgconfig
-	$(vala_depend)"
-
-# Tests require an operational valgrind
-# https://wiki.gentoo.org/wiki/Debugging
-RESTRICT="test"
-:
-PATCHES=( "${FILESDIR}"/${P}-meson_options.patch )
-
-src_prepare() {
-	vala_src_prepare
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use doc doc)
-	)
-	meson_src_configure
-}
diff --git a/media-libs/libinsane/libinsane-1.0.2.ebuild b/media-libs/libinsane/libinsane-1.0.2.ebuild
deleted file mode 100644
index 5fa12b107f72..000000000000
--- a/media-libs/libinsane/libinsane-1.0.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit meson vala
-
-DESCRIPTION="Crossplatform access to image scanners"
-HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork/libinsane"
-SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/libinsane/-/archive/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gtk-doc test"
-
-RDEPEND="media-gfx/sane-backends"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		dev-util/gtk-doc
-	)
-	test? (
-		dev-util/cunit
-		dev-util/valgrind
-	)"
-
-BDEPEND="virtual/pkgconfig
-	$(vala_depend)"
-
-# Tests require an operational valgrind
-# https://wiki.gentoo.org/wiki/Debugging
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.1-meson_options.patch )
-
-src_prepare() {
-	vala_src_prepare
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use doc doc)
-	)
-	meson_src_configure
-}
diff --git a/media-libs/libinsane/libinsane-1.0.3.ebuild b/media-libs/libinsane/libinsane-1.0.3.ebuild
deleted file mode 100644
index ee4d9d71875b..000000000000
--- a/media-libs/libinsane/libinsane-1.0.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit meson vala
-
-DESCRIPTION="Crossplatform access to image scanners"
-HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork/libinsane"
-SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/libinsane/-/archive/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gtk-doc test"
-
-RDEPEND="media-gfx/sane-backends"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		dev-util/gtk-doc
-	)
-	test? (
-		dev-util/cunit
-		dev-util/valgrind
-	)"
-
-BDEPEND="dev-util/glib-utils
-	virtual/pkgconfig
-	$(vala_depend)"
-
-# Tests require an operational valgrind
-# https://wiki.gentoo.org/wiki/Debugging
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.1-meson_options.patch )
-
-src_prepare() {
-	vala_src_prepare
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use doc doc)
-	)
-	meson_src_configure
-}
diff --git a/media-libs/libinsane/libinsane-1.0.4.ebuild b/media-libs/libinsane/libinsane-1.0.4.ebuild
index 15d9682e6445..bf213a427962 100644
--- a/media-libs/libinsane/libinsane-1.0.4.ebuild
+++ b/media-libs/libinsane/libinsane-1.0.4.ebuild
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc gtk-doc test"
 
-RDEPEND="media-gfx/sane-backends"
+RDEPEND="dev-libs/gobject-introspection
+	media-gfx/sane-backends"
 DEPEND="${RDEPEND}
 	doc? (
 		app-doc/doxygen
diff --git a/media-libs/libmng/Manifest b/media-libs/libmng/Manifest
index 98dcbef44b28..03bc18cc69e5 100644
--- a/media-libs/libmng/Manifest
+++ b/media-libs/libmng/Manifest
@@ -1,4 +1,4 @@
 AUX libmng-2.0.3-jpeg-9a.patch 1378 BLAKE2B 72a3cdd738dd480bb216589bdfc1b935cf966c2e6d3e1029eaef539f67cd8e01977de71dd0c0e22321238af2963a615ca180c3efda3096cdb4fceedffc6e8db3 SHA512 d30bc5aeb586b88698695762594a238e339e5790831fea45d0ef54c8107951791c87662fa555454528ea8591dd5f42c55ff4225c1b8f83228c925eccd6f0eb71
 DIST libmng-2.0.3.tar.xz 951808 BLAKE2B 18f29d270d8c646da1eef41da094271acd5ce86094441f7f4d78dadab9dbc147619c4226bc642722639eb6d1a49567c517acaadea823f38c7bdd8ee3f498b927 SHA512 764efd94643c17c449abcb8f676ec2aa750a2461cf46bc961343f8d443a16ac2caa135c27d846deb2351b9f25d6170c42a500d21f63c13276905fdd743b8fec6
-EBUILD libmng-2.0.3.ebuild 1156 BLAKE2B 047c8ff124a367ceb2436d0a7485b4230293bec500b3023dc78d34baabd767adf3978fcde3ae58e827b1b2707669c1cfd24afaf0ae6d9c62a36b5730fa543cd6 SHA512 68305c9e00cf2ade25c1e824a1917992048d836043239cccca95f65d6e03b17e37b5a1ff9bb231eebc7dc24118b4cd016fd04443577ab18682a02e9603075812
+EBUILD libmng-2.0.3.ebuild 1242 BLAKE2B b1e9f532c5e79d363bb1c1ba9cd8c491f55ce714e799c2cb6ac2ba15f5a36fc7e6960cba99a2c9ebe5eb4b755b3b3e6e24abf30f0e23ab573c8af5b36a5d4959 SHA512 3879386da773b73accf45372cc9c514f1b6ef09e9bebe4336b7cb140948384be4b9f4d0e1c18735fd9c38caf74fff8a9d2b53517e8d542d6113ef4d0bbcffdec
 MISC metadata.xml 335 BLAKE2B d1fae8ad219bf09d9bd3588fedaaca1599c795811ea024f726dc3e37e88e5b776e05c3c40eefa6d100e393fcf439aff9d67c77d85010f6e1e8e2319067386fee SHA512 a870b439c25b0dc7d251b15c53eded27ed9a4c708dd81bb4facc7cda49b57abb4a24c013b36c11db4d8a27af2cd55ad012792fe81e8893f5c92007790c4fd8f8
diff --git a/media-libs/libmng/libmng-2.0.3.ebuild b/media-libs/libmng/libmng-2.0.3.ebuild
index d894ab2fc5f5..766e9a921b3d 100644
--- a/media-libs/libmng/libmng-2.0.3.ebuild
+++ b/media-libs/libmng/libmng-2.0.3.ebuild
@@ -23,9 +23,10 @@ DEPEND="${RDEPEND}"
 PATCHES=( "${FILESDIR}"/${P}-jpeg-9a.patch )
 
 src_prepare() {
-	eautoreconf
-	emake distclean
 	default
+	# effect of 'make distclean'
+	rm Makefile config.h config.log config.status libmng.pc stamp-h1 || die
+	eautoreconf
 }
 
 multilib_src_configure() {
diff --git a/media-libs/libmypaint/Manifest b/media-libs/libmypaint/Manifest
index 3734e2f89f31..e7274184685c 100644
--- a/media-libs/libmypaint/Manifest
+++ b/media-libs/libmypaint/Manifest
@@ -3,6 +3,6 @@ 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
-EBUILD libmypaint-1.4.0-r1.ebuild 1710 BLAKE2B 1af97fe704b5cf33c215ed3fe597b34b32ff14d0af312a4d94c369fdc014fa12e03dd8e9ce34640d3503028a6a786d1783d7aa185bb570cfaaa75961dc76541e SHA512 966b2a8541310aa6cc570c52058c9321cc6476830f9ce53bc85508d1bd51db393e882ec2a93f9cfba2002210d15a1b83e5d1e894ff077fe8e05ab4c29b03721c
+EBUILD libmypaint-1.4.0-r1.ebuild 1709 BLAKE2B 646c5a4fdd64b7a736469cbd812e1fcb5bd90bc195ea8df24dacf191f46251a83e94bb0ed61e5617dffb4a8c73eb8b9d40c5483e1d9e78be7be8d8ae38f83692 SHA512 ee60210e9d56a4d861c14ee0515c70715e18e94f83cccd6f74993e78a64473bea4e9db42e0d99a77d4951368257852ae254edc325226d590303d9112273e0ad2
 EBUILD libmypaint-1.4.0.ebuild 1547 BLAKE2B 2c313f5538f415ccd0aed83030f1b99c735131fe912a8873196b4443175b24a4913706a6512e4c81687d8e8913beb669ff823b8ce5ca9748a5e3a2f1ed8ee712 SHA512 5e0ee94cca9d0fecff12c5fbfc3460a417ae4e7a0517d851e035c4fa8321c678ca4f6e52d9cc9b40dfbee9b027ae1884e5509a070cb7f908849da2aec81fb82a
 MISC metadata.xml 335 BLAKE2B 9147fdc98c832807587c5435133f971898c59c5adc5bb17a49a4632c5eb051d1e7e43d7fbefb15f80763771c58faef55e505b8441309c5676130c3e0dd18eee3 SHA512 fd20f4baaf0a494c651b433e3c7a0a75d82db0264ce4ba0d8e34f965f7389bbc5ad27e222b3dcaab307042338993a2761765f217c87d80a83f53a909caadfbdc
diff --git a/media-libs/libmypaint/libmypaint-1.4.0-r1.ebuild b/media-libs/libmypaint/libmypaint-1.4.0-r1.ebuild
index 9ab57d2652e1..4dc0bf008ef9 100644
--- a/media-libs/libmypaint/libmypaint-1.4.0-r1.ebuild
+++ b/media-libs/libmypaint/libmypaint-1.4.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/mypaint/libmypaint/releases/download/v${MY_PV}/${MY_
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"  # https://github.com/mypaint/libmypaint/wiki/Versioning
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~x86"
 IUSE="gegl introspection nls openmp"
 
 CDEPEND="
diff --git a/media-libs/libopenshot-audio/Manifest b/media-libs/libopenshot-audio/Manifest
index 000d66c06203..31994cd699c5 100644
--- a/media-libs/libopenshot-audio/Manifest
+++ b/media-libs/libopenshot-audio/Manifest
@@ -2,7 +2,9 @@ AUX libopenshot-audio-0.1.4-fix-under-linking.patch 642 BLAKE2B d4ff9256d49efb3b
 DIST libopenshot-audio-0.1.4.tar.gz 2959997 BLAKE2B 0736d9f4877f46ac90fd236cbdcfce8c1f66f5ac5d5e9762672a4eaeb668eb61a5f1e45996f0feea604d2c30891198fa58fc89f360815336ea18311d019fed2c SHA512 5605164a8c66c33ac893cc2b42cdacffff03eb156a61740c1b2c00dd7e7602a802fa1dc3795c620810e3ee29a290aa6bae8b62bc17eab3f4dd2d8052e0481824
 DIST libopenshot-audio-0.1.9.tar.gz 1710939 BLAKE2B b9b117fe033c00219e9f6babd1d82dccd2f7a3754e916e5411047deca545bbda8c18ea71a1c7ef0952458ffd40b9f109a918c7c226bace569a8be1927c050bd6 SHA512 8113bf6f5747b0f72391a30560f49c97b13c68994097170797cdfeb44813791b90b073a6caffc91ba1a2153a41b86e8c1b188de0daaec3f5c785013c049c1b4d
 DIST libopenshot-audio-0.1.9_pre20190502.tar.gz 1696201 BLAKE2B 6bc0be3f8374f734cb6b7271c09dad8f7da794acb87236441f41999fab9baa3fee69d6a820db51a4c116b3a5113bb8f72da396babd13511d013b8ffafc2c1bf7 SHA512 73ba3e2054de1b74e6ae7c874a61388220efe12b640f741d5e18d9b242d427fd0fc82b03527af7de64ecd6dbe0a450b884c8557bb5a51493be21838e1f4dfd1a
+DIST libopenshot-audio-0.2.0.tar.gz 1711504 BLAKE2B 144502ac7074039861b16309fdf7d79b4846f4fdc7e4e14cf8e96456bf974b82af289e37454b6a93fd393d5faaf46e2685851ecd867bd5bef8df9f798a00cbc2 SHA512 c014a619f32283a8482e0df9224785610a9563073fbd98378367f28f713afa1dc9873d212a40352d3c96040004344f16084e5fe30e4cf64c57309f96e66068c1
 EBUILD libopenshot-audio-0.1.4.ebuild 665 BLAKE2B bde925e36f3875a26c4688d7bbb151ba499c4b28cc00053306e86c947e601475ae9fca2d3341275800aef5925a2d31ffb73abce975ad02b23499c88428d16f0e SHA512 38a7755b907648bf091c3808571efaaee5c6111042fd3da07b6c97bdb0f8573ccb1fbfb10478a50fb1fa9d0f1a4334141521f3ba8d384b9f06ba95c0d38c4d4c
 EBUILD libopenshot-audio-0.1.9.ebuild 556 BLAKE2B d3a7259d66c66564e743d8983bc396b547df7e41b79f06c30e3f6048ad7d23f440e6f063651e07548afe39d197929729c6c369112a13a4aab3dce88eb5560bf0 SHA512 7daef3d3e56f9cb68162df6cb0c56d5c706a1f7c3701b5afe13d74a5d221254628ce141adc39a316da202f9213c8a696d19c7993562385c7d3cdfed461a78a73
 EBUILD libopenshot-audio-0.1.9_pre20190502.ebuild 625 BLAKE2B 725a7962655c77f0a16b953135528cf13e46b8cbed0edbf3de1076c1a443bd64b98cfc9fba45a83db61ce9be351877ba885dbfa1387cd723b0860e7715887f98 SHA512 c938a556729e0a93af20f3a89264d975d15d1a3dd070474c8e2bf7f7b36560ee45e776091af53858639ac01a9c6ed3f8880223a1816c1b6acf5eb0256cf34987
+EBUILD libopenshot-audio-0.2.0.ebuild 556 BLAKE2B d3a7259d66c66564e743d8983bc396b547df7e41b79f06c30e3f6048ad7d23f440e6f063651e07548afe39d197929729c6c369112a13a4aab3dce88eb5560bf0 SHA512 7daef3d3e56f9cb68162df6cb0c56d5c706a1f7c3701b5afe13d74a5d221254628ce141adc39a316da202f9213c8a696d19c7993562385c7d3cdfed461a78a73
 MISC metadata.xml 532 BLAKE2B 1c8bbee08ed6782cd3cbec2eb11fa4775966b7dae76444409d393d0e6adcc82cd45993d4598b375c3e4f91a38e02e6856e0c41e141c82c64e8ec4886e86071ec SHA512 edec80960aa8b55318dc2c4c1fcaa1751c69ab7897a9c965be732f5dcd1e195f26ca13f910124b0d57a7d11a78483bcba9268be79efd4a558fab568693450f96
diff --git a/media-libs/libopenshot-audio/libopenshot-audio-0.2.0.ebuild b/media-libs/libopenshot-audio/libopenshot-audio-0.2.0.ebuild
new file mode 100644
index 000000000000..ed11d8638bf2
--- /dev/null
+++ b/media-libs/libopenshot-audio/libopenshot-audio-0.2.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Library for audio editing and playback used by OpenShot"
+HOMEPAGE="https://www.openshot.org/"
+SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0/7"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/alsa-lib
+	media-libs/freetype
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+"
+DEPEND="${RDEPEND}"
diff --git a/media-libs/libopenshot/Manifest b/media-libs/libopenshot/Manifest
index fa063a9fa618..3c0054738af4 100644
--- a/media-libs/libopenshot/Manifest
+++ b/media-libs/libopenshot/Manifest
@@ -1,8 +1,11 @@
 AUX libopenshot-0.2.2-imagemagick7.patch 3545 BLAKE2B e2fe6ae205459c69ff288f14ba2d0a2b461b761e7ff6e9e66e11e4895b10661d5fc2ab9e2011899ca983399af685a0d411aa4820c02d02b4600617bd314d7670 SHA512 06622c81253fd15440e1cf0256a0beb21e2039a5a98a8c889828898b137a9a6efeb6fb295a0646dc5aa12da9805ff73b62c29272b0037cb1ea2454de7571f59b
+AUX libopenshot-0.2.5-gcc10.patch 2605 BLAKE2B 34967db6b59816738e7895f8c608603eab656ae90878fbaa146231ac14370fb11da0be616d5df9bf9c750c73a93d01643543abe81cf9228078060fa1b31d3b70 SHA512 29c974bbb896417b27c70eb9238038f05a4d2d1267f17b4e4f935696cc706fff4c3e0124c369bd24a8128dfd8bddc57bb4e7a740a9c0203b07fc40979875b999
 DIST libopenshot-0.2.2.tar.gz 11037768 BLAKE2B c307e41bf17d40ae421a541bbdf4cd53c6ef4d97041a476c6910bd156c10815aa5a5811813b24fdc472401516f29cf8cb68fbda17a0b434767c3f3aa63d6f222 SHA512 b89189e57e82da68a063417bba9c94704c04b0546c0aed227daa23a794eee56341a05988d8e28dbd339edfcdeeaed48103b347060eccf94f32fe1a4bf23d6553
 DIST libopenshot-0.2.4.tar.gz 10295888 BLAKE2B 2967f1faa56090355255e24c0367a4171af7433c53eab303c9d88432174d03879ae9fd2e6904e614ea6ba210e0c72c401cab95a1d2aa93ddd2cea2b861e985ce SHA512 6824ad22e81814b6427a4cb6489e5b893be264b5afa6e54287cd649f244f86b938c1b1d56280c1f49af65fa118d056d204bd39bc5b2ccdc10376d2df2f33a352
 DIST libopenshot-0.2.4_pre20190609.tar.gz 10268173 BLAKE2B 01e07c0a7c051b5804f24fab1bfb920862a165ef14d3fdd020430b9e3a47858842c8cab3408ba0d161cb15cc6e90531a3b5df9ad327a01f414ff2e7e392fc243 SHA512 bf8c06aba6a899cb1ca6fbe9ac89fc859083b03175338c04af8dce68698f4ac78eac0b5b594e2b02390cd5e64576445b1c95324b254a267506353bed97ca16d1
+DIST libopenshot-0.2.5.tar.gz 10295768 BLAKE2B 19205c4f02d8b863b48e920164302853c7a505893783161e6a146e7a9728cefa19d4e48bc82b862e920967f110988ac28f5f495912efabbbacc98f55ebb51856 SHA512 b7cdf72897e6edaa8cc00e17dbe30f5b22a6b5d69aab64ddafb184458b41ef0332db1f3e2c6f039492bf7adb521d9758834d0bf6c24e6421a55970d8cf8caba7
 EBUILD libopenshot-0.2.2.ebuild 2120 BLAKE2B 396b319d1b0e9618b9c22c18565c4466d9bef1b8a8ed0b532e54cb207cb5348d48e05da6f240c854589e19b2e40df11976671eadf513807a6004d2ad6291732a SHA512 bfa64fa1b15e8389fb9369ab1e931c60f18becc812bb42cccbd644d52701cde9f523d5b1739e81842833292d02886a0ebdc3803b4eae5df6ec212e6a2b6614ee
 EBUILD libopenshot-0.2.4.ebuild 2258 BLAKE2B 1c18783cc8c33d985ee21044d3561eaae01c26a38df21b65f0c5ef18a783fa646fe453f91eb80fe328ff248f05bb51333d4cc5da03a49b28286be38a9928bf85 SHA512 1671c4ab1ba07e01f4c5e517ff4960ea641b24fe0cfb7b82edd174592c03820aacbc39140ac7591d983ec8dd39209a1fc2c7714137d529ce858f079c2106e056
 EBUILD libopenshot-0.2.4_pre20190609.ebuild 2415 BLAKE2B c890e1777e9fa8f01412bd50dffd1ff455c786805cde1717420fdaa846b2451ec0396dc2203a75baf969329525b75c5179830f145176dc3385a1496fd79da2bc SHA512 676bbbdc2958a228a0907e260a2a421f753283893415f393ebd3ba66379cc4910e3fc0b64dd7f87534db7e76d2ff6eb8f78bb22725ab4e095c9c969065410fab
+EBUILD libopenshot-0.2.5.ebuild 2312 BLAKE2B ae389d16d3a383c7e2784616f3b9cf8f9d0f14d7e70753b9fbb1ed442390dbe48809e754aa808305950911629247ec900217523c351342acef3f9422b11398d4 SHA512 b5bfb0a6d88b1efc54c3d3aa3b515a46d29c161a88bb920345bbc0a6a6ef1b2c8efbc89496337d69d582522fc8958f9a3fa44ec2ab01fac4eabdc592350beba0
 MISC metadata.xml 520 BLAKE2B d4eba07a3598f2fd073fb11a885ccb303a30624ea396fe43799348bc7284375d7223f0553cb01b582d5ceb7daa402878c89290eb27a7e6797d366c5bc1146e91 SHA512 19cdd8b9200c01945b48efbd52b78a45ee681244076bde7045d8d737d00fc7fe41cce6845459cccc2e4ff7b4be1e42eb3c6b14f43165435a9122ff266bbf0b15
diff --git a/media-libs/libopenshot/files/libopenshot-0.2.5-gcc10.patch b/media-libs/libopenshot/files/libopenshot-0.2.5-gcc10.patch
new file mode 100644
index 000000000000..4a116b120086
--- /dev/null
+++ b/media-libs/libopenshot/files/libopenshot-0.2.5-gcc10.patch
@@ -0,0 +1,58 @@
+From 13290364e7bea54164ab83d973951f2898ad9e23 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <steils@gentoo.org>
+Date: Sat, 16 May 2020 02:33:37 +0300
+Subject: [PATCH] FFmpegUtilities: replace variable definition with statement
+ expression
+
+It is needed to avoid multiple definitions of AV_GET_CODEC_CONTEXT,
+which is considered as an error with '-fno-common' which is default
+since gcc-10.
+
+Fixes: #511
+
+Upstream-Status: Submitted
+[https://github.com/OpenShot/libopenshot/pull/512]
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ include/FFmpegUtilities.h | 18 ++++++++----------
+ 1 file changed, 8 insertions(+), 10 deletions(-)
+
+diff --git a/include/FFmpegUtilities.h b/include/FFmpegUtilities.h
+index 62d64df..b4ec951 100644
+--- a/include/FFmpegUtilities.h
++++ b/include/FFmpegUtilities.h
+@@ -163,11 +163,10 @@
+ 		#define AV_FREE_CONTEXT(av_context) avcodec_free_context(&av_context)
+ 		#define AV_GET_CODEC_TYPE(av_stream) av_stream->codecpar->codec_type
+ 		#define AV_FIND_DECODER_CODEC_ID(av_stream) av_stream->codecpar->codec_id
+-		auto AV_GET_CODEC_CONTEXT = [](AVStream* av_stream, AVCodec* av_codec) { \
+-			AVCodecContext *context = avcodec_alloc_context3(av_codec); \
+-			avcodec_parameters_to_context(context, av_stream->codecpar); \
+-			return context; \
+-		};
++		#define AV_GET_CODEC_CONTEXT(av_stream, av_codec) \
++			({ AVCodecContext *context = avcodec_alloc_context3(av_codec); \
++			   avcodec_parameters_to_context(context, av_stream->codecpar); \
++			   context; })
+ 		#define AV_GET_CODEC_PAR_CONTEXT(av_stream, av_codec) av_codec;
+ 		#define AV_GET_CODEC_FROM_STREAM(av_stream,codec_in)
+ 		#define AV_GET_CODEC_ATTRIBUTES(av_stream, av_context) av_stream->codecpar
+@@ -199,11 +198,10 @@
+ 		#define AV_FREE_CONTEXT(av_context) avcodec_free_context(&av_context)
+ 		#define AV_GET_CODEC_TYPE(av_stream) av_stream->codecpar->codec_type
+ 		#define AV_FIND_DECODER_CODEC_ID(av_stream) av_stream->codecpar->codec_id
+-		auto AV_GET_CODEC_CONTEXT = [](AVStream* av_stream, AVCodec* av_codec) { \
+-			AVCodecContext *context = avcodec_alloc_context3(av_codec); \
+-			avcodec_parameters_to_context(context, av_stream->codecpar); \
+-			return context; \
+-		};
++		#define AV_GET_CODEC_CONTEXT(av_stream, av_codec) \
++			({ AVCodecContext *context = avcodec_alloc_context3(av_codec); \
++			   avcodec_parameters_to_context(context, av_stream->codecpar); \
++			   context; })
+ 		#define AV_GET_CODEC_PAR_CONTEXT(av_stream, av_codec) av_codec;
+ 		#define AV_GET_CODEC_FROM_STREAM(av_stream,codec_in)
+ 		#define AV_GET_CODEC_ATTRIBUTES(av_stream, av_context) av_stream->codecpar
+-- 
+2.26.2
+
diff --git a/media-libs/libopenshot/libopenshot-0.2.5.ebuild b/media-libs/libopenshot/libopenshot-0.2.5.ebuild
new file mode 100644
index 000000000000..840b5fb4de84
--- /dev/null
+++ b/media-libs/libopenshot/libopenshot-0.2.5.ebuild
@@ -0,0 +1,98 @@
+# 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 cmake python-single-r1 toolchain-funcs
+
+DESCRIPTION="Video editing library used by OpenShot"
+HOMEPAGE="https://www.openshot.org/"
+SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0/19"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples +imagemagick +python test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/jsoncpp:0=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5[widgets]
+	>=media-libs/libopenshot-audio-0.2.0:0=
+	net-libs/cppzmq
+	net-libs/zeromq
+	imagemagick? ( >=media-gfx/imagemagick-7:0=[cxx] )
+	media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora]
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	python? ( dev-lang/swig )
+	test? ( dev-libs/unittest++ )
+"
+
+PATCHES=( ${FILESDIR}/${PN}-0.2.5-gcc10.patch )
+
+check_compiler() {
+	if [[ ${MERGE_TYPE} != binary ]] && ! tc-has-openmp; then
+		eerror "${P} requires a compiler with OpenMP support. Your current"
+		eerror "compiler does not support it. If you use gcc, you can"
+		eerror "re-emerge it with the 'openmp' use flag enabled."
+		die "The current compiler does not support OpenMP"
+	fi
+}
+
+pkg_pretend() {
+	check_compiler
+}
+
+pkg_setup() {
+	check_compiler
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	# https://github.com/OpenShot/libopenshot/issues/17
+	use test || cmake_comment_add_subdirectory tests
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_RUBY=OFF # TODO: add ruby support
+		-DENABLE_PYTHON=$(usex python)
+		-DUSE_SYSTEM_JSONCPP=ON
+		$(cmake_use_find_package imagemagick ImageMagick)
+	)
+	use python && mycmakeargs+=(
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_build doc
+}
+
+src_test() {
+	cmake_build os_test
+}
+
+src_install() {
+	local DOCS=( AUTHORS README.md doc/HW-ACCEL.md )
+	use examples && DOCS+=( src/examples/ )
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+
+	cmake_src_install
+	use python && python_optimize
+}
diff --git a/media-libs/libpgf/Manifest b/media-libs/libpgf/Manifest
index 432ac7100f06..425a4d65bf48 100644
--- a/media-libs/libpgf/Manifest
+++ b/media-libs/libpgf/Manifest
@@ -1,3 +1,3 @@
 DIST libpgf-6.12.27.tar.bz2 1235651 BLAKE2B d155289398d6291d49a217a97e283d28440e398c330b3bb1006cdb2cf4c31bd7efef5db4cadd9d28812ffe4ef6deb12ab978b8feaac7c9119cff61ee26658628 SHA512 ad06b34d61219a61d06b87e05a26e8639cd7a93211943217832969c03c4dbc81fbbb287fa2d628b7e087b96e78665a3cbc78920c8ff5828dfb2a7748e04fe42a
-EBUILD libpgf-6.12.27.ebuild 689 BLAKE2B 69185c8148263d2a417ec73aecf2420018023fa3afcfcd4ee07897d700070ffed87bd841084fd2360a88c49bb808423772bce1975485684c0485962f1d255b7e SHA512 55a8a7b15893605867df7141efb8296aff302b87c5f6ea1bb1ef6d9ae35afb187a5cf4d66bbdac9ac1b3448e20de3ce8df2cccece97fd977eafc16c9f9b5c8ac
+EBUILD libpgf-6.12.27.ebuild 690 BLAKE2B 4a96fdc13840fa9277e7befc0be6e5ad6c19fd41d89cbbc4a6bba7b20d1de183dd8eefa6c7323a4bb885fa8aaa01fa34be5467fefc9b66e19eba5509047f65a2 SHA512 172ac9ac033df7d2a6d4397faaa37ae286616784e240ff19a8338d7b94015942edf08700ede3d024ebe6c7ede163e752120e21aff392c198e96ae3d84175cd3f
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-libs/libpgf/libpgf-6.12.27.ebuild b/media-libs/libpgf/libpgf-6.12.27.ebuild
index 1f8156146d8d..f63845ebade5 100644
--- a/media-libs/libpgf/libpgf-6.12.27.ebuild
+++ b/media-libs/libpgf/libpgf-6.12.27.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
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools
 
 DESCRIPTION="Library to load, handle and manipulate images in the PGF format"
-HOMEPAGE="http://www.libpgf.org/"
+HOMEPAGE="https://www.libpgf.org/"
 SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest
index aa47f45759ac..258d9d92c1df 100644
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -1,6 +1,7 @@
 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
@@ -8,6 +9,6 @@ DIST projectM-complete-2.1.0-Source.tar.gz 31130351 BLAKE2B ec3540326751aba45b96
 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 1352 BLAKE2B 6edbdf10a3721fbd4a9aea76f4c7f5400ef0c422e26c61cbceae4c0f47930f9dd72f220932a569b54b251b1b059ca8c278e490d0fa3cee0f838ffd48c0ee6ef6 SHA512 321d2cfb92e76976aac1a5c96e7df2c9712f58a56017e06f218fbff44eddf4d531a6cbf3405f98966bbb2a663d081f52bdc52706f87058644aad94c1cada5504
+EBUILD libprojectm-3.1.3.ebuild 1400 BLAKE2B a1d8c7b7f9dc0a0c4e65ab3e31b1dff97f769d343e6f4074b24632bba4568f42e60f76ef11b77d5d93ef30b0c602cf83f9044f5cab8bba83f412c38c2e943277 SHA512 8dcec3005bd5f5f2f8b357afbc4da25a3e374b12b964019531b58ff2bcd96ded871a7fe8c69c97d7b0337a05536947b49890fd1d6df34bdc522d4553ccffc3d1
 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
new file mode 100644
index 000000000000..8d84ece802cb
--- /dev/null
+++ b/media-libs/libprojectm/files/libprojectm-3.1.3-bashisms.patch
@@ -0,0 +1,47 @@
+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-3.1.3.ebuild b/media-libs/libprojectm/libprojectm-3.1.3.ebuild
index 1dc01b435666..8a83145eb817 100644
--- a/media-libs/libprojectm/libprojectm-3.1.3.ebuild
+++ b/media-libs/libprojectm/libprojectm-3.1.3.ebuild
@@ -22,6 +22,10 @@ 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(+)]
diff --git a/media-libs/libqaccessibilityclient/Manifest b/media-libs/libqaccessibilityclient/Manifest
index 86c3dc0f1438..256af0485410 100644
--- a/media-libs/libqaccessibilityclient/Manifest
+++ b/media-libs/libqaccessibilityclient/Manifest
@@ -1,3 +1,3 @@
 DIST libqaccessibilityclient-0.4.1.tar.xz 105280 BLAKE2B 7e8332e4d27e96c0728cecf73f13e9213f264e588dba321f0c0877954400c227e17e8bd4468b2567626407d2a283290e3b9752170ae602c6370d08beec7387d0 SHA512 d5c168ff39f4bb67f18120eea50f8e02a85d464a5bb6479c48dfdb02ea9bf0cc379cbed4da7d882b718a1e1723d3a00528fcb26903b617b43029fde25e82cb3c
-EBUILD libqaccessibilityclient-0.4.1.ebuild 609 BLAKE2B e376de0b1913f65d7df0b84f432e32da3eff07bfaaf0e67ffc2bf6542895db34f3b7b98983a21889bd8081249580edbb544aad977fcf7034fab0d0d4e90f217c SHA512 87cd8c1d3330a7b2e6e31ce1796744fbd2a07a625a62c558a0ac46abb9551d4ec5599ea135b6b5d234fdc734f8b7dca06e65c823dfd5666f926be78f2ce98956
+EBUILD libqaccessibilityclient-0.4.1.ebuild 657 BLAKE2B 9ba068391f06bd63f4d6188c3f6ff9f0d66aa7a402193469a96e938a7c7ea15b1b218c57321e5eef3c51d4f11ffafc4e68598643f88787ed626212d1b3b1ab11 SHA512 3cc24bbbc47156bb496d8a7cc11422831815c82aa7bf922aeca04c8c5d298e1edd58c354474825e5142e468a234f932d74f4d3c21cd7cf340d6dc57294fa118f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.1.ebuild b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.1.ebuild
index 0350acacd33e..ac55f2f8a2fb 100644
--- a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.1.ebuild
+++ b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.1.ebuild
@@ -10,7 +10,7 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Library for writing accessibility clients such as screen readers"
-HOMEPAGE="https://cgit.kde.org/libqaccessibilityclient.git"
+HOMEPAGE="https://community.kde.org/Accessibility https://invent.kde.org/libraries/libqaccessibilityclient"
 SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/libtgvoip/Manifest b/media-libs/libtgvoip/Manifest
index e64f21788d7b..c81759748240 100644
--- a/media-libs/libtgvoip/Manifest
+++ b/media-libs/libtgvoip/Manifest
@@ -1,5 +1,3 @@
-DIST libtgvoip-2.4.4_p20200301.tar.gz 1481876 BLAKE2B cb589eb5c1aacae92f2a6701fed727807f0527320276cd440754052469bae99d613ba3eb5f5166c169d9d0ee7eb77913e98b196f2269bb0a234bee8eed251ab1 SHA512 8d7e540e62447cfaf3e0ef98a2c3c0e9e16019299abd9e384f488d3f34b7efb750c3174175c287c2b520ebec649df55055bfca9736617c6adc33709c25a0cf0f
 DIST libtgvoip-2.4.4_p20200430.tar.gz 1481816 BLAKE2B 82bf6b880f28c9b63f547e473547298e25ea3b7e35b3a832a7375b0ae3a745ea3b5d55f5e635ec678e388a608532a14de85f50828da1dbc9ed77dc23be64b9e0 SHA512 f3130c50dfa7d3f710809bb72fb71d1b246bc91e9f8f413e704499011c8ff01f87a7226315f7cfd6edf2d2b8b6c875508185f516792ff5db74556aface33cdb4
-EBUILD libtgvoip-2.4.4_p20200301.ebuild 1022 BLAKE2B 9534bffdb331c660fed9eb6be2a0a51bb6990351eca8fc0786e609def80f8853a306cf4cfd46cb9af6ac5d2eaafa67d6a6c90938c1062a398ff1c39624825daa SHA512 d30198dfe0910e53912ea6386253472811f345cba956bd6a29ee598ee728ab62ec80647e3dcdafbcdc99d7e1da44c264f75cec74317ed5e5dbe2e0e7e2a52f88
-EBUILD libtgvoip-2.4.4_p20200430.ebuild 1040 BLAKE2B 386991f8aa3a8e3c42c08955b954b8401e204346e90a1aa28187018c3a4af3399b27d81359b32c378790cca82537c3a6625277d4ef5cecd8d26184dda139b3cc SHA512 2ebb9d4ba8ba165a28a66f5b4aaeb8a37aaa02cc126619f318cee0c0bd99da64465e9a0d6ba3475658b19895761334e5fe8c1afa08386247a2ff36b38dbd8ffa
+EBUILD libtgvoip-2.4.4_p20200430.ebuild 1039 BLAKE2B 21f3e2037b6d704070f183c1b21a7a82e772c1ee9119530a202063e7606244b9585e41dd39b82de347d6f72d6d4d88a92a4d96e928338a72b06b8f028db7e6c4 SHA512 76558155767123484954b131ff62e85b22f23cc40c4c867fd29aa2e010231ed03bde4dc617e3d2fb8104f3e8677b94faf48854b7912258bb1999a92368dcd1bc
 MISC metadata.xml 384 BLAKE2B 9eea01ea72a5894e8444fd48a7c20725acb60dec5cac6f7e2d6da2b5461890e099050c65d03df1ece80301b07fa2f93d99d7892c7e6742b7da5910f2ca5e98ec SHA512 e13630d4043b0a9067653ef75054cd339fb0b347b76ab7133fede4915f8c3eba858ffa4ab94527887c98db81788c662d2f050717c7ca790ba8071222a3fd2f89
diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20200301.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20200301.ebuild
deleted file mode 100644
index 187747187d47..000000000000
--- a/media-libs/libtgvoip/libtgvoip-2.4.4_p20200301.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="e422d2a80546a32ab7166a9b1058bacfc5daeefc"
-
-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=""
-
-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_p20200430.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20200430.ebuild
index 7d02572b760a..3438d6218474 100644
--- a/media-libs/libtgvoip/libtgvoip-2.4.4_p20200430.ebuild
+++ b/media-libs/libtgvoip/libtgvoip-2.4.4_p20200430.ebuild
@@ -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/libv4l/Manifest b/media-libs/libv4l/Manifest
index d2f0de4f4a2b..ca6a32f572a9 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -12,4 +12,4 @@ EBUILD libv4l-1.16.6.ebuild 1462 BLAKE2B e494bb7c233a67b174834037f94b44473744d02
 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
-MISC metadata.xml 1120 BLAKE2B b8854ccbfdb3674f5dd2657270945dcea8f9b48e501a07e8589bb04e0b99f927b8499afb979cb34a8d79a04e9813335188853db768dfe774fc5ab2919e9a34ee SHA512 09c21dcc53a675a4e04506dcf8b14b81947806dc761346a4bcb6a6ffdda7b60fb1adf0a778d7e4f060327aea55ec92b7fb700af7a874355d86b64a96541c8c5e
+MISC metadata.xml 1116 BLAKE2B 0a5c579aaa12eda3c043a7684a41ef17b8c7ed7411c2639fa3c0df6466f34ad01fa9d18fff1edd65b2bb4b9bf429e1a7c0ef120d75cbae8ea9dcbdbaa5e4b372 SHA512 8bf11a27222e9672c3662a6d807cfda13b5935618289b7acc259db7bfd9a13095b57d881170b7354fa8e971a87e15592e92f8853be18415618df38672a684c41
diff --git a/media-libs/libv4l/metadata.xml b/media-libs/libv4l/metadata.xml
index a5ad2dd06117..11e7a3bfde5e 100644
--- a/media-libs/libv4l/metadata.xml
+++ b/media-libs/libv4l/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>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
 	</maintainer>
 	<longdescription lang="en">
 	libv4l is a collection of libraries which adds a thin abstraction layer	on
diff --git a/media-libs/libwebp/Manifest b/media-libs/libwebp/Manifest
index 3e84194ab073..50092196a129 100644
--- a/media-libs/libwebp/Manifest
+++ b/media-libs/libwebp/Manifest
@@ -3,5 +3,5 @@ DIST libwebp-1.0.3.tar.gz 4029909 BLAKE2B c2b7f65515e455658153ef3042c50d35f3a1e1
 DIST libwebp-1.1.0.tar.gz 4033877 BLAKE2B ac6c2267f43ba42079975938c8fecb75237a494ab8a4ca71b68a49c3d219afa92079fd94431ccbcc363a1e6aef890642a658f429b8d75cd90dd5d735fa37dcef SHA512 c8440059a985587d4876a5e7fc2d07523bc7f582a04ee5dab0ef07df32b9635b907224de2cc15246c831dd5d9215569770196626badccc3171fe2832d7cb4549
 EBUILD libwebp-1.0.2.ebuild 1844 BLAKE2B bdbf6a9a11c75afa156fd79dde7432995d12a208f473dd62cced1aad47094aaec724daff8b470acb7f2a0cc6c203bddedd21e842939d9eba40fc640b4c4d8423 SHA512 52eb96dd6d80ab6b5b02078d78ee90cc413c54b5016fc5a25db274e46d0180c7b245c4a19df456dea967bd8b33dc7056a044441324f0dec6e3266b23dc097502
 EBUILD libwebp-1.0.3.ebuild 1861 BLAKE2B 680a8c445d2774d9975141ae2d095e7d5e0d301e3477cd67e0b13cb3a56c69f1160fda01b482b51ca7f585be24292917fb2324e52efbe581173b71de1aa8c908 SHA512 ad6284c84c4902c2af31272162564be381072d467ea2513d74f685115c6520e317d8621d0c3e72f361eedf464480aa50559b653d6dd733e1c00f7cd899ce2131
-EBUILD libwebp-1.1.0.ebuild 1861 BLAKE2B 093239c0e8d703fd9e2363c21f50c5b634eb2fda94e2231bf77b4b22ebc81b3a29c2ee4217447aa1fbe1f28cd8fc0fbcab4c7abda45b3dfae38e0b06a18240eb SHA512 283110fe35d4a10736b9b2cc5dd8f13a0013ea5b2403e8eeccdc775e7586eb6ef16d49093c3686c11c5eca66245678ab70f45e7c98472d30829c86131aa8740b
+EBUILD libwebp-1.1.0.ebuild 1853 BLAKE2B 24acb92f6787e20e2a3b6b3d2c06a67f01bc00a4e4249fed77bea5f48475b6a265b1e44501e718f7722a623331de53dbd8f042576a9d5cd78e8b61d209584518 SHA512 417aa75900b4c2ec1a598b80e14fc3b78745dfa80b9e7d820827ee307693e9aad74dae3b85aa22361b82ae7b245f0ddedc720f93e8f3a4eaa07d0a294c9a0aca
 MISC metadata.xml 551 BLAKE2B be0c5dde4ced33103958fc19f5c5f4e9f17c417ced75f9ca065f35fadd50cf286c2a5dba0889dbbe439aa59a5a60d975725984687c1e008cf338cf1cff0ff7ed SHA512 8557a448b4d83f68911d02ef4d2cc003eddae753f28a57f3f87670cbe7e89fbce784416270ecf4f471c883e2bfcabafc3340e16026c883712b96f8b295c868be
diff --git a/media-libs/libwebp/libwebp-1.1.0.ebuild b/media-libs/libwebp/libwebp-1.1.0.ebuild
index f9a7a0e88f04..883fbf2d222e 100644
--- a/media-libs/libwebp/libwebp-1.1.0.ebuild
+++ b/media-libs/libwebp/libwebp-1.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.webmproject.org/releases/webp/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/7" # subslot = libwebp soname version
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg opengl +png static-libs swap-16bit-csp tiff"
 
 # TODO: dev-lang/swig bindings in swig/ subdirectory
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index ee5183bdb17a..904eaf739092 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,13 +1,13 @@
 AUX mesa-20.0.4-meson-Specify-the-maximum-required-libdrm-in-dri.pc.patch 1179 BLAKE2B def1a82b31efd5a8aba5bc4869e296ddfa8f54698ba991e8327f3cb6b203cc5af8dd6faab7d43a650c7f0ced27131a58fac743b49452bbeabbb173cbdd65f7f4 SHA512 31ffed8ef5412fdbc478d327f8e6620ef0160628188457ba7934175a732432b6a8b05b91fd8f0bd63575ed219502af874178f9a464d254c3a3a5dc4b74f8680a
 DIST mesa-19.3.5.tar.xz 12064980 BLAKE2B a20ebfb149624f13951795e07154ab70dc1856a7a1261b339b0bdf0009511111756c88439e7b8729f768b0b4b298301b9a3c0c10d7f2fab3abd91649c12ba51c SHA512 413929573fab31e1bb2a1a04c0c770161c2db464a5aab3f0567d27603fff889ede70e1f6e197e7ff1c1639dc4cc543457bcf45761f0f8e6dffafccfa773a4e3f
 DIST mesa-20.0.4.tar.xz 12292888 BLAKE2B a14b747045ee4ff3bc07e527ad43d5b22047d6c9700cf290ba9c95e07bd88b9252bdd14380d4f0033dcb8fb652664987889d972db09462bcc69c8a7e843b606f SHA512 17d8bc3b56779a8e5648d81da9ee97b66bcec015710801edce4e8055fbb314cd9ebc1d112e3035480ba844c7d9ae6b5b1f1eac0cc0817e69e9253a7748451a55
-DIST mesa-20.0.5.tar.xz 12257484 BLAKE2B 12d2530fa77dffadea74908e0b8e52f19023f0e2d012c607d7d5fc8b1380efad13dee50eee99a453b751340a3633b6260a3f1c82e5b16c03051df2fca6947740 SHA512 6f5780f7574400fea54978b40eb97faca35826a8a7bed96362d7bebcda78e2cadd44585ef8dd7dc126e0cc62cff61bee9b2ea360fedcc09a1fbb4c1f20c6aa08
-DIST mesa-20.0.6.tar.xz 12275708 BLAKE2B 9f6d9ae9c260e396670a3980ba83914ad0c1b7dc5f08471a78e4ab76e6ce3c18b96152fefc3846d89840be971180a2f4c176d40beb2c4b1f572011cb4b913f58 SHA512 a93dc3ed57ed7469b7c60cdbdcf4f29c5da4ec3986171c7b534e009e136ca21fec16207ffab38a6747437a9b1060e2e6c4b74c4e5cdc168b9aba0fc1940b5e90
-DIST mesa-20.1.0-rc2.tar.xz 12577196 BLAKE2B 8dc88b2546fd85874fad03258b8b8c7d1dbe681f568e5947e1d758234a8f6559b60810142c125bb56142be6926c50a8c20aebf45271f0e8270ff057dbce472aa SHA512 b912b1af69d9c33f1d0855887d4e5c1ea3dc10e7ed875d3285ca13b62314647b56470149484f270e8c8ff0ce4818fafd1537a71b59852957aab26f36e53edfbd
-EBUILD mesa-19.3.5.ebuild 14493 BLAKE2B 87bf68a63138a3cd69ef55bd0e32914ecc322defc089dd93fd0dd44cffbcfee156bdf40a7f5fd0b8b05dc5be54d56362500011751adad3635a33a3d73288f980 SHA512 fa540374ada5503e9d87cc436d75de9351092fd82cf556c9398f87abf0c1493c7592b5c870dadfa784c46f5d8218805143088797f2d697772ef8f9ca593cd8ee
-EBUILD mesa-20.0.4-r1.ebuild 14505 BLAKE2B 048aa31180d1242e2617dd6f33adbae79d37e4def656f926faf8496b5925b52340783560ba45ffac730e1f4aa227ae77af093a5bb381e24a435e8df62a6cf852 SHA512 272c0a151a06f5dc594f547358fd38a4cbde6ad6bc6329b4b05c88e42efe1c90d65fcd490565f7855422b6f677368f3ec71811348e9eca3622af70092de2cffd
-EBUILD mesa-20.0.5.ebuild 14501 BLAKE2B 17f9ccacf1ad095db48ecc8e510334a639885c8860a9fd0fc19e1ac434e46fd44a4431f69e7974890ed2b8425a6291e18a33de9cab128fca95a00cd9949daf7b SHA512 9874a7416e92a72c0fc97eb5cabb686f2b8d27e6bebfc8322f3966e736259a07a1762fd4746a634dbffb3980c2efc51c45ae900f626242bc6fc667c641843dad
-EBUILD mesa-20.0.6.ebuild 14542 BLAKE2B 86e7f698319bec595583fae1cef94d8fcc453d20e8c9971a78ada1dd4e4a682f04994cfa61eefb8d97001a65e4ad78018110acfc7da08184b3c5ab5c287b90d2 SHA512 8264879e6c4b5cd8ca5b450e20f17bf403cdfa192536c507037e10027d81902fb865e84fda4827c96e39bad1ece856db2ed87ce5f345914215a0bf916106933c
-EBUILD mesa-20.1.0_rc2.ebuild 14542 BLAKE2B 86e7f698319bec595583fae1cef94d8fcc453d20e8c9971a78ada1dd4e4a682f04994cfa61eefb8d97001a65e4ad78018110acfc7da08184b3c5ab5c287b90d2 SHA512 8264879e6c4b5cd8ca5b450e20f17bf403cdfa192536c507037e10027d81902fb865e84fda4827c96e39bad1ece856db2ed87ce5f345914215a0bf916106933c
-EBUILD mesa-9999.ebuild 14542 BLAKE2B 86e7f698319bec595583fae1cef94d8fcc453d20e8c9971a78ada1dd4e4a682f04994cfa61eefb8d97001a65e4ad78018110acfc7da08184b3c5ab5c287b90d2 SHA512 8264879e6c4b5cd8ca5b450e20f17bf403cdfa192536c507037e10027d81902fb865e84fda4827c96e39bad1ece856db2ed87ce5f345914215a0bf916106933c
+DIST mesa-20.0.7.tar.xz 12308160 BLAKE2B fac8dffd08ada27080ee4c6f1e0dce69218c8f15b97ca59d9a1dc84098b7d376cea6ccdf05957690beb47a7c2ecfd75497bfa150c7c46a0c509ba37abb0e5359 SHA512 00baae50f14bf2b08b5654dffb11cf67499dc1825e1700b137fb5719e767e0e78e789979df2c194f677ea9c5e531f34965d47b9e37c239944c38d0570c7a9685
+DIST mesa-20.1.0-rc4.tar.xz 12601932 BLAKE2B a7d02e7f8f155ae1591df8c07aad642109cabfc64c0d015605bc0baa10233830b423e5aa57be23e450628f5ffc6f8655ce3962aecea08504574e54d7b2e1aa01 SHA512 31358470a330294fa4842997cd2e6f00c4ee6cac10d6c264aa673a10d82c29051fea2e83629e2a638b659df4cb17f4e2b9d0fff1c6f6259d07d9db4dbfa10824
+DIST mesa-20.1.0.tar.xz 12661712 BLAKE2B cdd5f1d9167ed2c2d1e4f63d5c8ededbaf3d10fc31a6366535a3424b89137fafa34df29f59443ca97eb071cad502e10fa85c32ca33982018d7a50299130d76c7 SHA512 f49230d18febe1bfd7c6282ab95fc244530f5cef56df0f804d8bece8a70bafcb445b8b83df96ad1b4c5af022c4e39a71f19a8f7e47b1fb09ada2b1a1317ff3be
+EBUILD mesa-19.3.5.ebuild 14865 BLAKE2B d7b0fcc84cf17d248a23f8d3decadaf7e55165bec5a186633d4cfb01b738583e4c7cfa81de5f669445776ee8b10043af8f1328a5918f48529ec9750324e1a155 SHA512 b7132b00f57356a4b244e0a9dd4b618119efa85b539bc0228f8e770b28fb6f1ccfffbe235100748ff2834a674c49bca38b8282b6c2e47d20356349c244b9f6e9
+EBUILD mesa-20.0.4-r1.ebuild 14877 BLAKE2B b7221bc6c6c564f5621d19d01c7412fdf8b734304b3469b757f9fed0fe9aa67330eab2ab6e2b8595cfe6cc4b019474118cf50b0c7b156948f0ee8c5bec1ee167 SHA512 8ca4b2b70f08775a2fce7c857cb64fc5cdf5e10075e4b5d3723535380024585a17a34cd344ec5de47acb404acc9af76171f7e97c6f54354a8da2d78135cecbf2
+EBUILD mesa-20.0.7.ebuild 14914 BLAKE2B 0593a1fefdfa89754eb0b9880dd555b286ac9efdaa91d93a31e711ea0ef36686773f7449b33c933c23e614167764937978c8bae95e7682c712fd817b741fb4c9 SHA512 5e904f7560f0766ba1c72834e59c8353eb409f3f14d0f0df3275fd2b5a0d5fb6640e02bd1991cd15527747016663ec2bab5bc2e16e77dab2d567f7a18b03c0c0
+EBUILD mesa-20.1.0.ebuild 14914 BLAKE2B 0593a1fefdfa89754eb0b9880dd555b286ac9efdaa91d93a31e711ea0ef36686773f7449b33c933c23e614167764937978c8bae95e7682c712fd817b741fb4c9 SHA512 5e904f7560f0766ba1c72834e59c8353eb409f3f14d0f0df3275fd2b5a0d5fb6640e02bd1991cd15527747016663ec2bab5bc2e16e77dab2d567f7a18b03c0c0
+EBUILD mesa-20.1.0_rc4.ebuild 14914 BLAKE2B 0593a1fefdfa89754eb0b9880dd555b286ac9efdaa91d93a31e711ea0ef36686773f7449b33c933c23e614167764937978c8bae95e7682c712fd817b741fb4c9 SHA512 5e904f7560f0766ba1c72834e59c8353eb409f3f14d0f0df3275fd2b5a0d5fb6640e02bd1991cd15527747016663ec2bab5bc2e16e77dab2d567f7a18b03c0c0
+EBUILD mesa-9999.ebuild 14914 BLAKE2B 0593a1fefdfa89754eb0b9880dd555b286ac9efdaa91d93a31e711ea0ef36686773f7449b33c933c23e614167764937978c8bae95e7682c712fd817b741fb4c9 SHA512 5e904f7560f0766ba1c72834e59c8353eb409f3f14d0f0df3275fd2b5a0d5fb6640e02bd1991cd15527747016663ec2bab5bc2e16e77dab2d567f7a18b03c0c0
 MISC metadata.xml 1989 BLAKE2B 239b50a1ebb1c70411ec31b3c1c2b85aa620f3ea7e0fcc104b3bdf9c1062df46948eeddbb5dc06258664b0a5c962d2af62d9d7f29091a82540ce170e2b1a3d21 SHA512 e8404153aa7d82b7c459afbab6483cb70372e3c69e366f71e3953d26a9299e5a82fc249751ba83a2a61329dae68e2aebb67d7989ea59fc2eb81c3d5c008ed2c0
diff --git a/media-libs/mesa/mesa-19.3.5.ebuild b/media-libs/mesa/mesa-19.3.5.ebuild
index 7773329bcc6e..734d4a391c51 100644
--- a/media-libs/mesa/mesa-19.3.5.ebuild
+++ b/media-libs/mesa/mesa-19.3.5.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit llvm meson multilib-minimal pax-utils python-any-r1
+inherit llvm meson multilib-minimal pax-utils python-any-r1 linux-info
 
 OPENGL_DIR="xorg-x11"
 
@@ -325,6 +325,15 @@ 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
+		CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		linux-info_pkg_setup
+	fi
+
 	if use gallium && use llvm; then
 		llvm_pkg_setup
 	fi
diff --git a/media-libs/mesa/mesa-20.0.4-r1.ebuild b/media-libs/mesa/mesa-20.0.4-r1.ebuild
index 7beeaef918f6..097105ff4c5b 100644
--- a/media-libs/mesa/mesa-20.0.4-r1.ebuild
+++ b/media-libs/mesa/mesa-20.0.4-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit llvm meson multilib-minimal python-any-r1
+inherit llvm meson multilib-minimal python-any-r1 linux-info
 
 OPENGL_DIR="xorg-x11"
 
@@ -330,6 +330,15 @@ 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
+		CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		linux-info_pkg_setup
+	fi
+
 	if use gallium && use llvm; then
 		llvm_pkg_setup
 	fi
diff --git a/media-libs/mesa/mesa-20.0.6.ebuild b/media-libs/mesa/mesa-20.0.7.ebuild
index 03083871b14d..ff719014070b 100644
--- a/media-libs/mesa/mesa-20.0.6.ebuild
+++ b/media-libs/mesa/mesa-20.0.7.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit llvm meson multilib-minimal python-any-r1
+inherit llvm meson multilib-minimal python-any-r1 linux-info
 
 OPENGL_DIR="xorg-x11"
 
@@ -334,6 +334,15 @@ 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
+		CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		linux-info_pkg_setup
+	fi
+
 	if use gallium && use llvm; then
 		llvm_pkg_setup
 	fi
diff --git a/media-libs/mesa/mesa-20.1.0_rc2.ebuild b/media-libs/mesa/mesa-20.1.0.ebuild
index 03083871b14d..ff719014070b 100644
--- a/media-libs/mesa/mesa-20.1.0_rc2.ebuild
+++ b/media-libs/mesa/mesa-20.1.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit llvm meson multilib-minimal python-any-r1
+inherit llvm meson multilib-minimal python-any-r1 linux-info
 
 OPENGL_DIR="xorg-x11"
 
@@ -334,6 +334,15 @@ 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
+		CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		linux-info_pkg_setup
+	fi
+
 	if use gallium && use llvm; then
 		llvm_pkg_setup
 	fi
diff --git a/media-libs/mesa/mesa-20.0.5.ebuild b/media-libs/mesa/mesa-20.1.0_rc4.ebuild
index b5ed3341ee9e..ff719014070b 100644
--- a/media-libs/mesa/mesa-20.0.5.ebuild
+++ b/media-libs/mesa/mesa-20.1.0_rc4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit llvm meson multilib-minimal python-any-r1
+inherit llvm meson multilib-minimal python-any-r1 linux-info
 
 OPENGL_DIR="xorg-x11"
 
@@ -146,9 +146,10 @@ RDEPEND="${RDEPEND}
 # 1. List all the working slots (with min versions) in ||, newest first.
 # 2. Update the := to specify *max* version, e.g. < 10.
 # 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="9"
+LLVM_MAX_SLOT="10"
 LLVM_DEPSTR="
 	|| (
+		sys-devel/llvm:10[${MULTILIB_USEDEP}]
 		sys-devel/llvm:9[${MULTILIB_USEDEP}]
 		sys-devel/llvm:8[${MULTILIB_USEDEP}]
 	)
@@ -333,6 +334,15 @@ 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
+		CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		linux-info_pkg_setup
+	fi
+
 	if use gallium && use llvm; then
 		llvm_pkg_setup
 	fi
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 03083871b14d..ff719014070b 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit llvm meson multilib-minimal python-any-r1
+inherit llvm meson multilib-minimal python-any-r1 linux-info
 
 OPENGL_DIR="xorg-x11"
 
@@ -334,6 +334,15 @@ 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
+		CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		linux-info_pkg_setup
+	fi
+
 	if use gallium && use llvm; then
 		llvm_pkg_setup
 	fi
diff --git a/media-libs/nas/Manifest b/media-libs/nas/Manifest
index 81ebbf36ab4e..93fdefef2923 100644
--- a/media-libs/nas/Manifest
+++ b/media-libs/nas/Manifest
@@ -1,8 +1,9 @@
 AUX nas-1.9.2-asneeded.patch 374 BLAKE2B a142f505190214db4f235ef8ec6283029c127b9b3c313b2405e6222a6f3d6d89931066d64a71b350b289ed07bed198bbc71a862396ef77d3fb5e7a2426b5abad SHA512 ad9275577d2e10f5201556e21f6251065d392a9620c475e1451b673fa62dc50ac8e45248862a802a70cd0efb19ad67205b50e05df1588f91ef854e66860334a3
+AUX nas-1.9.4-fno-config.patch 1525 BLAKE2B 82c6158ccad4b4de043309022fe8ecbbf02f1f934aaa6f41524920b9725e027d983eff49d85ea55ce866409c31137e9293c5f5b04a10b24f759fefc1043f540a SHA512 4619e6027590763195483af3b77b1802f8d3c9a2c54dbcbccd4a0c6814c0add7d8f89c85cfd5a6bb39654a1e2f95f1b4762f2b6f038b781f35773b5541b0d0fd
 AUX nas-1.9.4-libfl.patch 349 BLAKE2B ee8d3ec8859fc47c87bf5d9a40cc2b468c136983a6b8dfb22d4c6469630b5dae92d3ec382ff7afc5ac2f94435ac8208059f90313a03700c4da7b93a19e34c05c SHA512 e4291fce8199f4340b969da6e2742e26ef6589e71ecc947a0fb1d68b9f995ae7dd514ad98232a4c11d1ebc7ea0ab3ea95674893fedbae7626c97c06c9ba88459
 AUX nas-1.9.4-remove-abs-fabs.patch 1164 BLAKE2B 1fd8fb65a12cb340c47ee80929e2617d278c84bca2231ed55806301fbbd69f2b820327d06aad9f3ac5b763183fabc0282470bf396e08193ce35d4482d742e821 SHA512 bb8753e6dac817ec5df490ee385619ce39fff6c033aa6171e7ff3da5df649fd30dbf405729b1d27d2e37a24be5c6e7782a713f5cf452a2b68dab63d639e39ffb
 AUX nas.conf.d 229 BLAKE2B 2ac8a6d914d02bc92258d7dfe3118e89ed6e3fe9d98e7a24eb8d72ded22dbb68a2d8129d066dc1457c0b8959f1762197b61f90502d3c60cdefd8aaeced04bbb3 SHA512 53cb9906d169b63b3592443bc0b63d59c4d0683e4b2194c60b1bc4297e6556f04b3ee9bf81da3a7f144757354de9aebe08c8445fccaa9a458a3b6537da68a2ac
 AUX nas.init.d 347 BLAKE2B 8b87c877fafd0e5993f909a4e132ed9f7042a3d8bdced8c7487afc962dfcad24a586ac754b99cbff815475f1326f44d52effb8eefd65cd0e25e6bc45991233af SHA512 556fc5d5135f789b0691de889aeaadce29319964443052787db5cb4cda480ed68c547c772de97c07ba2e0800f25cfa859376a3d80e9518995aae8136fe171468
 DIST nas-1.9.4.src.tar.gz 1464598 BLAKE2B d79ecda9f86a89d2d61bfadfeee4bb6a9feca6754bb88249b1eb3c1964e784d18098465f30f1b5bbb13d0550aebf48bb1b98aeb1b7c712f344a2eddc7720531b SHA512 3f8bd60f8ce0f25a2605af17caaadfe4f21223ba4cd3fa02078d1427b17cdf33ebda887e5dc30cd68eb7f64bfad80aafc9071ff0a26f0d3a4a93caacac03b5bb
-EBUILD nas-1.9.4-r2.ebuild 2430 BLAKE2B 0d35757c1281174fb718b6c3c0c98fe9140902938b205c68bf6a105ee7ca5e32d1498e3ef541a77fd20337f94eee9b194afcd8dcb33bf8c9c53698309ef488ef SHA512 741300d9b381ed29175da4dbbad2986a418745d533946649212923167cff664428ae5e061a81d7d639b1feb368c3833c57c5226c0361987c3a571198e73bd268
+EBUILD nas-1.9.4-r2.ebuild 2453 BLAKE2B c774cff40be416f75b4ce9a8e5b4c8d94bb5a4df38f1a9fbe2ef525eb22b522087b59381764b9adc2350a7facc2dda561b86cfa57fad13457ec9e8b9429b2b47 SHA512 7133590ecd846dee2b73f5b0a7e2e6e43332f6e3fc952ac1f4c95b102053c4352ee345bca7b83bceec39884276c2f5c7754cb67c6176acfe2ab276a6871e4e1f
 MISC metadata.xml 326 BLAKE2B 837bd2d88bfc59121d0e166ae65c8d4732b8cdc6a898183bfb1fd984b5bc3e8e3a2c3f22d763a26664da7f97c9091fc9c3af8c419b3e9e39a7410989434ed739 SHA512 7a2a048b46af5cfd9167aec79f8a4f4e8a10f8327d1aec4b59330cdfdc7e4b90d9b9ab85e73e2b0a0e5db6b71bb729e7886dc3763a4d75d8ed4602b7b6cb61e7
diff --git a/media-libs/nas/files/nas-1.9.4-fno-config.patch b/media-libs/nas/files/nas-1.9.4-fno-config.patch
new file mode 100644
index 000000000000..e5ce72d37d9a
--- /dev/null
+++ b/media-libs/nas/files/nas-1.9.4-fno-config.patch
@@ -0,0 +1,42 @@
+From f1e8e0da221152560efcb097c00539476071047c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Thu, 23 Jan 2020 13:43:12 +0100
+Subject: [PATCH] Fix building with GCC 10
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+GCC 10 defaults to -fno-common and as a result raises an arror when
+linking nasd:
+
+gcc -o nasd -O2 -fno-strict-aliasing   -Wl,-z,relro -Wl,--as-needed  -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld  -L../lib/audio -L/usr/lib64 -L/usr/lib64    dia/libdia.a dda/voxware/libvoxware.a os/libos.a
+/usr/bin/ld: dia/libdia.a(lex.o): in function `$d':
+lex.c:(.bss+0x48): multiple definition of `yyin'; dia/libdia.a(main.o):/builddir/build/BUILD/nas-1.9.4/server/dia/main.c:79: first defined here
+collect2: error: ld returned 1 exit status
+
+The reason is that both lex.c (generated from lex.l) and main.c
+define yyin global variable.
+
+This patch changes the main.c definition into a declaration.
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ server/dia/main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/server/dia/main.c b/server/dia/main.c
+index 462e89b..9ea2a12 100644
+--- a/server/dia/main.c
++++ b/server/dia/main.c
+@@ -76,7 +76,7 @@ static char *AuServerName(void);
+ extern char *display;
+ 
+ static int restart = 0;
+-FILE *yyin;                     /* for the config parser */
++extern FILE *yyin;                     /* for the config parser */
+ 
+ void
+ NotImplemented()
+-- 
+2.26.2
+
diff --git a/media-libs/nas/nas-1.9.4-r2.ebuild b/media-libs/nas/nas-1.9.4-r2.ebuild
index f83d66bb9d9a..2965f1bf3de9 100644
--- a/media-libs/nas/nas-1.9.4-r2.ebuild
+++ b/media-libs/nas/nas-1.9.4-r2.ebuild
@@ -35,9 +35,10 @@ DEPEND="${RDEPEND}
 DOCS=( BUILDNOTES FAQ HISTORY README RELEASE TODO )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.2-asneeded.patch
-	"${FILESDIR}"/${PN}-1.9.4-remove-abs-fabs.patch
-	"${FILESDIR}"/${PN}-1.9.4-libfl.patch
+	"${FILESDIR}/${PN}-1.9.2-asneeded.patch"
+	"${FILESDIR}/${P}-remove-abs-fabs.patch"
+	"${FILESDIR}/${P}-libfl.patch"
+	"${FILESDIR}/${P}-fno-config.patch"
 )
 
 src_prepare() {
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index ff206ae99a19..e29915d8d1b2 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -4,5 +4,5 @@ AUX opencolorio-1.1.0-remove-building-of-bundled-programs.patch 6108 BLAKE2B dfd
 AUX opencolorio-1.1.0-use-GNUInstallDirs-and-fix-cmake-install-location.patch 4002 BLAKE2B 8cadf37f7e4ccc2f14268ef71c5765fa43493f6c93ce651d1d2a7a2d5859238ba77802907ee84b0d5efcd6bd75f4ccd13d585f7822a4c8d285be586207e58752 SHA512 37f852d4f0620dd799a7aa09f0c651c72a311656c6ecb72429a440563ca936852a1227a92dca01afd97632f401babf875796f222a82362727ff7074bbe251ac5
 AUX opencolorio-1.1.0-yaml-cpp-0.6.patch 2315 BLAKE2B eaaa69e7bd76a1c40ad823eb1be9cec93d69c0b024521e31d17aa6f5b2c1e29607cf3d238cac1aba19cec3149450b1ab15d1236332ff807bdb872db62f00b3b7 SHA512 2436a404581b26db6416b013ce9de8302c20878d1c956f5ddb40c2d590c0df7a2a8c3108590330598441db51f4aae9b6d485af8b7034b22316fa42ccdc801fa5
 DIST opencolorio-1.1.0.tar.gz 13826812 BLAKE2B 555a5ac393170503c944c3471ea482b1a22be7c98ee7b81af37f52db185c8b61c5318102c139a8711f4828d306b6c4322f5d839c4df08ce41ebbb9dcb2bda152 SHA512 909874a9f91a8d229622810fc70233680c6e75203bd8555179322de2873da00bf302432e19f189b787ffcda3157ddec1e4601c97f75a36e16f644fe7d42f6998
-EBUILD opencolorio-1.1.0-r4.ebuild 2309 BLAKE2B c58ee82e7093011a6ed5677e34bcea6b83463384a27d9a28c4999214a2e66351d57f2d0c19df1fcff22a682651de66637aa11483c49a172efb42173c9c0fbaac SHA512 c4d4a9d58578659bee3be7109d2127da60d39113bedecab966c045e495fbe3083a6ec60b425a7ede20bd9294961257f064451980d749300481a2be7d2f822dc2
+EBUILD opencolorio-1.1.0-r4.ebuild 2310 BLAKE2B 788799b39e953132ca0b41bab5e75f9fd0064525115f60b6f5c2dccede772682eeccd5a52f7c8149153fe194bd07fa871fe679ccd3f5c1c408bde18f05bccaba SHA512 62ff61d22e5bd13019568bfa9b17ac1533ca3791da58bf8cdda0af65e26481f8027ad3695ef61dbb654c1e556d10e6944ecd4612530517a78880b1df302c5346
 MISC metadata.xml 551 BLAKE2B b7a648f31772a6a72121dda8736a96e5c54189b20f1eea1600222b27385b695644887a9f084ba7a01c7a530593aa28a2319353c0fdb6e549a03a85fc8a7a1cf4 SHA512 ddd9c8afeb0540e663b3e963f926247da21c72574459cb2f82dc956476fce18f5eb0e2b140ccdbadc98f71b5b855f674d227271f9ff781f689126afbc555f846
diff --git a/media-libs/opencolorio/opencolorio-1.1.0-r4.ebuild b/media-libs/opencolorio/opencolorio-1.1.0-r4.ebuild
index 4a379bbe9135..e1ff1e915821 100644
--- a/media-libs/opencolorio/opencolorio-1.1.0-r4.ebuild
+++ b/media-libs/opencolorio/opencolorio-1.1.0-r4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake flag-o-matic python-single-r1
 
 DESCRIPTION="A color management framework for visual effects and animation"
-HOMEPAGE="http://opencolorio.org/"
+HOMEPAGE="https://opencolorio.org/"
 
 SRC_URI="https://github.com/imageworks/OpenColorIO/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest
index 3a829f37da70..3d51222b7bb1 100644
--- a/media-libs/openh264/Manifest
+++ b/media-libs/openh264/Manifest
@@ -1,5 +1,8 @@
 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
 EBUILD openh264-1.7.0-r1.ebuild 2949 BLAKE2B 2085049cb86b5ac355e552acf9b0aedb363f6d9fd6ed806ce1bdf70e9da633b8a9657eef131af8dbc647e9e66e410190fe7c05ae99ff4311423b81ec4ceda08f SHA512 d5ed45707baa5a689b9060e0a1c784721b3f8be5632565bc0581acc9dec982666b54bed97aa7e04f0ecd429784e45aabf20c2fed88f7bf5d8e648308668c1140
+EBUILD openh264-2.1.0.ebuild 3016 BLAKE2B 9f66932a8bc4adb8999889fbab3ba7dd45e6115c8e90a244ae476099bdaf24001c8bfba25e95c4c6ad789de40b45ba2853884fd3a0134a9cc2ad8823069e418e SHA512 f5a3b0afc0c30d53d5770a6a0423176f77fd6c23d16b91458cbc654b907324fa294674ecd89f3e3a2c78f818c8325cbc7be846bdb813fc31ad469d479798bebd
 MISC metadata.xml 595 BLAKE2B 9d5fd608235086cb070457016516be296db695e67d50e8b3c0958133bff3cfa24a87c9abb42c043d94d5d64ba6fb3e9d485b4c9d07042054a9eb25e6ee73ad4b SHA512 8fc3fa7f260a188f7ebf43d85da27a49a924a2ce0835fd37f0db356caa401102eee0ade0fa414303d8a0681ddb4b10abd4da5a9bb5cf79ea31f5b96199897220
diff --git a/media-libs/openh264/files/openh264-2.1.0-pkgconfig-pathfix.patch b/media-libs/openh264/files/openh264-2.1.0-pkgconfig-pathfix.patch
new file mode 100644
index 000000000000..275322a01906
--- /dev/null
+++ b/media-libs/openh264/files/openh264-2.1.0-pkgconfig-pathfix.patch
@@ -0,0 +1,43 @@
+diff --git a/Makefile b/Makefile
+index bf398d7..c72b024 100644
+--- a/Makefile
++++ b/Makefile
+@@ -27,6 +27,7 @@ OBJ=o
+ DESTDIR=
+ LIBDIR_NAME=lib
+ SHAREDLIB_DIR=$(PREFIX)/lib
++INCLUDES_DIR=$(PREFIX)/include
+ PROJECT_NAME=openh264
+ MODULE_NAME=gmpopenh264
+ GMP_API_BRANCH=Firefox39
+@@ -285,14 +286,14 @@ endif
+ endif
+ 
+ $(PROJECT_NAME).pc: $(PROJECT_NAME).pc.in
+-	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@libdir@;$(PREFIX)/lib;' -e 's;@VERSION@;$(FULL_VERSION);' -e 's;@LIBS@;;' -e 's;@LIBS_PRIVATE@;$(STATIC_LDFLAGS);' < $< > $@
++	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@libdir@;$(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;@libdir@;$(PREFIX)/lib;' -e 's;@VERSION@;$(FULL_VERSION);' -e 's;@LIBS@;$(STATIC_LDFLAGS);' -e 's;@LIBS_PRIVATE@;;' < $< > $@
++	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@libdir@;$(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/openh264.pc.in b/openh264.pc.in
+index f86225c..bee78bc 100644
+--- a/openh264.pc.in
++++ b/openh264.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ libdir=@libdir@
+-includedir=${prefix}/include
++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.
diff --git a/media-libs/openh264/openh264-2.1.0.ebuild b/media-libs/openh264/openh264-2.1.0.ebuild
new file mode 100644
index 000000000000..adcec1df1fb6
--- /dev/null
+++ b/media-libs/openh264/openh264-2.1.0.ebuild
@@ -0,0 +1,106 @@
+# 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="${EROOT}/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/portaudio/Manifest b/media-libs/portaudio/Manifest
index 20a3121091d6..1700ac22012d 100644
--- a/media-libs/portaudio/Manifest
+++ b/media-libs/portaudio/Manifest
@@ -1,5 +1,7 @@
+AUX portaudio-19.06.00-AR.patch 349 BLAKE2B 0653ad46ccfff8b50c127471395c1f6bdc493c42a0376f6604544c5c242794ac9f4abd7c4b3d617a9d07cbc6e3c3907023f98243bdf67a44b8bb64d9fb0c2a95 SHA512 106acc5c072e9fa39763ce10a905c4a1c5b7f46951109c3cb06c8b2fba0e56791e8fd88f1bb3b0254ad0bd305d5e32bee3a19a44b0d49e633e3f8c86e6a3be35
 DIST pa_stable_v190600_20161030.tgz 1450572 BLAKE2B 3cd63cca55ff222f452d306a1ab9035739545f48dbc9bc58196052cb51e518d86568059c7528533a6932c39c68d1a5210e06470a16343b92c7e4132b71cc552e SHA512 7ec692cbd8c23878b029fad9d9fd63a021f57e60c4921f602995a2fca070c29f17a280c7f2da5966c4aad29d28434538452f4c822eacf3a60af59a6dc8e9704c
 DIST portaudio-19.06.00-audacity-portmixer.patch 8722 BLAKE2B 2b69bcf26e55be46d354dc44756fd03b16031fa86a334b776eb4326a4c64a7e22abd6bf60794847526102391c8e65813b41338cf94c647e3e9b68d82ea5dc5f5 SHA512 f693aef477b516c7a03eb021260cbecb23200422a927a117e3e59a1b4e6c6c2983fbea8ee3a3714ebc55728933654bd7909327a0bab4450ccf4e6a02c86a63b5
 EBUILD portaudio-19.06.00-r1.ebuild 1285 BLAKE2B 319c55d024d2ae68eb5f2b3a93c47c999ef5eed32d9836f5a96812a44a719b0243018d0688231afdbe1bcac92a4d3d60fc2b2f51f34205e9da0054d4b3d31629 SHA512 afb626dfa7b4b2cee075aef3a6c4a479882bc16bb79747f8e0f47f15537de6b8f55b523ef18b557609a7f4eb87b4d2ae5d5ea62089a7541778e81b2a62f98107
 EBUILD portaudio-19.06.00-r2.ebuild 1531 BLAKE2B 581984a97619f43f1a92091021bc3b814d3d9484ff4e50ddf4c4f971ddedcd090fdcc57287c415a520cc60527e05f46e52f7f59503f5883a8e7523a2eb340bfb SHA512 1fa626365aca15516489cb564f8014267dfba7ee0119821e96c860e6e76d5bb1c91afe0a9a8b74bb2a86b19e25b7b2e9504673e6056a4e42093c1bbff4e71307
+EBUILD portaudio-19.06.00-r3.ebuild 1650 BLAKE2B f3769c0948f6e4a2c40f7ac4ac48bfd62b81eae2cd4381d64a15a9745f60a4acfb0cb410894b1f06a9cc8b4bb997995d55547401a7700c53e4724c1d3c350a9e SHA512 6640b50b0041de0062e8a8872c7407e20dd219510e682321af122fe8c3d68fae3c122f9c089d67bb720679b7c44dc87287fc0e62a0334fbd65924e6c35ad848e
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/portaudio/files/portaudio-19.06.00-AR.patch b/media-libs/portaudio/files/portaudio-19.06.00-AR.patch
new file mode 100644
index 000000000000..4628c0aff920
--- /dev/null
+++ b/media-libs/portaudio/files/portaudio-19.06.00-AR.patch
@@ -0,0 +1,14 @@
+Accept relative paths to AR as well.
+
+https://bugs.gentoo.org/720966
+--- a/configure.in
++++ b/configure.in
+@@ -105,7 +105,7 @@ AC_LIBTOOL_WIN32_DLL
+ AC_PROG_LIBTOOL
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+-AC_PATH_PROG(AR, ar, no)
++AC_CHECK_PROG(AR, ar, no)
+ if [[ $AR = "no" ]] ; then
+     AC_MSG_ERROR("Could not find ar - needed to create a library")
+ fi
diff --git a/media-libs/portaudio/portaudio-19.06.00-r3.ebuild b/media-libs/portaudio/portaudio-19.06.00-r3.ebuild
new file mode 100644
index 000000000000..5664a73ea98f
--- /dev/null
+++ b/media-libs/portaudio/portaudio-19.06.00-r3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools multilib-minimal
+
+DESCRIPTION="A free, cross-platform, open-source, audio I/O library"
+HOMEPAGE="http://www.portaudio.com/"
+SRC_URI="http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz
+	https://sources.debian.org/data/main/p/portaudio19/19.6.0-1/debian/patches/audacity-portmixer.patch -> ${PN}-19.06.00-audacity-portmixer.patch"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="alsa +cxx debug doc jack oss static-libs"
+
+RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${PN}"
+
+DOCS=( README.txt )
+
+PATCHES=(
+	"${DISTDIR}/${PN}-19.06.00-audacity-portmixer.patch"
+	"${FILESDIR}"/${PN}-19.06.00-AR.patch # bug #720966, trigger reconf
+)
+
+src_prepare() {
+	default
+
+	eautoconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable debug debug-output)
+		$(use_enable cxx)
+		$(use_enable static-libs static)
+		$(use_with alsa)
+		$(use_with jack)
+		$(use_with oss)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	# workaround parallel build issue
+	emake lib/libportaudio.la
+	emake
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if use doc; then
+		doxygen -u Doxyfile || die
+		doxygen Doxyfile || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	use doc && dodoc -r doc/html
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/media-libs/pulseaudio-qt/Manifest b/media-libs/pulseaudio-qt/Manifest
index 759746395ac2..1bc0fca725f7 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 675 BLAKE2B 8167b7caceaa1a6ac146dbdc5c88d1a821a53e707f021077b645a503a1024cbf54b5fd0eaa686a6498c8406359228e3d8e7d4fd83c6e4414c3be6d90e8b86616 SHA512 6d05d095f2317558db7eafce5f6158fd0733f4967b4b6a68fa4b806069ababa964f47448ce5a53191b9ab0f4d1184505bbec66ad5df6aceca08740b394de7e66
+EBUILD pulseaudio-qt-1.2.ebuild 682 BLAKE2B 82674bb678033fc75f72d4a6d408633d2865f94e5bf6500c72f39edc4129279523f286bcac0952623d127030c3698903a8b7b6e1101eb6570412d88453236bf2 SHA512 32a38922b7c1f770d539cc1b06e5c351f94a0dd1512641a46bc0cb2959b6e1faf2eafa95658399c33ba05468f58d297a3cf06155272af71fb34c9284cee80f97
 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 577af8c394e9..4aa20d60c53c 100644
--- a/media-libs/pulseaudio-qt/pulseaudio-qt-1.2.ebuild
+++ b/media-libs/pulseaudio-qt/pulseaudio-qt-1.2.ebuild
@@ -10,7 +10,7 @@ QTMIN=5.12.3
 inherit ecm kde.org
 
 DESCRIPTION="Qt bindings for libpulse"
-HOMEPAGE="https://cgit.kde.org/pulseaudio-qt.git/"
+HOMEPAGE="https://invent.kde.org/libraries/pulseaudio-qt"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
diff --git a/media-libs/rlottie/Manifest b/media-libs/rlottie/Manifest
index 6b547cbaf2e2..14d029865713 100644
--- a/media-libs/rlottie/Manifest
+++ b/media-libs/rlottie/Manifest
@@ -1,6 +1,4 @@
 AUX rlottie-0.0.1_pre20190920-disable-werror.patch 420 BLAKE2B 3b3173c4514227de44f1f953678dcce871b3df07ccbb617d0f8a18763f66dadf584fdacd8eeb31a8391a5b8a8a1c00a05137790ad09662e093eb7888f8f0bb4d SHA512 893b5a658a63e8fe4f62e72e967d9e89eaef8184680c1b753fbc0c0893078bbf963967dd4dadff6a94150b7b15c0b6c7ee7cd54631b6874aa3cf3d21989746ed
-DIST rlottie-0.0.1_pre20200110.tar.gz 3370396 BLAKE2B 02a51e6f24a83967ccbf085e0c28400e23057c833e4849db3f749d30a3ccb4ade2d4e0a8ea624da7ba0148bc84013ca4df963f01fc75ed4156ab8dc36bda6945 SHA512 e78470254ab7b9653dcd95037001a1763f4229bdc611f4631943f302b20739a6e4b519d54c967c1ecd7bcc4b555bb8f651af0bceebc04cc9ea41789360b49af4
 DIST rlottie-0.0.1_pre20200424.tar.gz 3371620 BLAKE2B cdfc89f66e7aec736029416decf76777f22b4cb8293bed74e647088480faed4c6ffd03a29a967ac532f9e747858fdd93fa552eb974085f7cf1701a12fe3a2c38 SHA512 1a05b835c083337a80b32ea8c1e201d1d2356c58e314b791f74f95504303f3ef46d3951abf2a7467daaeae462c1fe2cf793d9fb2402639b279ca6ea6367cdda7
-EBUILD rlottie-0.0.1_pre20200110.ebuild 907 BLAKE2B 7a3ca199c35e65723f84ab673ceb7efab88c1fa85fc0d0fef9c313221c8337e8931493b7b07f95fb6f82209e04c982efdf5fb9fa21390f544554b90d35f054dc SHA512 c2c00742c7416cf543c8b38eff58e908b1d9dc2554a332e2ebd80a60da6d2c62f35ca34a4174ee6ad449672b3323720c1828f2a7d6936840644f6f2f670893df
-EBUILD rlottie-0.0.1_pre20200424.ebuild 1011 BLAKE2B efb762e3569df15fd700b131dbcd5a08504120f4ff87f9031bbd84a536f60cd8d80e1a1c9d50b0d2f01bf571d2c9c03bccfe599ef08a615d4ee4f1e57d9a658e SHA512 af73e5c014ddb75cbcc3f053cc39e89850b537716af2da974377e8f492f9932dcf446d714bb78272b1431541b40436808a9fbc254e7ca6426801380aad1d58a1
+EBUILD rlottie-0.0.1_pre20200424.ebuild 1009 BLAKE2B 8961c52e46ad05d16f96a04620373a950b8a6164b2dee685cda2079b96e466edfb5049c4f8f551f327b5a6f16d31ddb061aa88c8dfe3b6ced9e0f828b088cac0 SHA512 54bf08e1a2781a80b4c190bb0c86245dbc267a6d4bbd4e14e6bc83538c237819be1275737085ea25ae926d639397c26a7026ea93156649444a74f4ba42738ebd
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/media-libs/rlottie/rlottie-0.0.1_pre20200110.ebuild b/media-libs/rlottie/rlottie-0.0.1_pre20200110.ebuild
deleted file mode 100644
index 0888d99869e9..000000000000
--- a/media-libs/rlottie/rlottie-0.0.1_pre20200110.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-MY_COMMIT="f6fc61f214945ac9961ba49fdfc9a3d3336e999b"
-
-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"
-
-LICENSE="BSD FTL JSON LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="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 example=false
-		$(meson_use test)
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die "Failed to switch into BUILD_DIR."
-	eninja test
-}
diff --git a/media-libs/rlottie/rlottie-0.0.1_pre20200424.ebuild b/media-libs/rlottie/rlottie-0.0.1_pre20200424.ebuild
index 26b4f6d67e7f..04dfd80aa4c6 100644
--- a/media-libs/rlottie/rlottie-0.0.1_pre20200424.ebuild
+++ b/media-libs/rlottie/rlottie-0.0.1_pre20200424.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Samsung/rlottie/archive/${MY_COMMIT}.tar.gz -> ${P}.
 
 LICENSE="BSD FTL JSON LGPL-2.1 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/media-libs/tremor/Manifest b/media-libs/tremor/Manifest
index 30f77d361010..5cac764f69aa 100644
--- a/media-libs/tremor/Manifest
+++ b/media-libs/tremor/Manifest
@@ -1,5 +1,5 @@
 AUX tremor-0_pre20130223-out-of-bounds-write.patch 2721 BLAKE2B a9d254873d08d261c72197fbe44875aefe9f48f97464ccc5653e88e50fe3546d2426d80e62a67c0a595695737fb2b7c95df1a850b612688c02b2574a3b986fcc SHA512 022a8e813f42e3e9a0983cd2e948898dc36689433cc76d292b8b24bb3c7318bbe71a2618022a16025ee25dea0dab063266212499e5d84669603414b6c769f74e
 DIST tremor-0_pre20130223.tar.xz 110096 BLAKE2B aec25548c971d2021a3b5f81469d3bf74434f2bcf215601e79a2663fd044085519fde449736f0513c949de5a79e297cac65a7abd50f5fcd8b940f655b966b164 SHA512 3fc109dfc6f9f33da9d2da7d5c1708d6fe4b22179048c4acd5b4b037eafbdda392d5ba74ffec5d8a225d56ebd860f67d28e4460f0b54cb170152a0b9fd89c514
-EBUILD tremor-0_pre20130223-r1.ebuild 1021 BLAKE2B 3108f32c7f520e7d5d6f51a47f536e26063d7d6e659dcada38617042a49f8a655589235acae7893607f9c9c5e7045a2f2398a82d60ab5b9276995948234d7fa8 SHA512 d249b0f034aa3ac15f9f496eac373f2918d02c43ca02c6c3803f617259bd15a2898c27277a6a45b7bca5ce83b94ff1129561f19f9c7a7cdd7c3a8ca64d5aff0d
-EBUILD tremor-0_pre20130223-r2.ebuild 1113 BLAKE2B 3f1457d36bc7016ed5163b806ffc75d7b0f17a936dc35742eac96ea44482b1d0d0b64316afec2634b12396a2a8e8b437878a240e672a54b515dccc5c37ee5494 SHA512 9f58d0cbe18db7b96243baea709e53cd71652f65b8f8b7cfb139bf3ecdfa68d970e5260e19bdecfe7586b611b0d8b4acaee6f9236ed8aaa077548acc9a52f3aa
+EBUILD tremor-0_pre20130223-r1.ebuild 1022 BLAKE2B f153f867cd4326b392c62638ec680fa37034ead9424fb15aa16288d1f93a663542542c57162d28cfe54aa0ac412184848fc080fa968c85e45bb90248e2fda0a9 SHA512 bf9f397972e968f9ee384e64d0dc0d2e5a0b231c3e151c8a79fd316209c723ed041b334cea6ca31584de15d002a34eaaf4db1848c4b0d5c55383e793171a62ba
+EBUILD tremor-0_pre20130223-r2.ebuild 1107 BLAKE2B 875d0c2a1294aa8c735f75241d852ddd4fddcc5d01fedc45816b570a45a786b6f3b52f4489f22266668fc5f719e82e4251c773d1b5740268b798128550729fe0 SHA512 b4d256c39ee1eb32f3483a3d3438be2dfbc53fd0dc05aa8b4b84d0295ca924de7645a9ecf963948840143ed91e022fcdff82a6cd4deb37eb7598051fd8de78c7
 MISC metadata.xml 341 BLAKE2B f36ce19410676996a1ea63ed668fc17bb9d6bd795f4cc83d3fe4a01c4fc71bb43ec4982474f549a87b7d38ddd08a8d24c049a9243c1adeee5da8dc59f1fb265b SHA512 d386b0e5f226a6459d41ef8ac18fb129ecff461db36e5b26faeabc52b8814535d669ba1cf816e921eabc8786c6d073ed1ce8c9dde57c91bc186f282706b0c7c0
diff --git a/media-libs/tremor/tremor-0_pre20130223-r1.ebuild b/media-libs/tremor/tremor-0_pre20130223-r1.ebuild
index f1af3bd8b063..eb4cab721d89 100644
--- a/media-libs/tremor/tremor-0_pre20130223-r1.ebuild
+++ b/media-libs/tremor/tremor-0_pre20130223-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="low-accuracy static-libs"
 
 RDEPEND=">=media-libs/libogg-1.3.0:=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/tremor/tremor-0_pre20130223-r2.ebuild b/media-libs/tremor/tremor-0_pre20130223-r2.ebuild
index 4aa37c129b8c..1d96e6e8fde3 100644
--- a/media-libs/tremor/tremor-0_pre20130223-r2.ebuild
+++ b/media-libs/tremor/tremor-0_pre20130223-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="low-accuracy static-libs"
 
 RDEPEND=">=media-libs/libogg-1.3.0:=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/urt/Manifest b/media-libs/urt/Manifest
index 04bb6592cbad..4b2ffe844c48 100644
--- a/media-libs/urt/Manifest
+++ b/media-libs/urt/Manifest
@@ -9,6 +9,6 @@ AUX urt-3.1b-rle-fixes.patch 5108 BLAKE2B 0aca69e90f54386a654d1a20958239c988b48d
 AUX urt-3.1b-solaris.patch 281 BLAKE2B 55cc8b4824624c5b9f6db6ff6e62c841950c222981de896c8c6e9d66a8dbb1cbe5b90e54e3f24b07bea23c508c260e0639720b4103ada81fea3277e06ca63939 SHA512 6403f48e858af2f8a177588e231367c09f8c939fc614198a10e45ca83ec000f9d5baf67681c5a65fe75177d59d34ab10c19c3621ac0eda6382793ed3b6bd8d84
 AUX urt-3.1b-tempfile.patch 597 BLAKE2B 9f032e0b4dab232d4540a5e7043ff73ace2e6fcdc69e0b2ba1ecedc7f2b62902e0dfadaa78a2e1cddf6f0c173767afe36ee20af0a586072472c77d8f7d81212a SHA512 83784725f216d387771698b0f29c6d5b2bd5e79e5f6deb091905bbb87839824314217641df760cfb18ce87c9d58196860a4c9d12f08da6020fc80a2e7d40347f
 DIST urt-3.1b.tar.Z 1016405 BLAKE2B 68742773591e2ae28702efb4286939c4000d32edd93110548abc25ab62bfa85e36354f20de6aa74c805ea1c4c8dfa23219c9e6fb08e1c73d90d2625404583aa1 SHA512 6c9070cd106f1d696d22f862cc1c4e10325fafc7bae51e8bb1fb98f6bf8babe21a133e21b3acc0c11cf1b28a23123c8ee7bb064c9d86301b14a1c217fbe1a12d
-EBUILD urt-3.1b-r1.ebuild 2023 BLAKE2B a0400b38357f61b670d4ff16ecc700933acdb3610a8385d4107e4b5e3aa74fb1a6f2f627a2125c658f83585de238e8e59fc409107be7c3cc822e63b2d488cdf9 SHA512 da87588daa7782585c4384673abf494d71a09fa3e7edbf79e49608309f93daf46426bcbdc0ad5cc9b7fe917b0de740d444c02393b00b594c7247e9e97fceb9cc
-EBUILD urt-3.1b-r3.ebuild 2357 BLAKE2B 4a3b6fd6daac0982039c69f9e76cdaae9dbef5012389a69c53f6a10d9934043c398d42cc81478b28fe96196b0cf82cdb6b0d32b3308414aa1be89bc8133bf78d SHA512 d9d2237e05f9bfcd15eab694a22277c117712a8b06aa78e56e0f995cc0607e2fb6903a873248e2c5b55c485b0abb59b44883af3fa8fbb78f2d3f329b8fdf7008
+EBUILD urt-3.1b-r1.ebuild 2024 BLAKE2B 83ced9f74ef19a2c24d0c93f55f1eb8d58d7e6c9e963b7c25485ce5fdb5215e7ce4612ab47533f9d5fbf5d0283bda98d151a1371d3a8fd4ff65066d4cc77902b SHA512 7b71e6690bc1297c30550e54ae92b842748c3ad41a3a32ffd4faa05d60404c5c0b136f0332d24c9f0229a75465c675fd6fb488ea16ceea361d228fcc900fbcb4
+EBUILD urt-3.1b-r3.ebuild 2358 BLAKE2B e54f679e95e44661ad7e334196ac1a5a6631c0ca0b3da637540fe514a8b363ba941b69dbe43d9126495186d20edab9f0c2a152e1593fbdbb248f12a1d73aafd4 SHA512 dab0b1fcb0b8a6acf46b6763a4d86f8949d1b311bb66fa89bc77520b866b915e0ed286f3edbfafa342106b67a145836a9291f5aebbeff9c1d75ed67c0068a426
 MISC metadata.xml 308 BLAKE2B 6006038e97bc7af97fd7e4c95f87d19d2458452da5ba066df88aff58fd10bf0f29daef641aaf39ec14a102f4e23a0b3be30006a6aed3830322e2f148a13dc5b7 SHA512 1056a163d7f6c3f2e540e6f1b315ea23aa4e9664c14ba51d094e33ab8ac4e3888fc9b049b91e3f2596e9458efe6041a7e2c5c40979171f7fd473fa6994862ffd
diff --git a/media-libs/urt/urt-3.1b-r1.ebuild b/media-libs/urt/urt-3.1b-r1.ebuild
index 3b4bba553645..4765c23d3cfa 100644
--- a/media-libs/urt/urt-3.1b-r1.ebuild
+++ b/media-libs/urt/urt-3.1b-r1.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 inherit eutils toolchain-funcs
 
 DESCRIPTION="the Utah Raster Toolkit is a library for dealing with raster images"
-HOMEPAGE="http://www.cs.utah.edu/gdc/projects/urt/"
+HOMEPAGE="https://www.cs.utah.edu/gdc/projects/urt/"
 SRC_URI="ftp://ftp.iastate.edu/pub/utah-raster/${P}.tar.Z"
 
 LICENSE="URT gif? ( free-noncomm )"
diff --git a/media-libs/urt/urt-3.1b-r3.ebuild b/media-libs/urt/urt-3.1b-r3.ebuild
index 23810c5338e1..04a75fb83a64 100644
--- a/media-libs/urt/urt-3.1b-r3.ebuild
+++ b/media-libs/urt/urt-3.1b-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit eutils flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="the Utah Raster Toolkit is a library for dealing with raster images"
-HOMEPAGE="http://www.cs.utah.edu/gdc/projects/urt/"
+HOMEPAGE="https://www.cs.utah.edu/gdc/projects/urt/"
 SRC_URI="ftp://ftp.iastate.edu/pub/utah-raster/${P}.tar.Z"
 
 LICENSE="URT gif? ( free-noncomm )"
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index f4dbcc7fe462..9cfcfe52fabc 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -2,9 +2,10 @@ DIST vulkan-loader-1.1.125.tar.gz 1398802 BLAKE2B 7cf1f99f60b4b37bfad12580fc8809
 DIST vulkan-loader-1.2.133.tar.gz 1401215 BLAKE2B 4a52e2735ed584f96f563dd23761c25169158a12488f50267375cb85dec411fed61f3ac0f090d77a650e9d055e384562d4fd644571b20e45ff0c316547b88647 SHA512 ba486cd0b20d1936a8a7e97509bdaa5e1c42f024428d6f710af80152d55f486c76db072ae44add089ff20eef21a768073904236e6d29d46dd1475d77d26f9907
 DIST vulkan-loader-1.2.135.tar.gz 1405922 BLAKE2B 02d984f758da0c57fbabf18b042da73a2e44d8990e74da9959eddabfb6190732f72ffbe91ccad9c54daf76535ad1b5d7a24244db5e6a0a32a2f1be0ca9dae683 SHA512 cd0092761fed30c830872ee7d5b923996047ac5fcd4e3ba7f5e5f02f36c31a17f93a4acf2b2a5f42e3b956a9769427730b6974f745697a2c871e1582afec7284
 DIST vulkan-loader-1.2.137.tar.gz 1407611 BLAKE2B 32762198b4a71d14c9f487c28a728067a81c8607df2174688cbe3dc575fc5655e22ff7840b516d7dc5d1eaf291d098c26d927ebfa9c80e49e702735af98bca02 SHA512 8ada45a79fed7c99bb7b35d8d2f15a69086aca30a1175469a6a2be31a418828abd16d1695ce36c0df305a6d0395e65008115a82aede8b31313edd745314b4796
+EBUILD vulkan-loader-1.1.125-r1.ebuild 1801 BLAKE2B fd54a22c96c7a4e7c300d0e1c0a550fe0efef2be29fcaf5aa2b0c4f5488ea723e628b9e155bac6c95cac219bcd7b2ef176e44a7f0b7260f687f237314fca7509 SHA512 dfdb4a2b512e61e1d4aee6290d401e5081b53311452b0e265ac659c43fc84b7b443b71a80c95473658c85ce93d6924a2f3da0d40b086eedcd4eaf54c682a88ef
 EBUILD vulkan-loader-1.1.125.ebuild 1800 BLAKE2B 16285fe9cd9fff1e3e2ff741fb6755aa383cf6519adef4fb9e9ab0ee093b3a0e73212d16c94c6e366ef34cbcaa6aa6394288b6a180a605e5998b80628129f00f SHA512 0f6f1e42cde2d1f53e32d4b217986fc1e50e8c5286d58891181392ff1b85c59f6d6556519e1b82fca00e43433b7b85054f76c8805fffd211af45acbd920e0f9c
-EBUILD vulkan-loader-1.2.133.ebuild 1698 BLAKE2B 3632bd3bf1f2068c1a56c3aa4cb624713035d991a1ecab697fa2c72d98ce9edd2fcf6c6b485f887b21f12c439c47223224016f172b0321a7e9b0f0c1ff5d3e52 SHA512 2ead18fc2b3afece6e66147f8c7b0f43c2b2ba30963d678e4a1c5d8277f7861c0cd4d27d9707c68a02b1b228c76d13f0879a242d63fb1a7ca1bcd07371cfcd05
-EBUILD vulkan-loader-1.2.135.ebuild 1700 BLAKE2B 99e462a8779ae8e88b78cdd8f0b79ea6249869c6f6a47d4d5f67658e17dcbe734b2f85ca864256715612dc658da8b1fdea62bee82f94831bba5227bc71b8c796 SHA512 71a07781d148b5eb100e5b60969f6a885147f353eb7790ffd12ae91765853d82eeda4cb6c268d63611c8f50dee72d3858a90c5e8519bd993dd2a2262e09c2d70
-EBUILD vulkan-loader-1.2.137.ebuild 1700 BLAKE2B df062c73b1bdac83fa37d69405e357b45a9d5284773e790772758234f2214b7d78c06d7109e8f951366f0ca908afee15403bc2f5afa586069a27ccfb96683b93 SHA512 17481c79255973bd98a61eb7eabf4566f7290afa4fbccde06fcc31d53349172ee32bf2c82b17829f1ab722141cd4a4eb5ce1d4e0a86311d91e50133dfae81a9f
+EBUILD vulkan-loader-1.2.133.ebuild 1697 BLAKE2B f4bf1eed24c38ce0021f600991c0ca54030ddf15be2e324c891b5c1b1f3aee3d66f5c3f6777a12af98a577f7e85da5b027cf1a02bb8b85686bd82729a897315b SHA512 ad844080c6a0d96dddabf970462248850d6c0aa4f97e0b88751fe537f8616d54e7f21619b55b0118c33103eecfafd39554bace0f2c37f539b56f01071b01637e
+EBUILD vulkan-loader-1.2.135.ebuild 1699 BLAKE2B f4ecffc6d5076ac5f2b14ab560710b64b72ad91b1f90222132cbb9caed631a30012de6969f990f8d121753e34c090558d09dd0ad860981ef144724ccbe3955c4 SHA512 f0968104aca0b72e3a12e5268518904fcf7c46c8def6549a3145becc5d76e0dbdbbb0321e2dcb47c73f27e5d7c2ab4805aab4036eeee67b1debb32f2694e7c15
+EBUILD vulkan-loader-1.2.137.ebuild 1699 BLAKE2B 17fd74e931fc376c6f10468990e647ba337fbdcd0ca7425be2b5668ae0b5ac364237abe0dcd5efa90ff859821f0dcb80a49098ada6ba7329454c44bd4920a907 SHA512 a5c8989d7365431805da588a317b5accca8f782fcb614b48c2717281ac520ba2749f627bd9a821f2346df08f943326949954fd8a21b4f14c0494127ffdca1650
 EBUILD vulkan-loader-9999.ebuild 1698 BLAKE2B 3632bd3bf1f2068c1a56c3aa4cb624713035d991a1ecab697fa2c72d98ce9edd2fcf6c6b485f887b21f12c439c47223224016f172b0321a7e9b0f0c1ff5d3e52 SHA512 2ead18fc2b3afece6e66147f8c7b0f43c2b2ba30963d678e4a1c5d8277f7861c0cd4d27d9707c68a02b1b228c76d13f0879a242d63fb1a7ca1bcd07371cfcd05
 MISC metadata.xml 414 BLAKE2B 53100d7021d8350e960e2b087bba612ee99f6ce960b63964aa2ba50b1172f5b9fe13fb9addb069ae74cc03292b92fc88838b41eac1083c8779dcb8e0e480d1dc SHA512 6328c52f607ed4ea3ba31430f63df84e942ea3e6726b5107c8840e3869725bd7407b446d4f905765a0c6d6dd04fda643bd2b5e06681f6ac771bbb4fbc8d4c417
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.125-r1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.125-r1.ebuild
new file mode 100644
index 000000000000..703cf7774d17
--- /dev/null
+++ b/media-libs/vulkan-loader/vulkan-loader-1.1.125-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Loader.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	if [[ -z ${SNAPSHOT_COMMIT} ]]; then
+		MY_PV=v${PV}
+		MY_P=Vulkan-Loader-${PV}
+	else
+		MY_PV=${SNAPSHOT_COMMIT}
+		MY_P=Vulkan-Loader-${SNAPSHOT_COMMIT}
+	fi
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+	SRC_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain-funcs python-any-r1 cmake-multilib
+
+DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="layers wayland X"
+
+PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
+DEPEND="${PYTHON_DEPS}
+	~dev-util/vulkan-headers-${PV}
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${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=True
+		-DBUILD_TESTS=False
+		-DBUILD_LOADER=True
+		-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-utils_src_configure
+}
+
+multilib_src_install() {
+	keepdir /etc/vulkan/icd.d
+
+	cmake-utils_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.133.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.133.ebuild
index 60deb31aa071..33cdb2c53840 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.133.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.133.ebuild
@@ -27,7 +27,7 @@ IUSE="layers wayland X"
 
 BDEPEND=">=dev-util/cmake-3.10.2"
 DEPEND="${PYTHON_DEPS}
-	>=dev-util/vulkan-headers-${PV}
+	~dev-util/vulkan-headers-${PV}
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
 		x11-libs/libX11:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.135.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.135.ebuild
index 313f090553bb..45a674083b07 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.135.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.135.ebuild
@@ -27,7 +27,7 @@ IUSE="layers wayland X"
 
 BDEPEND=">=dev-util/cmake-3.10.2"
 DEPEND="${PYTHON_DEPS}
-	>=dev-util/vulkan-headers-1.2.136
+	~dev-util/vulkan-headers-1.2.136
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
 		x11-libs/libX11:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild
index d47301d0d52a..0c346926f2c6 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild
@@ -27,7 +27,7 @@ IUSE="layers wayland X"
 
 BDEPEND=">=dev-util/cmake-3.10.2"
 DEPEND="${PYTHON_DEPS}
-	>=dev-util/vulkan-headers-1.2.137
+	~dev-util/vulkan-headers-1.2.137
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
 		x11-libs/libX11:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 6a1e9927694a..0ace40ee6621 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -3,6 +3,9 @@ AUX neon.patch 677 BLAKE2B 805177f9d3d3f703699adad93b0ca655065b9d093ecc3776600fa
 AUX non_x86.patch 698 BLAKE2B b565a558e521b32ff67b24abb49a546615f42f009dc12ae9ee00a43df3efa657960601109d3023e07322fc47b5e4d87cd8f4d12efd44888a28f52c9c6784a353 SHA512 444623b91301049175624664de58eef6735c1b86c92792e5a6f1d7154e08f46e861e38f7cec23b5528deaffabcc494ec8754a48ae8cdd9e0f8665bdf96c4cd5b
 AUX ppc64.patch 619 BLAKE2B 17ea28b03ee80af9e73222df7d999138a51d6c8836574d005981426465e328cffdde034753fcc510ae305ee061e2aa278fc1a37c3bf2bc439f7c6f21bf991c99 SHA512 7b23e9bdb3cc634206ffd42fc381bb3b7915b7b788b30567e01592d83b3d8aee8ba794a20587a31e5ead02c837deae9c8f3d9e82b2b05409892dbe6ff37fe822
 AUX x265-2.9-detect512.patch 374 BLAKE2B 7123069c19e85ac5953434eb6c4a80135e60178537f3598e796cf6550cc4efdb5bcd358bc96401d948d26f36676892bb344c097143a310a1e19c8b2a921cd44a SHA512 6be1540b89f0f622476d3511dd01cb3dcc24ff4823cef57d08432e857fd7da3c9810904a02d1583896767a33f97140651d3a4c163952ed459338623999d93e18
+AUX x265-3.3-arm.patch 1177 BLAKE2B 72ffeda05e1ec23153cd328b18d4719b7883d8f910354405de9780151b013c032fa3489ad7416f2b6dc8a8c016092c5156fbb730722aab3163eb6c3e49160da2 SHA512 9578a3f386e099eb15e5779d7ad99c6f5696f1694656b1ab91f59cdde821008f038bf5ab7901df2b1416b03127f09ef1a2178e3274075fddb41e2c701a2c5ecd
+AUX x265-3.3-neon.patch 666 BLAKE2B 27166c0e9de3bf316ac64742c40156a623c362e896ba358e4cbbf5c17a4dbbeccc645fea5731c9ac6615fe1bd254685fc742d5258e2953ddb53e6b0ccfbf7e0c SHA512 a5d84e7f111574a2fce90b24ba67b08d05431c903ad853a976eea476c16bb0b8ff2cc4c43e7212bc1b8b5a3cbbca7a5b346456527a8d6523200db7b9d1501b59
+AUX x265-3.3-ppc64.patch 590 BLAKE2B bbc6f18b8f192424450d2860e33ea6dbba14b46876f05cf9c499412d491127c877c342b1900bb9d06d66126aca2f383da1a4986ce69670ebc392fec0fe9b59a9 SHA512 bb4ace2c4bc899a0ccdd17fb78e63980354f41ff0f201812d47c5df16b23fea6fcdbde086e737d0efd5d8cb8fa571a131c03433bec31999c71ff51bccd754950
 DIST x265_2.8.tar.gz 1379551 BLAKE2B c124864a08492739cdde89e44d72c84ad94a0b236d2c59d995e53a26d1a5fb9ec1557a03640a3065a727be69bfb0c0633b50351dc875c9706a1550f488c8ee24 SHA512 c2a8eaec64aa022badcbcd2a96304a9abd9d08489300b6a9c4c9d76066f3d9848e6948238c84ae16ea91bff0b2fac528a67ee29950d94dcd0ea7c0e9e7baa714
 DIST x265_2.9.tar.gz 1385848 BLAKE2B ff14eba55cea0646ad0ffc12f9032c9033d23c9d805939fc3a049911ebae459eee097349f074dcd224bef97d6140dbc37ee9bd3db54c5473b158e135784d2179 SHA512 270818c7fd84947fde371e32bef225c1880cfb0bcd95378d95b51f50577a134d7cd585fcdfa43b103a24d76c5ad826b09509a07eb9e208e8f2b56f2f77365cf3
 DIST x265_3.0.tar.gz 1398519 BLAKE2B e3ac28b01e89ce8a428f294c759644a8177e1b79941aba5e1b53033c236e3445f9afeea96f8adf7e5cdcfff8c790ca9fcadcc8b2de6c31ba3fe9ba87321a8ca8 SHA512 bb7665194ddd4bccbb91c16337463ad4ef32111a1e7779e4cc16964df0992aa99e578cb74fef0edbf41119105e4085574247f60541b0558cc36730ea12d2c6ba
@@ -10,6 +13,7 @@ DIST x265_3.1.2.tar.gz 1419864 BLAKE2B 1eeb210e58d6977f9a048b84e924d690868aa350b
 DIST x265_3.1.tar.gz 1419649 BLAKE2B b9151f136fdc6c0512f481af6c8d4d575ce4c75ef8891b42ca24ddfd1f4802bfe8cd47bb07dfc1834243560a8d36ddd5ca4d79d7b9f140fbd411b5b80ea6b8d4 SHA512 81905b6286a61fada7cb1632d7f8461295a28e8d53ccd53d3c26c60c7d8091df47a1b694de28caa721f632d66940f5ceeb44d3405dc3b079edd17d21c30e7a7d
 DIST x265_3.2.1.tar.gz 1426255 BLAKE2B 4184cfa290b36f497c5f3a5e3b597bf44e52dd20ba6af21c665d98709c9b984122a339d93aae572756a94549c0c1a293ee195c6c1d34902d298664ecf016f896 SHA512 5cb29b9d4475c1f686f6e31e47ccddde3db1639d5dcf9c058513389a9fdeb35a83b14e30e59498a76dec74bb0b410b6d8f5b1b45d18927be9811bb6a40d8d568
 DIST x265_3.2.tar.gz 1425689 BLAKE2B 58da4aa52381ec89b0aea1dc896fef92d9ec9fc781fd279acd0a338cd872f52482c81c558dde749c1205dbc13341a9851c381d01e2f312f5e2b4712d2242b7d3 SHA512 08c779026fe4c03797efef9d6a898b16c308355311e167c81b976345eb78039725a31294c77a60b76b4ef648d8720e16b2d6524e7108755531a5375231f5313e
+DIST x265_3.3.tar.gz 1438685 BLAKE2B 43806915c3b22fabff71c307dc53e9a3408262528f8ec01bf81168826eee26b468b0e68c738e3c0371f6de6121a3ac090bfaeed0cbfca0a3b8c57710d7f25ad0 SHA512 3d56900ecd58e83d2ecc93d956524e3b0e622dbe3c74a137c7b21f98599245547403401e9ec7f679996fd09fca788aa10272bf17e58a68fce449c8cb555ad7c0
 EBUILD x265-2.8.ebuild 5708 BLAKE2B 3ee8c0f535143ba5ac91476a4d30e5dd546cf3856a81b81ee5ced12414498329d8a5fb24222450770b0856cc5ee4b94018054d4e3437ac7a8bf0a475aac309c1 SHA512 1c91b82022cdc6c24991a891b691f6b13f04eed9aa586bc3fb333f5379bf868d0ab0006a05ce0438adbfdfbac8759360c27f5b3e57e17d4aad9848fd89a4cdcb
 EBUILD x265-2.9.ebuild 5726 BLAKE2B 05f297461b0a065d623e0de43a28d7e8f016c93da9e16b2316ad9ac19ea0ead60eb0f88e0abfa4e753444983b2c52aad673bcb5d41d2703cdb4f06218b94aeae SHA512 153cf5598086e6ef642328133dd8c8ac3d8a157dab810b5a95641dc2dce04ceba3639b0895f06aad5fa03f40d69474bb442dbc46d26fe339209d1be36d72e86e
 EBUILD x265-3.0.ebuild 5684 BLAKE2B 5ac5d28a1de72646b53a556398f42f849c77d7df72dca297d6e692036988112bf25bb2d6e9a6176ff0937cfaa15be46cd9482f912da5e298eb413fcba4044b44 SHA512 3f40e68a5fc46542103d555d6277da304c3c443f546c64c77b24127e28bb1f05ad85d1deec143346f23a0ac91942328e676456058f1b2b7051c7bf13d6a4232f
@@ -17,5 +21,6 @@ EBUILD x265-3.1.2.ebuild 5685 BLAKE2B 6cfac74e85e8b5637b480974c5dfa9be45614b31e7
 EBUILD x265-3.1.ebuild 5685 BLAKE2B 6cfac74e85e8b5637b480974c5dfa9be45614b31e720ae0e637309b4d4f0ad5e8b48965fad88b95a071d98f02bd2da8f63f35f71c22c6878cfb26c6c9156cbfe SHA512 900ef8019a7c894bc104ab7a7ef0476ff091e191309af89042a1804a4cae61877bfcd5172a1ba89aedda700d42454d68a92bf4a98fb1fcebc6711680af6871e3
 EBUILD x265-3.2.1.ebuild 5685 BLAKE2B ffe6557df2f83c26883d85d5c014d8d6f5978f93f4882a5a26ef3f139b409f5318043f1242626edd7c32483efbb718e2a3e07f364265a3616e416dacfa798708 SHA512 cc09a08013a2a4645aaa36199633071b408639902ca6d084d2e732b6df857aeb80ef46f29473a4cfe59d58df5af97a5896b5bb06e98ea27af628a7d0aeccd282
 EBUILD x265-3.2.ebuild 5685 BLAKE2B 03a54678214d214fe79b8c4cd5c6bca412f57c87399d0231b30ea7b276ee4bdcaa6438623f6ca6b73e1fdb91349b7b298ff3eae89afc3ecddd704ae3dde7588a SHA512 9bd96418e104f5f3675551aa40bfef52291b22a33e1560133f678feb9cd5b50d75ff10608d54728318e2f1c629b30272717dd9353c080b174c7dd80369c7f365
-EBUILD x265-9999.ebuild 5685 BLAKE2B 650e0506ab41a7e2573866adc8af101c00d7dfbbe9f778c0f971303462044aef6afb5d481a755bd7d115c2b6276b2d04234b9d3ec611ae97243aac46e458c74b SHA512 c07a92b909137490ed16a7fce8fe24f3e272021abe9f01c62a90adb6fbb9f750238f4c8f9ac4062dc59307fac8f6a9f594a0bf6453a522e4b63b183a4f42e75a
-MISC metadata.xml 703 BLAKE2B c71ecd74be6e4fcdf70dcdc197e6830875f6cae0b1ee4e96b0edc4b16db4e512b2b8e8962fa75c7f4f380d74ff713158fd6124d4a22229b3c213c197124a59c6 SHA512 b9f2ac6ed88fce31fa7459321cc7cc2114caee48066b0ae1773a8711f2d652370d154a6167d8c8eb0dc47f55ca211812b99d11c4a1941a3a2553c62a6f21abf6
+EBUILD x265-3.3.ebuild 6105 BLAKE2B 617d44d3f721f322e3f61af3d3376454a919c6b5b2eff43dde47be1d98c306afb8e454f47456531a6cfd9283c1372816cd97c37a9dae73922fdd332bc824b5e3 SHA512 7e39312c29d8c5b0381022cfbc447637f6113afe5fc15d339db3e1a588a7183257aeff3947cba4aad02b35026c5b9c7d3f3a8594ba81c3328839b6eb8907f304
+EBUILD x265-9999.ebuild 6105 BLAKE2B 617d44d3f721f322e3f61af3d3376454a919c6b5b2eff43dde47be1d98c306afb8e454f47456531a6cfd9283c1372816cd97c37a9dae73922fdd332bc824b5e3 SHA512 7e39312c29d8c5b0381022cfbc447637f6113afe5fc15d339db3e1a588a7183257aeff3947cba4aad02b35026c5b9c7d3f3a8594ba81c3328839b6eb8907f304
+MISC metadata.xml 769 BLAKE2B 4e666c1f92c76523b92990a3f23cfe8945b16443ab04957ddb490d9f7c9c5aed7e636b54b823f5bf9123ed46a57a0b53b051812406e013af2b4296edf8b08def SHA512 19576dd98759fceeeb172e846c44354d709fe125a27e9fe027f9d220f3fc839c82f8bbf28014130d761fec05594b5964a31b247f9e3c7ba47099a934fb312b23
diff --git a/media-libs/x265/files/x265-3.3-arm.patch b/media-libs/x265/files/x265-3.3-arm.patch
new file mode 100644
index 000000000000..7e7c8c58b724
--- /dev/null
+++ b/media-libs/x265/files/x265-3.3-arm.patch
@@ -0,0 +1,34 @@
+More aliases for ARM.
+Do not force CFLAGS for ARM.
+
+Index: source/CMakeLists.txt
+===================================================================
+--- old/CMakeLists.txt
++++ new/CMakeLists.txt
+@@ -41,7 +41,7 @@ SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_
+ # System architecture detection
+ string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSPROC)
+ set(X86_ALIASES x86 i386 i686 x86_64 amd64)
+-set(ARM_ALIASES armv6l armv7l)
++set(ARM_ALIASES armv6l armv6j armv7l armv7a)
+ list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)
+ list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH)
+ set(POWER_ALIASES ppc64 ppc64le)
+@@ -208,15 +208,11 @@ if(GCC)
+             endif()
+         endif()
+     endif()
+-    if(ARM AND CROSS_COMPILE_ARM)
+-        set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC)
+-    elseif(ARM)
++    if(ARM)
+         find_package(Neon)
+         if(CPU_HAS_NEON)
+-            set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC)
++            set(ARM_ARGS -mfpu=neon)
+             add_definitions(-DHAVE_NEON)
+-        else()
+-            set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm)
+         endif()
+     endif()
+     add_definitions(${ARM_ARGS})
diff --git a/media-libs/x265/files/x265-3.3-neon.patch b/media-libs/x265/files/x265-3.3-neon.patch
new file mode 100644
index 000000000000..316e670febe3
--- /dev/null
+++ b/media-libs/x265/files/x265-3.3-neon.patch
@@ -0,0 +1,16 @@
+These functions are only built when enabling assembly on ARM; use proper check
+to avoid undefined symbols.
+
+Index: source/common/primitives.cpp
+===================================================================
+--- old/common/primitives.cpp
++++ new/common/primitives.cpp
+@@ -270,7 +270,7 @@ void PFX(cpu_emms)(void) {}
+ void PFX(cpu_cpuid)(uint32_t, uint32_t *eax, uint32_t *, uint32_t *, uint32_t *) { *eax = 0; }
+ void PFX(cpu_xgetbv)(uint32_t, uint32_t *, uint32_t *) {}
+ 
+-#if X265_ARCH_ARM == 0
++#if X265_ARCH_ARM == 0 || !defined(ENABLE_ASSEMBLY)
+ void PFX(cpu_neon_test)(void) {}
+ int PFX(cpu_fast_neon_mrc_test)(void) { return 0; }
+ #endif // X265_ARCH_ARM
diff --git a/media-libs/x265/files/x265-3.3-ppc64.patch b/media-libs/x265/files/x265-3.3-ppc64.patch
new file mode 100644
index 000000000000..8e739e3fab1b
--- /dev/null
+++ b/media-libs/x265/files/x265-3.3-ppc64.patch
@@ -0,0 +1,15 @@
+More complete ppc64 matches.
+
+Index: x265_2.2/source/CMakeLists.txt
+===================================================================
+--- old/CMakeLists.txt
++++ new/CMakeLists.txt
+@@ -44,7 +44,7 @@ set(X86_ALIASES x86 i386 i686 x86_64 amd
+ set(ARM_ALIASES armv6l armv6j armv7l armv7a)
+ list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)
+ list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH)
+-set(POWER_ALIASES ppc64 ppc64le)
++set(POWER_ALIASES ppc64 ppc64le powerpc64 powerpc64le)
+ list(FIND POWER_ALIASES "${SYSPROC}" POWERMATCH)
+ if("${SYSPROC}" STREQUAL "" OR X86MATCH GREATER "-1")
+     set(X86 1)
diff --git a/media-libs/x265/metadata.xml b/media-libs/x265/metadata.xml
index 22a07293b836..c585d5536314 100644
--- a/media-libs/x265/metadata.xml
+++ b/media-libs/x265/metadata.xml
@@ -5,6 +5,7 @@
     <email>media-video@gentoo.org</email>
   </maintainer>
   <use>
+    <flag name="asm">Enable x86_64 assembly optimizations.</flag>
     <flag name="10bit">Add support for producing 10bits HEVC.</flag>
     <flag name="12bit">Add support for producing 12bits HEVC.</flag>
     <flag name="numa">Build with support for NUMA nodes.</flag>
diff --git a/media-libs/x265/x265-3.3.ebuild b/media-libs/x265/x265-3.3.ebuild
new file mode 100644
index 000000000000..736bea15bb84
--- /dev/null
+++ b/media-libs/x265/x265-3.3.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CMAKE_ECLASS=cmake
+inherit flag-o-matic multibuild cmake-multilib
+
+if [[ ${PV} = 9999* ]]; then
+	inherit mercurial
+	EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
+else
+	SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
+HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265/wiki/Home"
+
+LICENSE="GPL-2"
+# subslot = libx265 soname
+SLOT="0/188"
+IUSE="+asm +10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_altivec numa power8 test"
+
+# Test suite requires assembly support and is known to be broken
+RESTRICT="test"
+
+ASM_DEPEND=">=dev-lang/nasm-2.13"
+
+BDEPEND="asm? (
+		abi_x86_32? ( ${ASM_DEPEND} )
+		abi_x86_64? ( ${ASM_DEPEND} )
+	)"
+
+RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3-arm.patch
+	"${FILESDIR}"/${PN}-3.3-neon.patch
+	"${FILESDIR}"/${PN}-3.3-ppc64.patch
+)
+
+src_unpack() {
+	if [[ ${PV} = 9999* ]] ; then
+		mercurial_src_unpack
+		# Can't set it at global scope due to mercurial.eclass limitations...
+		export S=${WORKDIR}/${P}/source
+	else
+		unpack ${A}
+		export S="$(echo "${WORKDIR}/${PN}_"*"/source")"
+	fi
+}
+
+# By default, the library and the encoder is configured for only one output bit
+# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
+# files with a different bit depth, which is annoying. However, upstream
+# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
+# that together so that the resulting library can produce all three of them
+# instead of only one.
+# The API requires the bit depth parameter, so that libx265 can then chose which
+# variant of the encoder to use.
+# To achieve this, we have to build one (static) library for each non-main
+# variant, and link it into the main library.
+# Upstream documents using the 8bit variant as main library, hence we do not
+# allow disabling it: "main" *MUST* come last in the following list.
+
+x265_get_variants() {
+	local -a variants=()
+	use 12bit && variants+=( main12 )
+	use 10bit && variants+=( main10 )
+	variants+=( main )
+	echo "${variants[@]}"
+}
+
+x265_variant_src_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" >/dev/null || die
+
+	local mycmakeargs=( "${myabicmakeargs[@]}" )
+	case "${MULTIBUILD_VARIANT}" in
+		"main12")
+			mycmakeargs+=(
+				-DHIGH_BIT_DEPTH=ON
+				-DEXPORT_C_API=OFF
+				-DENABLE_SHARED=OFF
+				-DENABLE_CLI=OFF
+				-DMAIN12=ON
+			)
+			# disable altivec for 12bit build #607802#c5
+			[[ ${ABI} = ppc* ]] && mycmakeargs+=( -DENABLE_ALTIVEC=OFF )
+			;;
+		"main10")
+			mycmakeargs+=(
+				-DHIGH_BIT_DEPTH=ON
+				-DEXPORT_C_API=OFF
+				-DENABLE_SHARED=OFF
+				-DENABLE_CLI=OFF
+			)
+			# disable altivec for 10bit build #607802#c5
+			[[ ${ABI} = ppc* ]] && mycmakeargs+=( -DENABLE_ALTIVEC=OFF )
+			;;
+		"main")
+			if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
+				local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
+				unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
+				local liblist="" v=
+				for v in "${myvariants[@]}" ; do
+					ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" || die
+					liblist+="libx265_${v}.a;"
+				done
+				mycmakeargs+=(
+					-DEXTRA_LIB="${liblist}"
+					-DEXTRA_LINK_FLAGS=-L.
+					-DLINKED_10BIT=$(usex 10bit)
+					-DLINKED_12BIT=$(usex 12bit)
+				)
+				# we have to handle ppc here and not in multilib_src_configure
+				# because we want those flags apply ONLY to "main" variant
+				if [[ ${ABI} = ppc* ]] ; then
+					myabicmakeargs+=(
+						-DCPU_POWER8=$(usex power8 ON OFF)
+						-DENABLE_ALTIVEC=$(usex cpu_flags_ppc_altivec ON OFF)
+					)
+				fi
+			fi
+			;;
+		*)
+			die "Unknown variant: ${MULTIBUILD_VARIANT}";;
+	esac
+
+	cmake_src_configure
+	popd >/dev/null || die
+}
+
+multilib_src_configure() {
+	local myabicmakeargs=(
+		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
+		-DENABLE_PIC=ON
+		-DENABLE_LIBNUMA=$(usex numa ON OFF)
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+	)
+
+	local supports_asm=yes
+
+	if [[ ${ABI} = x86 ]] ; then
+		if use asm ; then
+			# Bug #528202
+			ewarn "x86 asm is not PIC-safe, disabling it."
+			supports_asm=no
+		fi
+	elif [[ ${ABI} = x32 ]] ; then
+		if use asm ; then
+			# bug #510890
+			ewarn "x32 ABI doesn't support asm"
+			supports_asm=no
+		fi
+	elif [[ ${ABI} = arm ]] ; then
+		if use asm && use cpu_flags_arm_neon ; then
+			supports_asm=yes
+		elif use asm ; then
+			ewarn "arm asm is not PIC-safe, disabling it."
+			supports_asm=no
+		fi
+	elif [[ ${ABI} = ppc* ]] ; then
+		if use asm ; then
+			ewarn "ppc64 uses altivec instead of asm, disabling it."
+			supports_asm=no
+		fi
+	fi
+
+	if [[ "${supports_asm}" = yes ]] && use asm ; then
+		myabicmakeargs+=( -DENABLE_ASSEMBLY=ON )
+
+		if multilib_is_native_abi ; then
+			myabicmakeargs+=( -DENABLE_TESTS=$(usex test ON OFF) )
+		fi
+	else
+		myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+	fi
+
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant x265_variant_src_configure
+}
+
+multilib_src_compile() {
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant cmake_src_compile
+}
+
+x265_variant_src_test() {
+	if [[ -x "${BUILD_DIR}/test/TestBench" ]] ; then
+		"${BUILD_DIR}/test/TestBench" || die
+	else
+		einfo "Unit tests check only assembly."
+		einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
+		einfo "Skipping tests."
+	fi
+}
+
+multilib_src_test() {
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant x265_variant_src_test
+}
+
+multilib_src_install() {
+	# Install only "main" variant since the others are already linked into it.
+	local MULTIBUILD_VARIANTS=( "main" )
+	multibuild_foreach_variant cmake_src_install
+}
+
+multilib_src_install_all() {
+	dodoc -r "${S}/../doc/"*
+
+	# we don't install *.a files for all variants,
+	# so just delete these files instead of pretending
+	# real USE=static-libs support
+	find "${ED}" -name "*.a" -delete || die
+}
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index aaf2a4fe9a00..736bea15bb84 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI="7"
 
-inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic
+CMAKE_ECLASS=cmake
+inherit flag-o-matic multibuild cmake-multilib
 
 if [[ ${PV} = 9999* ]]; then
 	inherit mercurial
@@ -14,28 +15,35 @@ else
 fi
 
 DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
-HOMEPAGE="http://x265.org/"
+HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265/wiki/Home"
 
 LICENSE="GPL-2"
 # subslot = libx265 soname
-SLOT="0/184"
-IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
-RESTRICT="!test? ( test )"
+SLOT="0/188"
+IUSE="+asm +10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_altivec numa power8 test"
+
+# Test suite requires assembly support and is known to be broken
+RESTRICT="test"
+
+ASM_DEPEND=">=dev-lang/nasm-2.13"
+
+BDEPEND="asm? (
+		abi_x86_32? ( ${ASM_DEPEND} )
+		abi_x86_64? ( ${ASM_DEPEND} )
+	)"
 
-ASM_DEPEND=">=dev-lang/yasm-1.2.0"
 RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	abi_x86_32? ( ${ASM_DEPEND} )
-	abi_x86_64? ( ${ASM_DEPEND} )"
+
+DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/arm.patch"
-	"${FILESDIR}/neon.patch"
-	"${FILESDIR}/ppc64.patch"
+	"${FILESDIR}"/${PN}-3.3-arm.patch
+	"${FILESDIR}"/${PN}-3.3-neon.patch
+	"${FILESDIR}"/${PN}-3.3-ppc64.patch
 )
 
 src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
+	if [[ ${PV} = 9999* ]] ; then
 		mercurial_src_unpack
 		# Can't set it at global scope due to mercurial.eclass limitations...
 		export S=${WORKDIR}/${P}/source
@@ -59,11 +67,11 @@ src_unpack() {
 # allow disabling it: "main" *MUST* come last in the following list.
 
 x265_get_variants() {
-	local variants=""
-	use 12bit && variants+="main12 "
-	use 10bit && variants+="main10 "
-	variants+="main"
-	echo "${variants}"
+	local -a variants=()
+	use 12bit && variants+=( main12 )
+	use 10bit && variants+=( main10 )
+	variants+=( main )
+	echo "${variants[@]}"
 }
 
 x265_variant_src_configure() {
@@ -80,17 +88,8 @@ x265_variant_src_configure() {
 				-DENABLE_CLI=OFF
 				-DMAIN12=ON
 			)
-			if [[ ${ABI} = x86 ]] ; then
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-			fi
-			if [[ ${ABI} = arm ]] ; then
-				# 589674
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-			fi
-			if [[ ${ABI} = ppc64 ]] ; then
-				# https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
-			fi
+			# disable altivec for 12bit build #607802#c5
+			[[ ${ABI} = ppc* ]] && mycmakeargs+=( -DENABLE_ALTIVEC=OFF )
 			;;
 		"main10")
 			mycmakeargs+=(
@@ -99,25 +98,16 @@ x265_variant_src_configure() {
 				-DENABLE_SHARED=OFF
 				-DENABLE_CLI=OFF
 			)
-			if [[ ${ABI} = x86 ]] ; then
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-			fi
-			if [[ ${ABI} = arm ]] ; then
-				# 589674
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-			fi
-			if [[ ${ABI} = ppc64 ]] ; then
-				# https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
-			fi
+			# disable altivec for 10bit build #607802#c5
+			[[ ${ABI} = ppc* ]] && mycmakeargs+=( -DENABLE_ALTIVEC=OFF )
 			;;
 		"main")
 			if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
 				local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
 				unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
-				local liblist=""
+				local liblist="" v=
 				for v in "${myvariants[@]}" ; do
-					ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" ||	die
+					ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" || die
 					liblist+="libx265_${v}.a;"
 				done
 				mycmakeargs+=(
@@ -126,39 +116,68 @@ x265_variant_src_configure() {
 					-DLINKED_10BIT=$(usex 10bit)
 					-DLINKED_12BIT=$(usex 12bit)
 				)
+				# we have to handle ppc here and not in multilib_src_configure
+				# because we want those flags apply ONLY to "main" variant
+				if [[ ${ABI} = ppc* ]] ; then
+					myabicmakeargs+=(
+						-DCPU_POWER8=$(usex power8 ON OFF)
+						-DENABLE_ALTIVEC=$(usex cpu_flags_ppc_altivec ON OFF)
+					)
+				fi
 			fi
 			;;
 		*)
 			die "Unknown variant: ${MULTIBUILD_VARIANT}";;
 	esac
-	cmake-utils_src_configure
+
+	cmake_src_configure
 	popd >/dev/null || die
 }
 
 multilib_src_configure() {
-	append-cflags -fPIC
-	append-cxxflags -fPIC
 	local myabicmakeargs=(
-		$(cmake-utils_use_enable test TESTS)
 		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
+		-DENABLE_PIC=ON
 		-DENABLE_LIBNUMA=$(usex numa ON OFF)
-		-DCPU_POWER8=$(usex power8 ON OFF)
-		-DENABLE_ALTIVEC=$(usex power8 ON OFF)
 		-DLIB_INSTALL_DIR="$(get_libdir)"
 	)
 
+	local supports_asm=yes
+
 	if [[ ${ABI} = x86 ]] ; then
-		# Bug #528202
-		if use pic ; then
-			ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
-			myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+		if use asm ; then
+			# Bug #528202
+			ewarn "x86 asm is not PIC-safe, disabling it."
+			supports_asm=no
 		fi
 	elif [[ ${ABI} = x32 ]] ; then
-		# bug #510890
-		myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+		if use asm ; then
+			# bug #510890
+			ewarn "x32 ABI doesn't support asm"
+			supports_asm=no
+		fi
 	elif [[ ${ABI} = arm ]] ; then
-		myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) )
-		use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
+		if use asm && use cpu_flags_arm_neon ; then
+			supports_asm=yes
+		elif use asm ; then
+			ewarn "arm asm is not PIC-safe, disabling it."
+			supports_asm=no
+		fi
+	elif [[ ${ABI} = ppc* ]] ; then
+		if use asm ; then
+			ewarn "ppc64 uses altivec instead of asm, disabling it."
+			supports_asm=no
+		fi
+	fi
+
+	if [[ "${supports_asm}" = yes ]] && use asm ; then
+		myabicmakeargs+=( -DENABLE_ASSEMBLY=ON )
+
+		if multilib_is_native_abi ; then
+			myabicmakeargs+=( -DENABLE_TESTS=$(usex test ON OFF) )
+		fi
+	else
+		myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
 	fi
 
 	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
@@ -167,11 +186,11 @@ multilib_src_configure() {
 
 multilib_src_compile() {
 	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
-	multibuild_foreach_variant cmake-utils_src_compile
+	multibuild_foreach_variant cmake_src_compile
 }
 
 x265_variant_src_test() {
-	if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
+	if [[ -x "${BUILD_DIR}/test/TestBench" ]] ; then
 		"${BUILD_DIR}/test/TestBench" || die
 	else
 		einfo "Unit tests check only assembly."
@@ -188,9 +207,14 @@ multilib_src_test() {
 multilib_src_install() {
 	# Install only "main" variant since the others are already linked into it.
 	local MULTIBUILD_VARIANTS=( "main" )
-	multibuild_foreach_variant cmake-utils_src_install
+	multibuild_foreach_variant cmake_src_install
 }
 
 multilib_src_install_all() {
 	dodoc -r "${S}/../doc/"*
+
+	# we don't install *.a files for all variants,
+	# so just delete these files instead of pretending
+	# real USE=static-libs support
+	find "${ED}" -name "*.a" -delete || die
 }