diff --git a/sci-chemistry/gromacs/gromacs-2020.4.ebuild b/sci-chemistry/gromacs/gromacs-2020.4.ebuild
index d8b28c2b0a7bb..f57647178191b 100644
--- a/sci-chemistry/gromacs/gromacs-2020.4.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2020.4.ebuild
@@ -11,12 +11,12 @@ DISTUTILS_SINGLE_IMPL=1
 
 inherit bash-completion-r1 cmake cuda distutils-r1 eutils flag-o-matic multilib readme.gentoo-r1 toolchain-funcs xdg-utils
 
-if [[ $PV = *9999* ]]; then
+if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="
 		https://gitlab.com/gromacs/gromacs.git
 		https://github.com/gromacs/gromacs.git
 		git://git.gromacs.org/gromacs.git"
-	[[ $PV = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
+	[[ ${PV} = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
 	inherit git-r3
 else
 	SRC_URI="
diff --git a/sci-chemistry/gromacs/gromacs-2020.5.ebuild b/sci-chemistry/gromacs/gromacs-2020.5.ebuild
index 9b2e7ff39e9a3..ccd8e2d594f46 100644
--- a/sci-chemistry/gromacs/gromacs-2020.5.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2020.5.ebuild
@@ -11,12 +11,12 @@ DISTUTILS_SINGLE_IMPL=1
 
 inherit bash-completion-r1 cmake cuda distutils-r1 eutils flag-o-matic multilib readme.gentoo-r1 toolchain-funcs xdg-utils
 
-if [[ $PV = *9999* ]]; then
+if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="
 		https://gitlab.com/gromacs/gromacs.git
 		https://github.com/gromacs/gromacs.git
 		git://git.gromacs.org/gromacs.git"
-	[[ $PV = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
+	[[ ${PV} = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
 	inherit git-r3
 else
 	SRC_URI="
diff --git a/sci-chemistry/gromacs/gromacs-2020.9999.ebuild b/sci-chemistry/gromacs/gromacs-2020.9999.ebuild
index 9b2e7ff39e9a3..ccd8e2d594f46 100644
--- a/sci-chemistry/gromacs/gromacs-2020.9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2020.9999.ebuild
@@ -11,12 +11,12 @@ DISTUTILS_SINGLE_IMPL=1
 
 inherit bash-completion-r1 cmake cuda distutils-r1 eutils flag-o-matic multilib readme.gentoo-r1 toolchain-funcs xdg-utils
 
-if [[ $PV = *9999* ]]; then
+if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="
 		https://gitlab.com/gromacs/gromacs.git
 		https://github.com/gromacs/gromacs.git
 		git://git.gromacs.org/gromacs.git"
-	[[ $PV = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
+	[[ ${PV} = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
 	inherit git-r3
 else
 	SRC_URI="
diff --git a/sci-chemistry/gromacs/gromacs-2021.9999.ebuild b/sci-chemistry/gromacs/gromacs-2021.9999.ebuild
index a1ba0b4d74a3d..1674a44df0e85 100644
--- a/sci-chemistry/gromacs/gromacs-2021.9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2021.9999.ebuild
@@ -11,12 +11,12 @@ DISTUTILS_SINGLE_IMPL=1
 
 inherit bash-completion-r1 cmake cuda distutils-r1 eutils flag-o-matic multilib readme.gentoo-r1 toolchain-funcs xdg-utils
 
-if [[ $PV = *9999* ]]; then
+if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="
 		https://gitlab.com/gromacs/gromacs.git
 		https://github.com/gromacs/gromacs.git
 		git://git.gromacs.org/gromacs.git"
-	[[ $PV = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
+	[[ ${PV} = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
 	inherit git-r3
 else
 	SRC_URI="
diff --git a/sci-chemistry/gromacs/gromacs-2021.ebuild b/sci-chemistry/gromacs/gromacs-2021.ebuild
index a1ba0b4d74a3d..1674a44df0e85 100644
--- a/sci-chemistry/gromacs/gromacs-2021.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2021.ebuild
@@ -11,12 +11,12 @@ DISTUTILS_SINGLE_IMPL=1
 
 inherit bash-completion-r1 cmake cuda distutils-r1 eutils flag-o-matic multilib readme.gentoo-r1 toolchain-funcs xdg-utils
 
-if [[ $PV = *9999* ]]; then
+if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="
 		https://gitlab.com/gromacs/gromacs.git
 		https://github.com/gromacs/gromacs.git
 		git://git.gromacs.org/gromacs.git"
-	[[ $PV = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
+	[[ ${PV} = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
 	inherit git-r3
 else
 	SRC_URI="
diff --git a/sci-chemistry/gromacs/gromacs-9999.ebuild b/sci-chemistry/gromacs/gromacs-9999.ebuild
index a1ba0b4d74a3d..1674a44df0e85 100644
--- a/sci-chemistry/gromacs/gromacs-9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-9999.ebuild
@@ -11,12 +11,12 @@ DISTUTILS_SINGLE_IMPL=1
 
 inherit bash-completion-r1 cmake cuda distutils-r1 eutils flag-o-matic multilib readme.gentoo-r1 toolchain-funcs xdg-utils
 
-if [[ $PV = *9999* ]]; then
+if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="
 		https://gitlab.com/gromacs/gromacs.git
 		https://github.com/gromacs/gromacs.git
 		git://git.gromacs.org/gromacs.git"
-	[[ $PV = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
+	[[ ${PV} = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
 	inherit git-r3
 else
 	SRC_URI="