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