Gentoo Archives: gentoo-commits

From: Alfredo Tupone <tupone@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/spark/files/, dev-lang/spark/
Date: Mon, 21 Jun 2021 20:34:52
Message-Id: 1624307677.dd85fc72ef380a6bd87457d16a2fa9e562366f1f.tupone@gentoo
1 commit: dd85fc72ef380a6bd87457d16a2fa9e562366f1f
2 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 21 20:34:37 2021 +0000
4 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 21 20:34:37 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd85fc72
7
8 dev-lang/spark: patch gnatls command
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.2
11 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
12
13 dev-lang/spark/files/spark-2021-gentoo.patch | 13 +++++++++++++
14 dev-lang/spark/spark-2021.ebuild | 5 +++++
15 2 files changed, 18 insertions(+)
16
17 diff --git a/dev-lang/spark/files/spark-2021-gentoo.patch b/dev-lang/spark/files/spark-2021-gentoo.patch
18 new file mode 100644
19 index 00000000000..d79a5af9e38
20 --- /dev/null
21 +++ b/dev-lang/spark/files/spark-2021-gentoo.patch
22 @@ -0,0 +1,13 @@
23 +--- a/src/gnatprove/configuration.adb 2021-06-21 22:30:18.962850246 +0200
24 ++++ b/src/gnatprove/configuration.adb 2021-06-21 22:31:03.621210570 +0200
25 +@@ -1269,7 +1269,9 @@
26 +
27 + end if;
28 +
29 +- Set_Path_From_Gnatls (Proj_Env.all, "gnatls", GNAT_Version);
30 ++ Set_Path_From_Gnatls (Proj_Env.all,
31 ++ "gnatls",
32 ++ GNAT_Version);
33 + Free (GNAT_Version);
34 + Set_Object_Subdir (Proj_Env.all,
35 + Filesystem_String
36
37 diff --git a/dev-lang/spark/spark-2021.ebuild b/dev-lang/spark/spark-2021.ebuild
38 index 01b83053481..9c090883d17 100644
39 --- a/dev-lang/spark/spark-2021.ebuild
40 +++ b/dev-lang/spark/spark-2021.ebuild
41 @@ -36,6 +36,8 @@ REQUIRED_USE="${ADA_REQUIRED_USE}"
42
43 S="${WORKDIR}"/${MYP}
44
45 +PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
46 +
47 pkg_setup() {
48 ada_pkg_setup
49 python-any-r1_pkg_setup
50 @@ -44,6 +46,9 @@ pkg_setup() {
51 src_prepare() {
52 ln -sf "${WORKDIR}"/${GNATDIR}/src/ada gnat2why/gnat_src || die
53 default
54 + sed -i \
55 + -e "s:gnatls:${GNATLS}:g" \
56 + src/gnatprove/configuration.adb || die
57 }
58
59 src_compile() {