From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/libpod/
Date: Mon, 9 Mar 2020 22:21:53 +0000 (UTC) [thread overview]
Message-ID: <1583792504.c979fbf04b85ccf20759a45aec6fbba94afc827a.zmedico@gentoo> (raw)
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
next reply other threads:[~2020-03-09 22:21 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-09 22:21 Zac Medico [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-01-18 1:11 [gentoo-commits] repo/gentoo:master commit in: app-emulation/libpod/ Zac Medico
2020-12-29 18:03 Zac Medico
2020-12-29 0:03 Zac Medico
2020-09-23 16:12 Zac Medico
2020-09-23 5:40 Zac Medico
2020-08-30 0:12 Zac Medico
2020-08-29 22:45 Sam James
2020-07-31 21:06 Zac Medico
2020-07-23 18:23 Zac Medico
2020-07-16 0:47 Zac Medico
2020-06-28 20:53 Zac Medico
2020-06-20 3:26 Zac Medico
2020-06-09 23:02 Zac Medico
2020-06-09 23:02 Zac Medico
2020-05-25 22:53 Zac Medico
2020-04-19 22:57 Zac Medico
2020-04-19 22:57 Zac Medico
2020-04-05 19:41 Zac Medico
2020-04-02 0:49 Zac Medico
2020-02-08 3:17 Zac Medico
2020-01-19 21:22 Zac Medico
2020-01-19 21:17 Zac Medico
2020-01-18 0:59 Zac Medico
2019-12-13 22:26 Zac Medico
2019-12-06 8:05 Zac Medico
2019-11-26 4:26 Zac Medico
2019-11-24 19:46 Zac Medico
2019-11-15 21:38 Zac Medico
2019-11-09 22:52 Zac Medico
2019-11-09 22:37 Zac Medico
2019-11-03 21:41 Zac Medico
2019-10-18 5:30 Zac Medico
2019-09-19 3:37 Zac Medico
2019-09-19 3:37 Zac Medico
2019-09-07 0:34 Zac Medico
2019-08-21 19:45 Zac Medico
2019-07-18 19:48 Zac Medico
2019-06-10 17:51 Zac Medico
2019-06-01 6:16 Zac Medico
2019-06-01 6:10 Zac Medico
2019-05-28 23:47 Zac Medico
2019-04-11 22:53 Zac Medico
2019-04-11 21:42 Zac Medico
2019-03-13 16:52 Zac Medico
2019-02-19 19:45 Zac Medico
2019-02-17 2:44 Zac Medico
2019-01-07 10:16 Zac Medico
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1583792504.c979fbf04b85ccf20759a45aec6fbba94afc827a.zmedico@gentoo \
--to=zmedico@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox