From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1281696-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0CC181382C5 for <garchives@archives.gentoo.org>; Fri, 14 May 2021 06:31:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E660AE086B; Fri, 14 May 2021 06:31:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B96ECE086B for <gentoo-commits@lists.gentoo.org>; Fri, 14 May 2021 06:31:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CDFDE335D6E for <gentoo-commits@lists.gentoo.org>; Fri, 14 May 2021 06:31:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 27BA0643 for <gentoo-commits@lists.gentoo.org>; Fri, 14 May 2021 06:31:24 +0000 (UTC) From: "Alfredo Tupone" <tupone@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alfredo Tupone" <tupone@gentoo.org> Message-ID: <1620973856.18b5491049d641e38f0df0609f8dc6092ded3b20.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ada/libgpr/files/, dev-ada/libgpr/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ada/libgpr/Manifest dev-ada/libgpr/files/libgpr-2019-gentoo.patch dev-ada/libgpr/libgpr-2019-r1.ebuild dev-ada/libgpr/libgpr-2020-r1.ebuild X-VCS-Directories: dev-ada/libgpr/ dev-ada/libgpr/files/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: 18b5491049d641e38f0df0609f8dc6092ded3b20 X-VCS-Branch: master Date: Fri, 14 May 2021 06:31:24 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8edcb06c-2a5a-4598-bd74-405437e1bba2 X-Archives-Hash: 80241dfc1d876b7f93ee038239721da0 commit: 18b5491049d641e38f0df0609f8dc6092ded3b20 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Fri May 14 06:30:56 2021 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Fri May 14 06:30:56 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18b54910 dev-ada/libgpr: enable gnat_2020 Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> dev-ada/libgpr/Manifest | 1 - dev-ada/libgpr/files/libgpr-2019-gentoo.patch | 55 ---------------------- ...libgpr-2019-r1.ebuild => libgpr-2020-r1.ebuild} | 14 +++--- 3 files changed, 7 insertions(+), 63 deletions(-) diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest index 5936167a479..ec83579dfab 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 b7b9a2d3c87..00000000000 --- 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 similarity index 79% rename from dev-ada/libgpr/libgpr-2019-r1.ebuild rename to dev-ada/libgpr/libgpr-2020-r1.ebuild index 7906a8d27d4..f71361c4147 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 )