[gentoo-commits] repo/gentoo:master commit in: dev-ada/gnatcoll-core/

["Alfredo Tupone" <tupone@gentoo.org>]

commit:     f2da2047db041bbe2a18af7a7a58fc3f66c8323b
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat May 22 10:40:13 2021 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat May 22 10:40:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2da2047

dev-ada/gnatcoll-core: enable gnat_2020, fix VariableScope

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 ...tcoll-core-2020.ebuild => gnatcoll-core-2020-r1.ebuild} | 14 +++++++-------
 dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild            | 10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2020-r1.ebuild
similarity index 84%
copy from dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild
copy to dev-ada/gnatcoll-core/gnatcoll-core-2020-r1.ebuild
index 40b7c90fb6f..625f0692fdc 100644
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-2020-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 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,7,8,9} gnat_2020 )
 inherit ada multiprocessing
 
 MYP=${P}-20200429-19B7C
@@ -14,7 +14,7 @@ SRC_URI="https://community.download.adacore.com/v1/c94f2ac914cb305f6bef174329fa0
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+shared static-libs static-pic"
 
 RDEPEND="
@@ -38,7 +38,7 @@ src_prepare() {
 }
 
 src_configure() {
-	emake prefix="${D}"/usr PROCESSORS=$(makeopts_jobs) setup
+	emake setup
 }
 
 src_compile() {
@@ -61,13 +61,13 @@ src_compile() {
 
 src_install() {
 	if use shared; then
-		emake install-relocatable
+		emake prefix="${D}"/usr install-relocatable
 	fi
 	if use static-pic; then
-		emake install-static-pic
+		emake prefix="${D}"/usr install-static-pic
 	fi
 	if use static-libs; then
-		emake install-static
+		emake prefix="${D}"/usr install-static
 	fi
 	rm -r "${D}"/usr/share/gpr/manifests || die
 	einstalldocs

diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild
index 40b7c90fb6f..142bfee5352 100644
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,7 +38,7 @@ src_prepare() {
 }
 
 src_configure() {
-	emake prefix="${D}"/usr PROCESSORS=$(makeopts_jobs) setup
+	emake setup
 }
 
 src_compile() {
@@ -61,13 +61,13 @@ src_compile() {
 
 src_install() {
 	if use shared; then
-		emake install-relocatable
+		emake prefix="${D}"/usr install-relocatable
 	fi
 	if use static-pic; then
-		emake install-static-pic
+		emake prefix="${D}"/usr install-static-pic
 	fi
 	if use static-libs; then
-		emake install-static
+		emake prefix="${D}"/usr install-static
 	fi
 	rm -r "${D}"/usr/share/gpr/manifests || die
 	einstalldocs