gentoo resync : 28.11.2020

16 files changed, 34 insertions, 177 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index d781097d229e..9ff940519cdc 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/dav1d/Manifest b/media-libs/dav1d/Manifest
index c73a18c3c4ef..daffe01c5901 100644
--- a/media-libs/dav1d/Manifest
+++ b/media-libs/dav1d/Manifest
@@ -1,10 +1,6 @@
-DIST dav1d-0.5.2.tar.bz2 554192 BLAKE2B 29305d0bb20a3de0048d102789fe1fdb1a030596213a1e2f025918ac6bb37c92c8c5f8078320487702ed66b16d4d63234823b5475d84bdea853b92e76be4c70e SHA512 37da9138a1dba68b9e723ba48b23eab567f839308132fc5a28727c131280f2eca3e160b074982f5265c914dcad0e4029af9ce23909b32bb9ec60f235c623e384
-DIST dav1d-0.7.0.tar.bz2 613106 BLAKE2B e41dcf4c597da437c0840753eedb3d4c8c7e53494376128f7c0cabf9fe00038fbe676f093f4bce079233934c9f78def0b98b4f09a464c6bd162b7b2fb9f88410 SHA512 2ee1de4c29db6a5cbba0a1db669fb1143f3bae26595c4ea3f17c555fdccbaabc814b7af5caf738cf4dbffd22c690cfe869d33cd830533e24990679b7b9cb4b8b
 DIST dav1d-0.7.1.tar.bz2 644556 BLAKE2B f3539d73b2731be882c71a0e8e90c4382282a650ff9e0aa2bb1142f59a823bbe00011e384c65ae86b8b617054a167b8c90b83d96591ad5c133b7de336c30c753 SHA512 7db0f2eb5f6cbf2809ffb9ebaa18bf1331df00dc6e9d571380b2524143ce3bfdd2e7df1a31e82a52640e7ac81b2712127a395e857d061118845011a1e5fb4751
 DIST dav1d-0.8.0.tar.bz2 668627 BLAKE2B 6f45c6b0011acb74bb26fa201e667b16dbf8b691a2bc5d2043517381ca58132fa29ee828841609762737ac8637948b2bd4bac9e2c1d2ca23b1d3ad23f5883875 SHA512 906481ce5b9ce99cef2723c4c2466ba762095b9f88caccd42dcabfd4800964d7cd142736de1bf2ef25b631ee01eb26f7f1ac1754fc161b8fb7192e104df10e28
-EBUILD dav1d-0.5.2.ebuild 1175 BLAKE2B 8be48906d6eb61ba878631fda7fd52868d936b7a662237d15ef0e0607223bdefaded31334536d4bf7d06e57ae4d784e44b3e2c7c6484076faefe28303ecff521 SHA512 8e4d96a829b824eb3ab63d391e63aabaf1685ce65bedd1a28e6984bf6322f7a77054b8317450378bfbc0c97da142d2c1daa03d0c5b46120844519942000873f8
-EBUILD dav1d-0.7.0.ebuild 1175 BLAKE2B c22a14777ab513828543133397ee75aef8ffd765ffdd1b1c6ca90f21304727617e6689e4251e1ccd97db34c908c4ec981927634f9609c33db2d0486ed4960233 SHA512 1a0fd0605c5383d5a8d4094c3cf7e74d8fd369b2cbafba952c391655f20d23db5f513e4cee3597a92c432855911e4671a4efaf45dce750842bb7ee11fd8d9bec
-EBUILD dav1d-0.7.1.ebuild 1178 BLAKE2B dc2fb3a87757ca83f674df994f28dfe3e9302eb022fd9eac7c3b70cccba844d3d0841a130a447827bfcdf972a1c5c44e2b12f49bbfb815a7ddf78254c783a09b SHA512 271625cacc2ef35b7bc3898ffa621fdb41165fd6ebe974b77d43a36451cb2c65a8e01d4b9f880c52b68122c6caee33dc22e44c3da9658a328ac1800f1f770250
+EBUILD dav1d-0.7.1.ebuild 1175 BLAKE2B c22a14777ab513828543133397ee75aef8ffd765ffdd1b1c6ca90f21304727617e6689e4251e1ccd97db34c908c4ec981927634f9609c33db2d0486ed4960233 SHA512 1a0fd0605c5383d5a8d4094c3cf7e74d8fd369b2cbafba952c391655f20d23db5f513e4cee3597a92c432855911e4671a4efaf45dce750842bb7ee11fd8d9bec
 EBUILD dav1d-0.8.0.ebuild 1181 BLAKE2B 4438aac0f48b74545fae674b1a708e94d3c90e63e37195125f496b050b4c6f21bd52c06b5a743a1575d6f01fcf5feb34c4b371de536aa27f7dd85bd5066281ef SHA512 f7255074abf3124961d94a897413858ee8254343696902a7ec7dacad9c3fce368350ed061dc5b96c6ac3b3558dd9a3d789471f75c321298c1f8b3a472efb2c14
 EBUILD dav1d-9999.ebuild 1181 BLAKE2B 4438aac0f48b74545fae674b1a708e94d3c90e63e37195125f496b050b4c6f21bd52c06b5a743a1575d6f01fcf5feb34c4b371de536aa27f7dd85bd5066281ef SHA512 f7255074abf3124961d94a897413858ee8254343696902a7ec7dacad9c3fce368350ed061dc5b96c6ac3b3558dd9a3d789471f75c321298c1f8b3a472efb2c14
 MISC metadata.xml 536 BLAKE2B 40ec2224aed078ad4748d3182defb6813cdd34a614d40db2fbbbeb8b63e24a59ba1cbe9d458fec17516c328a89f77927d9fbeb9a1e4a2b8c296b7de7235b1af4 SHA512 74e6595ce441bb313364f375a8afa9b2a0179f350e30d075ecf99e058874450e15f4005a0712e20a4feb047d57799dffacb3903af00a3c5a8d059f7025e49de6
diff --git a/media-libs/dav1d/dav1d-0.5.2.ebuild b/media-libs/dav1d/dav1d-0.5.2.ebuild
deleted file mode 100644
index 62bf16413ec4..000000000000
--- a/media-libs/dav1d/dav1d-0.5.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 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.7.0.ebuild b/media-libs/dav1d/dav1d-0.7.0.ebuild
deleted file mode 100644
index 92d86ac5f998..000000000000
--- a/media-libs/dav1d/dav1d-0.7.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 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/4"
-IUSE="+8bit +10bit +asm"
-
-ASM_DEPEND=">=dev-lang/nasm-2.14.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.7.1.ebuild b/media-libs/dav1d/dav1d-0.7.1.ebuild
index 4517e90ea4af..92d86ac5f998 100644
--- a/media-libs/dav1d/dav1d-0.7.1.ebuild
+++ b/media-libs/dav1d/dav1d-0.7.1.ebuild
@@ -8,7 +8,7 @@ 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"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~sparc x86"
 	SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
 fi
 
diff --git a/media-libs/icclib/Manifest b/media-libs/icclib/Manifest
index 937507994756..2d20c98b7a78 100644
--- a/media-libs/icclib/Manifest
+++ b/media-libs/icclib/Manifest
@@ -1,4 +1,5 @@
+AUX icclib-2.14-fno-common.patch 637 BLAKE2B e5eee3f4fa04bcf3199f2ccf6601ce02c78573f9f7e93b52cd64ff779b9a9e1345d6f28528ab20d89c7065a3fae951c73c079125552d3c48d2eb328bbc28d648 SHA512 7a86dc56ab0065fec4f26071aae9bc5bca81a5506dbde367ca9e2ef1b21f8ff3280a58a20abd49701092fae8144b474afc9e68886ba1607b7a44e3b7a16f27f1
 AUX icclib-2.14-make.patch 3074 BLAKE2B 9f45af8c8c0041525e98352b9aa4b2743607d76b79dee02b17cf67e3410f9d45caf433f7e6490bb761c2b19616acf19275356f21a9b9a582f3f30a0e15997e70 SHA512 e2245b6f7aa24fcb135e8ce7a4332b6a689822c6429cf48cab5cd61285e80c72ff50adb6d8e691b948e45b9dd5d3df42935b810e1a25aba4f2d9d51ac9b9a1eb
 DIST icclib_V2.14.zip 158606 BLAKE2B a42a16a00d540f3e0036f86a4934ed8ac3c67bfea135df5fc893cef939b451f0298c576aa4067360597912fff1afe3315588af64e4edc9605ea5944ff9e42cf6 SHA512 ed038c8655968c794491f30c295ef115900bfcc2e8bfd8607f12f73d6f2236fc339c1ed53a364524478273097ab9065a372bb26f38231bfc6dc02773a11546a3
-EBUILD icclib-2.14.ebuild 818 BLAKE2B c84324a55a2cc9c80fe7fb18989d6e3e45119f0b793287eecb04acd937a49d6bc925bb3637b177d1b7520ec64f294c4d785b67c18242c86eee28cc1516f6d7e6 SHA512 1de661247080d6170f7bf973441b7809adbc32c06da3111dd67feddc4b25254278580e6f14ee5e6f3f1b24d676bade73472941a2bd16a1e300f128467f2da950
+EBUILD icclib-2.14.ebuild 856 BLAKE2B c10a16b2924dfcfe6ad975398ddc54e6dd27977862512e610ed5826cbb04610ed84245244fe57986882a67f0cf21e6d3bfe262ee7d2cbb9536dc4263a9d89a2e SHA512 056c460bfa8f97bd0cf5d0b4f5929c20182d474786137a9bedc74d58550013a45f7c2d7ee05feb6b78b2a7718c7c729d85a39337e4dd026c5ae0e037320d46be
 MISC metadata.xml 332 BLAKE2B 228aac7bfb93c3611d6308bc9edb709395734cbbdc97d686647f8030ff1cd258191d734e1a94a7aec2dbac31081d081c5de0f70d7b4d09ef3f46ad377665a782 SHA512 079f7df30b6a832bd5d0b0ff76889c44c615126a9297a80c9fc8a3b0aa9b4cd4c8f63e2ea57fbc8d2bbf742a5cc95638f66d702aa50fd19477dcdefbd6a58717
diff --git a/media-libs/icclib/files/icclib-2.14-fno-common.patch b/media-libs/icclib/files/icclib-2.14-fno-common.patch
new file mode 100644
index 000000000000..564822b9fc83
--- /dev/null
+++ b/media-libs/icclib/files/icclib-2.14-fno-common.patch
@@ -0,0 +1,17 @@
+--- a/icc.h
++++ b/icc.h
+@@ -1705,12 +1705,12 @@ extern ICCLIB_API void icm1960UCS21964WUV(icmXYZNumber *w, double *out, double *
+ /* The standard D50 illuminant value */
+ extern icmXYZNumber icmD50;
+ extern icmXYZNumber icmD50_100;		/* Scaled to 100 */
+-double icmD50_ary3[3];				/* As an array */
++extern double icmD50_ary3[3];				/* As an array */
+ 
+ /* The standard D65 illuminant value */
+ extern icmXYZNumber icmD65;
+ extern icmXYZNumber icmD65_100;		/* Scaled to 100 */
+-double icmD65_ary3[3];				/* As an array */
++extern double icmD65_ary3[3];				/* As an array */
+ 
+ /* The default black value */
+ extern icmXYZNumber icmBlack;
diff --git a/media-libs/icclib/icclib-2.14.ebuild b/media-libs/icclib/icclib-2.14.ebuild
index c9b8483e17a5..b472dd74897b 100644
--- a/media-libs/icclib/icclib-2.14.ebuild
+++ b/media-libs/icclib/icclib-2.14.ebuild
@@ -19,7 +19,10 @@ BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}"
 
-PATCHES=( "${FILESDIR}"/${P}-make.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-make.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
 src_compile() {
 	ICCLIB_SOVERSION="0"
diff --git a/media-libs/libavif/Manifest b/media-libs/libavif/Manifest
index ff9177783212..1591199153f8 100644
--- a/media-libs/libavif/Manifest
+++ b/media-libs/libavif/Manifest
@@ -5,4 +5,4 @@ EBUILD libavif-0.8.1.ebuild 1664 BLAKE2B 4d23f517dfb7afe074b36a3aef30ffde2ecddc4
 EBUILD libavif-0.8.3.ebuild 1694 BLAKE2B 2c78f19dd03937d006bedc88142134a6e44932d706b9d7e48d4bf634e1887247aed5fb13d9cec1561240bba6a5a854f1a212b29f2946da15571a6a67013177d6 SHA512 df76aad645ed8f3b56db9aabd953920210ba6a9ce77cc376b30da25dad60f3b487e0eaad58137ef651dbdba3dc315834d3d8f297d8b3b5db6cc9a8dc34af3a64
 EBUILD libavif-0.8.4.ebuild 1694 BLAKE2B 2c78f19dd03937d006bedc88142134a6e44932d706b9d7e48d4bf634e1887247aed5fb13d9cec1561240bba6a5a854f1a212b29f2946da15571a6a67013177d6 SHA512 df76aad645ed8f3b56db9aabd953920210ba6a9ce77cc376b30da25dad60f3b487e0eaad58137ef651dbdba3dc315834d3d8f297d8b3b5db6cc9a8dc34af3a64
 EBUILD libavif-9999.ebuild 1616 BLAKE2B 6fd97427b007b3ef0e892505eafd538cfd7eb13879fa6d5817608e4dfb027983b283b830b8a5a6fdaad10e764a3281f41a5a382286e27ffaa8db530d5f776749 SHA512 80003f7397e70ce3a50281c508fe43c96745a0c24b316a6f2f9b4abbfd6ff4312c2c3edf506d9325c5732c8ed379b050b503a9124ed62a4f3dcd6cf1c0d3bfc8
-MISC metadata.xml 887 BLAKE2B 07dd6586bb1553346742120a8a79e89df0df54b7d88673f2b05e04523ba9158dc1bb8ce43fe4202eabc053e039d44db886f2ddb22047cc76e240cd917313adc3 SHA512 ad588808bf4fbfb7065053a5178df233a106b4dd57191aab3439b620238aca08370099f2618c21126a0358c7100f572b499461eddb01770b8a270aed43e82a91
+MISC metadata.xml 772 BLAKE2B ef2759de03290413ee0922ceaa954c162589f2506d898c1da168ed4825967e06afe568e648d988a9b5ca36e31baf55476e8c63e0340e122084b3cd8a014bf6af SHA512 8b7ddd778f700afebbb2f5174af9139175e5048430e6bdf63bbbd75556c8b1f87626bc134b3a246f05cc33d8f9957e9670cd86e65ced919ec562f8af3e76f783
diff --git a/media-libs/libavif/metadata.xml b/media-libs/libavif/metadata.xml
index 31ef145a4ce5..2df8acaf8694 100644
--- a/media-libs/libavif/metadata.xml
+++ b/media-libs/libavif/metadata.xml
@@ -2,10 +2,6 @@
 <!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 type="person">
     <email>dnovomesky@gmail.com</email>
     <name>Daniel Novomesky</name>
   </maintainer>
diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index 8618834ee8b6..6be4e633d120 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,4 +1,3 @@
-AUX libheif-1.7.0-aom.patch 1530 BLAKE2B 150b86b0b1ed872ff13dfc59933b1aec80d259456666f7bd3fac11d4c5d220349b2ca927f36835e8710f476e1df2ca13c7a5126545c80a2abd0b069953186f18 SHA512 f30474c9f31aa8676352b9848a49699c320ead37a8a59b5c62b98945e520af40fc24fcbf225240c3237cde638d7b274e45dc135a16a3e8a7b278bbafc2cfca3d
 DIST libheif-1.9.1.tar.gz 1556450 BLAKE2B 5829afbde9c8ad8d7a2ed46e736d17e84dc6f5f2c4deccd1647c3048588fb8bdec96764a31e7801aac81d5f0a3f1c3e1474b8bd5e2d4d84236ef07478e62933e SHA512 a41ff9666877904da095c72af743b56196c75ce90deaeb1998be7eba9729a62282827e7e916e2a067489cc78e558c55fbb6d70da6a5b5281f6d2efcccbe6dbbe
 EBUILD libheif-1.9.1.ebuild 1594 BLAKE2B 32fcf5315081f5aa4437c88de45393c2965a391f0d37fde470f3527d8ce5a5c346088ce0e119672cafc4788eced325c7eb415f4252a16d455995249636f38912 SHA512 45026b98d6cab726bea57cc32b16ac5ee535c1b56355f75108cb5c3e566a7df07d74caa566deb8baf3046803c69c35ed71626d07dbe7676ef0a9a4c5b8cfbdbf
 EBUILD libheif-9999.ebuild 1597 BLAKE2B 7cc9e56415e52d885e159897fee4ef8e1da9d8d8e3a545d409692f64d01f0cc23da0dbc994d725afd7090051dc790fc8e1e466bebfcbc9df7e53a336c1879f0f SHA512 5b9b509908870e681e34c7f037fec5682d1b18deefe3cfbbbbbfd73f9e1c0da6fb731c5aa0436c0f70544fbfaec4ec93e8ef85c7b807b7d285bb3d82bb75aea6
diff --git a/media-libs/libheif/files/libheif-1.7.0-aom.patch b/media-libs/libheif/files/libheif-1.7.0-aom.patch
deleted file mode 100644
index 9dce291f9647..000000000000
--- a/media-libs/libheif/files/libheif-1.7.0-aom.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 331dff0ba58d5265ddcdadeaf5a45c1f0698a388 Mon Sep 17 00:00:00 2001
-From: Jakov Smolic <jakov.smolic@sartura.hr>
-Date: Fri, 14 Aug 2020 22:03:25 +0200
-Subject: [PATCH] Fix building against aom 1.0
-
-Taken from upstream commit:
-https://github.com/strukturag/libheif/commit/6768552c0a99bb2957906be0f369850326486a58
-
-Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr>
----
- libheif/heif_encoder_aom.cc | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/libheif/heif_encoder_aom.cc b/libheif/heif_encoder_aom.cc
-index 9953e34..669a51a 100644
---- a/libheif/heif_encoder_aom.cc
-+++ b/libheif/heif_encoder_aom.cc
-@@ -502,9 +502,11 @@ struct heif_error aom_encode_image(void* encoder_raw, const struct heif_image* i
- 
- 
-   // --- configure codec
--
--  unsigned int aomUsage = (encoder->realtime_mode ? AOM_USAGE_REALTIME : AOM_USAGE_GOOD_QUALITY);
--
-+  unsigned int aomUsage = 0;
-+#if defined(AOM_USAGE_REALTIME)
-+  // aom 2.0
-+  aomUsage = (encoder->realtime_mode ? AOM_USAGE_REALTIME : AOM_USAGE_GOOD_QUALITY);
-+#endif
- 
-   aom_codec_enc_cfg_t cfg;
-   aom_codec_err_t res = aom_codec_enc_config_default(encoder->iface, &cfg, aomUsage);
-@@ -540,7 +542,10 @@ struct heif_error aom_encode_image(void* encoder_raw, const struct heif_image* i
-   aom_codec_control(&encoder->codec, AOME_SET_CPUUSED, encoder->cpu_used);
- 
-   if (encoder->threads > 1) {
-+#if defined(AV1E_SET_ROW_MT)
-+    // aom 2.0
-     aom_codec_control(&encoder->codec, AV1E_SET_ROW_MT, 1);
-+#endif
-   }
- 
-   // --- encode frame
--- 
-2.26.2
-
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 9105f2ea88f7..b1faeaf7e4b3 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -9,5 +9,5 @@ DIST libjpeg-turbo-2.0.6.tar.gz 2192315 BLAKE2B 1e003b147bf5bc1fed59df1eb42c8bd8
 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
 EBUILD libjpeg-turbo-1.5.3-r4.ebuild 2997 BLAKE2B 07eb75644ba9322de5b9c926c25f7f14b88cec9c331be79dc94c93f4b85492335ac5b4bcad08cc1400e63c58345b7e18c47d3efd25c4b4df631f2900fc23ccbb SHA512 27a1dc6d9c3f23af59d16e63a78b45320aac8be1feca9dbff4714b183ff2bf5b615856cba2f06f9aa45bae65e069708564763710afea2c1a5f4e2f13488da077
 EBUILD libjpeg-turbo-2.0.5-r2.ebuild 3004 BLAKE2B f5ee859c4da49f85b3519625d1b9e0756c052a8e6a2616560a6ca6d4061915c91489d8c23ae7a1017e377355b5a55be386b673b793dd3c01284d3825d355b258 SHA512 6ae05da3888ede7bb888dcc6c2a7d78701e14df4942f1f63384e391b6a1108e2fea8593ead06cd676de4150beb43eda0540383e00d4086c3f8f8cf836dcfa0e0
-EBUILD libjpeg-turbo-2.0.6.ebuild 3012 BLAKE2B 98cbdcdef7465e1a6e1d0dc686a4dda0e1891f74fa4e6e9671b5e43d2a342d2b2a70a2aec5c58bc5b1b8d2ccf97286ca5d244a145d5069f739338c68ede2f924 SHA512 d634ff16ba2381d59fa121562d24c88c92f7412a57a68f1edf41126ba4b7ba2ee55d083b37cb4ead615b4460588b0eb90a9b2d98c6dc9e617f2bf6b6363cf5bd
+EBUILD libjpeg-turbo-2.0.6.ebuild 3238 BLAKE2B b249408679a3f8505ffb73ccaa448d3d3dfb94d77b74d82929422f03b7de9fc26e67d01e03bb3277800faff2b444323fcfcacb8f41d390396d236e1d6cb59248 SHA512 2d490158ce49dd55b31d1f5299282cdc632f8e18aff4d402693e28294670f1d39ef257a86bb3ec192c8b67492ea02045311e95965694597a30fb4082cad7418e
 MISC metadata.xml 475 BLAKE2B 00e12208a526ec05edd06341a1f582af2f6cca0ecf4f2de50ff6f1f8d0472c28e6aeaf3994825b90d821144ab351c1f4716a922ac6a454748c76e6c0791b5df2 SHA512 58fadedea7b2a97f0dac0fb0db13cece27a46dfcf2aa2c2bc25ee7ab5ebdd56315d4b465df9cf1b71e4c27588f1398837b5cdb2ea9e2c3caddfb768dd3be13b6
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild
index 47751e0823a7..ef4620715867 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild
@@ -85,6 +85,11 @@ multilib_src_configure() {
 
 	[[ ${ABI} == "x32" ]] && mycmakeargs+=( -DREQUIRE_SIMD=OFF ) #420239
 
+	# mostly for Prefix, ensure that we use our yasm if installed and
+	# not pick up host-provided nasm
+	has_version dev-lang/yasm && ! has_version dev-lang/nasm && \
+		mycmakeargs+=( -DCMAKE_ASM_NASM_COMPILER=$(type -P yasm) )
+
 	if use ppc ; then
 		# Workaround recommended by upstream:
 		# https://bugs.gentoo.org/715406#c9
diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest
index 7a90340bf10c..04ecffd3727b 100644
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -4,6 +4,6 @@ AUX libprojectm-2.1.0-path.patch 593 BLAKE2B b4f23ca265e02310e1f7e70ab012e2cdf91
 DIST libprojectm-3.1.8.tar.gz 55482686 BLAKE2B 226cc62ce84932e81c650dac8dcf89eed4d71513324b3bb3a7250c450cb002870f2c2c2eaf6947f6056b35efa5159ea7956bfec420e9f545df445f7654a76d05 SHA512 efbcd5e867ab9e710d11018d580ae6c3bc7aaba46e3ce2a3d682e9ec341756db6ecf613deab0a9d13ed6ace3d05dcf19a384c00ee21832acd5b6ebfe2b806f44
 DIST projectM-complete-2.1.0-Source.tar.gz 31130351 BLAKE2B ec3540326751aba45b9620adfe1e7aed21347c97278de6d23b53ed7fb03878c2d02982fba17b4cda4f713d2cf624fd24adeb15b28fed9d2ab165567f9ff49eaa SHA512 53f4531208d2594f1c28a7f7842fb5ee3349ca9e48f9f0d999a90b6a62d315c9c0ae9cba1cdfacb8a149eba3e5ddc4517ac406ee2c53718191be8e26ee2cca5f
 EBUILD libprojectm-2.1.0-r2.ebuild 1462 BLAKE2B 02bd1446c7250f0313805c051814ea9114b881ab8cfa7b5ccde11c88c636826600660026935bdbf7a9a283c540c220080f98b28bce7f626ea21dce830723e73a SHA512 b82ecdef0da92c14e0993d099cad1741ff5f7d5407c2d31c275ce3a9664929001ed3099b554767ca49626a2e104bbb5c4ac90a68689f20f1e0e9e3f58b66c40c
-EBUILD libprojectm-3.1.8.ebuild 1359 BLAKE2B f68f5127f00e1f011c1be28b64c013ea655f2d0f8b47bd790b3a9878737a09098633902697f2c5a802c193157137f0c52fe89dbfde9860c80173ea4900c4aef8 SHA512 76da921f433287a3a46c14f8dd766239c084516f913768440bb465e1d6a3acb081cd469eade3127f6b7314875961cd28c5a822126cd1981f6eb3b460c41b6e12
+EBUILD libprojectm-3.1.8.ebuild 1364 BLAKE2B 68653f1c1a9c05a94b8090cbdbdd218b40942da410f6574248c162e90b76ce2d1a4bd85054876cf02cb53bfff24880a61fcbf9f15fd3018ebdaeeda357daf02f SHA512 bfcbaf8ea08cfa529e108812faacbdb3eabada214490e16448cb798d3153bbf29af70fcfdaf407f03c723abdb4d0b3f1cada5d819ac3bf1cbee9aaa879506e10
 EBUILD libprojectm-9999.ebuild 1359 BLAKE2B f68f5127f00e1f011c1be28b64c013ea655f2d0f8b47bd790b3a9878737a09098633902697f2c5a802c193157137f0c52fe89dbfde9860c80173ea4900c4aef8 SHA512 76da921f433287a3a46c14f8dd766239c084516f913768440bb465e1d6a3acb081cd469eade3127f6b7314875961cd28c5a822126cd1981f6eb3b460c41b6e12
 MISC metadata.xml 536 BLAKE2B 097c6a56c2e21ee9badc9f08053423f76341ade802b23ffc0ceb3c88c87daafbd5b8d614ffa7f2e4698211cc873412270ddc477ea58a33ffaed76b1f93012e00 SHA512 5f9fede51b40d834ba1078c410b1644f70c6b239b1ff8b1b343e13a0efe33f90464f9300ebe98c138bdf201014c6b6d22e90805efce2a80110007b00b99bdaa0
diff --git a/media-libs/libprojectm/libprojectm-3.1.8.ebuild b/media-libs/libprojectm/libprojectm-3.1.8.ebuild
index cd148676740c..168c60f314c7 100644
--- a/media-libs/libprojectm/libprojectm-3.1.8.ebuild
+++ b/media-libs/libprojectm/libprojectm-3.1.8.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	MY_PV="${PV/_/-}"
 	SRC_URI="https://github.com/projectM-visualizer/projectm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 	S=${WORKDIR}/projectm-${MY_PV}/
 fi