diff --git a/dev-ada/gnat-suite-bin/gnat-suite-bin-2016.ebuild b/dev-ada/gnat-suite-bin/gnat-suite-bin-2016-r1.ebuild
similarity index 96%
rename from dev-ada/gnat-suite-bin/gnat-suite-bin-2016.ebuild
rename to dev-ada/gnat-suite-bin/gnat-suite-bin-2016-r1.ebuild
index cd65dfa8890a6..7e44aa89cf35f 100644
--- a/dev-ada/gnat-suite-bin/gnat-suite-bin-2016.ebuild
+++ b/dev-ada/gnat-suite-bin/gnat-suite-bin-2016-r1.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"
@@ -17,7 +17,10 @@ IUSE=""
 DEPEND=""
 RDEPEND="${DEPEND}
 	sys-devel/binutils
-	sys-devel/gdb"
+	sys-devel/gdb
+	sys-libs/gdbm
+	sys-libs/ncurses-compat
+"
 
 S="${WORKDIR}"/${MYP}-x86_64-linux-bin
 
diff --git a/dev-ada/gnat-suite-bin/gnat-suite-bin-2017.ebuild b/dev-ada/gnat-suite-bin/gnat-suite-bin-2017-r1.ebuild
similarity index 96%
rename from dev-ada/gnat-suite-bin/gnat-suite-bin-2017.ebuild
rename to dev-ada/gnat-suite-bin/gnat-suite-bin-2017-r1.ebuild
index 47430b2c10287..0c084228c8e87 100644
--- a/dev-ada/gnat-suite-bin/gnat-suite-bin-2017.ebuild
+++ b/dev-ada/gnat-suite-bin/gnat-suite-bin-2017-r1.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"
@@ -17,7 +17,10 @@ IUSE=""
 DEPEND=""
 RDEPEND="${DEPEND}
 	sys-devel/binutils
-	sys-devel/gdb"
+	sys-devel/gdb
+	sys-libs/gdbm
+	sys-libs/ncurses-compat
+"
 
 S="${WORKDIR}"/${MYP}-x86_64-linux-bin
 
diff --git a/dev-ada/gnat-suite-bin/gnat-suite-bin-2018.ebuild b/dev-ada/gnat-suite-bin/gnat-suite-bin-2018-r1.ebuild
similarity index 96%
rename from dev-ada/gnat-suite-bin/gnat-suite-bin-2018.ebuild
rename to dev-ada/gnat-suite-bin/gnat-suite-bin-2018-r1.ebuild
index 04ffaf338d727..e2b10d6fa1d75 100644
--- a/dev-ada/gnat-suite-bin/gnat-suite-bin-2018.ebuild
+++ b/dev-ada/gnat-suite-bin/gnat-suite-bin-2018-r1.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"
@@ -17,7 +17,10 @@ IUSE=""
 DEPEND=""
 RDEPEND="${DEPEND}
 	sys-devel/binutils
-	sys-devel/gdb"
+	sys-devel/gdb
+	sys-libs/gdbm
+	sys-libs/ncurses-compat
+"
 
 PREFIX=/opt/${P}
 
diff --git a/dev-ada/gnat-suite-bin/gnat-suite-bin-2019.ebuild b/dev-ada/gnat-suite-bin/gnat-suite-bin-2019-r1.ebuild
similarity index 96%
rename from dev-ada/gnat-suite-bin/gnat-suite-bin-2019.ebuild
rename to dev-ada/gnat-suite-bin/gnat-suite-bin-2019-r1.ebuild
index 8e8d445e3d3d1..64c8331619ffc 100644
--- a/dev-ada/gnat-suite-bin/gnat-suite-bin-2019.ebuild
+++ b/dev-ada/gnat-suite-bin/gnat-suite-bin-2019-r1.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"
@@ -17,7 +17,10 @@ IUSE=""
 DEPEND=""
 RDEPEND="${DEPEND}
 	sys-devel/binutils
-	sys-devel/gdb"
+	sys-devel/gdb
+	sys-libs/gdbm
+	sys-libs/ncurses-compat
+"
 
 PREFIX=/opt/${P}