[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/

[Alfredo Tupone]

commit:     f62537c112bcf92c8e243e06a4b0a109b5c631d1
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 21 21:50:00 2021 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Dec 21 21:50:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f62537c1

dev-ada/gprbuild: use ${CHOST}-nm

Closes: https://bugs.gentoo.org/829656
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-ada/gprbuild/files/gprbuild-2021-nm.patch      | 11 ++++++++
 dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch    | 11 ++++++++
 ...build-22.0.0.ebuild => gprbuild-2021-r2.ebuild} | 33 ++++++++++------------
 ...ild-22.0.0.ebuild => gprbuild-22.0.0-r1.ebuild} |  5 +++-
 4 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/dev-ada/gprbuild/files/gprbuild-2021-nm.patch b/dev-ada/gprbuild/files/gprbuild-2021-nm.patch
new file mode 100644
index 000000000000..2bf41a8e1b07
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild-2021-nm.patch
@@ -0,0 +1,11 @@
+--- a/share/gprconfig/linker.xml	2021-12-21 21:36:45.306813518 +0100
++++ b/share/gprconfig/linker.xml	2021-12-21 22:20:21.642668870 +0100
+@@ -128,7 +128,7 @@
+       <host name="^i686.*-linux.*$" />
+     </hosts>
+     <config>
+-   for Object_Lister use ("nm", "-g");
++   for Object_Lister use ("${HOST(Ada)}-nm", "-g");
+    for Object_Lister_Matcher use " [TDRB] (.*)";
+ 
+    LDFLAGS := External_As_List ("LDFLAGS", " ");

diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch b/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch
new file mode 100644
index 000000000000..4455e8befffa
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch
@@ -0,0 +1,11 @@
+--- a/share/gprconfig/linker.xml	2021-12-21 22:36:01.054738486 +0100
++++ b/share/gprconfig/linker.xml	2021-12-21 22:36:59.973738600 +0100
+@@ -128,7 +128,7 @@
+       <host name="^i686.*-linux.*$" />
+     </hosts>
+     <config>
+-   for Object_Lister use ("nm", "-g");
++   for Object_Lister use ("${HOST(Ada)}-nm", "-g");
+    for Object_Lister_Matcher use " [TDRB] (.*)";
+ 
+    package Linker is

diff --git a/dev-ada/gprbuild/gprbuild-22.0.0.ebuild b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild
similarity index 71%
copy from dev-ada/gprbuild/gprbuild-22.0.0.ebuild
copy to dev-ada/gprbuild/gprbuild-2021-r2.ebuild
index 6de6ca467e32..40a16cb9b2d4 100644
--- a/dev-ada/gprbuild/gprbuild-22.0.0.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild
@@ -3,22 +3,21 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_2021 )
+ADA_COMPAT=( gnat_202{0..1} )
 
 inherit ada multiprocessing
 
-XMLADA=xmlada-${PV}
-GPRCONFIG_KB=gprconfig_kb-${PV}
+MYP=${P}-${PV}0519-19A34-src
+ID=23a77a37247ff811609e23a0a271f445c299fc8f
+XMLADA=xmlada-${PV}-${PV}0518-19D50-src
+XMLADAID=6a2cf72f308cc787926b12ddc20993fcf2b8ea79
+ADAMIRROR=https://community.download.adacore.com/v1
 
 DESCRIPTION="Multi-Language Management"
 HOMEPAGE="http://libre.adacore.com/"
 SRC_URI="
-	https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-		-> ${P}.tar.gz
-	https://github.com/AdaCore/xmlada/archive/refs/tags/v${PV}.tar.gz
-		-> ${XMLADA}.tar.gz
-	https://github.com/AdaCore/gprconfig_kb/archive/refs/tags/v${PV}.tar.gz
-		-> ${GPRCONFIG_KB}.tar.gz"
+	${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz
+	${ADAMIRROR}/${XMLADAID}?filename=${XMLADA}.tar.gz -> ${XMLADA}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -27,16 +26,15 @@ IUSE=""
 DEPEND="${ADA_DEPS}"
 RDEPEND="${DEPEND}"
 
+S="${WORKDIR}"/${MYP}
+
 REQUIRED_USE="${ADA_REQUIRED_USE}"
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-nm.patch
+)
 
 src_prepare() {
-	kb_src=../${GPRCONFIG_KB}
-
-	# Install the gprconfig knowledge base
-	rm -rf share/gprconfig
-	cp -r "$kb_src"/db share/gprconfig || die
-
 	default
 	sed -i \
 		-e "s:@VER@:${GCC_PV}:g" \
@@ -75,8 +73,7 @@ src_install() {
 	exeinto /usr/libexec/gprbuild
 	doexe ${lib_progs}
 	insinto /usr/share/gprconfig
-	doins share/gprconfig/*.xml
-	doins share/gprconfig/*.ent
+	doins share/gprconfig/*
 	insinto /usr/share/gpr
 	doins share/_default.gpr
 	einstalldocs

diff --git a/dev-ada/gprbuild/gprbuild-22.0.0.ebuild b/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild
similarity index 96%
rename from dev-ada/gprbuild/gprbuild-22.0.0.ebuild
rename to dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild
index 6de6ca467e32..2a07d5e4d71d 100644
--- a/dev-ada/gprbuild/gprbuild-22.0.0.ebuild
+++ b/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild
@@ -28,7 +28,10 @@ DEPEND="${ADA_DEPS}"
 RDEPEND="${DEPEND}"
 
 REQUIRED_USE="${ADA_REQUIRED_USE}"
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-nm.patch
+)
 
 src_prepare() {
 	kb_src=../${GPRCONFIG_KB}