diff --git a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-25.0.0.ebuild b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-25.0.0-r1.ebuild
similarity index 89%
rename from x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-25.0.0.ebuild
rename to x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-25.0.0-r1.ebuild
index 3581a34dc6f82..e0d71ccd22af5 100644
--- a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-25.0.0.ebuild
+++ b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-25.0.0-r1.ebuild
@@ -18,9 +18,9 @@ RDEPEND=">=x11-libs/libdrm-2.4.89[video_cards_amdgpu]
 DEPEND="${RDEPEND}"
 
 src_configure() {
-	local emesonargs=(
+	local XORG_CONFIGURE_OPTIONS=(
 		-Dglamor=enabled
 		$(meson_feature udev)
 	)
-	meson_src_configure
+	xorg-meson_src_configure
 }
diff --git a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild
index 3581a34dc6f82..e0d71ccd22af5 100644
--- a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild
+++ b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild
@@ -18,9 +18,9 @@ RDEPEND=">=x11-libs/libdrm-2.4.89[video_cards_amdgpu]
 DEPEND="${RDEPEND}"
 
 src_configure() {
-	local emesonargs=(
+	local XORG_CONFIGURE_OPTIONS=(
 		-Dglamor=enabled
 		$(meson_feature udev)
 	)
-	meson_src_configure
+	xorg-meson_src_configure
 }