1 |
commit: 18b5491049d641e38f0df0609f8dc6092ded3b20 |
2 |
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 14 06:30:56 2021 +0000 |
4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 14 06:30:56 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18b54910 |
7 |
|
8 |
dev-ada/libgpr: enable gnat_2020 |
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-ada/libgpr/Manifest | 1 - |
14 |
dev-ada/libgpr/files/libgpr-2019-gentoo.patch | 55 ---------------------- |
15 |
...libgpr-2019-r1.ebuild => libgpr-2020-r1.ebuild} | 14 +++--- |
16 |
3 files changed, 7 insertions(+), 63 deletions(-) |
17 |
|
18 |
diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest |
19 |
index 5936167a479..ec83579dfab 100644 |
20 |
--- a/dev-ada/libgpr/Manifest |
21 |
+++ b/dev-ada/libgpr/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST gprbuild-2019-20190517-194D8-src.tar.gz 2507961 BLAKE2B 0f70d94cb0db9ddc1dd308862aaa305a91965a62a936cfbdde2ae9f3f735f0cc3d69596b09da4b979a1d7923087ab0ec5cf2d6541551f057b5e8e0c499065a90 SHA512 0388d7e6cdf625fef40b33da764091b3283dd88714c64ecfad4b5e99253f183b1a9b717c19281e6d45cc4277a05fadb2e2ace394d6f30638664b66c97123052b |
24 |
DIST gprbuild-2020-20200429-19BD2-src.tar.gz 2489399 BLAKE2B 3a036cb40bbe5522af63c376a672384093901b44df6fd74013f1eff9d269c2f5056224ab5e7d59b6f3cf126cd14dd30420056b09e887851351462de59f700e3a SHA512 d2ff6a5d8281d332a31533c7a5744b6169fd250c9086373fd658486c1e529564d9830b9ef3b2dfcbec5f8c1ba50d244a9eb45bf8fdccd53f8b711dcf29258dfd |
25 |
|
26 |
diff --git a/dev-ada/libgpr/files/libgpr-2019-gentoo.patch b/dev-ada/libgpr/files/libgpr-2019-gentoo.patch |
27 |
deleted file mode 100644 |
28 |
index b7b9a2d3c87..00000000000 |
29 |
--- a/dev-ada/libgpr/files/libgpr-2019-gentoo.patch |
30 |
+++ /dev/null |
31 |
@@ -1,55 +0,0 @@ |
32 |
---- a/gpr/src/gpr-env.adb 2017-11-13 22:16:53.349083426 +0100 |
33 |
-+++ b/gpr/src/gpr-env.adb 2017-11-13 22:17:22.692590351 +0100 |
34 |
-@@ -1948,6 +1948,8 @@ |
35 |
- |
36 |
- end if; |
37 |
- |
38 |
-+ Add_Directories (Self, "/usr/share/gpr"); |
39 |
-+ |
40 |
- if Gpr_Prj_Path.all /= "" then |
41 |
- Add_Directories (Self, Gpr_Prj_Path.all); |
42 |
- end if; |
43 |
---- a/gpr/src/gpr-names.ads 2017-11-19 13:09:18.947527738 +0100 |
44 |
-+++ b/gpr/src/gpr-names.ads 2017-11-19 13:10:08.125654595 +0100 |
45 |
-@@ -27,6 +27,8 @@ |
46 |
- Name_Buffer : String (1 .. 1_000_000); |
47 |
- Name_Len : Natural := 0; |
48 |
- |
49 |
-+ Last_Id : Name_Id := Name_Id'First; |
50 |
-+ |
51 |
- procedure Get_Name_String (Id : Name_Id); |
52 |
- procedure Get_Name_String (Id : Unit_Name_Type); |
53 |
- procedure Get_Name_String (Id : File_Name_Type); |
54 |
---- a/gpr/src/gpr-names.adb 2017-11-19 13:10:27.674316703 +0100 |
55 |
-+++ b/gpr/src/gpr-names.adb 2017-11-19 13:14:38.360963627 +0100 |
56 |
-@@ -354,6 +354,8 @@ |
57 |
- |
58 |
- Name_Chars.Append (ASCII.NUL); |
59 |
- |
60 |
-+ Last_Id := Name_Entries.Last; |
61 |
-+ |
62 |
- return Name_Entries.Last; |
63 |
- end Name_Enter; |
64 |
- |
65 |
-@@ -427,6 +429,8 @@ |
66 |
- |
67 |
- Name_Chars.Append (ASCII.NUL); |
68 |
- |
69 |
-+ Last_Id := Name_Entries.Last; |
70 |
-+ |
71 |
- return Name_Entries.Last; |
72 |
- end Name_Find; |
73 |
- |
74 |
---- a/gpr/src/gpr-snames.adb 2017-11-19 13:12:41.592995718 +0100 |
75 |
-+++ b/gpr/src/gpr-snames.adb 2017-11-19 13:16:31.980979696 +0100 |
76 |
-@@ -53,6 +53,10 @@ |
77 |
- return; |
78 |
- end if; |
79 |
- |
80 |
-+ if Last_Id = Name_Id'First then |
81 |
-+ Add_Name (""); |
82 |
-+ end if; |
83 |
-+ |
84 |
- Add_Name ("a"); |
85 |
- Add_Name ("b"); |
86 |
- Add_Name ("c"); |
87 |
|
88 |
diff --git a/dev-ada/libgpr/libgpr-2019-r1.ebuild b/dev-ada/libgpr/libgpr-2020-r1.ebuild |
89 |
similarity index 79% |
90 |
rename from dev-ada/libgpr/libgpr-2019-r1.ebuild |
91 |
rename to dev-ada/libgpr/libgpr-2020-r1.ebuild |
92 |
index 7906a8d27d4..f71361c4147 100644 |
93 |
--- a/dev-ada/libgpr/libgpr-2019-r1.ebuild |
94 |
+++ b/dev-ada/libgpr/libgpr-2020-r1.ebuild |
95 |
@@ -1,20 +1,20 @@ |
96 |
-# Copyright 1999-2019 Gentoo Authors |
97 |
+# Copyright 1999-2021 Gentoo Authors |
98 |
# Distributed under the terms of the GNU General Public License v2 |
99 |
|
100 |
EAPI=7 |
101 |
|
102 |
-ADA_COMPAT=( gnat_201{6,7,8,9} ) |
103 |
+ADA_COMPAT=( gnat_201{6..9} gnat_2020 ) |
104 |
inherit ada toolchain-funcs multiprocessing |
105 |
|
106 |
-MYP=gprbuild-${PV}-20190517-194D8 |
107 |
+MYP=gprbuild-${PV}-20200429-19BD2-src |
108 |
|
109 |
DESCRIPTION="Ada library to handle GPRbuild project files" |
110 |
HOMEPAGE="http://libre.adacore.com/" |
111 |
-SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf8e8031e87a8f1d425093 |
112 |
- -> ${MYP}-src.tar.gz" |
113 |
+SRC_URI="https://community.download.adacore.com/v1/408ec35c3bb86bd227db3da55d3e1e0c572a56e3?filename=${MYP}.tar.gz |
114 |
+ -> ${MYP}.tar.gz" |
115 |
LICENSE="GPL-3" |
116 |
SLOT="0" |
117 |
-KEYWORDS="amd64 x86" |
118 |
+KEYWORDS="~amd64 ~x86" |
119 |
IUSE="+shared static-libs static-pic" |
120 |
|
121 |
RDEPEND="dev-ada/xmlada[shared?,static-libs?,static-pic?,${ADA_USEDEP}] |
122 |
@@ -23,7 +23,7 @@ DEPEND="${RDEPEND} |
123 |
dev-ada/gprbuild[${ADA_USEDEP}]" |
124 |
REQUIRED_USE="${ADA_REQUIRED_USE}" |
125 |
|
126 |
-S="${WORKDIR}"/${MYP}-src |
127 |
+S="${WORKDIR}"/${MYP} |
128 |
|
129 |
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) |