diff --git a/media-libs/mesa/mesa-19.3.4.ebuild b/media-libs/mesa/mesa-19.3.4-r1.ebuild
similarity index 99%
rename from media-libs/mesa/mesa-19.3.4.ebuild
rename to media-libs/mesa/mesa-19.3.4-r1.ebuild
index 78bbe80db9e85..ea716c993c10b 100644
--- a/media-libs/mesa/mesa-19.3.4.ebuild
+++ b/media-libs/mesa/mesa-19.3.4-r1.ebuild
@@ -355,7 +355,7 @@ multilib_src_configure() {
 		fi
 	fi
 
-	emesonargs+=( -Dplatforms=surfaceless$(use X && echo ",x11")$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+	emesonargs+=( -Dplatforms=$(use X && echo "x11,")$(use wayland && echo "wayland,")$(use gbm && echo "drm,")surfaceless )
 
 	if use gallium; then
 		emesonargs+=(
diff --git a/media-libs/mesa/mesa-20.0.1.ebuild b/media-libs/mesa/mesa-20.0.1-r1.ebuild
similarity index 99%
rename from media-libs/mesa/mesa-20.0.1.ebuild
rename to media-libs/mesa/mesa-20.0.1-r1.ebuild
index 8805749d430f5..8997f8d06a371 100644
--- a/media-libs/mesa/mesa-20.0.1.ebuild
+++ b/media-libs/mesa/mesa-20.0.1-r1.ebuild
@@ -356,7 +356,7 @@ multilib_src_configure() {
 		fi
 	fi
 
-	emesonargs+=( -Dplatforms=surfaceless$(use X && echo ",x11")$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+	emesonargs+=( -Dplatforms=$(use X && echo "x11,")$(use wayland && echo "wayland,")$(use gbm && echo "drm,")surfaceless )
 
 	if use gallium; then
 		emesonargs+=(
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 7210761bb6219..d621673607420 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -357,7 +357,7 @@ multilib_src_configure() {
 		fi
 	fi
 
-	emesonargs+=( -Dplatforms=surfaceless$(use X && echo ",x11")$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+	emesonargs+=( -Dplatforms=$(use X && echo "x11,")$(use wayland && echo "wayland,")$(use gbm && echo "drm,")surfaceless )
 
 	if use gallium; then
 		emesonargs+=(