[gentoo-commits] repo/gentoo:master commit in: app-emulation/runc/

[Georgy Yakovlev]

commit:     db01e788666a794dd6746686a7810efe59b75816
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu May 13 09:58:55 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Thu May 13 10:41:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db01e788

app-emulation/runc: fix variables

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 app-emulation/runc/runc-1.0.0_rc10-r1.ebuild | 14 ++++++++------
 app-emulation/runc/runc-1.0.0_rc92.ebuild    | 14 ++++++++------
 app-emulation/runc/runc-1.0.0_rc93.ebuild    | 16 +++++++++-------
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/app-emulation/runc/runc-1.0.0_rc10-r1.ebuild 
b/app-emulation/runc/runc-1.0.0_rc10-r1.ebuild
index 9f60bd86db1..0a433baafd1 100644
--- a/app-emulation/runc/runc-1.0.0_rc10-r1.ebuild
+++ b/app-emulation/runc/runc-1.0.0_rc10-r1.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
@@ -40,9 +40,9 @@ RESTRICT+=" test"
 
 src_compile() {
        # Taken from app-emulation/docker-1.7.0-r1
-       export CGO_CFLAGS="-I${ROOT}/usr/include"
+       export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
        export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
-               -L${ROOT}/usr/$(get_libdir)"
+               -L${ESYSROOT}/usr/$(get_libdir)"
 
        # build up optional flags
        local options=(
@@ -54,11 +54,8 @@ src_compile() {
        )
 
        myemakeargs=(
-               BINDIR="${ED}/usr/bin"
                BUILDTAGS="${options[*]}"
                COMMIT=${RUNC_COMMIT}
-               DESTDIR="${ED}"
-               PREFIX="${ED}/usr"
                GOPATH="${S}"
                -C "src/${EGO_PN}"
        )
@@ -67,6 +64,11 @@ src_compile() {
 }
 
 src_install() {
+       myemakeargs+=(
+               PREFIX="${ED}/usr"
+               BINDIR="${ED}/usr/bin"
+               MANDIR="${ED}/usr/share/man"
+       )
        emake "${myemakeargs[@]}" install install-man install-bash
 
        local DOCS=( src/"${EGO_PN}"/{README.md,PRINCIPLES.md,docs/.} )

diff --git a/app-emulation/runc/runc-1.0.0_rc92.ebuild 
b/app-emulation/runc/runc-1.0.0_rc92.ebuild
index fe79682ba08..35e4c457ae5 100644
--- a/app-emulation/runc/runc-1.0.0_rc92.ebuild
+++ b/app-emulation/runc/runc-1.0.0_rc92.ebuild
@@ -42,9 +42,9 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 src_compile() {
        # Taken from app-emulation/docker-1.7.0-r1
-       export CGO_CFLAGS="-I${ROOT}/usr/include"
+       export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
        export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
-               -L${ROOT}/usr/$(get_libdir)"
+               -L${ESYSROOT}/usr/$(get_libdir)"
 
        # build up optional flags
        local options=(
@@ -56,17 +56,19 @@ src_compile() {
        )
 
        myemakeargs=(
-               BINDIR="${ED}/usr/bin"
                BUILDTAGS="${options[*]}"
-               COMMIT=${RUNC_COMMIT}
-               DESTDIR="${ED}"
-               PREFIX="${ED}/usr"
+               COMMIT="${RUNC_COMMIT}"
        )
 
        emake "${myemakeargs[@]}" runc man
 }
 
 src_install() {
+       myemakeargs+=(
+               PREFIX="${ED}/usr"
+               BINDIR="${ED}/usr/bin"
+               MANDIR="${ED}/usr/share/man"
+       )
        emake "${myemakeargs[@]}" install install-man install-bash
 
        local DOCS=( README.md PRINCIPLES.md docs/. )

diff --git a/app-emulation/runc/runc-1.0.0_rc93.ebuild 
b/app-emulation/runc/runc-1.0.0_rc93.ebuild
index f89d4a1ce27..316f720fc29 100644
--- a/app-emulation/runc/runc-1.0.0_rc93.ebuild
+++ b/app-emulation/runc/runc-1.0.0_rc93.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
@@ -42,9 +42,9 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 src_compile() {
        # Taken from app-emulation/docker-1.7.0-r1
-       export CGO_CFLAGS="-I${ROOT}/usr/include"
+       export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
        export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
-               -L${ROOT}/usr/$(get_libdir)"
+               -L${ESYSROOT}/usr/$(get_libdir)"
 
        # build up optional flags
        local options=(
@@ -54,17 +54,19 @@ src_compile() {
        )
 
        myemakeargs=(
-               BINDIR="/usr/bin"
                BUILDTAGS="${options[*]}"
-               COMMIT=${RUNC_COMMIT}
-               DESTDIR="${ED}"
-               PREFIX="/usr"
+               COMMIT="${RUNC_COMMIT}"
        )
 
        emake "${myemakeargs[@]}" runc man
 }
 
 src_install() {
+       myemakeargs+=(
+               PREFIX="${ED}/usr"
+               BINDIR="${ED}/usr/bin"
+               MANDIR="${ED}/usr/share/man"
+       )
        emake "${myemakeargs[@]}" install install-man install-bash
 
        local DOCS=( README.md PRINCIPLES.md docs/. )