diff --git a/index/gn/gnatcoll_gmp/gnatcoll_gmp-2019.0.0.toml b/index/gn/gnatcoll_gmp/gnatcoll_gmp-2019.0.0.toml
deleted file mode 100644
index b11495ce..00000000
--- a/index/gn/gnatcoll_gmp/gnatcoll_gmp-2019.0.0.toml
+++ /dev/null
@@ -1,28 +0,0 @@
-description = "GNAT Components Collection - Bindings to GMP"
-name = "gnatcoll_gmp"
-version = "2019.0.0"
-authors = ["AdaCore"]
-licenses = ["GPL 3.0"]
-maintainers = ["derodat@adacore.com"]
-maintainers-logins = ["pmderodat"]
-project-files = ["gmp/gnatcoll_gmp.gpr"]
-
-[[depends-on]]
-gnat = ">=9.0"
-gnatcoll = "^2019"
-libgmp = "^6.1"
-
-[gpr-externals]
-GNATCOLL_VERSION = ""
-BUILD = ["DEBUG", "PROD"]
-LIBRARY_TYPE = ["relocatable", "static", "static-pic"]
-
-[gpr-set-externals]
-BUILD = "PROD"
-GNATCOLL_VERSION = "2019"
-LIBRARY_TYPE = "static-pic"
-
-[origin]
-url = "https://community.download.adacore.com/v1/964ece4f78755a2fb3c1c84cec2c375cda66bd98?filename="
-archive-name = "gnatcoll-bindings-2019-20190430-1928C-src.tar.gz"
-hashes = ["sha512:6db1d35a1cdf5188001084750f7aa32b193768f8c3dfb6d7db8a8314c745fc054b0a6d2234a6dd64c5acd4b1bafffa7ce7f1080bd51fbb8bc88edfcc855b7a48"]
diff --git a/index/gn/gnatcoll_gmp/gnatcoll_gmp-21.0.0.toml b/index/gn/gnatcoll_gmp/gnatcoll_gmp-21.0.0.toml
new file mode 100644
index 00000000..53ebe09c
--- /dev/null
+++ b/index/gn/gnatcoll_gmp/gnatcoll_gmp-21.0.0.toml
@@ -0,0 +1,22 @@
+name = "gnatcoll_gmp"
+version = "21.0.0"
+description = "GNAT Components Collection - gomp binding"
+website = "https://github.com/adacore/gnatcoll-bindings"
+authors = ["AdaCore"]
+licenses = ["GMGPL 3.0"]
+maintainers = ["chouteau@adacore.com"]
+maintainers-logins = ["Fabien-Chouteau"]
+project-files = ["gmp/gnatcoll_gmp.gpr"]
+tags = ["gnatcoll", "bindings", "gmp", "arbitrary", "precision", "arithmetic"]
+
+[gpr-externals]
+GNATCOLL_BUILD_MODE = ["DEBUG", "PROD"]
+LIBRARY_TYPE = ["static", "relocatable", "static-pic"]
+
+[[depends-on]]
+gnatcoll = "~21.0.0"
+libgmp = "*"
+
+[origin]
+url= "https://github.com/AdaCore/gnatcoll-bindings/archive/v21.0.0.zip"
+hashes=['sha512:0278508bd697f1334d2b3efb62ae731fda105d07eae02c5e260f7183c561a38d69bf087f9562fd2df3269d87b8732625d7a9a00c130259edc1a6614bf115910d']
diff --git a/index/gn/gnatcoll_iconv/gnatcoll_iconv-2019.0.0.toml b/index/gn/gnatcoll_iconv/gnatcoll_iconv-2019.0.0.toml
deleted file mode 100644
index 2421015d..00000000
--- a/index/gn/gnatcoll_iconv/gnatcoll_iconv-2019.0.0.toml
+++ /dev/null
@@ -1,38 +0,0 @@
-description = "GNAT Components Collection - Bindings to libiconv"
-name = "gnatcoll_iconv"
-version = "2019.0.0"
-authors = ["AdaCore"]
-licenses = ["GPL 3.0"]
-maintainers = ["derodat@adacore.com"]
-maintainers-logins = ["pmderodat"]
-project-files = ["iconv/gnatcoll_iconv.gpr"]
-
-[[depends-on]]
-gnat = ">=9.0"
-gnatcoll = "^2019"
-
-[gpr-externals]
-GNATCOLL_ICONV_OPT = ""
-GNATCOLL_VERSION = ""
-BUILD = ["DEBUG", "PROD"]
-GNATCOLL_OS = ["windows", "unix", "osx"]
-LIBRARY_TYPE = ["relocatable", "static", "static-pic"]
-
-[gpr-set-externals]
-BUILD = "PROD"
-GNATCOLL_ICONV_OPT = ""
-GNATCOLL_VERSION = "2019"
-LIBRARY_TYPE = "static-pic"
-[gpr-set-externals."case(os)".linux]
-GNATCOLL_OS = "unix"
-
-[gpr-set-externals."case(os)".macos]
-GNATCOLL_OS = "osx"
-
-[gpr-set-externals."case(os)".windows]
-GNATCOLL_OS = "windows"
-
-[origin]
-url = "https://community.download.adacore.com/v1/964ece4f78755a2fb3c1c84cec2c375cda66bd98?filename="
-archive-name = "gnatcoll-bindings-2019-20190430-1928C-src.tar.gz"
-hashes = ["sha512:6db1d35a1cdf5188001084750f7aa32b193768f8c3dfb6d7db8a8314c745fc054b0a6d2234a6dd64c5acd4b1bafffa7ce7f1080bd51fbb8bc88edfcc855b7a48"]
diff --git a/index/gn/gnatcoll_iconv/gnatcoll_iconv-21.0.0.toml b/index/gn/gnatcoll_iconv/gnatcoll_iconv-21.0.0.toml
new file mode 100644
index 00000000..14954a4c
--- /dev/null
+++ b/index/gn/gnatcoll_iconv/gnatcoll_iconv-21.0.0.toml
@@ -0,0 +1,29 @@
+name = "gnatcoll_iconv"
+version = "21.0.0"
+description = "GNAT Components Collection - iconv binding"
+website = "https://github.com/adacore/gnatcoll-bindings"
+authors = ["AdaCore"]
+licenses = ["GMGPL 3.0"]
+maintainers = ["chouteau@adacore.com"]
+maintainers-logins = ["Fabien-Chouteau"]
+project-files = ["iconv/gnatcoll_iconv.gpr"]
+tags = ["gnatcoll", "bindings", "iconv", "i18n"]
+
+[gpr-externals]
+GNATCOLL_BUILD_MODE = ["DEBUG", "PROD"]
+LIBRARY_TYPE = ["static", "relocatable", "static-pic"]
+
+# GNATCOLL_ICONV_OPT should be empty on linux but gprbuild consider empty
+# environement variable as not being set. So we use a harmless linker option to
+# have a non-empty GNATCOLL_ICONV_OPT.
+[gpr-set-externals."case(os)".linux]
+GNATCOLL_ICONV_OPT = "-v"
+
+[[depends-on]]
+gnatcoll = "~21.0.0"
+[depends-on."case(os)".windows]
+libiconv = "*"
+
+[origin]
+url= "https://github.com/AdaCore/gnatcoll-bindings/archive/v21.0.0.zip"
+hashes=['sha512:0278508bd697f1334d2b3efb62ae731fda105d07eae02c5e260f7183c561a38d69bf087f9562fd2df3269d87b8732625d7a9a00c130259edc1a6614bf115910d']
diff --git a/index/gn/gnatcoll_lzma/gnatcoll_lzma-21.0.0.toml b/index/gn/gnatcoll_lzma/gnatcoll_lzma-21.0.0.toml
new file mode 100644
index 00000000..79937a2c
--- /dev/null
+++ b/index/gn/gnatcoll_lzma/gnatcoll_lzma-21.0.0.toml
@@ -0,0 +1,22 @@
+name = "gnatcoll_lzma"
+version = "21.0.0"
+description = "GNAT Components Collection - lzma binding"
+website = "https://github.com/adacore/gnatcoll-bindings"
+authors = ["AdaCore"]
+licenses = ["GMGPL 3.0"]
+maintainers = ["chouteau@adacore.com"]
+maintainers-logins = ["Fabien-Chouteau"]
+project-files = ["lzma/gnatcoll_lzma.gpr"]
+tags = ["gnatcoll", "bindings", "lzma", "compression", "7z", "7zip"]
+
+[gpr-externals]
+GNATCOLL_BUILD_MODE = ["DEBUG", "PROD"]
+LIBRARY_TYPE = ["static", "relocatable", "static-pic"]
+
+[[depends-on]]
+gnatcoll = "~21.0.0"
+liblzma = "*"
+
+[origin]
+url= "https://github.com/AdaCore/gnatcoll-bindings/archive/v21.0.0.zip"
+hashes=['sha512:0278508bd697f1334d2b3efb62ae731fda105d07eae02c5e260f7183c561a38d69bf087f9562fd2df3269d87b8732625d7a9a00c130259edc1a6614bf115910d']
diff --git a/index/gn/gnatcoll_omp/gnatcoll_omp-21.0.0.toml b/index/gn/gnatcoll_omp/gnatcoll_omp-21.0.0.toml
new file mode 100644
index 00000000..b627afc5
--- /dev/null
+++ b/index/gn/gnatcoll_omp/gnatcoll_omp-21.0.0.toml
@@ -0,0 +1,22 @@
+name = "gnatcoll_omp"
+version = "21.0.0"
+description = "GNAT Components Collection - gomp binding"
+website = "https://github.com/adacore/gnatcoll-bindings"
+authors = ["AdaCore"]
+licenses = ["GMGPL 3.0"]
+maintainers = ["chouteau@adacore.com"]
+maintainers-logins = ["Fabien-Chouteau"]
+project-files = ["omp/gnatcoll_omp.gpr"]
+tags = ["gnatcoll", "bindings", "openmp", "libgomp"]
+
+[gpr-externals]
+GNATCOLL_BUILD_MODE = ["DEBUG", "PROD"]
+LIBRARY_TYPE = ["static", "relocatable", "static-pic"]
+
+[[depends-on]]
+gnatcoll = "~21.0.0"
+libgomp = "*"
+
+[origin]
+url= "https://github.com/AdaCore/gnatcoll-bindings/archive/v21.0.0.zip"
+hashes=['sha512:0278508bd697f1334d2b3efb62ae731fda105d07eae02c5e260f7183c561a38d69bf087f9562fd2df3269d87b8732625d7a9a00c130259edc1a6614bf115910d']
diff --git a/index/gn/gnatcoll_python/gnatcoll_python-21.0.0.toml b/index/gn/gnatcoll_python/gnatcoll_python-21.0.0.toml
new file mode 100644
index 00000000..758ad328
--- /dev/null
+++ b/index/gn/gnatcoll_python/gnatcoll_python-21.0.0.toml
@@ -0,0 +1,30 @@
+name = "gnatcoll_python"
+version = "21.0.0"
+description = "GNAT Components Collection - python2 binding"
+website = "https://github.com/adacore/gnatcoll-bindings"
+authors = ["AdaCore"]
+licenses = ["GMGPL 3.0"]
+maintainers = ["chouteau@adacore.com"]
+maintainers-logins = ["Fabien-Chouteau"]
+project-files = ["python/gnatcoll_python.gpr"]
+tags = ["gnatcoll", "bindings", "python", "python2"]
+
+[gpr-externals]
+GNATCOLL_BUILD_MODE = ["DEBUG", "PROD"]
+LIBRARY_TYPE = ["static", "relocatable", "static-pic"]
+
+[environment.'case(distribution)']
+"debian|ubuntu" = { C_INCLUDE_PATH.append = "${DISTRIB_ROOT}/usr/include/python2.7/" }
+msys2 = { C_INCLUDE_PATH.append = "${DISTRIB_ROOT}/mingw64/include/python2.7/" }
+
+[available.'case(distribution)']
+'debian|ubuntu|msys2' = true
+'...' = false
+
+[[depends-on]]
+gnatcoll = "~21.0.0"
+libpython2dev = "^2"
+
+[origin]
+url= "https://github.com/AdaCore/gnatcoll-bindings/archive/v21.0.0.zip"
+hashes=['sha512:0278508bd697f1334d2b3efb62ae731fda105d07eae02c5e260f7183c561a38d69bf087f9562fd2df3269d87b8732625d7a9a00c130259edc1a6614bf115910d']
diff --git a/index/gn/gnatcoll_python3/gnatcoll_python3-21.0.0.toml b/index/gn/gnatcoll_python3/gnatcoll_python3-21.0.0.toml
new file mode 100644
index 00000000..ded0979a
--- /dev/null
+++ b/index/gn/gnatcoll_python3/gnatcoll_python3-21.0.0.toml
@@ -0,0 +1,30 @@
+name = "gnatcoll_python3"
+version = "21.0.0"
+description = "GNAT Components Collection - python3 binding"
+website = "https://github.com/adacore/gnatcoll-bindings"
+authors = ["AdaCore"]
+licenses = ["GMGPL 3.0"]
+maintainers = ["chouteau@adacore.com"]
+maintainers-logins = ["Fabien-Chouteau"]
+project-files = ["python3/gnatcoll_python.gpr"]
+tags = ["gnatcoll", "bindings", "python", "python3"]
+
+[gpr-externals]
+GNATCOLL_BUILD_MODE = ["DEBUG", "PROD"]
+LIBRARY_TYPE = ["static", "relocatable", "static-pic"]
+
+[environment.'case(distribution)']
+"debian|ubuntu" = { C_INCLUDE_PATH.append = "${DISTRIB_ROOT}/usr/include/python3.7/:${DISTRIB_ROOT}/usr/include/python3.8/"}
+msys2 = { C_INCLUDE_PATH.append = "${DISTRIB_ROOT}/mingw64/include/python3.8/" }
+
+[available.'case(distribution)']
+'debian|ubuntu|msys2' = true
+'...' = false
+
+[[depends-on]]
+gnatcoll = "~21.0.0"
+libpython3dev = "^3"
+
+[origin]
+url= "https://github.com/AdaCore/gnatcoll-bindings/archive/v21.0.0.zip"
+hashes=['sha512:0278508bd697f1334d2b3efb62ae731fda105d07eae02c5e260f7183c561a38d69bf087f9562fd2df3269d87b8732625d7a9a00c130259edc1a6614bf115910d']
diff --git a/index/gn/gnatcoll_readline/gnatcoll_readline-21.0.0.toml b/index/gn/gnatcoll_readline/gnatcoll_readline-21.0.0.toml
new file mode 100644
index 00000000..cd969988
--- /dev/null
+++ b/index/gn/gnatcoll_readline/gnatcoll_readline-21.0.0.toml
@@ -0,0 +1,22 @@
+name = "gnatcoll_readline"
+version = "21.0.0"
+description = "GNAT Components Collection - readline binding"
+website = "https://github.com/adacore/gnatcoll-bindings"
+authors = ["AdaCore"]
+licenses = ["GMGPL 3.0"]
+maintainers = ["chouteau@adacore.com"]
+maintainers-logins = ["Fabien-Chouteau"]
+project-files = ["readline/gnatcoll_readline.gpr"]
+tags = ["gnatcoll", "bindings", "readline", "cli"]
+
+[gpr-externals]
+GNATCOLL_BUILD_MODE = ["DEBUG", "PROD"]
+LIBRARY_TYPE = ["static", "relocatable", "static-pic"]
+
+[[depends-on]]
+gnatcoll = "~21.0.0"
+libreadline = "*"
+
+[origin]
+url= "https://github.com/AdaCore/gnatcoll-bindings/archive/v21.0.0.zip"
+hashes=['sha512:0278508bd697f1334d2b3efb62ae731fda105d07eae02c5e260f7183c561a38d69bf087f9562fd2df3269d87b8732625d7a9a00c130259edc1a6614bf115910d']
diff --git a/index/gn/gnatcoll_syslog/gnatcoll_syslog-21.0.0.toml b/index/gn/gnatcoll_syslog/gnatcoll_syslog-21.0.0.toml
new file mode 100644
index 00000000..8703404e
--- /dev/null
+++ b/index/gn/gnatcoll_syslog/gnatcoll_syslog-21.0.0.toml
@@ -0,0 +1,25 @@
+name = "gnatcoll_syslog"
+version = "21.0.0"
+description = "GNAT Components Collection - syslog binding"
+website = "https://github.com/adacore/gnatcoll-bindings"
+authors = ["AdaCore"]
+licenses = ["GMGPL 3.0"]
+maintainers = ["chouteau@adacore.com"]
+maintainers-logins = ["Fabien-Chouteau"]
+project-files = ["syslog/gnatcoll_syslog.gpr"]
+tags = ["gnatcoll", "bindings", "syslog", "logging"]
+
+[gpr-externals]
+GNATCOLL_BUILD_MODE = ["DEBUG", "PROD"]
+LIBRARY_TYPE = ["static", "relocatable", "static-pic"]
+
+[available.'case(os)']
+'windows' = false
+'...' = true
+
+[[depends-on]]
+gnatcoll = "~21.0.0"
+
+[origin]
+url= "https://github.com/AdaCore/gnatcoll-bindings/archive/v21.0.0.zip"
+hashes=['sha512:0278508bd697f1334d2b3efb62ae731fda105d07eae02c5e260f7183c561a38d69bf087f9562fd2df3269d87b8732625d7a9a00c130259edc1a6614bf115910d']
diff --git a/index/gn/gnatcoll_zlib/gnatcoll_zlib-21.0.0.toml b/index/gn/gnatcoll_zlib/gnatcoll_zlib-21.0.0.toml
new file mode 100644
index 00000000..b2c40b26
--- /dev/null
+++ b/index/gn/gnatcoll_zlib/gnatcoll_zlib-21.0.0.toml
@@ -0,0 +1,22 @@
+name = "gnatcoll_zlib"
+version = "21.0.0"
+description = "GNAT Components Collection - zlib binding"
+website = "https://github.com/adacore/gnatcoll-bindings"
+authors = ["AdaCore"]
+licenses = ["GMGPL 3.0"]
+maintainers = ["chouteau@adacore.com"]
+maintainers-logins = ["Fabien-Chouteau"]
+project-files = ["zlib/gnatcoll_zlib.gpr"]
+tags = ["gnatcoll", "bindings", "zlib", "compression", "zip", "deflate"]
+
+[gpr-externals]
+GNATCOLL_BUILD_MODE = ["DEBUG", "PROD"]
+LIBRARY_TYPE = ["static", "relocatable", "static-pic"]
+
+[[depends-on]]
+gnatcoll = "~21.0.0"
+zlib = "*"
+
+[origin]
+url= "https://github.com/AdaCore/gnatcoll-bindings/archive/v21.0.0.zip"
+hashes=['sha512:0278508bd697f1334d2b3efb62ae731fda105d07eae02c5e260f7183c561a38d69bf087f9562fd2df3269d87b8732625d7a9a00c130259edc1a6614bf115910d']
diff --git a/index/li/libgomp/libgomp-external.toml b/index/li/libgomp/libgomp-external.toml
new file mode 100644
index 00000000..9543f550
--- /dev/null
+++ b/index/li/libgomp/libgomp-external.toml
@@ -0,0 +1,11 @@
+description = "GNU OpenMP library"
+name = "libgomp"
+licenses = []
+maintainers = ["chouteau@adacore.com"]
+maintainers-logins = ["Fabien-Chouteau"]
+
+[[external]]
+kind = "system"
+[external.origin."case(distribution)"]
+"debian|ubuntu" = ["libgomp1"]
+msys2=["mingw-w64-x86_64-gcc"]
diff --git a/index/li/libiconv/libiconv-external.toml b/index/li/libiconv/libiconv-external.toml
new file mode 100644
index 00000000..bc0e1fb2
--- /dev/null
+++ b/index/li/libiconv/libiconv-external.toml
@@ -0,0 +1,10 @@
+description = "GNU libiconv"
+name = "libiconv"
+licenses = ["LGPL 2.1"]
+maintainers = ["chouteau@adacore.com"]
+maintainers-logins = ["Fabien-Chouteau"]
+
+[[external]]
+kind = "system"
+[external.origin."case(distribution)"]
+msys2 = ["mingw-w64-x86_64-libiconv"]
diff --git a/index/li/liblzma/liblzma-external.toml b/index/li/liblzma/liblzma-external.toml
new file mode 100644
index 00000000..611357ec
--- /dev/null
+++ b/index/li/liblzma/liblzma-external.toml
@@ -0,0 +1,10 @@
+description = "The GNU Readline Library"
+name = "liblzma"
+licenses = ["GPL 2.0", "GPL 3.0", "LGPL 2.1"]
+maintainers = ["chouteau@adacore.com"]
+maintainers-logins = ["Fabien-Chouteau"]
+
+[[external]]
+kind = "system"
+[external.origin."case(distribution)"]
+"debian|ubuntu" = ["liblzma-dev"]
diff --git a/index/li/libpython2dev/libpython2dev-external.toml b/index/li/libpython2dev/libpython2dev-external.toml
new file mode 100644
index 00000000..8bfb89db
--- /dev/null
+++ b/index/li/libpython2dev/libpython2dev-external.toml
@@ -0,0 +1,11 @@
+description = "Header files and a static library for Python2"
+name = "libpython2dev"
+licenses = ["Custom"] # PSF is not available in Alire yet
+maintainers = ["chouteau@adacore.com"]
+maintainers-logins = ["Fabien-Chouteau"]
+
+[[external]]
+kind = "system"
+[external.origin."case(distribution)"]
+"debian|ubuntu" = ["libpython2-dev"]
+msys2 = ["mingw-w64-x86_64-python2"]
diff --git a/index/li/libpython3dev/libpython3dev-external.toml b/index/li/libpython3dev/libpython3dev-external.toml
new file mode 100644
index 00000000..e840d654
--- /dev/null
+++ b/index/li/libpython3dev/libpython3dev-external.toml
@@ -0,0 +1,11 @@
+description = "Header files and a static library for Python3"
+name = "libpython3dev"
+licenses = ["Custom"] # PSF is not available in Alire yet
+maintainers = ["chouteau@adacore.com"]
+maintainers-logins = ["Fabien-Chouteau"]
+
+[[external]]
+kind = "system"
+[external.origin."case(distribution)"]
+"debian|ubuntu" = ["libpython3-dev"]
+msys2 = ["mingw-w64-x86_64-python"]
diff --git a/index/li/libreadline/libreadline-external.toml b/index/li/libreadline/libreadline-external.toml
new file mode 100644
index 00000000..3c38edbd
--- /dev/null
+++ b/index/li/libreadline/libreadline-external.toml
@@ -0,0 +1,11 @@
+description = "The GNU Readline Library"
+name = "libreadline"
+licenses = ["GPL 3.0"]
+maintainers = ["chouteau@adacore.com"]
+maintainers-logins = ["Fabien-Chouteau"]
+
+[[external]]
+kind = "system"
+[external.origin."case(distribution)"]
+"debian|ubuntu" = ["libreadline-dev"]
+msys2 = ["mingw-w64-x86_64-readline"]