From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 55DB5138350 for ; Mon, 9 Mar 2020 22:21:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 82938E08C9; Mon, 9 Mar 2020 22:21:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 66E3BE08C9 for ; Mon, 9 Mar 2020 22:21:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 18ED334F32F for ; Mon, 9 Mar 2020 22:21:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B8A4E102 for ; Mon, 9 Mar 2020 22:21:53 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1583792504.c979fbf04b85ccf20759a45aec6fbba94afc827a.zmedico@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/libpod/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/libpod/libpod-1.8.0.ebuild X-VCS-Directories: app-emulation/libpod/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: c979fbf04b85ccf20759a45aec6fbba94afc827a X-VCS-Branch: master Date: Mon, 9 Mar 2020 22:21:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2fcbd84e-a9f6-4287-8ff7-38f6c9e0f6d9 X-Archives-Hash: 2b8b89ec76af9c5a81db5f382a2c5a43 commit: c979fbf04b85ccf20759a45aec6fbba94afc827a Author: Zac Medico gentoo org> AuthorDate: Mon Mar 9 22:18:21 2020 +0000 Commit: Zac Medico gentoo 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 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