diff --git a/media-gfx/graphite2/graphite2-1.3.11.ebuild b/media-gfx/graphite2/graphite2-1.3.11-r1.ebuild
similarity index 96%
rename from media-gfx/graphite2/graphite2-1.3.11.ebuild
rename to media-gfx/graphite2/graphite2-1.3.11-r1.ebuild
index 2eef1c685687f..64d56a70455a7 100644
--- a/media-gfx/graphite2/graphite2-1.3.11.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.11-r1.ebuild
@@ -62,7 +62,8 @@ src_prepare() {
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		"-DVM_MACHINE_TYPE=direct"
+		# Renamed VM_MACHINE_TYPE to GRAPHITE2_VM_TYPE
+		"-DGRAPHITE2_VM_TYPE=direct"
 		# https://sourceforge.net/p/silgraphite/bugs/49/
 		$([[ ${CHOST} == powerpc*-apple* ]] && \
 			echo "-DGRAPHITE2_NSEGCACHE:BOOL=ON")
diff --git a/media-gfx/graphite2/graphite2-1.3.12.ebuild b/media-gfx/graphite2/graphite2-1.3.12-r1.ebuild
similarity index 96%
rename from media-gfx/graphite2/graphite2-1.3.12.ebuild
rename to media-gfx/graphite2/graphite2-1.3.12-r1.ebuild
index 2eef1c685687f..64d56a70455a7 100644
--- a/media-gfx/graphite2/graphite2-1.3.12.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.12-r1.ebuild
@@ -62,7 +62,8 @@ src_prepare() {
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		"-DVM_MACHINE_TYPE=direct"
+		# Renamed VM_MACHINE_TYPE to GRAPHITE2_VM_TYPE
+		"-DGRAPHITE2_VM_TYPE=direct"
 		# https://sourceforge.net/p/silgraphite/bugs/49/
 		$([[ ${CHOST} == powerpc*-apple* ]] && \
 			echo "-DGRAPHITE2_NSEGCACHE:BOOL=ON")