From f0ab2fe76dbbb4a425fcc6885e19e5845c940da3 Mon Sep 17 00:00:00 2001
From: Alfredo Tupone <tupone@gentoo.org>
Date: Sat, 19 Mar 2022 23:06:55 +0100
Subject: [PATCH] dev-ada/gprbuild: fix NULL DT_RUNPATH

Closes: https://bugs.gentoo.org/834701
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
---
 dev-ada/gprbuild/files/gprbuild-2021-runpath.patch    | 11 +++++++++++
 ...prbuild-2021-r2.ebuild => gprbuild-2021-r3.ebuild} |  3 ++-
 ...ild-22.0.0-r1.ebuild => gprbuild-22.0.0-r2.ebuild} |  1 +
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 dev-ada/gprbuild/files/gprbuild-2021-runpath.patch
 rename dev-ada/gprbuild/{gprbuild-2021-r2.ebuild => gprbuild-2021-r3.ebuild} (96%)
 rename dev-ada/gprbuild/{gprbuild-22.0.0-r1.ebuild => gprbuild-22.0.0-r2.ebuild} (98%)

diff --git a/dev-ada/gprbuild/files/gprbuild-2021-runpath.patch b/dev-ada/gprbuild/files/gprbuild-2021-runpath.patch
new file mode 100644
index 0000000000000..9224a09f90494
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild-2021-runpath.patch
@@ -0,0 +1,11 @@
+--- a/gpr/src/gpr-util.adb	2022-03-19 22:41:32.372348082 +0100
++++ b/gpr/src/gpr-util.adb	2022-03-19 22:41:54.325010633 +0100
+@@ -3634,7 +3634,7 @@
+             end if;
+          end loop;
+ 
+-         return Ret;
++         return Ret(1 .. Length - Separator'Length);
+       end;
+    end Concat_Paths;
+ 
diff --git a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild b/dev-ada/gprbuild/gprbuild-2021-r3.ebuild
similarity index 96%
rename from dev-ada/gprbuild/gprbuild-2021-r2.ebuild
rename to dev-ada/gprbuild/gprbuild-2021-r3.ebuild
index 8bfc6af4419b0..3aeaaf969f805 100644
--- a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2021-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,6 +33,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-nm.patch
 	"${FILESDIR}"/${PN}-22.0.0-ar.patch
+	"${FILESDIR}"/${P}-runpath.patch
 )
 
 src_prepare() {
diff --git a/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild b/dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild
similarity index 98%
rename from dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild
rename to dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild
index 97506af95abf6..63740fc4c7a93 100644
--- a/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild
+++ b/dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild
@@ -32,6 +32,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-nm.patch
 	"${FILESDIR}"/${P}-ar.patch
+	"${FILESDIR}"/${PN}-2021-runpath.patch
 )
 
 src_prepare() {