gentoo resync : 20.06.2021

17 files changed, 733 insertions, 335 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index cd4a14ecc55d..aaba59391855 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libcaca/Manifest b/media-libs/libcaca/Manifest
index 6020fee2612a..ca521aa14de0 100644
--- a/media-libs/libcaca/Manifest
+++ b/media-libs/libcaca/Manifest
@@ -8,7 +8,5 @@ AUX fix-css-path.patch 502 BLAKE2B c494c458524f98017dceb41266ed051cb3bc9f00c5718
 AUX libcaca-0.99_beta18-fix-tests.patch 1886 BLAKE2B 8961c617ae568ab19b0404a8ddb1e4da743f7792b36fd32ace460071c04754f8e5845200333f96e4b9602f547d3249da301c3df62cee7bb20235da6a3242789f SHA512 583b440f93d2d468b14a707946eda928811b8c6573b1a48a1f6010d2f3713399689434531b0068ebbc1999dc82867c7ae6da0bdea9fb754277eda484fe39b1f6
 AUX libcaca-0.99_beta18-latex_hacks.patch 645 BLAKE2B 8b72799bdb19accf044c590a144ec7330532aebb7faa3076b12cc49ca82e8e127126b7d1ec8930d0a0871476e4f7632c6ebb6d10ae36146a3006040be72157d6 SHA512 9c1fc4aba3eecf94f47f296ebf11441de60ddf7a335c11bae4da4aa04e5cbbddd07d8cacf40b2b0aaf96312923c24cc0f1a3f031284cac13e8dd9c29ce36aa18
 DIST libcaca-0.99.beta19.tar.gz 1203495 BLAKE2B 65462090fc503d640d91753ff21b55ad1bac360fb6e5aae8f46d8162e62f8834f791a1db6e2045a63deaa7c409c3455b484750294cfb01e1027f0ca8dc2f2798 SHA512 780fc7684d40207cc10df3f87d6d8f1d47ddfffa0e76e41a5ce671b82d5c7f090facb054c3d49ca7c4ea1a619625bb9085ce52f837f50792b4a2d776a4c68e15
-EBUILD libcaca-0.99_beta19-r1.ebuild 4017 BLAKE2B 09e3b339beb9a45a816779ce2b0394601b4bd687e6606bbe70ce09dcf0d91e8b82388909f657cb3de11ec4210bd06cd7bee5fe6379cae83ea023a49d38b5f84d SHA512 5c5356db2d1e3d4e0cd083d29be5261698677989c59941b1b632ce2164a23a829bcd249e4178e33589dd81ba40447b0b9fce1125cceb6bca4109cd0257c73038
-EBUILD libcaca-0.99_beta19-r3.ebuild 4162 BLAKE2B 721115dcd52859816b62ad09c2ca11e0083154fabd5cf5298b9f1ca28f908e64fb8521c5f507ef9995a8a84b3cbdaa28573b3bce777ef2ef20d5eb40c07d14fc SHA512 b2a5edc036c7b92b75a9bef4a7007ad71afb24d068adc405b11e70076a35b3bba3a0993bee9b1ed2627284c7df59aeb6e373faeca17969738aa73f57b594574f
-EBUILD libcaca-0.99_beta19-r4.ebuild 4489 BLAKE2B 59bc7b32f8ace89d2a36c302bb77ec25977262a3f590d8935bf822830e554840a5808785949054796234fec56bc29875c870031ecb477ea6190fc81ba95a8c71 SHA512 e33a1880f941d63668e4cb7546cd362e3193e3045f41ea6de5c47213ebc6d3946631cec2306ff993d30883e50113724a0763f48ff746d004f7927b8f2c0b7a17
+EBUILD libcaca-0.99_beta19-r7.ebuild 4480 BLAKE2B 111efd3fba0668074f78a2346d84e16e1df15990dfa10e2ee99fc253aca4c4d6ed11ff1eb8c506b80c535e7150672a41668f7c6211d17bb2f1a7118bef7c6f03 SHA512 8f4988bce594b728b31d0e283844213dcb1c7a154de4ee180d3d2d1acd7a77c965a5f0ecebc0d15f1dd5b39d91d2c43c558a5ed538e7c4f924445c19e515684f
 MISC metadata.xml 219 BLAKE2B bca5749b6f2d3541ba2d2635b59056f9ecdc46553991dec3ee5a7bc9f26393bdae62755418850d3cbda0eeb65b7f72029ddf09d4f088b21c84d407d0e6eaa098 SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2
diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild b/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild
deleted file mode 100644
index a7e21adb2add..000000000000
--- a/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-RUBY_OPTIONAL=yes
-#USE_RUBY=ruby20
-inherit autotools ruby-ng epatch eutils flag-o-matic mono-env multilib java-pkg-opt-2 multilib-minimal
-
-MY_P=${P/_/.}
-DESCRIPTION="A library that creates colored ASCII-art graphics"
-HOMEPAGE="http://libcaca.zoy.org/"
-SRC_URI="http://libcaca.zoy.org/files/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 ISC LGPL-2.1 WTFPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="cxx doc imlib java mono ncurses opengl ruby slang static-libs test truetype X"
-RESTRICT="!test? ( test )"
-REQUIRED_USE=""
-#	ruby? ( ruby_targets_${USE_RUBY} )
-
-COMMON_DEPEND="imlib? ( >=media-libs/imlib2-1.4.6-r2[${MULTILIB_USEDEP}] )
-	mono? ( dev-lang/mono )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
-	opengl? (
-		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-		>=media-libs/freeglut-2.8.1[${MULTILIB_USEDEP}]
-		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
-	)
-	slang? ( >=sys-libs/slang-2.2.4-r1[${MULTILIB_USEDEP}] )
-	X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )"
-#	ruby? (  $(ruby_implementations_depend) )
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.5 )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		virtual/latex-base
-		>=dev-texlive/texlive-fontsrecommended-2012
-		>=dev-texlive/texlive-latexextra-2012
-		dev-texlive/texlive-latexrecommended
-	)
-	java? ( >=virtual/jdk-1.5 )
-	test? ( dev-util/cppunit )"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS ChangeLog NEWS NOTES README THANKS )
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	use mono && mono-env_pkg_setup
-}
-
-src_unpack() {
-	default
-}
-
-src_prepare() {
-	sed -i -e '/doxygen_tests = check-doxygen/d' test/Makefile.am || die #339962
-
-	sed -i \
-		-e 's:-g -O2 -fno-strength-reduce -fomit-frame-pointer::' \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		configure.ac || die
-
-	sed -i \
-		-e 's:$(JAVAC):$(JAVAC) $(JAVACFLAGS):' \
-		-e 's:libcaca_java_la_CPPFLAGS =:libcaca_java_la_CPPFLAGS = -I$(top_srcdir)/caca:' \
-		java/Makefile.am || die
-
-	if ! use truetype; then
-		sed -i -e '/PKG_CHECK_MODULES/s:ftgl:dIsAbLe&:' configure.ac || die
-	fi
-
-	if use imlib && ! use X; then
-		append-cflags -DX_DISPLAY_MISSING
-	fi
-
-	# bug 653400
-	append-cxxflags -std=c++11
-
-	# Removed 'has_version '>=dev-texlive/texlive-latex-2013' &&' that prefixed this
-	# patch before wrt #517474
-	epatch "${FILESDIR}"/${PN}-0.99_beta18-latex_hacks.patch
-
-	# fix out of source tests
-	epatch "${FILESDIR}"/${PN}-0.99_beta18-fix-tests.patch
-
-	eautoreconf
-
-	java-pkg-opt-2_src_prepare
-}
-
-multilib_src_configure() {
-	if multilib_is_native_abi; then
-		if use java; then
-			export JAVACFLAGS="$(java-pkg_javac-args)"
-			export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)"
-		fi
-
-		use mono && export CSC="$(type -P gmcs)" #329651
-		export VARTEXFONTS="${T}/fonts" #44128
-		use ruby && use ruby_targets_${USE_RUBY} && export RUBY=$(ruby_implementation_command ${USE_RUBY})
-	fi
-
-	ECONF_SOURCE="${S}" \
-		econf \
-			$(use_enable static-libs static) \
-			$(use_enable slang) \
-			$(use_enable ncurses) \
-			$(use_enable X x11) $(use_with X x) --x-libraries=/usr/$(get_libdir) \
-			$(use_enable opengl gl) \
-			$(use_enable cxx) \
-			$(use_enable imlib imlib2) \
-			$(use_enable test cppunit) \
-			$(multilib_native_use_enable java) \
-			$(multilib_native_use_enable ruby) \
-			--disable-python \
-			$(multilib_native_use_enable mono csharp) \
-			$(multilib_native_use_enable doc)
-}
-
-multilib_src_compile() {
-	local _java_makeopts
-	use java && _java_makeopts="-j1" #480864
-	emake V=1 ${_java_makeopts}
-}
-
-multilib_src_test() {
-	emake V=1 -j1 check
-}
-
-multilib_src_install() {
-	emake V=1 DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use java; then
-		java-pkg_newjar java/libjava.jar
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	rm -rf "${D}"/usr/share/java
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r3.ebuild b/media-libs/libcaca/libcaca-0.99_beta19-r3.ebuild
deleted file mode 100644
index 9e2445342374..000000000000
--- a/media-libs/libcaca/libcaca-0.99_beta19-r3.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-RUBY_OPTIONAL=yes
-#USE_RUBY=ruby20
-
-inherit autotools ruby-ng flag-o-matic java-pkg-opt-2 mono-env toolchain-funcs multilib-minimal
-
-MY_P=${P/_/.}
-DESCRIPTION="A library that creates colored ASCII-art graphics"
-HOMEPAGE="http://libcaca.zoy.org/"
-SRC_URI="http://libcaca.zoy.org/files/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2 ISC LGPL-2.1 WTFPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="cxx doc imlib java mono ncurses opengl ruby slang static-libs test truetype X"
-RESTRICT="!test? ( test )"
-
-# ruby? ( ruby_targets_${USE_RUBY} )
-REQUIRED_USE=""
-
-# ruby? (  $(ruby_implementations_depend) )
-DEPEND="
-	imlib? ( >=media-libs/imlib2-1.4.6-r2[${MULTILIB_USEDEP}] )
-	mono? ( dev-lang/mono )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
-	opengl? (
-		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-		>=media-libs/freeglut-2.8.1[${MULTILIB_USEDEP}]
-		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
-	)
-	slang? ( >=sys-libs/slang-2.2.4-r1[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
-	)
-"
-RDEPEND="java? ( >=virtual/jre-1.5 )"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		virtual/latex-base
-		>=dev-texlive/texlive-fontsrecommended-2012
-		>=dev-texlive/texlive-latexextra-2012
-		dev-texlive/texlive-latexrecommended
-	)
-	java? ( >=virtual/jdk-1.5 )
-	test? ( dev-util/cppunit )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS NOTES README THANKS )
-
-PATCHES=(
-	# Removed 'has_version '>=dev-texlive/texlive-latex-2013' &&' that prefixed this
-	# patch before wrt #517474
-	"${FILESDIR}"/${PN}-0.99_beta18-latex_hacks.patch
-	# Fix out of source tests
-	"${FILESDIR}"/${PN}-0.99_beta18-fix-tests.patch
-)
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	use mono && mono-env_pkg_setup
-}
-
-src_unpack() {
-	default
-}
-
-src_prepare() {
-	# bug #339962
-	sed -i -e '/doxygen_tests = check-doxygen/d' test/Makefile.am || die
-
-	sed -i \
-		-e 's:-g -O2 -fno-strength-reduce -fomit-frame-pointer::' \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		configure.ac || die
-
-	sed -i \
-		-e 's:$(JAVAC):$(JAVAC) $(JAVACFLAGS):' \
-		-e 's:libcaca_java_la_CPPFLAGS =:libcaca_java_la_CPPFLAGS = -I$(top_srcdir)/caca:' \
-		java/Makefile.am || die
-
-	if ! use truetype; then
-		sed -i -e '/PKG_CHECK_MODULES/s:ftgl:dIsAbLe&:' configure.ac || die
-	fi
-
-	if use imlib && ! use X; then
-		append-cflags -DX_DISPLAY_MISSING
-	fi
-
-	# bug #653400
-	append-cxxflags -std=c++11
-
-	# bug #601902
-	append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
-
-	default
-	eautoreconf
-
-	java-pkg-opt-2_src_prepare
-}
-
-multilib_src_configure() {
-	if multilib_is_native_abi; then
-		if use java; then
-			export JAVACFLAGS="$(java-pkg_javac-args)"
-			export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)"
-		fi
-
-		# bug #44128
-		export VARTEXFONTS="${T}/fonts"
-
-		# bug #329651
-		use mono && export CSC="$(type -P gmcs)"
-		use ruby && use ruby_targets_${USE_RUBY} && export RUBY=$(ruby_implementation_command ${USE_RUBY})
-	fi
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable slang)
-		$(use_enable ncurses)
-		$(use_enable X x11)
-		$(use_with X x)
-		--x-libraries=/usr/$(get_libdir)
-		$(use_enable opengl gl)
-		$(use_enable cxx)
-		$(use_enable imlib imlib2)
-		$(use_enable test cppunit)
-		$(multilib_native_use_enable java)
-		$(multilib_native_use_enable ruby)
-		--disable-python
-		$(multilib_native_use_enable mono csharp)
-		$(multilib_native_use_enable doc)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	local _java_makeopts
-
-	# bug #480864
-	use java && _java_makeopts="-j1"
-	emake V=1 ${_java_makeopts}
-}
-
-multilib_src_test() {
-	emake V=1 -j1 check
-}
-
-multilib_src_install() {
-	emake V=1 DESTDIR="${D}" install
-
-	# Note: broken, see bug #508564 and bug #773913
-	if multilib_is_native_abi && use java; then
-		java-pkg_newjar java/libjava.jar
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	rm -rf "${ED}"/usr/share/java || die
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild b/media-libs/libcaca/libcaca-0.99_beta19-r7.ebuild
index f0eece5142c7..bc7b204dd360 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r7.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-2 ISC LGPL-2.1 WTFPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="cxx doc imlib java mono ncurses opengl ruby slang static-libs test truetype X"
+IUSE="doc imlib java mono ncurses opengl ruby slang static-libs test truetype X"
 RESTRICT="!test? ( test )"
 
 # ruby? ( ruby_targets_${USE_RUBY} )
@@ -139,7 +139,7 @@ multilib_src_configure() {
 		$(use_with X x)
 		--x-libraries=/usr/$(get_libdir)
 		$(use_enable opengl gl)
-		$(use_enable cxx)
+		--enable-cxx
 		$(use_enable imlib imlib2)
 		$(use_enable test cppunit)
 		$(multilib_native_use_enable java)
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index d463afac2856..51624745e326 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -7,5 +7,5 @@ DIST libjpeg-turbo-2.1.0.tar.gz 2255497 BLAKE2B 693eccd00e8e1574e60ceb7464552ce9
 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
 EBUILD libjpeg-turbo-1.5.3-r4.ebuild 2978 BLAKE2B 50575c65e6fd694e2a9b3a124294f72974a2996ed3d8434ef7cc60ca00c59bec617f0ee5472bc5fbf8a0afa6bb4bb3d2c0e5fff6087c287ba9818133d8a79eb1 SHA512 50937ee99535fe2d4aa9da3b403f9dc412a39ea15551f216845645ac8cdcb711570553ed444c9154bfd980c8019da230c0d1b2089abea34f40aa00f9b3d89866
 EBUILD libjpeg-turbo-2.1.0-r1.ebuild 3114 BLAKE2B 5da60b00e56b11581e85273e73252842d52833eab960ad6e9240c64d5311908fcaea885dd014f05e48ac7cee525a23b4e3932f5becc26079194c535253991788 SHA512 9766f9cd99a23bdc83e1cc27a04a8eb704a79ac1454dcf67e2ce107469071ab581b275b1d70de18376c95f99e03cb90a189ac1ac50068e1b61a5bdc32666de0c
-EBUILD libjpeg-turbo-2.1.0-r2.ebuild 3232 BLAKE2B 789ebf33027f218a795226880ccc4d0c64055a1c8ec6fa0f0556b26affcae2b3db4469090acdf2462cb14f908562af77d3850b001aa6099cc79dcb9cc899f06a SHA512 ff846c4d7a91de095a2af7ef38d66041aaae616776c0b0e46f2a33a924c711424717fbd67ad91be99a4b45452d19a03acdc226d00f621774aba0f116265a2c16
+EBUILD libjpeg-turbo-2.1.0-r2.ebuild 3227 BLAKE2B ab42f68788ba943c7e1b7fb19e6e44059055cb5c6b8981d796dab48f724ba62643bebd308f6b9c6256be90f6bc5014f9f31803803cdced94486a86adda5baff5 SHA512 9b1986a5427131ba9009bc2c0a0b8dc28a2034b487f4200accf41aa9be1f32054087f3d1f7e3ea299fe11e24e8660a8e2d8c1aba8a5558106dbc2cb6aff38664
 MISC metadata.xml 566 BLAKE2B 57882cb0d2f18155c76966075cc2e39de863edd42a161077cf98fe070b045e95181851609b9b2e79134919b7c88504ffcaf6a43f1cfa913fd68a728c64dde514 SHA512 33c2184b17b1c3ace640fc94a2aca554fa3dcbdee1dd2f1546e2340f6490c89e5f2c35dc60c3b3410be80fb66abc015846c311f1f0722431345214262ca8d900
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild
index 78714e29ba7e..d93561d9aca9 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 LICENSE="BSD IJG ZLIB"
 SLOT="0/0.2"
 if [[ "$(ver_cut 3)" -lt 90 ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE="cpu_flags_arm_neon java static-libs"
 
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index e73004f1557a..fb7b705fc457 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -2,9 +2,11 @@ DIST mesa-20.3.5.tar.xz 14367412 BLAKE2B 7bad876ce702158e727a752eda6722e7165b497
 DIST mesa-21.0.3.tar.xz 14710004 BLAKE2B f2165da4487824931d8ff90e4f13624546a297b0d3577d69b7cfd6078a965282b4a732cb720cbb08ea83a3a987603cfe67876fb18022fa444b011fcc9b7df352 SHA512 4a8aee48a8ea7f32e8aa3bbbd91db26c6053b9a43e62ff88256929e6bc147884f0fef988726b5a3d59d7008663f017c746a0352fd3fcc1c476b8190af4a2531f
 DIST mesa-21.1.1.tar.xz 15169732 BLAKE2B b2c2f2fa14ebf78baeb64ca976dde2920a594bcea02b3a17820135afc169c8489f37a2869b140d637b11b618c96e37834c255ca7a92d17f70003a11e8fffd401 SHA512 79d0e2b0e1e590e7f36a082df3584010a553af0b3060bd2d3a7ace700ac7a8d1b7734ba67f2e193dd441434eeec74a16e0dbcbf8c15061b5dd5d6a1feca73d62
 DIST mesa-21.1.2.tar.xz 15199892 BLAKE2B 1e1d9e0bee2eec95a38379047c050ba7e4a9ada47bb8d4f1d3faf355ec6f71ad8e792cfaf72234a3c86f254c33618883f772c0f3f7f7f97085a8c7b5a1ad90d0 SHA512 a7907fa29fdb4e137015ee5405b9c8c0769ef9354bbe963c1af80318b398c05c79db6129b583106d620c42a5e9b625611b648fd5207334eb9b588d7963defc70
+DIST mesa-21.1.3.tar.xz 15230376 BLAKE2B 49098dc462a19ded67329556acdf136f249609dae85e8b898f721c34127df17fe816fea90e23a93ca9f86ab1f06f660e787cdb2b01b9caa2cd694c04ee1e2027 SHA512 8ca6d5516035484ea2a63bc6338794003ef167239ab0c220f8d3693f97f9725b46fc9d9a704c4ba11b83197d4b8e5f658d65ef0cce1e0957f5e58bd13726b9e0
 EBUILD mesa-20.3.5.ebuild 14915 BLAKE2B 73f85b8bbbbbbfba3be499ba55ffa2bcdb5e6f860049819502957e803c2760edf3e45ada1f103f58752e77177065ad12d81ea72c36f96c19c6ebc87d1fe03ab9 SHA512 0b1dd3fad90392be514da0d347efe19b35fe82d13ca02d959f56e625d00a9beb917c83c678e7d6ad419dc81b6fc32e0dd8ca6f95f5fd77484872af464f9ae52b
 EBUILD mesa-21.0.3.ebuild 14826 BLAKE2B 1c9793f1dc8b7769406d49d02fcf152c2b21a446972fb754871ec5103ddab1eb93bfc52aed895bbc74b9c7a6743c360d5cbcbc0d1ede2cd28307eb243803a77b SHA512 3b5db1497b6b99412353134139bfd2abac642989d1570d4c8d2172dd82e63aeed6ef1bc1d7ce0c2653288a6c7bd8a6315494ed152deb627fc3eb304a6d5f9be7
 EBUILD mesa-21.1.1.ebuild 14873 BLAKE2B 04fc1df71cb1520fedbfdd73a4042b4871f1bd69b7b89f7152c84de4e3d2a7da6002861ab13d9a6a40130def670d31fdfe1a577175f5916bddd95ea392e3581c SHA512 330970c7a8396a1f938e9ee395cd58425fb62b0a05e4c464e2f0963ee23c218ca7fb012b75d59aac4426c9104682c948f782ad1ba4c1704b0dcc6ff70803127a
 EBUILD mesa-21.1.2.ebuild 14873 BLAKE2B 04fc1df71cb1520fedbfdd73a4042b4871f1bd69b7b89f7152c84de4e3d2a7da6002861ab13d9a6a40130def670d31fdfe1a577175f5916bddd95ea392e3581c SHA512 330970c7a8396a1f938e9ee395cd58425fb62b0a05e4c464e2f0963ee23c218ca7fb012b75d59aac4426c9104682c948f782ad1ba4c1704b0dcc6ff70803127a
+EBUILD mesa-21.1.3.ebuild 14873 BLAKE2B 04fc1df71cb1520fedbfdd73a4042b4871f1bd69b7b89f7152c84de4e3d2a7da6002861ab13d9a6a40130def670d31fdfe1a577175f5916bddd95ea392e3581c SHA512 330970c7a8396a1f938e9ee395cd58425fb62b0a05e4c464e2f0963ee23c218ca7fb012b75d59aac4426c9104682c948f782ad1ba4c1704b0dcc6ff70803127a
 EBUILD mesa-9999.ebuild 14833 BLAKE2B 114e3b670f928a2745a6affa18ec5ad29fc929f5397453f2b276e1a8f7448fc0664aa4057e15cf248a9ad723e48f523619cbe2b1dd39692f273971f1a8e95e1c SHA512 b00131e879ceac909e558ee182fbd50ace215db5a27849707ead338c6199b3878cef066440a51752dc4f481e87a8f87666ddbce46c383c3f46df1032dad2f3bf
 MISC metadata.xml 1895 BLAKE2B abf62dda9b9eba657e310c68fdd86aaa49c550dc34ef624e8feb038e0412f0da786e1120dc16631399cb2c83961b88e78571347c3e6d464c2cf3a343bc0f1483 SHA512 7758641386100e07c1112afe04a8613de8ae1e35a8e940f0eefcfc7daa829789c42b903320339b04b44c2400f0857c180740407abd171e9773a9f51e3dd9468a
diff --git a/media-libs/mesa/mesa-21.1.3.ebuild b/media-libs/mesa/mesa-21.1.3.ebuild
new file mode 100644
index 000000000000..b67e6c7e47f0
--- /dev/null
+++ b/media-libs/mesa/mesa-21.1.3.ebuild
@@ -0,0 +1,553 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit llvm meson-multilib python-any-r1 linux-info
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +llvm
+	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
+	vulkan-overlay wayland +X xa xvmc zink +zstd"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	osmesa? ( gallium )
+	vulkan? ( dri3
+			  video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_iris?   ( gallium )
+	video_cards_lima?   ( gallium )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_panfrost? ( gallium )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_v3d? ( gallium )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+	xa? ( X )
+	xvmc? ( X )
+	zink? ( gallium vulkan )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.105"
+RDEPEND="
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					>=virtual/opencl-3[${MULTILIB_USEDEP}]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	)
+	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 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="12"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:12[${MULTILIB_USEDEP}]
+		sys-devel/llvm:11[${MULTILIB_USEDEP}]
+		sys-devel/llvm:10[${MULTILIB_USEDEP}]
+	)
+	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	gallium? (
+		llvm? (
+			opencl? (
+				video_cards_r600? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+				!video_cards_r600? (
+					video_cards_radeonsi? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeonsi? (
+						video_cards_radeon? (
+							${CLANG_DEPSTR_AMDGPU}
+						)
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeon? (
+						!video_cards_radeonsi? (
+							${CLANG_DEPSTR}
+						)
+					)
+				)
+			)
+			!opencl? (
+				video_cards_r600? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+				!video_cards_r600? (
+					video_cards_radeonsi? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeonsi? (
+						video_cards_radeon? (
+							${LLVM_DEPSTR_AMDGPU}
+						)
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeon? (
+						!video_cards_radeonsi? (
+							${LLVM_DEPSTR}
+						)
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	wayland? ( dev-util/wayland-scanner[${MULTILIB_USEDEP}] )
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	usr/lib*/libglapi.so.0.0.0
+	usr/lib*/libGLESv1_CM.so.1.1.0
+	usr/lib*/libGLESv2.so.2.0.0
+	usr/lib*/libGL.so.1.2.0
+	usr/lib*/libOSMesa.so.8.0.0
+	usr/lib/libGLX_mesa.so.0.0.0
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+	if use vulkan; then
+		if ! use video_cards_i965 &&
+		   ! use video_cards_iris &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_v3d; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, radeonsi, or v3d"
+		fi
+	fi
+
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+
+	if use osmesa && ! use llvm; then
+		ewarn "OSMesa will be slow without enabling USE=llvm"
+	fi
+}
+
+python_check_deps() {
+	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use video_cards_i965 ||
+	   use video_cards_iris ||
+	   use video_cards_radeonsi; then
+		if kernel_is -ge 5 11 3; then
+			CONFIG_CHECK="~KCMP"
+		elif kernel_is -ge 5 11; then
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		elif kernel_is -ge 5 10 20; then
+			CONFIG_CHECK="~KCMP"
+		else
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		fi
+		linux-info_pkg_setup
+	fi
+
+	if use gallium && use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	local platforms
+	use X && platforms+="x11"
+	use wayland && platforms+=",wayland"
+	emesonargs+=(-Dplatforms=${platforms#,})
+
+	if use X || use egl; then
+		emesonargs+=(-Dglvnd=true)
+	else
+		emesonargs+=(-Dglvnd=false)
+	fi
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_feature llvm)
+			$(meson_feature lm-sensors lmsensors)
+			$(meson_feature unwind libunwind)
+		)
+
+		if use video_cards_iris ||
+		   use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=disabled)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=disabled)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_feature xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=disabled)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=disabled)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_lima ||
+		   use video_cards_panfrost ||
+		   use video_cards_v3d ||
+		   use video_cards_vc4 ||
+		   use video_cards_vivante; then
+			gallium_enable -- kmsro
+		fi
+
+		gallium_enable -- swrast
+		gallium_enable video_cards_lima lima
+		gallium_enable video_cards_panfrost panfrost
+		gallium_enable video_cards_v3d v3d
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable zink zink
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_iris iris
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_iris intel
+		vulkan_enable video_cards_radeonsi amd
+		vulkan_enable video_cards_v3d broadcom
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=$(usex X dri disabled)
+		-Dshared-glapi=enabled
+		$(meson_feature dri3)
+		$(meson_feature egl)
+		$(meson_feature gbm)
+		$(meson_feature gles1)
+		$(meson_feature gles2)
+		$(meson_use osmesa)
+		$(meson_use selinux)
+		$(meson_feature zstd)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		$(meson_use vulkan vulkan-device-select-layer)
+		$(meson_use vulkan-overlay vulkan-overlay-layer)
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	meson_src_test -t 100
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index ff7ab53df5ec..76ce4e3d79f2 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -2,8 +2,10 @@ DIST openimageio-2.2.12.0.tar.gz 29251419 BLAKE2B 7ab1b611f9354d4a8d3fc33bc30acf
 DIST openimageio-2.2.13.1.tar.gz 29265740 BLAKE2B 98403db440410d391ff150a988ac5cb970e0f8d30758c73200d54f07594b458d1f6a8bee58dc92bd254338da678fc4494555df94d8f865b09bd9c13bac7f8f6c SHA512 911e3671557df3c8bdbada00b83b7631750f5bf4dfc0568a4978c91d28a6e408c69dbe0e4e113b13702eab27176d3c84043d73778a0213eac0b2ac94d2e942d6
 DIST openimageio-2.2.14.0.tar.gz 29226972 BLAKE2B 29daaf4fb987b77dffdd8cb29c5f67a80c20c49cd5dc369e68a5588a61fae7119aeb22814886e68eb055f2a66e02e75afba25991f8edc14752ccacf6599d889f SHA512 063291c0bd742b79a7b6065a41856b84732af2e2e404265262aa9ba91d07209fb308ecf0403a139d7021b8062f9c3e1b92a725a7cad091af1bcf45499ae47a82
 DIST openimageio-2.2.15.0.tar.gz 29238071 BLAKE2B f74f779635b7ff068f87ab6231756cb22acb80185c717c556750d964025aa343f8b3a30b9e73acf6237328b8bdd3fcb6588321d37a3752a6f1d0dd1e3a976363 SHA512 7ade071ae8a78427fb51d75f81e6fcc2d9a3632f0854aea70b985794a53a386072fb171dc8179fa762de19067d402c7ab9f2ea1a44bd3196d3a201ea2cb9ec22
+DIST openimageio-2.2.15.1.tar.gz 29237852 BLAKE2B 0f5050e888e82721aa7012cc5c5eb229b5ac314b067406ef003369431241228d91904fbe455da8423ff978411052b2c960b0688a6b943a0e2bfdb47c489d26a5 SHA512 c06df310f91938b25f1f66cd98d995dcaba51c6a0041b47882c52f5ad4a098a9016fc99f41de250dd1b1b7af3ad22f6ed63d5e76f95f1f1cf0f45c80eee9c8e0
 EBUILD openimageio-2.2.12.0.ebuild 3710 BLAKE2B 2076161c441805358fc03c4ed31a283a6851d59486c2cce1b4eed6a5f14171ce10f2e3c72916d00418d03488b7d38b6a777e5907a9414570428f597fb63be5a8 SHA512 d5a4a577c06d712ed7c6f55af24bdaa5be2bba5f9da838348f418da5c3d5958d5b36bffc5e33e72a02efa415d60e0f263c8e0db67f5b653e46d0ea1e8bdb0171
 EBUILD openimageio-2.2.13.1.ebuild 3710 BLAKE2B 2076161c441805358fc03c4ed31a283a6851d59486c2cce1b4eed6a5f14171ce10f2e3c72916d00418d03488b7d38b6a777e5907a9414570428f597fb63be5a8 SHA512 d5a4a577c06d712ed7c6f55af24bdaa5be2bba5f9da838348f418da5c3d5958d5b36bffc5e33e72a02efa415d60e0f263c8e0db67f5b653e46d0ea1e8bdb0171
-EBUILD openimageio-2.2.14.0.ebuild 3712 BLAKE2B cf5acaa0f25cd75a85e3de9d33ffa72b393fc2a9fdbf2c673b43b9d882d92c9055285d10d1bfdfc354e7728514e23fbc85f2c415791faf50593ee3a7b03309c7 SHA512 38010387ab746b6345b84ca9207c6c79c896543222cb40569ba94340a81bc5cdcc50e942ba5a256d7c531424cda86803632ce9b046470b6f97ef7c2db4524e83
-EBUILD openimageio-2.2.15.0.ebuild 3712 BLAKE2B cf5acaa0f25cd75a85e3de9d33ffa72b393fc2a9fdbf2c673b43b9d882d92c9055285d10d1bfdfc354e7728514e23fbc85f2c415791faf50593ee3a7b03309c7 SHA512 38010387ab746b6345b84ca9207c6c79c896543222cb40569ba94340a81bc5cdcc50e942ba5a256d7c531424cda86803632ce9b046470b6f97ef7c2db4524e83
+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
 MISC metadata.xml 936 BLAKE2B 0ba7d5d9c77d481d876a273f479cc33f7b4233be522a6722aa4762ff682166eebf93645a5c042591c7495e4954bc0c61fa89083fd2b4ee76a5ccbdb5299dfcba SHA512 732d0ad35c7176710ac7a5362a4a6ac03c01d11d8df016654b13490e84b6d56801714158536abaccafccbc14b55234a78095e8a1d9550419bf0a67fe3d4cab5c
diff --git a/media-libs/openimageio/openimageio-2.2.14.0.ebuild b/media-libs/openimageio/openimageio-2.2.14.0.ebuild
index a5b480aec5c5..36c2ee69a52d 100644
--- a/media-libs/openimageio/openimageio-2.2.14.0.ebuild
+++ b/media-libs/openimageio/openimageio-2.2.14.0.ebuild
@@ -136,6 +136,9 @@ src_configure() {
 		-DUSE_FREETYPE=$(usex truetype)
 		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
 	)
+	if use python; then
+		mycmakeargs+=( -DPYTHON_SITE_DIR=$(python_get_sitedir) )
+	fi
 
 	cmake_src_configure
 }
diff --git a/media-libs/openimageio/openimageio-2.2.15.0.ebuild b/media-libs/openimageio/openimageio-2.2.15.0.ebuild
index a5b480aec5c5..36c2ee69a52d 100644
--- a/media-libs/openimageio/openimageio-2.2.15.0.ebuild
+++ b/media-libs/openimageio/openimageio-2.2.15.0.ebuild
@@ -136,6 +136,9 @@ src_configure() {
 		-DUSE_FREETYPE=$(usex truetype)
 		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
 	)
+	if use python; then
+		mycmakeargs+=( -DPYTHON_SITE_DIR=$(python_get_sitedir) )
+	fi
 
 	cmake_src_configure
 }
diff --git a/media-libs/openimageio/openimageio-2.2.15.1.ebuild b/media-libs/openimageio/openimageio-2.2.15.1.ebuild
new file mode 100644
index 000000000000..36c2ee69a52d
--- /dev/null
+++ b/media-libs/openimageio/openimageio-2.2.15.1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FONT_PN=OpenImageIO
+PYTHON_COMPAT=( python3_{7..9} )
+inherit cmake font python-single-r1
+
+DESCRIPTION="A library for reading and writing images"
+HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
+SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/oiio-Release-${PV}"
+
+LICENSE="BSD"
+SLOT="0/2.2"
+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
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# test data in separate repo
+# second repo has no structure whatsoever
+RESTRICT="test"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+"
+RDEPEND="
+	>=dev-libs/boost-1.62:=
+	dev-cpp/robin-map
+	dev-libs/libfmt:=
+	dev-libs/pugixml:=
+	>=media-libs/ilmbase-2.2.0-r1:=
+	>=media-libs/libheif-1.7.0:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.2.1:=
+	media-libs/opencolorio:=
+	>=media-libs/openexr-2.2.0-r2:=
+	media-libs/tiff:0=
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	dicom? ( sci-libs/dcmtk )
+	ffmpeg? ( media-video/ffmpeg:= )
+	field3d? ( media-libs/Field3D:= )
+	gif? ( media-libs/giflib:0= )
+	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
+	opencv? ( media-libs/opencv:= )
+	opengl? (
+		media-libs/glew:=
+		virtual/glu
+		virtual/opengl
+	)
+	openvdb? (
+		dev-cpp/tbb:=
+		media-gfx/openvdb:=
+	)
+	ptex? ( media-libs/ptex:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[python,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/pybind11[${PYTHON_USEDEP}]
+		')
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	raw? ( media-libs/libraw:= )
+	truetype? ( media-libs/freetype:2= )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES.md CREDITS.md README.md )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	cmake_comment_add_subdirectory src/fonts
+}
+
+src_configure() {
+	# Build with SIMD support
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd} ]] && mysimd=("0")
+
+	local mycmakeargs=(
+		-DVERBOSE=ON
+		-DOIIO_BUILD_TESTS=OFF
+		-DINSTALL_FONTS=OFF
+		-DBUILD_DOCS=$(usex doc)
+		-DINSTALL_DOCS=$(usex doc)
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_CCACHE=OFF
+		-DUSE_DCMTK=$(usex dicom)
+		-DUSE_EXTERNAL_PUGIXML=ON
+		-DUSE_JPEGTURBO=ON
+		-DUSE_NUKE=OFF # not in Gentoo
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-DUSE_FIELD3D=$(usex field3d)
+		-DUSE_GIF=$(usex gif)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENCV=$(usex opencv)
+		-DUSE_OPENGL=$(usex opengl)
+		-DUSE_OPENVDB=$(usex openvdb)
+		-DUSE_PTEX=$(usex ptex)
+		-DUSE_PYTHON=$(usex python)
+		-DUSE_QT=$(usex qt5)
+		-DUSE_LIBRAW=$(usex raw)
+		-DUSE_FREETYPE=$(usex truetype)
+		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
+	)
+	if use python; then
+		mycmakeargs+=( -DPYTHON_SITE_DIR=$(python_get_sitedir) )
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# can't use font_src_install
+	# it does directory hierarchy recreation
+	FONT_S=(
+		"${S}/src/fonts/Droid_Sans"
+		"${S}/src/fonts/Droid_Sans_Mono"
+		"${S}/src/fonts/Droid_Serif"
+	)
+	insinto ${FONTDIR}
+	for dir in "${FONT_S[@]}"; do
+		doins "${dir}"/*.ttf
+	done
+}
diff --git a/media-libs/qhull/Manifest b/media-libs/qhull/Manifest
index 222e48947e56..38a2ac3823f2 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 1489 BLAKE2B 2698c5f32d2a75e77e958db40ef85b241dd774880886c00536dd05b1f8f427ead00429d5fc4f10b56357a12444589151413716845ce56871748eb4b4141fc5f2 SHA512 2424ab6c611b9b5966ccdeeb01fd3aa87a544efa4e200768bffee3c3b11c96832aba8ce4f20edb38e3d8e27c45f8ed14547ec559038439eedb44cedc732479a4
+EBUILD qhull-2020.2-r3.ebuild 1496 BLAKE2B 2f20b70a6865a12a7f858a505adef22a8f14674eb78388f0908542fd608f26ce05b38811ee65645b947427926f8b8e24b1eb7e890a1d5dff2cf1568c45bafc02 SHA512 28186546c9f682870ebc4e6858882e07d7fbeb724d8a1fe1aad5e721109ba74ba85a243c1bb3610157aa1b7dbad60d6426833dce6691bdcca10a518275fa34de
 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 839985c989cb..66b6330a868d 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 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~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/svt-av1/Manifest b/media-libs/svt-av1/Manifest
index 3054fa825d1f..9cbdf6346521 100644
--- a/media-libs/svt-av1/Manifest
+++ b/media-libs/svt-av1/Manifest
@@ -2,4 +2,4 @@ AUX svt-av1-0.8.6-fix-c-only-build.patch 5078 BLAKE2B c26a13dba8ac62ec2951d43d14
 DIST svt-av1-0.8.6.tar.gz 6416120 BLAKE2B c30d3bfc2dba6d7964625c4505bb135aa335adf195df91ad058fb02496276cabdc651b09854a2d14136352a434e08f4974148e03e7d54bde0924d25a1c4524cd SHA512 07e7353e35bc581b23c71913e65f5fd27566f4bf1d317d474d57d5bb2b82f380f713a00be19bd3f703935da50f81f3abf1d4ae38fbdf253385edf423737c0543
 EBUILD svt-av1-0.8.6.ebuild 1184 BLAKE2B f3ed01e5b0afd5a8651a70d39c379c821da594d8ee20c4eebe2a86a0dc9b6a5832f43bd4883be8af8a04f323b5d39677f9fc3eb711a4682ae9e9ae4528582229 SHA512 502d049655a4ba6b20e83bcb93cfdf5ddae75ff3ea18ae375d896eb62a825e4da3d2ca16e63d5e839293daadbde6d95c5a6a355f0224d01a9a5ab34761ee04f4
 EBUILD svt-av1-9999.ebuild 1090 BLAKE2B 130f31f96ac34ec20e237ff7134f09132b98795aaf1a4c94f3e4d12789e21599a8128fbbc12f94903cc9699de97cf769585f891917d32864a63fe2f0af873922 SHA512 0d40431b5fe9f11137499595ae6cf41d86ed05843ed121f01f499208db76814b83577a7ad7b18528a18698d098f098b0865d981b4b6614dea484c72b7c025da2
-MISC metadata.xml 561 BLAKE2B d7ef721d1c86b184505d2b16dc4ccc39f1e2b2077e377ef3e18e5db8b756148ac7c36c3664f5b5cbb6e0a01cb77cf690fec40de5e5b590e8fd59169572579b55 SHA512 de3456b47eb8342ce7a7156eeaff18e8b55c224df6c758010c9cec75cc88cc220a5d5f893467a40be6b900bf0a399e9a40a26afc894bb4496c746e1e5f2a643b
+MISC metadata.xml 560 BLAKE2B 461a02e90deb5b56feb939e7816accaa73f64b1771b6e3f257a550e12e1530c4523b3faea357ffaa5180dc5245f2e8e3cf62b0718823c7af342742e27b39fc65 SHA512 90b97116c665fa0a020825e00dcda7f14af528e68104867b3106068c2fe80a5f6a7e50d4d30591d45857386e05caec18eb8921bb2347e785ae2e8f6adbd81cdf
diff --git a/media-libs/svt-av1/metadata.xml b/media-libs/svt-av1/metadata.xml
index 90e261ce833f..02959d044e2b 100644
--- a/media-libs/svt-av1/metadata.xml
+++ b/media-libs/svt-av1/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
 		<email>telans@posteo.de</email>
-		<name>Theo Anderson</name>
+		<name>James Beddek</name>
 	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<name>Proxy Maintainers</name>