diff --git a/app-emulation/xen-tools/xen-tools-4.13.2-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.13.2-r2.ebuild
index fddf402c3ec18..3eb28b9298507 100644
--- a/app-emulation/xen-tools/xen-tools-4.13.2-r2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.13.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-func
 
 MY_PV=${PV/_/-}
 
-if [[ $PV == *9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	REPO="xen.git"
 	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
diff --git a/app-emulation/xen-tools/xen-tools-4.13.2-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.13.2-r3.ebuild
index 7159688a1ac3f..17e66b7306502 100644
--- a/app-emulation/xen-tools/xen-tools-4.13.2-r3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.13.2-r3.ebuild
@@ -10,7 +10,7 @@ inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-func
 
 MY_PV=${PV/_/-}
 
-if [[ $PV == *9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	REPO="xen.git"
 	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
diff --git a/app-emulation/xen-tools/xen-tools-4.13.2-r4.ebuild b/app-emulation/xen-tools/xen-tools-4.13.2-r4.ebuild
index 50f18d15c457c..e7e7510eb1f60 100644
--- a/app-emulation/xen-tools/xen-tools-4.13.2-r4.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.13.2-r4.ebuild
@@ -10,7 +10,7 @@ inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-func
 
 MY_PV=${PV/_/-}
 
-if [[ $PV == *9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	REPO="xen.git"
 	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
diff --git a/app-emulation/xen-tools/xen-tools-4.14.1-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.14.1-r1.ebuild
index 0e0c29c4bf2ef..93372ecabe5be 100644
--- a/app-emulation/xen-tools/xen-tools-4.14.1-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.14.1-r1.ebuild
@@ -10,7 +10,7 @@ inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-func
 
 MY_PV=${PV/_/-}
 
-if [[ $PV == *9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	REPO="xen.git"
 	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
diff --git a/app-emulation/xen-tools/xen-tools-4.14.1-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.14.1-r2.ebuild
index 5db1d2c80b59b..dfd8b2e0b73a8 100644
--- a/app-emulation/xen-tools/xen-tools-4.14.1-r2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.14.1-r2.ebuild
@@ -10,7 +10,7 @@ inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-func
 
 MY_PV=${PV/_/-}
 
-if [[ $PV == *9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	REPO="xen.git"
 	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
diff --git a/app-emulation/xen-tools/xen-tools-4.14.1.ebuild b/app-emulation/xen-tools/xen-tools-4.14.1.ebuild
index bade7dc645377..22eeb91a3f843 100644
--- a/app-emulation/xen-tools/xen-tools-4.14.1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-func
 
 MY_PV=${PV/_/-}
 
-if [[ $PV == *9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	REPO="xen.git"
 	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"