From 6f19578327c3f9dcab471c1021749d702af8be16 Mon Sep 17 00:00:00 2001
From: Rowan Walshe <walshe@adacore.com>
Date: Thu, 23 Nov 2023 13:25:28 +0000
Subject: [PATCH] Match more version of gnat/gprbuild when using external
 versions

---
 index/gn/gnat_external/gnat_external-external.toml | 2 +-
 index/gp/gprbuild/gprbuild-external.toml           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/index/gn/gnat_external/gnat_external-external.toml b/index/gn/gnat_external/gnat_external-external.toml
index dda3f9d13..db2a5a56a 100644
--- a/index/gn/gnat_external/gnat_external-external.toml
+++ b/index/gn/gnat_external/gnat_external-external.toml
@@ -6,7 +6,7 @@ maintainers-logins = ["mosteo"]
 
 [[external]]
 kind = "version-output"
-version-regexp = "^GNAT ([\\d\\.]+).*|^GNAT Community ([\\d]{4}).*"
+version-regexp = "^GNAT\\D*([\\d\\.]+).*"
 version-command = ["gnat", "--version"]
 provides = "gnat"
 
diff --git a/index/gp/gprbuild/gprbuild-external.toml b/index/gp/gprbuild/gprbuild-external.toml
index cd347dfb4..8b7a2c988 100644
--- a/index/gp/gprbuild/gprbuild-external.toml
+++ b/index/gp/gprbuild/gprbuild-external.toml
@@ -6,7 +6,7 @@ maintainers-logins = ["mosteo"]
 
 [[external]]
 kind = "version-output"
-version-regexp = "^GPRBUILD ([\\d\\.-]+).*|^GPRBUILD Community ([\\d\\.-]+).*"
+version-regexp = "^GPRBUILD\\D*([\\d\\.-]+).*"
 version-command = ["gprbuild", "--version"]
 
 # Neither macOS distribution (Homebrew, MacPorts) provides gprbuild.