--- media-libs/mesa/mesa-23.3.3.ebuild	2024-01-13 21:11:39.000000000 +0300
+++ media-libs/mesa/mesa-23.3.3.ebuild	2024-01-15 04:59:10.500606100 +0300
@@ -25,7 +25,7 @@
 RESTRICT="!test? ( test )"
 
 RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lavapipe lima nouveau panfrost v3d vc4 virgl vivante vmware"
+VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel swrast lima nouveau panfrost v3d vc4 virgl vivante vmware"
 for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
 done
@@ -49,13 +49,14 @@
 	)
 	vulkan? ( video_cards_radeonsi? ( llvm ) )
 	vulkan-overlay? ( vulkan )
-	video_cards_lavapipe? ( llvm vulkan )
+	video_cards_swrast? ( vulkan? ( llvm ) )
 	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
 	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
 	video_cards_radeonsi?   ( llvm )
 	vdpau? ( X )
 	xa? ( X )
 	zink? ( vulkan )
+	osmesa? ( video_cards_swrast )
 "
 
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.110"
@@ -345,7 +346,7 @@
 		gallium_enable -- kmsro
 	fi
 
-	gallium_enable -- swrast
+	gallium_enable video_cards_swrast swrast
 	gallium_enable video_cards_freedreno freedreno
 	gallium_enable video_cards_intel crocus i915 iris
 	gallium_enable video_cards_lima lima
@@ -377,7 +378,7 @@
 	fi
 
 	if use vulkan; then
-		vulkan_enable video_cards_lavapipe swrast
+		vulkan_enable video_cards_swrast swrast
 		vulkan_enable video_cards_freedreno freedreno
 		vulkan_enable video_cards_intel intel intel_hasvk
 		vulkan_enable video_cards_d3d12 microsoft-experimental