Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/
Date: Fri, 28 Dec 2018 18:23:49
Message-Id: 1546021149.97e55f75067a87c7dfd46d1a139cbd4e01bc70b9.zmedico@gentoo
1 commit: 97e55f75067a87c7dfd46d1a139cbd4e01bc70b9
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 28 18:18:34 2018 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 28 18:19:09 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97e55f75
7
8 sys-apps/portage: 2.3.53-r1 revbump for bug 673900
9
10 Temporarily disable new FEATURES that require unshare, since
11 they may not fail gracefully in some cases.
12
13 Bug: https://bugs.gentoo.org/673900
14 Package-Manager: Portage-2.3.53, Repoman-2.3.12
15 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
16
17 .../portage/{portage-2.3.53.ebuild => portage-2.3.53-r1.ebuild} | 7 +++++++
18 1 file changed, 7 insertions(+)
19
20 diff --git a/sys-apps/portage/portage-2.3.53.ebuild b/sys-apps/portage/portage-2.3.53-r1.ebuild
21 similarity index 97%
22 rename from sys-apps/portage/portage-2.3.53.ebuild
23 rename to sys-apps/portage/portage-2.3.53-r1.ebuild
24 index da25940d204..749f0d8ed97 100644
25 --- a/sys-apps/portage/portage-2.3.53.ebuild
26 +++ b/sys-apps/portage/portage-2.3.53-r1.ebuild
27 @@ -95,6 +95,13 @@ pkg_setup() {
28 python_prepare_all() {
29 distutils-r1_python_prepare_all
30
31 + # Bug 673900 - FEATURES that require unshare may fail
32 + # ungracefully if unshare support is somehow broken.
33 + sed -e 's: ipc-sandbox::' \
34 + -e 's:network-sandbox ::' \
35 + -e 's: pid-sandbox::' \
36 + -i cnf/make.globals || die
37 +
38 if use gentoo-dev; then
39 einfo "Disabling --dynamic-deps by default for gentoo-dev..."
40 sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \