diff options
| -rw-r--r-- | dev-ada/libgpr/Manifest | 1 | ||||
| -rw-r--r-- | dev-ada/libgpr/files/libgpr-2019-gentoo.patch | 55 | ||||
| -rw-r--r-- | dev-ada/libgpr/libgpr-2020-r1.ebuild (renamed from dev-ada/libgpr/libgpr-2019-r1.ebuild) | 14 |
3 files changed, 7 insertions, 63 deletions
diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest index 5936167a4799..ec83579dfab4 100644 --- a/dev-ada/libgpr/Manifest +++ b/dev-ada/libgpr/Manifest @@ -1,2 +1 @@ -DIST gprbuild-2019-20190517-194D8-src.tar.gz 2507961 BLAKE2B 0f70d94cb0db9ddc1dd308862aaa305a91965a62a936cfbdde2ae9f3f735f0cc3d69596b09da4b979a1d7923087ab0ec5cf2d6541551f057b5e8e0c499065a90 SHA512 0388d7e6cdf625fef40b33da764091b3283dd88714c64ecfad4b5e99253f183b1a9b717c19281e6d45cc4277a05fadb2e2ace394d6f30638664b66c97123052b DIST gprbuild-2020-20200429-19BD2-src.tar.gz 2489399 BLAKE2B 3a036cb40bbe5522af63c376a672384093901b44df6fd74013f1eff9d269c2f5056224ab5e7d59b6f3cf126cd14dd30420056b09e887851351462de59f700e3a SHA512 d2ff6a5d8281d332a31533c7a5744b6169fd250c9086373fd658486c1e529564d9830b9ef3b2dfcbec5f8c1ba50d244a9eb45bf8fdccd53f8b711dcf29258dfd diff --git a/dev-ada/libgpr/files/libgpr-2019-gentoo.patch b/dev-ada/libgpr/files/libgpr-2019-gentoo.patch deleted file mode 100644 index b7b9a2d3c870..000000000000 --- a/dev-ada/libgpr/files/libgpr-2019-gentoo.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- a/gpr/src/gpr-env.adb 2017-11-13 22:16:53.349083426 +0100 -+++ b/gpr/src/gpr-env.adb 2017-11-13 22:17:22.692590351 +0100 -@@ -1948,6 +1948,8 @@ - - end if; - -+ Add_Directories (Self, "/usr/share/gpr"); -+ - if Gpr_Prj_Path.all /= "" then - Add_Directories (Self, Gpr_Prj_Path.all); - end if; ---- a/gpr/src/gpr-names.ads 2017-11-19 13:09:18.947527738 +0100 -+++ b/gpr/src/gpr-names.ads 2017-11-19 13:10:08.125654595 +0100 -@@ -27,6 +27,8 @@ - Name_Buffer : String (1 .. 1_000_000); - Name_Len : Natural := 0; - -+ Last_Id : Name_Id := Name_Id'First; -+ - procedure Get_Name_String (Id : Name_Id); - procedure Get_Name_String (Id : Unit_Name_Type); - procedure Get_Name_String (Id : File_Name_Type); ---- a/gpr/src/gpr-names.adb 2017-11-19 13:10:27.674316703 +0100 -+++ b/gpr/src/gpr-names.adb 2017-11-19 13:14:38.360963627 +0100 -@@ -354,6 +354,8 @@ - - Name_Chars.Append (ASCII.NUL); - -+ Last_Id := Name_Entries.Last; -+ - return Name_Entries.Last; - end Name_Enter; - -@@ -427,6 +429,8 @@ - - Name_Chars.Append (ASCII.NUL); - -+ Last_Id := Name_Entries.Last; -+ - return Name_Entries.Last; - end Name_Find; - ---- a/gpr/src/gpr-snames.adb 2017-11-19 13:12:41.592995718 +0100 -+++ b/gpr/src/gpr-snames.adb 2017-11-19 13:16:31.980979696 +0100 -@@ -53,6 +53,10 @@ - return; - end if; - -+ if Last_Id = Name_Id'First then -+ Add_Name (""); -+ end if; -+ - Add_Name ("a"); - Add_Name ("b"); - Add_Name ("c"); diff --git a/dev-ada/libgpr/libgpr-2019-r1.ebuild b/dev-ada/libgpr/libgpr-2020-r1.ebuild index 7906a8d27d4f..f71361c41475 100644 --- a/dev-ada/libgpr/libgpr-2019-r1.ebuild +++ b/dev-ada/libgpr/libgpr-2020-r1.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -ADA_COMPAT=( gnat_201{6,7,8,9} ) +ADA_COMPAT=( gnat_201{6..9} gnat_2020 ) inherit ada toolchain-funcs multiprocessing -MYP=gprbuild-${PV}-20190517-194D8 +MYP=gprbuild-${PV}-20200429-19BD2-src DESCRIPTION="Ada library to handle GPRbuild project files" HOMEPAGE="http://libre.adacore.com/" -SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf8e8031e87a8f1d425093 - -> ${MYP}-src.tar.gz" +SRC_URI="https://community.download.adacore.com/v1/408ec35c3bb86bd227db3da55d3e1e0c572a56e3?filename=${MYP}.tar.gz + -> ${MYP}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="+shared static-libs static-pic" RDEPEND="dev-ada/xmlada[shared?,static-libs?,static-pic?,${ADA_USEDEP}] @@ -23,7 +23,7 @@ DEPEND="${RDEPEND} dev-ada/gprbuild[${ADA_USEDEP}]" REQUIRED_USE="${ADA_REQUIRED_USE}" -S="${WORKDIR}"/${MYP}-src +S="${WORKDIR}"/${MYP} PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) |