[gentoo-commits] repo/gentoo:master commit in: dev-lang/spark/files/, dev-lang/spark/

[Alfredo Tupone]

commit:     dd85fc72ef380a6bd87457d16a2fa9e562366f1f
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 21 20:34:37 2021 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Jun 21 20:34:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd85fc72

dev-lang/spark: patch gnatls command

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

 dev-lang/spark/files/spark-2021-gentoo.patch | 13 +++++++++++++
 dev-lang/spark/spark-2021.ebuild             |  5 +++++
 2 files changed, 18 insertions(+)

diff --git a/dev-lang/spark/files/spark-2021-gentoo.patch 
b/dev-lang/spark/files/spark-2021-gentoo.patch
new file mode 100644
index 00000000000..d79a5af9e38
--- /dev/null
+++ b/dev-lang/spark/files/spark-2021-gentoo.patch
@@ -0,0 +1,13 @@
+--- a/src/gnatprove/configuration.adb  2021-06-21 22:30:18.962850246 +0200
++++ b/src/gnatprove/configuration.adb  2021-06-21 22:31:03.621210570 +0200
+@@ -1269,7 +1269,9 @@
+ 
+          end if;
+ 
+-         Set_Path_From_Gnatls (Proj_Env.all, "gnatls", GNAT_Version);
++         Set_Path_From_Gnatls (Proj_Env.all,
++                               "gnatls",
++                               GNAT_Version);
+          Free (GNAT_Version);
+          Set_Object_Subdir (Proj_Env.all,
+                             Filesystem_String

diff --git a/dev-lang/spark/spark-2021.ebuild b/dev-lang/spark/spark-2021.ebuild
index 01b83053481..9c090883d17 100644
--- a/dev-lang/spark/spark-2021.ebuild
+++ b/dev-lang/spark/spark-2021.ebuild
@@ -36,6 +36,8 @@ REQUIRED_USE="${ADA_REQUIRED_USE}"
 
 S="${WORKDIR}"/${MYP}
 
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
 pkg_setup() {
        ada_pkg_setup
        python-any-r1_pkg_setup
@@ -44,6 +46,9 @@ pkg_setup() {
 src_prepare() {
        ln -sf "${WORKDIR}"/${GNATDIR}/src/ada gnat2why/gnat_src || die
        default
+       sed -i \
+               -e "s:gnatls:${GNATLS}:g" \
+               src/gnatprove/configuration.adb || die
 }
 
 src_compile() {