[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/

[Alfredo Tupone]

commit:     684579cabe8b97ec395650d1ec892b9ad9796dd2
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon May 31 08:42:20 2021 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon May 31 08:42:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=684579ca

dev-ada/gprbuild: fix gnat discovery

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch                 | 8 +++++++-
 .../gprbuild/{gprbuild-2021.ebuild => gprbuild-2021-r1.ebuild}    | 0
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch
index ac61f561785..15264d6828e 100644
--- a/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch
+++ b/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch
@@ -65,7 +65,7 @@
        <grep regexp="[^\r\n]+"></grep>
      </target>
    </compiler_description>
-@@ -185,9 +185,9 @@
+@@ -185,14 +185,14 @@
     -->
    <compiler_description>
      <name>GNAT</name>
@@ -77,6 +77,12 @@
        <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
      </version>
      <languages>Ada</languages>
+     <variable name="gcc_version">
+-      <external>${PREFIX}gcc -v</external>
++      <external>${PREFIX}gcc-@VER@ -v</external>
+       <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
+     </variable>
+     <runtimes default="default,kernel,native">
 @@ -202,68 +202,11 @@
         <directory group="1" >\.\./$TARGET/lib/gnat/(.*)/adalib/</directory>
      </runtimes>

diff --git a/dev-ada/gprbuild/gprbuild-2021.ebuild b/dev-ada/gprbuild/gprbuild-2021-r1.ebuild
similarity index 100%
rename from dev-ada/gprbuild/gprbuild-2021.ebuild
rename to dev-ada/gprbuild/gprbuild-2021-r1.ebuild