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

[Alfredo Tupone]

commit:     5f6504cc8a6cd6890faedb00b9317bb5e1597ee4
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu May 20 17:17:50 2021 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu May 20 17:17:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f6504cc

dev-ada/libgpr: fix VariableScope

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

 dev-ada/libgpr/libgpr-2020-r1.ebuild | 6 +++---
 dev-ada/libgpr/libgpr-2020.ebuild    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-ada/libgpr/libgpr-2020-r1.ebuild 
b/dev-ada/libgpr/libgpr-2020-r1.ebuild
index 1ab635a5e86..9a3b8981ee3 100644
--- a/dev-ada/libgpr/libgpr-2020-r1.ebuild
+++ b/dev-ada/libgpr/libgpr-2020-r1.ebuild
@@ -29,7 +29,7 @@ S="${WORKDIR}"/${MYP}
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_configure() {
-       emake prefix="${D}"/usr setup
+       emake setup
 }
 
 src_compile() {
@@ -51,11 +51,11 @@ src_compile() {
 
 src_install() {
        if use static-libs; then
-               emake DESTDIR="${D}" libgpr.install.static
+               emake prefix="${D}"/usr libgpr.install.static
        fi
        for kind in shared static-pic; do
                if use ${kind}; then
-                       emake DESTDIR="${D}" libgpr.install.${kind}
+                       emake prefix="${D}"/usr libgpr.install.${kind}
                fi
        done
        rm -r "${D}"/usr/share/gpr/manifests || die

diff --git a/dev-ada/libgpr/libgpr-2020.ebuild 
b/dev-ada/libgpr/libgpr-2020.ebuild
index 3b4ca5795e9..ab41d067b56 100644
--- a/dev-ada/libgpr/libgpr-2020.ebuild
+++ b/dev-ada/libgpr/libgpr-2020.ebuild
@@ -29,7 +29,7 @@ S="${WORKDIR}"/${MYP}
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_configure() {
-       emake prefix="${D}"/usr setup
+       emake setup
 }
 
 src_compile() {
@@ -51,11 +51,11 @@ src_compile() {
 
 src_install() {
        if use static-libs; then
-               emake DESTDIR="${D}" libgpr.install.static
+               emake prefix="${D}"/usr libgpr.install.static
        fi
        for kind in shared static-pic; do
                if use ${kind}; then
-                       emake DESTDIR="${D}" libgpr.install.${kind}
+                       emake prefix="${D}"/usr libgpr.install.${kind}
                fi
        done
        rm -r "${D}"/usr/share/gpr/manifests || die