gentoo resync : 25.11.2020

6 files changed, 66 insertions, 69 deletions

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 164a6121010b..2de53c2f36aa 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,8 +1,8 @@
-DIST mesa-20.1.8.tar.xz 12846348 BLAKE2B b31680458100fc4394819a379a14237cfe39befea91f53641dc181d29891cb3e508c45f5ea1b07deee97f6bf04b6d8b2ca9cd8270bf79ab4a524035fbdc58c36 SHA512 519b0e2837982d097c362d974a90c94efd1cdf14505fc43eaa740a23c042bc0c3f04d0edaf6b371966d82667cade6d0c68c92528e1be6c12884b38c67fd064c1
-DIST mesa-20.1.9.tar.xz 12870484 BLAKE2B 01ef2387e7bfc174b40b530f2ae9ea02dc288bd171d3caedc470808502c21e3949609e94aeb1454a8001fb74c8be9684777fa7d3cc3da2c22758599a09896943 SHA512 0fb8ceff3c91ad2076efb0b2ac7e95d2d72ff1df955eb8fedf712ceaa7f49184eae9958072edd872f5c38adbaeb867988f67627b33da8b208706f69325d7e260
-DIST mesa-20.2.0.tar.xz 13675596 BLAKE2B d1c6b4ac631446a35eb916d0b2ddbe2a8d75429268b1598b35f5776953b560ac08917bde07e32cf4ca33aa4e6a2713d46dc6de86d717127fbb950f0de2aa6325 SHA512 3dd7def04ba4f196be8fd59999285febb10366e89d6e649c518b436b732c62d3f1bd235fc470de7fda4b4cc09a1baaadca4222dcdc2449225d789b151cea69d7
-EBUILD mesa-20.1.8.ebuild 14701 BLAKE2B 0cb3259a8b9f6621024c9ad3c5aae4d84cb3cc4d63f3142521554675ea9753db7b525b54049429d35abb1cc221a7269e60b80e27ed9a01b03ac070977b61a167 SHA512 96b4eaee573bca46b5c51ad438ba5fd843372dc93b97507d3edd0d230c1a7086e3f386037ec8d97ed524d25f3ffa2d603abc4387dfac3ab32fab13317b1994a8
-EBUILD mesa-20.1.9.ebuild 14429 BLAKE2B 48203f756b3f2fb10b07ed8efbd0e5141a593caadb68799d055c416d5dbef6a550d79a53fb0e9b0f11aebade3ba769a1badfbb1cf80b8ff28df9ae475b45753a SHA512 d355a6571329e6d7c673c0e949591968d8e5baa190ecae7d6858ebd92d294db6da7f3d8a683f482b5a004fe69c303904731a8cd8f1b027c46477843ffb99024d
-EBUILD mesa-20.2.0.ebuild 14711 BLAKE2B 473089ec5a66bf30e4473590614ef8a29a209a3771a6bdab13e38beadabcf667c82134e2846862a2a810d24ddca321bc4c1efc0aaf2fa733aceb8da8b5e1e5a4 SHA512 82f90a9076a67f54167881b61c32675f5572a6c1b2c0ee897382c0954005f72a269f223a4559049056cc67bc43e2060ad28f1e97f2e09b712219ba7fe0904478
-EBUILD mesa-9999.ebuild 14711 BLAKE2B 473089ec5a66bf30e4473590614ef8a29a209a3771a6bdab13e38beadabcf667c82134e2846862a2a810d24ddca321bc4c1efc0aaf2fa733aceb8da8b5e1e5a4 SHA512 82f90a9076a67f54167881b61c32675f5572a6c1b2c0ee897382c0954005f72a269f223a4559049056cc67bc43e2060ad28f1e97f2e09b712219ba7fe0904478
-MISC metadata.xml 1953 BLAKE2B 809b2ae05dadf1ef3b78c8c0353032c77aaba205530a51e6e099170d186bc9fdaf289b135e68984aef8f71f69970f9e63a38de816f04199dc2e9965e71e940d0 SHA512 09b322501feafc80de4b81c7a30e1d6f4565247069dc7d80218684382a68b285ca1b80733b6f3126bd15c777cc5a896062686f06fc1822039595b3fed9bcb9e6
+DIST mesa-20.1.10.tar.xz 12918420 BLAKE2B 408f4bc6eb0dc11199cd161d6914b77cb57313bca94f26794cbfd05332922c45dc216a64e33df9fad64cd41e1ad8b2de6c2e5f99cad234870f7a5b970a62dcbd SHA512 0d4016abfcc733c853d7b6c3c997ddc554a44088c0a4d9a7edb51ab5ad7d9e1234728b61ffcb9c82a6c5fee1429091a1c31cbeabcb1b50411337b99ee550d28a
+DIST mesa-20.2.3.tar.xz 13844212 BLAKE2B 53eff6d43d2e05dad051c30de624bd8d872e87d6f1d2f32b631b1c4fea657b8dd9b2d5b9702bdd9138b0d9d6c78b74d737162d3f1c76ca969ce6d9ae4f561eda SHA512 e55b57523f6fdb1199586538c119c3e7c81d1a7af86be14c90d140c514f65e54ac0c56bd341686d04b770b80d3ddd92188ee17b3bc23f243aed10c25de7e19a6
+DIST mesa-20.3.0-rc2.tar.xz 14085024 BLAKE2B c87e3e48ed1dfec2da4fa6bbb549fc925d806f8681e8dc1b3fc3b54eec4864402bb34009a95998c1fc818ddb7d1df2d51347df3d20ec9e4364245ae4f750f16d SHA512 1d94100550b60a0dc6e984d898114b11b8656e2954e946478a2732cec678d1e6a0f07bb5bcdc856facf7e274aea52cfc2b4228c064eadc7bbc00147c6b17cc0e
+EBUILD mesa-20.1.10.ebuild 14439 BLAKE2B 44180101e4e4c6692661cae16822ed29e292e86821df1361e733839bceeb8353883e5aff3893a91f5e09936aa8e5c0d2d14f8871f558c24590e61b78c6e8716a SHA512 d4474ce10d3cab18cc75ff5c0b9cfe2d05e0987e9c20a2a01ce2cf9873fac0b8e259fad1196327cf3426406e0a338ed326ff9309439af93403f458b104f0fde7
+EBUILD mesa-20.2.3.ebuild 14709 BLAKE2B f32b8f3f99197ad5e7a16393929ddccb1b6fb650dcf413587a74a497531b94ea7c3ba2f0490a32b37729e33271d100e52fa480c8b6422742a16e9ddb9d756911 SHA512 5223621eaf05a7f2b7500b8f31c1b0cf0a68b729c00a57527e741eb353aa57c65e1abffeb552bedf70012338beb7d49efdadd4847626cfbabbc89f59938dc5f2
+EBUILD mesa-20.3.0_rc2.ebuild 14785 BLAKE2B 13affc84aea9015a935438268bb2b71a5751026ad6cb903b37ad6ee52cc449129835a21231597b7f75227381bb90ecb4ec5f54bc272da98130e59642d51110dc SHA512 bc70799ecbcb81ed135354fcdca48f1fe50c35ebbbc0c48d162a70c9d700f7db49ec054dc5266dedeee0cc98d49e16f8a3486f5f50c5651b8344a17aa2509a0c
+EBUILD mesa-9999.ebuild 14785 BLAKE2B 13affc84aea9015a935438268bb2b71a5751026ad6cb903b37ad6ee52cc449129835a21231597b7f75227381bb90ecb4ec5f54bc272da98130e59642d51110dc SHA512 bc70799ecbcb81ed135354fcdca48f1fe50c35ebbbc0c48d162a70c9d700f7db49ec054dc5266dedeee0cc98d49e16f8a3486f5f50c5651b8344a17aa2509a0c
+MISC metadata.xml 1895 BLAKE2B abf62dda9b9eba657e310c68fdd86aaa49c550dc34ef624e8feb038e0412f0da786e1120dc16631399cb2c83961b88e78571347c3e6d464c2cf3a343bc0f1483 SHA512 7758641386100e07c1112afe04a8613de8ae1e35a8e940f0eefcfc7daa829789c42b903320339b04b44c2400f0857c180740407abd171e9773a9f51e3dd9468a
diff --git a/media-libs/mesa/mesa-20.1.9.ebuild b/media-libs/mesa/mesa-20.1.10.ebuild
index 2d132350da8f..f83e05fef141 100644
--- a/media-libs/mesa/mesa-20.1.9.ebuild
+++ b/media-libs/mesa/mesa-20.1.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit llvm meson multilib-minimal python-any-r1 linux-info
 
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
@@ -482,7 +482,7 @@ multilib_src_configure() {
 	emesonargs+=(
 		$(meson_use test build-tests)
 		-Dglx=$(usex X dri disabled)
-		-Dglvnd=enabled
+		-Dglvnd=true
 		-Dshared-glapi=true
 		$(meson_use dri3)
 		$(meson_use egl)
@@ -516,7 +516,7 @@ multilib_src_install_all() {
 }
 
 multilib_src_test() {
-	meson test -v -C "${BUILD_DIR}" -t 100
+	meson test -v -C "${BUILD_DIR}" -t 100 || die "tests failed"
 }
 
 # $1 - VIDEO_CARDS flag (check skipped for "--")
diff --git a/media-libs/mesa/mesa-20.2.0.ebuild b/media-libs/mesa/mesa-20.2.3.ebuild
index 7e2bd851871f..e1622cc2b02e 100644
--- a/media-libs/mesa/mesa-20.2.0.ebuild
+++ b/media-libs/mesa/mesa-20.2.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit llvm meson multilib-minimal python-any-r1 linux-info
 
@@ -74,7 +74,6 @@ REQUIRED_USE="
 
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
 RDEPEND="
-	!app-eselect/eselect-mesa
 	>=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}]
@@ -143,9 +142,10 @@ RDEPEND="${RDEPEND}
 # 1. List all the working slots (with min versions) in ||, newest first.
 # 2. Update the := to specify *max* version, e.g. < 10.
 # 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="10"
+LLVM_MAX_SLOT="11"
 LLVM_DEPSTR="
 	|| (
+		sys-devel/llvm:11[${MULTILIB_USEDEP}]
 		sys-devel/llvm:10[${MULTILIB_USEDEP}]
 		sys-devel/llvm:9[${MULTILIB_USEDEP}]
 	)
@@ -524,7 +524,7 @@ multilib_src_install_all() {
 }
 
 multilib_src_test() {
-	meson test -v -C "${BUILD_DIR}" -t 100
+	meson_src_test -t 100
 }
 
 # $1 - VIDEO_CARDS flag (check skipped for "--")
diff --git a/media-libs/mesa/mesa-20.1.8.ebuild b/media-libs/mesa/mesa-20.3.0_rc2.ebuild
index 934ec32ce41d..1da56517de7e 100644
--- a/media-libs/mesa/mesa-20.1.8.ebuild
+++ b/media-libs/mesa/mesa-20.3.0_rc2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit llvm meson multilib-minimal python-any-r1 linux-info
 
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
@@ -29,15 +29,15 @@ RESTRICT="
 "
 
 RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost vc4 virgl vivante vmware"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
 for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
+	+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 +zstd"
+	vulkan-overlay wayland +X xa xvmc zink +zstd"
 
 REQUIRED_USE="
 	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
@@ -62,26 +62,21 @@ REQUIRED_USE="
 	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
 	video_cards_r600?   ( gallium )
 	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_v3d? ( gallium )
 	video_cards_vc4? ( gallium )
 	video_cards_virgl? ( gallium )
 	video_cards_vivante? ( gallium gbm )
 	video_cards_vmware? ( gallium )
 	xa? ( X )
 	xvmc? ( X )
+	zink? ( gallium vulkan )
 "
 
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
 RDEPEND="
-	!app-eselect/eselect-mesa
 	>=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}]
-	libglvnd? (
-		>=media-libs/libglvnd-1.2.0-r1[X?,${MULTILIB_USEDEP}]
-		!app-eselect/eselect-opengl
-	)
-	!libglvnd? (
-		>=app-eselect/eselect-opengl-1.3.0
-	)
 	gallium? (
 		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
 		llvm? (
@@ -127,6 +122,7 @@ RDEPEND="
 		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
 		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
 	)
+	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
 	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
 "
 for card in ${RADEON_CARDS}; do
@@ -146,9 +142,10 @@ RDEPEND="${RDEPEND}
 # 1. List all the working slots (with min versions) in ||, newest first.
 # 2. Update the := to specify *max* version, e.g. < 10.
 # 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="10"
+LLVM_MAX_SLOT="11"
 LLVM_DEPSTR="
 	|| (
+		sys-devel/llvm:11[${MULTILIB_USEDEP}]
 		sys-devel/llvm:10[${MULTILIB_USEDEP}]
 		sys-devel/llvm:9[${MULTILIB_USEDEP}]
 	)
@@ -227,7 +224,6 @@ BDEPEND="
 	)
 	sys-devel/bison
 	sys-devel/flex
-	sys-devel/gettext
 	virtual/pkgconfig
 	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
 "
@@ -242,7 +238,7 @@ x86? (
 	usr/lib*/libGLESv2.so.2.0.0
 	usr/lib*/libGL.so.1.2.0
 	usr/lib*/libOSMesa.so.8.0.0
-	libglvnd? ( usr/lib/libGLX_mesa.so.0.0.0 )
+	usr/lib/libGLX_mesa.so.0.0.0
 )"
 
 llvm_check_deps() {
@@ -262,8 +258,9 @@ pkg_pretend() {
 	if use vulkan; then
 		if ! use video_cards_i965 &&
 		   ! use video_cards_iris &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, or radeonsi"
+		   ! 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
 
@@ -370,13 +367,16 @@ multilib_src_configure() {
 		fi
 	fi
 
-	emesonargs+=( -Dplatforms=$(use X && echo "x11,")$(use wayland && echo "wayland,")$(use gbm && echo "drm,")surfaceless )
+	local platforms
+	use X && platforms+="x11"
+	use wayland && platforms+=",wayland"
+	[[ -n $platforms ]] && emesonargs+=(-Dplatforms=${platforms#,})
 
 	if use gallium; then
 		emesonargs+=(
-			$(meson_use llvm)
-			$(meson_use lm-sensors lmsensors)
-			$(meson_use unwind libunwind)
+			$(meson_feature llvm)
+			$(meson_feature lm-sensors lmsensors)
+			$(meson_feature unwind libunwind)
 		)
 
 		if use video_cards_iris ||
@@ -393,39 +393,40 @@ multilib_src_configure() {
 		if use video_cards_r600 ||
 		   use video_cards_radeonsi ||
 		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vaapi gallium-va))
+			emesonargs+=($(meson_feature vaapi gallium-va))
 			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
 		else
-			emesonargs+=(-Dgallium-va=false)
+			emesonargs+=(-Dgallium-va=disabled)
 		fi
 
 		if use video_cards_r300 ||
 		   use video_cards_r600 ||
 		   use video_cards_radeonsi ||
 		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vdpau gallium-vdpau))
+			emesonargs+=($(meson_feature vdpau gallium-vdpau))
 		else
-			emesonargs+=(-Dgallium-vdpau=false)
+			emesonargs+=(-Dgallium-vdpau=disabled)
 		fi
 
 		if use video_cards_freedreno ||
 		   use video_cards_nouveau ||
 		   use video_cards_vmware; then
-			emesonargs+=($(meson_use xa gallium-xa))
+			emesonargs+=($(meson_feature xa gallium-xa))
 		else
-			emesonargs+=(-Dgallium-xa=false)
+			emesonargs+=(-Dgallium-xa=disabled)
 		fi
 
 		if use video_cards_r600 ||
 		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use xvmc gallium-xvmc))
+			emesonargs+=($(meson_feature xvmc gallium-xvmc))
 		else
-			emesonargs+=(-Dgallium-xvmc=false)
+			emesonargs+=(-Dgallium-xvmc=disabled)
 		fi
 
 		if use video_cards_freedreno ||
 		   use video_cards_lima ||
 		   use video_cards_panfrost ||
+		   use video_cards_v3d ||
 		   use video_cards_vc4 ||
 		   use video_cards_vivante; then
 			gallium_enable -- kmsro
@@ -433,10 +434,12 @@ multilib_src_configure() {
 
 		gallium_enable video_cards_lima lima
 		gallium_enable video_cards_panfrost panfrost
+		gallium_enable video_cards_v3d v3d
 		gallium_enable video_cards_vc4 vc4
 		gallium_enable video_cards_vivante etnaviv
 		gallium_enable video_cards_vmware svga
 		gallium_enable video_cards_nouveau nouveau
+		gallium_enable zink zink
 
 		# Only one i915 driver (classic vs gallium). Default to classic.
 		if ! use classic; then
@@ -470,6 +473,7 @@ multilib_src_configure() {
 		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
 
 	if use gallium; then
@@ -488,15 +492,15 @@ multilib_src_configure() {
 	emesonargs+=(
 		$(meson_use test build-tests)
 		-Dglx=$(usex X dri disabled)
+		-Dglvnd=true
 		-Dshared-glapi=true
-		$(meson_use dri3)
-		$(meson_use egl)
-		$(meson_use gbm)
-		$(meson_use gles1)
-		$(meson_use gles2)
-		$(meson_use libglvnd glvnd)
+		$(meson_feature dri3)
+		$(meson_feature egl)
+		$(meson_feature gbm)
+		$(meson_feature gles1)
+		$(meson_feature gles2)
 		$(meson_use selinux)
-		$(meson_use zstd)
+		$(meson_feature zstd)
 		-Dvalgrind=$(usex valgrind auto false)
 		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
 		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
@@ -522,15 +526,7 @@ multilib_src_install_all() {
 }
 
 multilib_src_test() {
-	meson test -v -C "${BUILD_DIR}" -t 100
-}
-
-pkg_postinst() {
-	if ! use libglvnd; then
-		# Switch to the xorg implementation.
-		echo
-		eselect opengl set --use-old ${OPENGL_DIR}
-	fi
+	meson_src_test -t 100
 }
 
 # $1 - VIDEO_CARDS flag (check skipped for "--")
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 7e2bd851871f..1da56517de7e 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit llvm meson multilib-minimal python-any-r1 linux-info
 
@@ -74,7 +74,6 @@ REQUIRED_USE="
 
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
 RDEPEND="
-	!app-eselect/eselect-mesa
 	>=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}]
@@ -143,9 +142,10 @@ RDEPEND="${RDEPEND}
 # 1. List all the working slots (with min versions) in ||, newest first.
 # 2. Update the := to specify *max* version, e.g. < 10.
 # 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="10"
+LLVM_MAX_SLOT="11"
 LLVM_DEPSTR="
 	|| (
+		sys-devel/llvm:11[${MULTILIB_USEDEP}]
 		sys-devel/llvm:10[${MULTILIB_USEDEP}]
 		sys-devel/llvm:9[${MULTILIB_USEDEP}]
 	)
@@ -258,8 +258,9 @@ pkg_pretend() {
 	if use vulkan; then
 		if ! use video_cards_i965 &&
 		   ! use video_cards_iris &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, or radeonsi"
+		   ! 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
 
@@ -472,6 +473,7 @@ multilib_src_configure() {
 		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
 
 	if use gallium; then
@@ -524,7 +526,7 @@ multilib_src_install_all() {
 }
 
 multilib_src_test() {
-	meson test -v -C "${BUILD_DIR}" -t 100
+	meson_src_test -t 100
 }
 
 # $1 - VIDEO_CARDS flag (check skipped for "--")
diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index 8aecc5f66080..a2a3def69e27 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -14,7 +14,6 @@
 		<flag name="gbm">Enable the Graphics Buffer Manager for EGL on KMS.</flag>
 		<flag name="gles1">Enable GLESv1 support.</flag>
 		<flag name="gles2">Enable GLESv2 support.</flag>
-		<flag name="libglvnd">Use libglvnd for dispatch.</flag>
 		<flag name="llvm">Enable LLVM backend for Gallium3D.</flag>
 		<flag name="lm-sensors">Enable Gallium HUD lm-sensors support.</flag>
 		<flag name="opencl">Enable the Clover Gallium OpenCL state tracker.</flag>