commit: c979fbf04b85ccf20759a45aec6fbba94afc827a Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Mon Mar 9 22:18:21 2020 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Mon Mar 9 22:21:44 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c979fbf0
app-emulation/libpod: fix network-sandbox for go-1.14 Closes: https://bugs.gentoo.org/711964 Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> app-emulation/libpod/libpod-1.8.0.ebuild | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/app-emulation/libpod/libpod-1.8.0.ebuild b/app-emulation/libpod/libpod-1.8.0.ebuild index 502e3dde382..27fe79a5b91 100644 --- a/app-emulation/libpod/libpod-1.8.0.ebuild +++ b/app-emulation/libpod/libpod-1.8.0.ebuild @@ -41,11 +41,15 @@ src_prepare() { # Disable installation of python modules here, since those are # installed by separate ebuilds. - sed -e '/^GIT_.*/d' \ - -e 's:GO111MODULE=off:GO111MODULE=on:' \ - -e 's/$(GO) build/$(GO) build -v -work -x/' \ - -e 's/^\(install:.*\) install\.python$/\1/' \ - -i Makefile || die + local makefile_sed_args=( + -e '/^GIT_.*/d' + -e 's/$(GO) build/$(GO) build -v -work -x/' + -e 's/^\(install:.*\) install\.python$/\1/' + ) + + has_version -b '>=dev-lang/go-1.14' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:') + + sed "${makefile_sed_args[@]}" -i Makefile || die sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \ -i hack/get_release_info.sh || die
