diff --git a/sci-geosciences/grass/grass-7.8.5.ebuild b/sci-geosciences/grass/grass-7.8.5-r1.ebuild
similarity index 98%
rename from sci-geosciences/grass/grass-7.8.5.ebuild
rename to sci-geosciences/grass/grass-7.8.5-r1.ebuild
index 755437aec9cf9..d1341ec38da66 100644
--- a/sci-geosciences/grass/grass-7.8.5.ebuild
+++ b/sci-geosciences/grass/grass-7.8.5-r1.ebuild
@@ -33,10 +33,10 @@ RDEPEND="
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
 	')
-	sci-libs/gdal
-	sys-libs/gdbm
+	sci-libs/gdal:=
+	sys-libs/gdbm:=
 	sys-libs/ncurses:0=
-	sci-libs/proj
+	sci-libs/proj:=
 	sci-libs/xdrfile
 	sys-libs/zlib
 	blas? (
@@ -44,11 +44,11 @@ RDEPEND="
 		virtual/blas[eselect-ldso(+)]
 	)
 	fftw? ( sci-libs/fftw:3.0= )
-	geos? ( sci-libs/geos )
+	geos? ( sci-libs/geos:= )
 	lapack? ( virtual/lapack[eselect-ldso(+)] )
 	liblas? ( sci-geosciences/liblas )
 	mysql? ( dev-db/mysql-connector-c:= )
-	netcdf? ( sci-libs/netcdf )
+	netcdf? ( sci-libs/netcdf:= )
 	odbc? ( dev-db/unixODBC )
 	opencl? ( virtual/opencl )
 	opengl? ( virtual/opengl )
@@ -67,7 +67,7 @@ RDEPEND="
 		x11-libs/libXext
 		x11-libs/libXt
 	)
-	zstd? ( app-arch/zstd )"
+	zstd? ( app-arch/zstd:= )"
 DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )"
 BDEPEND="
diff --git a/sci-geosciences/grass/grass-7.8.6.ebuild b/sci-geosciences/grass/grass-7.8.6-r1.ebuild
similarity index 98%
rename from sci-geosciences/grass/grass-7.8.6.ebuild
rename to sci-geosciences/grass/grass-7.8.6-r1.ebuild
index 5f6717ab03eff..4332f826c81ab 100644
--- a/sci-geosciences/grass/grass-7.8.6.ebuild
+++ b/sci-geosciences/grass/grass-7.8.6-r1.ebuild
@@ -33,10 +33,10 @@ RDEPEND="
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
 	')
-	sci-libs/gdal
-	sys-libs/gdbm
+	sci-libs/gdal:=
+	sys-libs/gdbm:=
 	sys-libs/ncurses:0=
-	sci-libs/proj
+	sci-libs/proj:=
 	sci-libs/xdrfile
 	sys-libs/zlib
 	blas? (
@@ -44,11 +44,11 @@ RDEPEND="
 		virtual/blas[eselect-ldso(+)]
 	)
 	fftw? ( sci-libs/fftw:3.0= )
-	geos? ( sci-libs/geos )
+	geos? ( sci-libs/geos:= )
 	lapack? ( virtual/lapack[eselect-ldso(+)] )
 	liblas? ( sci-geosciences/liblas )
 	mysql? ( dev-db/mysql-connector-c:= )
-	netcdf? ( sci-libs/netcdf )
+	netcdf? ( sci-libs/netcdf:= )
 	odbc? ( dev-db/unixODBC )
 	opencl? ( virtual/opencl )
 	opengl? ( virtual/opengl )
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index 965bd4beb28cc..e91faa8e4ab62 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -29,10 +29,10 @@ RDEPEND="
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
 	')
-	sci-libs/gdal
-	sys-libs/gdbm
+	sci-libs/gdal:=
+	sys-libs/gdbm:=
 	sys-libs/ncurses:0=
-	sci-libs/proj
+	sci-libs/proj:=
 	sci-libs/xdrfile
 	sys-libs/zlib
 	media-libs/libglvnd
@@ -46,7 +46,7 @@ RDEPEND="
 	lapack? ( virtual/lapack[eselect-ldso(+)] )
 	liblas? ( sci-geosciences/liblas )
 	mysql? ( dev-db/mysql-connector-c:= )
-	netcdf? ( sci-libs/netcdf )
+	netcdf? ( sci-libs/netcdf:= )
 	odbc? ( dev-db/unixODBC )
 	opencl? ( virtual/opencl )
 	png? ( media-libs/libpng:0= )