gentoo resync : 01.08.2021

27 files changed, 163 insertions, 87 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 7e3be8bad0b2..169e794fbf87 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/glfw/Manifest b/media-libs/glfw/Manifest
index 5af993d6a090..7492dc64a562 100644
--- a/media-libs/glfw/Manifest
+++ b/media-libs/glfw/Manifest
@@ -1,6 +1,4 @@
-DIST glfw-3.3.3.tar.gz 763713 BLAKE2B bd6202877a3462d717a6d77b6381de704da854df011f7ab5172e626dc46df90793190284241b470a4b78e020302e5dca4051476e092e73e34731f6245a43ea14 SHA512 6d743d89d159bff6c4f7fa3fc5bc407fd728bdc432d76acc4897fd392580be272f8a9d1d7c375c4323e82bf2fd28310e5daab097fef33e8f43b69ce104f9bd31
 DIST glfw-3.3.4.tar.gz 762885 BLAKE2B b88f80ec8cfb1607a8c5ce5e6eabfe5c9813235c6225629ef8001ba5f46cdbed1d726aeed170a8749bbd048f1517cb614f9fc5ad7604ae1698b83b5e995b8cd6 SHA512 2b45ab72da7a2c007c0f42ccd56205f9684cfb980e2b1df127850cd057bb2b02ce02c7c64acd54cd433778e7017148f214afedf09badff9d2edf5f9b8d9d2701
-EBUILD glfw-3.3.3.ebuild 917 BLAKE2B 201613d30143c1145aaf264198be05a0f87e17b5a261174bb397241c8fafdfc38a40dc268cd6f269b10dc41c6b74c65a51ddfdc8121ec5e67b5df3ff0a8e5a5c SHA512 7555c1164fe1fca8fc860e52cafc492fe580a1f1a3456d68209f03adfeeaa377de0217570aa563f95345a9070afadf3358d117efbff2ac70b15879ab54d2d7ca
-EBUILD glfw-3.3.4-r1.ebuild 1210 BLAKE2B a9f95844bb5f1a578511cf62756462259799a58d736dfd85a753ad9be0b25edf22deeef6cd20e7e2bcad44e187ed4801dbe26a1ac724565798cb5ea9a9c041cb SHA512 5163c45026772199ca6b6322cbfa3393d3173516980e136027f1859dbd9573de631012eecabc2006e137e8af7ed1a39a291bd06b843e3c2cb2d2d6e9f89d672c
-EBUILD glfw-3.3.4.ebuild 917 BLAKE2B 201613d30143c1145aaf264198be05a0f87e17b5a261174bb397241c8fafdfc38a40dc268cd6f269b10dc41c6b74c65a51ddfdc8121ec5e67b5df3ff0a8e5a5c SHA512 7555c1164fe1fca8fc860e52cafc492fe580a1f1a3456d68209f03adfeeaa377de0217570aa563f95345a9070afadf3358d117efbff2ac70b15879ab54d2d7ca
-MISC metadata.xml 388 BLAKE2B 6f83bc48ed7a722cf0b64e450ac3839543db9713d3252c40eab395a54d53b9782e163a3238e6d443c2f8f6c8fd747a273ca018e08918fe084b048821665a8bbe SHA512 47ef3b02e4c8b3a12f328bc227f3ed2196c82e05970a9af12d1988a4466d5b614e0b788914dc03b4325a5cd2d63d93a677b6d093cdd50455c78b3d79c64a5171
+EBUILD glfw-3.3.4-r2.ebuild 920 BLAKE2B 1eea6a698f674045f0a5aceccb17a91970dcebb6df2b5a9c35a8296db0fb679764dfcaa84c5e5dca0cc34fa4762f318628770204e25c7a3a9741c719edc80462 SHA512 6eaf04bc7d9cd04725a78984f425fe35de49527ece075cf8ac9336b5a7b05c1f1643f7f1fcaf938e7697aa25b8aab39b9c6c3bc35aac242e820be189f0eaaf30
+EBUILD glfw-3.3.4-r3.ebuild 1274 BLAKE2B 9913c1bb47a27d7184740d7815e2aaac4548d95e354f11456d7348971c04b54c4ae617c1e77fc14b8ef95257ded33aea9b22ea07cd2b7735054c68098dd36e94 SHA512 632d68dc987ae90322f1bb13a7d5eb5e9611d3712e3e74947448a7eff5f17729765611a853e560256ad848683469e1a34ec5d9c0747d92d757cb7d554e2b0b0e
+MISC metadata.xml 485 BLAKE2B 0f1924b9f19207b2df6f61de6bd230a6423dac81d60dfd4602354e73db9fa6f5051e1f903c4f180fd5c0f9d58f39f645c720ebed8d7a67f4e260831ff3f3e3c9 SHA512 4cc8567cad28dff3b759614e99a02e86baf2eb8d2aa9be7bb3f4fb4efd341c59b4b25c79d204c63fa764e9b833142116f511cffa84f92d77721438d9df1df017
diff --git a/media-libs/glfw/glfw-3.3.3.ebuild b/media-libs/glfw/glfw-3.3.4-r2.ebuild
index 126bde0fc027..a8d714e18bad 100644
--- a/media-libs/glfw/glfw-3.3.3.ebuild
+++ b/media-libs/glfw/glfw-3.3.4-r2.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	)
 	wayland? (
 		dev-libs/wayland
-		media-libs/mesa[egl,wayland]
+		media-libs/mesa[egl(+),wayland]
 	)
 "
 DEPEND="
diff --git a/media-libs/glfw/glfw-3.3.4-r1.ebuild b/media-libs/glfw/glfw-3.3.4-r3.ebuild
index 43f33ee0dd73..499e6061c4fe 100644
--- a/media-libs/glfw/glfw-3.3.4-r1.ebuild
+++ b/media-libs/glfw/glfw-3.3.4-r3.ebuild
@@ -6,50 +6,47 @@ EAPI=7
 CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
-DESCRIPTION="The Portable OpenGL FrameWork"
+DESCRIPTION="Portable OpenGL FrameWork"
 HOMEPAGE="https://www.glfw.org/"
 SRC_URI="https://github.com/glfw/glfw/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
-IUSE="wayland"
+IUSE="wayland-only"
 
+# note: libglfw uses dlopen() for most of these at runtime
 RDEPEND="
 	x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
-	!wayland? (
+	wayland-only? (
+		dev-libs/wayland[${MULTILIB_USEDEP}]
+		media-libs/mesa[egl(+),wayland,${MULTILIB_USEDEP}]
+	)
+	!wayland-only? (
 		virtual/opengl[${MULTILIB_USEDEP}]
 		x11-libs/libX11[${MULTILIB_USEDEP}]
 		x11-libs/libXcursor[${MULTILIB_USEDEP}]
 		x11-libs/libXinerama[${MULTILIB_USEDEP}]
 		x11-libs/libXrandr[${MULTILIB_USEDEP}]
 		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	wayland? (
-		dev-libs/wayland[${MULTILIB_USEDEP}]
-		media-libs/mesa[egl,wayland,${MULTILIB_USEDEP}]
-	)
-"
+	)"
 DEPEND="
 	${RDEPEND}
-	!wayland? (
+	wayland-only? ( dev-libs/wayland-protocols )
+	!wayland-only? (
 		x11-base/xorg-proto
 		x11-libs/libXi[${MULTILIB_USEDEP}]
-	)
-	wayland? ( dev-libs/wayland-protocols )
-"
+	)"
 BDEPEND="
-	wayland? (
+	wayland-only? (
 		dev-util/wayland-scanner
 		kde-frameworks/extra-cmake-modules
-	)
-"
+	)"
 
 src_configure() {
 	local mycmakeargs=(
 		-DGLFW_BUILD_EXAMPLES=no
-		-DGLFW_USE_WAYLAND="$(usex wayland)"
-		-DBUILD_SHARED_LIBS=1
+		-DGLFW_USE_WAYLAND=$(usex wayland-only)
 	)
 	cmake-multilib_src_configure
 }
diff --git a/media-libs/glfw/glfw-3.3.4.ebuild b/media-libs/glfw/glfw-3.3.4.ebuild
deleted file mode 100644
index 126bde0fc027..000000000000
--- a/media-libs/glfw/glfw-3.3.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="The Portable OpenGL FrameWork"
-HOMEPAGE="https://www.glfw.org/"
-SRC_URI="https://github.com/glfw/glfw/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 x86"
-IUSE="wayland"
-
-RDEPEND="
-	x11-libs/libxkbcommon
-	!wayland? (
-		virtual/opengl
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXxf86vm
-	)
-	wayland? (
-		dev-libs/wayland
-		media-libs/mesa[egl,wayland]
-	)
-"
-DEPEND="
-	${RDEPEND}
-	!wayland? ( x11-libs/libXi )
-	wayland? ( dev-libs/wayland-protocols )
-"
-BDEPEND="
-	wayland? ( kde-frameworks/extra-cmake-modules )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DGLFW_BUILD_EXAMPLES=no
-		-DGLFW_USE_WAYLAND="$(usex wayland)"
-		-DBUILD_SHARED_LIBS=1
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/glfw/metadata.xml b/media-libs/glfw/metadata.xml
index 6e5bbe581196..cd68a68804a2 100644
--- a/media-libs/glfw/metadata.xml
+++ b/media-libs/glfw/metadata.xml
@@ -9,4 +9,7 @@
 		<remote-id type="github">glfw/glfw</remote-id>
 		<changelog>https://www.glfw.org/changelog.html</changelog>
 	</upstream>
+	<use>
+		<flag name="wayland-only">Enable wayland support and disable X11 support</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index aa8ba0ce5633..ee4048884cbb 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.16.3.tar.xz 4900188 BLAKE2B 7d8280a434adb1cb65b065dcdabdb37aad000802c011bb27779c109978d8b75aa4e2fa47043dde95464bb0c34a0d7466dc1f6216f29f0f4911f7a6fe1fb04b25 SHA512 378d8813ba2fd61ea2cab512d5c1fa81e0a4ac4f4ca756547d9b8742e56024c1bc5d6cd332798de66ecfe2b69485c860e181a6c2090398b0e2ad8c4b3fe95d04
 DIST gst-plugins-bad-1.18.4.tar.xz 5640292 BLAKE2B 5385abe635a35f61c6780e6cfa1189835877b8c0a12145de6890708a097fc453b1abfb14a3497cae4e6961f71fc2c6e01759fe19386cd30a64c4069704ddf77a SHA512 02123e054419f5ce6ca2ebe0bdf23572269ea4120bf463b4d672efbe5d9e5d417d4d711cc80094be974c4569f754d8b2ad93f59b827e3b018d450582834cb125
 EBUILD gst-plugins-bad-1.16.3.ebuild 2204 BLAKE2B 4997f2c2c124f632229b3dbe185f553b53be5419d00479d4b9c712bade33bc4558800c9e64648e603cb007f2fc6bf9c67f25cc8215e66e65e32e579c373c2eed SHA512 a508b1e0d2521cbc35ddeeef9fee6a46d89d9c9670a8037875573cd34492acd2a222bd95d09e78dfd4996c977e81ec71ba382f6c68578d7e6dbb15d95653255a
-EBUILD gst-plugins-bad-1.18.4.ebuild 2283 BLAKE2B e8b5e6a9e096ca4a80b2b4528e7039eff1c9452028b40940afdd3f2761a5b444c80f25553a88f9ece038b305ec03f3d7652848edbf5d65aa2c7e959c1e80d197 SHA512 7172d2c14973d58c169d2b6a9ce58111a5af2cd70007fff14421b4b316139a2009bf6484d858ea4e55ab53fa06806f810de208ff7110ed26120e62f546c7b0a6
+EBUILD gst-plugins-bad-1.18.4-r1.ebuild 2314 BLAKE2B 75de39e014467b29cefcd5f38bd23d83bf9d2d354a013272e136d741675d86a02c0b8a2cf3f7b377105a332e8b31cc8b88a634064a17c0bfe54848e3d890ca96 SHA512 b045a8ebd940c1122cc482a5256d46dd7dfc4c702c0a84f0b856931a22fc45524c64338579fddfd504c4df88ba6f13db9ca20f4bce787392f2ab00a2faf101cc
 MISC metadata.xml 439 BLAKE2B 5a4a36ccf4bd485eaf1fa66650eec8fa592d4c5bbf9fa478f1645e1b39649b7115694bf55dee7aeb4a5c53b2ba3c4614591cdf4e7d745938397c304108e0aa7c SHA512 9bd27a1a513fc2d697f7d0f2ceb7fa0701c446fe21b597256afd4c2c1f44145e875323ed1ef6202bf7b85472ab4aab43a4b6db5795bb1d28ff53a2a7e484055e
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4-r1.ebuild
index 7e613b0fa6d4..a8972f02f837 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4-r1.ebuild
@@ -19,6 +19,7 @@ IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vnc wayland" # Keep def
 # We mirror opengl/gles2 from -base to ensure no automagic openglmixers plugin (with "opengl?" it'd still get built with USE=-opengl here)
 # FIXME	gtk? ( >=media-plugins/gst-plugins-gtk-${PV}:${SLOT}[${MULTILIB_USEDEP}] )
 RDEPEND="
+	!media-plugins/gst-transcoder
 	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
 	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},egl?,introspection?,gles2=,opengl=]
 	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
diff --git a/media-libs/libhdhomerun/Manifest b/media-libs/libhdhomerun/Manifest
index 3b30fc661398..45790f15dec3 100644
--- a/media-libs/libhdhomerun/Manifest
+++ b/media-libs/libhdhomerun/Manifest
@@ -2,5 +2,5 @@ AUX 20190621-use_shared_library.patch 524 BLAKE2B 51fa3fa3e8be71ce255b714f4c542e
 DIST libhdhomerun_20190621.tgz 50817 BLAKE2B 7d4293e38be5283fba5d46cb162ee19d90c30ed63481cd94445a055fa0f80597fdacedd59e35ba4edfb53934ce339e967eb0c42d0ae72289ce7d39eb1f91cd50 SHA512 d15c5b0703bf8ca1f3979a8cad93fc33d87c1309367ad5117354c60112a5505d90e80d4bf9055d16b0eef2b892015c5f4886e6544178090b3550c3a8dbd86576
 DIST libhdhomerun_20200521.tgz 51014 BLAKE2B bca7c09afd16dae9177cf8b8c828827818acf8bc24eff404591178519bd1b568bb8689721b452bf23ae5b37143cf85aa6fbce52177fcfbafcd5e30e6f1ceafce SHA512 ac253923b531a8e1f714b7fb98da5a2a062144c045117a63e5bb16b33a49ccafcffd24f5520d412d15ca55bc1810fc0ecb9ad05e2d7f5a196b5439b4e28d5c23
 EBUILD libhdhomerun-20190621.ebuild 742 BLAKE2B 4b318d87d60e18826d853bc92451f2d4659af5ed915aeb3c596f7fa33e17cb6e7a0ea2b45d53e2f9ed4237b2ddcfeb05a19afe882166c4596ccdf5c531838275 SHA512 d3ae13a413af9e8ad508d1f5834295dfedadfe1047b65fd360d4997c7b58d6c3e533bc66c09738e57261698c1c5630df463e4a063a92bc649acc7a6420d5e72e
-EBUILD libhdhomerun-20200521.ebuild 744 BLAKE2B 371d6131e7ce1c1e6993ddeb859baaa463450ff2f614208910d457bfb0fa03ac78aa97c7cdd5ee11ac5b3e698c8273e128ff535cf1cef69ab592f7b1f702de34 SHA512 5d08574b6a4a446f90228b47e363f313b474466deb8a4bb6715bb0551187515644eeaba6d2832f9b05d02fc15b82e6768c191c7688dfa5c9910f76c8571b9656
+EBUILD libhdhomerun-20200521.ebuild 743 BLAKE2B 4d0c8729a70f1a3d4d3ab8a5c469dea3f650e9778160458f1eafa8b7a92fb569563f792a36598c41d024979f08519522ae26a5f9b51ca5d54294e0d630d3b2b6 SHA512 12ea5a2751e9f82e7bfc848d1532a91f86a19831f4834492a537711b5206a97f1e27bf94da8d6329717c9f4be7c24d64d6952fdf2adf1f6286974609d5451f5d
 MISC metadata.xml 411 BLAKE2B 75f777e333bd3226a4fa56e247c2a1a9470b3d9f8a75b03fa54c6d5d286c48ca6f139f9d40deefd95516eed1c29a6d90d490a82b1614c93042efc284cd4d1fe2 SHA512 5a494427f6131f779b27d6296673dc2448bd66116a9d668d3a3814f868bf0a951cd853ec2de514083b68e0b85e99ddffed5d99b8a5c1140569c546734466da5f
diff --git a/media-libs/libhdhomerun/libhdhomerun-20200521.ebuild b/media-libs/libhdhomerun/libhdhomerun-20200521.ebuild
index 237824f93458..a47b92cd0696 100644
--- a/media-libs/libhdhomerun/libhdhomerun-20200521.ebuild
+++ b/media-libs/libhdhomerun/libhdhomerun-20200521.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.silicondust.com/hdhomerun/${PN}_${PV}.tgz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 PATCHES=(
 	"${FILESDIR}/20190621-use_shared_library.patch"
diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index 4278c7df6c7a..bf8ad8933482 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,6 +1,6 @@
 DIST libheif-1.11.0.tar.gz 1680855 BLAKE2B a85ed643bd05cd59a34e9e42c0b8690fc779c06d01aa4925b177c1a36e7a4d11c9dfa798295c9b8215f45802e80119f2a8f5c3876103818c5436358416d97dd8 SHA512 1a5d54a09a5dc581a054052bac4299f7c96ca121650e9238312c426d5261247ce6af1840088b8717c5a53d212b7ec17bfaa109b9245abfaebf1603eaeb77b0ed
 DIST libheif-1.12.0.tar.gz 1684355 BLAKE2B 6d84678b39476f2d797d586c6dcaabc9a82351fe3bad536cd90edab16dabf91cbdcdb291195ff45061c7b0ad164748c53f87cbb2dc1e318b2cd458fcba74f644 SHA512 9e6f74dd52841a33b6021a1581ab28c56123d927caa7972acd284444e90888bbdae983b6d847d20eac7651dacea2193d27eb8df45928cb0774229ef8eea23294
 EBUILD libheif-1.11.0.ebuild 1829 BLAKE2B 79717765460165bad32b30e4e6ad000cc5436b516c62415e1b4d8d885fa03f894394f5b2e9e60114f2b0d3edfed335ee5c5de1ceb01f09bd2fbeb2cc3e29bc5e SHA512 cec879361ba3869c151da18a27059055d17466fb49bcb3d88121c8aa940b36bcd08e4ad2c9c684cfcb87db1800af23b61dbaca3d02ecdbf39a1843056c96a496
-EBUILD libheif-1.12.0.ebuild 1832 BLAKE2B c356d6900836f2be4a67be40684ffaf0546195d24c0387e1b140b5b2ffdb9d46f860af7350b6013a799ca783a37f981ca79e6e392d77b2b6f41d84e88a7a7ba5 SHA512 eedc2d6763d9a7d7116ba536f08c70c87e3255b2bcca2086eedff96109a94270ebbb424b6c87d88be58767259de1cf64ed7a63daf707143b51b563f37d6baadb
+EBUILD libheif-1.12.0.ebuild 1831 BLAKE2B d4dcb3a09dc6031152a89f01cf9ef58e9a3a8f9cb8b9dee77834cab99b0e3cb9d6badefa619b8696d45478461b7dbc31128ab6ca0dc67d2248ba473c51992f2f SHA512 12004e9b44197701e8322184321c9074112c63b277e96f68456f614aed8dfc57c824ffdebf943a40c52104f3a0ae7347b7fb1cd573e8e5802bde690d54f76413
 EBUILD libheif-9999.ebuild 1833 BLAKE2B 2049ab3555555fe927b1ebdaf5d9bb2bc29d160c836be1f346814b05f861a5c60ee8e9dad3077c59e689156dc61db57f90b2455f6ac1593aa59e11ddc155b28d SHA512 164ed6c60d44737d6915770a728e87a4bb53e58c4a6b7cd648661b6b406754aa909011066b8ba7c6a785f7f20884798c516b4c3a767f12fad015586d1f2a87b7
 MISC metadata.xml 1038 BLAKE2B c04c4e8ef4df16a22ab34e87ab9142f00243aec2e471a17645ae74b9159ab7092c396cb65131c762ab5b102bf510b3859f4a9e36870cb10d254614ba8fcdce95 SHA512 fad35ef040ebf936350bf75195aae4a8ceb42472f5243b5e3e6afa170a5a9d4c4f2e6fb93d6674c13e27051261f210f24b155f6f666f3a9af896726906280d31
diff --git a/media-libs/libheif/libheif-1.12.0.ebuild b/media-libs/libheif/libheif-1.12.0.ebuild
index 1a9f7ed19924..7189425c7796 100644
--- a/media-libs/libheif/libheif-1.12.0.ebuild
+++ b/media-libs/libheif/libheif-1.12.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strukturag/libheif/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
diff --git a/media-libs/libmediaart/Manifest b/media-libs/libmediaart/Manifest
index 65a9cedd776e..84da2fc13672 100644
--- a/media-libs/libmediaart/Manifest
+++ b/media-libs/libmediaart/Manifest
@@ -1,3 +1,4 @@
+AUX libmediaart-1.9.4-drop-bashisms-configure.patch 1524 BLAKE2B 6ae4ba196772750f9a09ad90d6c3e66965ee3c2a828211531aa3321f582da5b3c8e3304687fb077ff67fd1c0a5fe4ef39d9421382073452abf0e94de50eeb769 SHA512 ed049f69e5899e4fc8a897c245845a2b80e4aead9d7a28b9e20ce4b73de3c495f35afb0b8d44481ced868c537ecd0236dd5cbcc674e7483d75ac329c4ca9c0db
 DIST libmediaart-1.9.4.tar.xz 5827928 BLAKE2B defb53867341e3f0f794b3e167532f3ea232028b3ccc3968b13456eb74cacf8fab97e462914debaa0a7f08a2dcb98dcc0e77dec55319291388050a55b6a70a37 SHA512 e2526c22cb656c821da626c43c09d72afded1dfc369e77baea3de17dd6d3bd3b829cf3160e386459f55b9580cbeeb1d621c85876cb62739bc8d4f42429bdce1c
-EBUILD libmediaart-1.9.4.ebuild 1771 BLAKE2B 90f9d3b0ec1254db14cb0c12854bf50f88080ed6b09930c2370977496eb83737596fdee23725aa8eee8fd91fd6570d56e80be301f4f6ffb07299d716bf857bf9 SHA512 2230bafa2bac7c8cccbff07b3651f90f89678b6fa7bdd0e7d95ba5d853d7237e899c09a606f780d3501ced47e9eb79d01edc3705696784f395b8c63a9dee48b2
+EBUILD libmediaart-1.9.4.ebuild 1793 BLAKE2B 258615d5ea2858b72d842d52130e6e3abc67c28a9c82663c21bf285d5273c2f945387272700f6946c190d4860c288719d2dd39d8a6e92029dbe46119796258f5 SHA512 044aec185ae9be44719409479fbc9a5af5cf075a5962160b73c6d08461af05c441ce584504626b62c6f70c917083c8bf358636c7438d6ccc9899fdea8f6fb32b
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/media-libs/libmediaart/files/libmediaart-1.9.4-drop-bashisms-configure.patch b/media-libs/libmediaart/files/libmediaart-1.9.4-drop-bashisms-configure.patch
new file mode 100644
index 000000000000..8d65e7cd5c9f
--- /dev/null
+++ b/media-libs/libmediaart/files/libmediaart-1.9.4-drop-bashisms-configure.patch
@@ -0,0 +1,38 @@
+From a193e48dd01ad3aef9dd998c1247f649719f0a80 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 1 Aug 2021 07:48:51 +0100
+Subject: [PATCH] Drop bashisms from configure.ac
+
+---
+ configure.ac | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9ae1292..106ea57 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -218,18 +218,18 @@ selected_for_media_art="no  (disabled)"
+ # Choose between backends (GdkPixbuf/Qt/etc)
+ ##################################################################
+ 
+-if test "x$enable_qt" == "xyes" && test "x$enable_gdkpixbuf" == "xyes"; then
++if test "x$enable_qt" = "xyes" && test "x$enable_gdkpixbuf" = "xyes"; then
+    AC_MSG_ERROR([Can not enable both Qt and GdkPixbuf backends, please pick one])
+ fi
+ 
+ if test "x$enable_qt" != "xno" && test "x$enable_gdkpixbuf" != "xyes"; then
+-   if test "x$with_qt_version" == "xauto" || test "x$with_qt_version" == "x5"; then
++   if test "x$with_qt_version" = "xauto" || test "x$with_qt_version" = "x5"; then
+        PKG_CHECK_MODULES(QT5,
+                          [Qt5Gui >= $QT5_REQUIRED],
+                          [have_qt5=yes],
+                          [have_qt5=no])
+    fi
+-   if test "x$with_qt_version" == "xauto" || test "x$with_qt_version" == "x4"; then
++   if test "x$with_qt_version" = "xauto" || test "x$with_qt_version" = "x4"; then
+        PKG_CHECK_MODULES(QT4,
+                          [QtGui >= $QT4_REQUIRED],
+                          [have_qt4=yes],
+-- 
+2.32.0
+
diff --git a/media-libs/libmediaart/libmediaart-1.9.4.ebuild b/media-libs/libmediaart/libmediaart-1.9.4.ebuild
index 31eaf8162456..8bc2ef34496b 100644
--- a/media-libs/libmediaart/libmediaart-1.9.4.ebuild
+++ b/media-libs/libmediaart/libmediaart-1.9.4.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 VALA_USE_DEPEND="vapigen"
 VALA_MIN_API_VERSION="0.16"
 
-inherit autotools flag-o-matic gnome2 vala virtualx
+inherit autotools gnome2 vala virtualx
 
 DESCRIPTION="Manages, extracts and handles media art caches"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/libmediaart"
@@ -47,6 +47,7 @@ src_prepare() {
 	mv html/libmediaart{,-${SLOT}}.devhelp2 || die
 	cd "${S}" || die
 
+	eapply "${FILESDIR}"/${PN}-1.9.4-drop-bashisms-configure.patch
 	eautoreconf
 
 	use vala && vala_src_prepare
@@ -56,7 +57,6 @@ src_prepare() {
 src_configure() {
 	if use qt5 ; then
 		local myconf="--with-qt-version=5"
-		append-cxxflags -std=c++11
 	fi
 
 	gnome2_src_configure \
diff --git a/media-libs/libmng/Manifest b/media-libs/libmng/Manifest
index 8d04789c78f6..06dac74ef0a6 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-r1.ebuild 1183 BLAKE2B a1a32690bb385d1da40ed6e37c5f0d4407647d2bcda137f2bf0abe88e29730f789a9012f1e2ddd0750eb5f93e935d96c566b3005014371b74ed45b7bc8116200 SHA512 bfc98412688d2261182198cc2172d8713c61133713b550717db4994112106e10181d12575d21dd3afae431ceeb5e8dd689ace57e4b148953ac3e3c96ef5a6825
-MISC metadata.xml 291 BLAKE2B a9b24a9ed6218970d09a574357f76445e0966a927f5d12cf72b2be8b01a7dc6070562bdcb13d7f341b16ea695d45bf0330eb8a9e416593f79eff1fd5171638b1 SHA512 662be34d4175954a83c5dafae699a79ddefd0faef98f541d0c7ab1cccf930e1e980f9cb1c9efe085dafe4ed6373a254aee9d5f2f936b537da29acfa0cf5ea02c
+MISC metadata.xml 320 BLAKE2B f086cdd5cf1ec69446c9b85325be155bebb814097af345023714b9ecd967de4403f97aee61a60b4de13af9bc2864bf35f6fffc37f3fe0b866c100488cc31a72e SHA512 61aabe31a3fe3613a29b6baef4d387af66edf0bc1a0c8818b42458fe4e4d4c3409a2ad31f280eb7cc5d742440b1dff29c2d5953e63d66ed661c00184624c0267
diff --git a/media-libs/libmng/metadata.xml b/media-libs/libmng/metadata.xml
index a81b3f0f7ddb..0942c0b3fee7 100644
--- a/media-libs/libmng/metadata.xml
+++ b/media-libs/libmng/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>soap@gentoo.org</email>
+		<name>David Seifert</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libmng</remote-id>
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 76ce4e3d79f2..c49e27ff134c 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -7,5 +7,5 @@ EBUILD openimageio-2.2.12.0.ebuild 3710 BLAKE2B 2076161c441805358fc03c4ed31a283a
 EBUILD openimageio-2.2.13.1.ebuild 3710 BLAKE2B 2076161c441805358fc03c4ed31a283a6851d59486c2cce1b4eed6a5f14171ce10f2e3c72916d00418d03488b7d38b6a777e5907a9414570428f597fb63be5a8 SHA512 d5a4a577c06d712ed7c6f55af24bdaa5be2bba5f9da838348f418da5c3d5958d5b36bffc5e33e72a02efa415d60e0f263c8e0db67f5b653e46d0ea1e8bdb0171
 EBUILD openimageio-2.2.14.0.ebuild 3796 BLAKE2B 5cfefbf0405c513ff43d6baf459adae1700d446883646cdfdf29b650d9242209d3f7e77b0b3c835c71e61d6c7c065bd700d6287699b30754b9376526a5034fff SHA512 ff91ac8f04e6977506ad2cbfcc69d0ded458f0da9740a856ec25921f016f35e212f36af517a05c76d487cc263a597def610c772e8ba646e7de0689e99b558af3
 EBUILD openimageio-2.2.15.0.ebuild 3796 BLAKE2B 5cfefbf0405c513ff43d6baf459adae1700d446883646cdfdf29b650d9242209d3f7e77b0b3c835c71e61d6c7c065bd700d6287699b30754b9376526a5034fff SHA512 ff91ac8f04e6977506ad2cbfcc69d0ded458f0da9740a856ec25921f016f35e212f36af517a05c76d487cc263a597def610c772e8ba646e7de0689e99b558af3
-EBUILD openimageio-2.2.15.1.ebuild 3796 BLAKE2B 5cfefbf0405c513ff43d6baf459adae1700d446883646cdfdf29b650d9242209d3f7e77b0b3c835c71e61d6c7c065bd700d6287699b30754b9376526a5034fff SHA512 ff91ac8f04e6977506ad2cbfcc69d0ded458f0da9740a856ec25921f016f35e212f36af517a05c76d487cc263a597def610c772e8ba646e7de0689e99b558af3
+EBUILD openimageio-2.2.15.1.ebuild 3794 BLAKE2B 268bfcdecae67835a2da461d2ffdcbfb226bc5f46b3a988bf183eb4b6d95700e385cfd51e65026bd0f51a89f33765028948ce270e9c6189ddc6b4b0f579126b5 SHA512 e54417237b52b942e0fbd7ba4b5f60026bd41a2ad70fde07487217a14cce883c8c01b6b86677680045d3d70af198af8e18d3b9e8bd860fb924ad44b74d52915f
 MISC metadata.xml 936 BLAKE2B 0ba7d5d9c77d481d876a273f479cc33f7b4233be522a6722aa4762ff682166eebf93645a5c042591c7495e4954bc0c61fa89083fd2b4ee76a5ccbdb5299dfcba SHA512 732d0ad35c7176710ac7a5362a4a6ac03c01d11d8df016654b13490e84b6d56801714158536abaccafccbc14b55234a78095e8a1d9550419bf0a67fe3d4cab5c
diff --git a/media-libs/openimageio/openimageio-2.2.15.1.ebuild b/media-libs/openimageio/openimageio-2.2.15.1.ebuild
index 36c2ee69a52d..d12beb042a0e 100644
--- a/media-libs/openimageio/openimageio-2.2.15.1.ebuild
+++ b/media-libs/openimageio/openimageio-2.2.15.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oiio-Release-${PV}"
 
 LICENSE="BSD"
 SLOT="0/2.2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 X86_CPU_FEATURES=(
 	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
diff --git a/media-libs/qhull/Manifest b/media-libs/qhull/Manifest
index e3b5fb29c452..289915f8ac19 100644
--- a/media-libs/qhull/Manifest
+++ b/media-libs/qhull/Manifest
@@ -1,4 +1,4 @@
 AUX qhull-2020.2-deprecated-pkgconfig.patch 473 BLAKE2B 5fbc2b1b9a4cd5a6c5cff46484b943b36de2f327c051b9badc32c952373b7f250eb751b46c8884e1dcd1c23b4bd2c50e4d5b1af7129ee477e1e75aab55d1f7be SHA512 a688943f6e0210ef170cfe9a8b3f186460bd2654c30cd0b0ca30b71f3245189be76dfa3648fcb9cbfe8daee27e11bec23a7a6016abf0213f0ce418f1fb3c5654
 DIST qhull-2020.2.tar.gz 1307213 BLAKE2B db11d4b83124da3ceed95e1eb81c280ac55c871c83acd4c371f9716b57a1777105891a073282789c7a80b5d74e85164996fbe4f2140c8371bca5926eab4adbc2 SHA512 88f50c2a968f56deec61772490617cc877b0ca2d804954ade08297b9bab826076db6b960d6f1feb21c6851e5328cb11c6dd565666517fa78a3d65b901848ff36
-EBUILD qhull-2020.2-r3.ebuild 1503 BLAKE2B 686b26d03141a67125eb163ec66b64d102ff64dc218a577f33a0d24233c464e1b594191830d86d046cee78a9de8c4bb7bf0ce761925b98739c7c5d28bd977de9 SHA512 6977bb7b705e5664e37a9aee412b98623a314aa906d37a0c50abb03c7422140bfde36397f41652a4df7b3981e175fbd99a6f0bc8597df699190aa47f53e74dcc
+EBUILD qhull-2020.2-r3.ebuild 1509 BLAKE2B 49c2770268dc1cc2fd9ff9d3015ae55533d974d099f35d8d548d51021b32078dbc048e6ead0a3e004653b4cdbd4bc09ed2b5eb242158ba53547d10b47b0e5c0b SHA512 6f2232a244eb6f835240832c89ef23cdf17e28d502f228aea16a4c3ff6405deaa14ae3aa68d8bd01b3cb5806cd1be58457b7b2241c455aae461c86b7e38fa304
 MISC metadata.xml 1094 BLAKE2B 9667f9f89fc9717129401070888401f0db493c01e4fe73eb8168efae9c1c2d7f1a7aa234fe72f3beea7feb385dc920418a6affe4d99679736cc6a1aef212e4eb SHA512 b1e13904fe69b4535806a871cdda79fadbf294c30654fe119e7e3be0ed481dc926a9dfaffd75c2849e3eb91ebad671a6b7eca293b40a249c8ccbee6264cfdaf9
diff --git a/media-libs/qhull/qhull-2020.2-r3.ebuild b/media-libs/qhull/qhull-2020.2-r3.ebuild
index fe64e83f5a4e..e42418c0452d 100644
--- a/media-libs/qhull/qhull-2020.2-r3.ebuild
+++ b/media-libs/qhull/qhull-2020.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/qhull/qhull/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0/8"
 LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc static-libs"
 
 DOCS=( Announce.txt File_id.diz README.txt REGISTER.txt )
diff --git a/media-libs/quesoglc/Manifest b/media-libs/quesoglc/Manifest
index ff1da4b75ae5..4dfbb69f8d33 100644
--- a/media-libs/quesoglc/Manifest
+++ b/media-libs/quesoglc/Manifest
@@ -1,3 +1,4 @@
 DIST quesoglc-0.7.2-free.tar.bz2 657394 BLAKE2B 73798b80fea5be9a66aa7c0090ec0564d517417a8597d102d057fcd91bc4c6d0c48352470b02182705d135cb04434178b206a964d539283cc4ac69d2f1dc5cb9 SHA512 107cc28fe85722614bc6c222a64914eeef0de1c5dfa01cef9ec611e5caff54fdbcf2b387d413c0b56533d33e06741ca8dee99fc0c5ee1e63d9a95d86c6c69190
+EBUILD quesoglc-0.7.2-r1.ebuild 980 BLAKE2B 2cfb087464181f6019c5f83748c8d3bb4baee854104c7b252bb9a16b96d18d0852cbddc9057ff2c086dd35b48f7ac3416522fc802462cef5f24addbb6056bf3a SHA512 1bcdcf0b2f95874a1f16b71d0f83ccbb32ea8f250e6686525a4f46cecc53fd8fac3e740f9737fc911f55bbdc9d84fe2de831d186fe966b58b136f20797e2b474
 EBUILD quesoglc-0.7.2.ebuild 1070 BLAKE2B d47799a691ff92458be513ceb7c3cb450a536eb9bf5083ab1af805d8d52666ba6c5fcdfbb1a17ea7eb84a6e434e8a36ba2d664f55002e59ddcf9e29276b08829 SHA512 2d718bd3914ffb01fe1e4453ce6198754b2ffb67cfb6ff6863b457bdfc1b6d1832d57e8c2d6dd451bc2c39a94c42e271ad7592acf24ef55aeb65864f0153932f
 MISC metadata.xml 331 BLAKE2B ceaba043139669fa90e55b48c5b21bd1dcc7bcec0eb8fc8bd5d3ff4ed16a3c7bc29c63dfb12b5eb7b9041e918da1b79f9cfe34b27554f9ba83efae51d6c704a3 SHA512 ca843d6a3a6abbe8148dfd89cdda0a8b1335343f77b2f12fc6ac3760bbfa893c30db593ca6730674784fe60b3c1d31addfbafc6561ed415035880b09ca5df52b
diff --git a/media-libs/quesoglc/quesoglc-0.7.2-r1.ebuild b/media-libs/quesoglc/quesoglc-0.7.2-r1.ebuild
new file mode 100644
index 000000000000..6f4fe15c6eb7
--- /dev/null
+++ b/media-libs/quesoglc/quesoglc-0.7.2-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Free implementation of the OpenGL Character Renderer (GLC)"
+HOMEPAGE="http://quesoglc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-free.tar.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND="
+	dev-libs/fribidi
+	media-libs/fontconfig
+	media-libs/freetype:2
+	virtual/glu
+	virtual/opengl"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)"
+
+src_prepare() {
+	default
+	rm -r src/fribidi || die
+}
+
+src_configure() {
+	# Uses its own copy of media-libs/glew with GLEW_MX
+	local myeconfargs=(
+		--disable-executables
+		--with-fribidi
+		--without-glew
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake all $(usev doc)
+}
+
+src_install() {
+	default
+
+	use doc && dodoc -r docs/html
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/raptor/Manifest b/media-libs/raptor/Manifest
index dc05bfbdc169..c0c6f98b532f 100644
--- a/media-libs/raptor/Manifest
+++ b/media-libs/raptor/Manifest
@@ -3,5 +3,5 @@ AUX raptor-2.0.15-dont_use_curl-config.patch 1681 BLAKE2B 5c3b241836e04dabbcd6fd
 AUX raptor-2.0.15-heap-overflow.patch 1708 BLAKE2B cea8df63861760fe55f1320cbc0833d814c38148b3d5f2b7163348de48bd95a37ee3000d312ce76879c798182f74d60f49fcef89f5f051bd40febc0c1da68099 SHA512 f7df0ec3123ac8ec9f2852dfb54e380d210446a36ab2f74aa9d2dcb8346162046d239b4db9a0747b18e3d19f4dc1ce41d194557c5e53027a3618e81b7b251d3d
 DIST raptor2-2.0.15.tar.gz 1886657 BLAKE2B 0a39c7b5705bfbf2daa0ca633f79693953b4dfe24c144008d1646a9840a36d4d7ce153b527450647127ec2522047dbd0a6e71f307ee5656951f7e4b610adfd22 SHA512 563dd01869eb4df8524ec12e2c0a541653874dcd834bd1eb265bc2943bb616968f624121d4688579cdce11b4f00a8ab53b7099f1a0850e256bb0a2c16ba048ee
 EBUILD raptor-2.0.15-r3.ebuild 1713 BLAKE2B 9c61a997c410dc4600384ec53b8995ea4782dd2169179c49073b0812953ef399a9ce360b8b6c4d626aae7351e80d50763abe76ea2c85eb9c482bbef04817ec6b SHA512 bb56a414bd06bcf3ee8a656e87e1e7171e2e7fd4bf3c690995d97e3aedd7a99418083f19a0ab2da8772ea6d985a888757e8ba393d02a1c9298c1eaabd7f06ad5
-EBUILD raptor-2.0.15-r4.ebuild 1887 BLAKE2B 56199b0bdce95b0419b691370517fc8c689835f9f04db78e046c9137589d155af1fc8cd4ceac8e32855690a4c527792b87999bf5869f87f3231bbede34513b76 SHA512 2ebdadef2c14f9fe445ba574a870e40f193c49de1eab96a0243b1d468308a1fad5d0cbed6c39e37d5b1932e715d2185f7f2adc1e49693c6e296656eae7015998
+EBUILD raptor-2.0.15-r4.ebuild 1881 BLAKE2B 664cab272ace46c9e3bbfd63599fda487fd80f30f5fed914a8e701a1ff69cd8eec3b5487c277b9aee03329b64fe710deec18698e424f0ef74c40c7c2a044836f SHA512 c3fb47567f101ef6a916739f18743fb9975499a2fec0f360888686d1036c1b9653ca247086bd74ad3c19e88313549ed080354bb80d6f8cc46ee276d22d838094
 MISC metadata.xml 337 BLAKE2B 6244cd4ab5d8d13437590c4bbb672cb9b5ad47f7e70d30adda368737d745daf4df249eb2166d2ab8335fe0a0fec5b8d3afa9ec091cc6ddcaaf0f2d05f9425741 SHA512 3a2c420495274cfca80f0103066b282b9f1301786a8cbde76b894fac721030bee949fc468c92841698038b991b07fa66f15891392784041a87f655d1860fd11c
diff --git a/media-libs/raptor/raptor-2.0.15-r4.ebuild b/media-libs/raptor/raptor-2.0.15-r4.ebuild
index f32b2698b01d..3917c369d040 100644
--- a/media-libs/raptor/raptor-2.0.15-r4.ebuild
+++ b/media-libs/raptor/raptor-2.0.15-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.librdf.org/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+curl debug json static-libs unicode"
 
 DEPEND="
diff --git a/media-libs/sdl-net/Manifest b/media-libs/sdl-net/Manifest
index c16671bb5824..e92e68a698b7 100644
--- a/media-libs/sdl-net/Manifest
+++ b/media-libs/sdl-net/Manifest
@@ -1,3 +1,4 @@
 DIST SDL_net-1.2.8.tar.gz 360958 BLAKE2B 656fb9c86949bc962656edc7b950e64eee9b9b1ce1b257e6c4974c2d9be99714128c5556d3a3b7ea92cc6d294846af7a51a1925d17418afc8409e44a7b71099a SHA512 2766ca55343127c619958ab3a3ae3052a27a676839f10a158f7dfc071b8db38c2f1fc853e8add32b9fef94ab07eaa986f46a68e264e8087b57c990af30ea9a0b
 EBUILD sdl-net-1.2.8-r1.ebuild 950 BLAKE2B eace10eddbb039153f4de12e426cc8e7f170857541a4e4502522140bce44786e45c1e214b724fe3a57df25350bbfdc0e9447e5a8683decc72480cfa3c488b440 SHA512 5e8c3e5cf9112b614a082c9f5420cfcbae3af78fd011967fe4b2f6b81c4fa76a682a3b955eb96df2d0c72bcc14ca13bffb38e7b29c71b9fcea16b58fb04b07dd
+EBUILD sdl-net-1.2.8-r2.ebuild 741 BLAKE2B 5bf3efc99c552dc2e49f309ab784fdbcfcc44bb01b100ac230e4cd4682ac0b3e5f499f8354f5639d384a3faf357dabc495144fe08eb7edc79d4e5dafd0affd55 SHA512 a7bac88177b621a81476bf966cac977cb979e0094e2014d58116285bcdb9330abace1afd418faa354a77e820fe25fce01dfa769a35789d1811cf2c07a121fcb2
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild b/media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild
new file mode 100644
index 000000000000..c84784f71651
--- /dev/null
+++ b/media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+MY_P="${P/sdl-/SDL_}"
+
+DESCRIPTION="Simple Direct Media Layer Network Support Library"
+HOMEPAGE="https://www.libsdl.org/projects/SDL_net/"
+SRC_URI="https://www.libsdl.org/projects/SDL_net/release/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+RDEPEND="media-libs/libsdl[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf --disable-gui
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}