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: Wed, 03 Jul 2019 21:49:43
Message-Id: 1562190568.fb6dd4afe2540de3ae7de4b6d7ffdd776b14712b.zmedico@gentoo
1 commit: fb6dd4afe2540de3ae7de4b6d7ffdd776b14712b
2 Author: Zac Medico <zachary.medico <AT> sony <DOT> com>
3 AuthorDate: Wed Jul 3 21:40:27 2019 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 3 21:49:28 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb6dd4af
7
8 sys-apps/portage: revbump to 2.3.68-r1
9
10 Suppress export error messages like this for eix-update:
11
12 /usr/lib/portage/python3.6/ebuild.sh: line 11: export: ___in_portage_iuse: not a function
13
14 Bug: https://bugs.gentoo.org/680810#c10
15 Bug: https://bugs.gentoo.org/689128#c3
16 Package-Manager: Portage-2.3.68, Repoman-2.3.16
17 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
18
19 sys-apps/portage/{portage-2.3.68.ebuild => portage-2.3.68-r1.ebuild} | 4 ++++
20 1 file changed, 4 insertions(+)
21
22 diff --git a/sys-apps/portage/portage-2.3.68.ebuild b/sys-apps/portage/portage-2.3.68-r1.ebuild
23 similarity index 98%
24 rename from sys-apps/portage/portage-2.3.68.ebuild
25 rename to sys-apps/portage/portage-2.3.68-r1.ebuild
26 index 841947dcfff..951420b89ea 100644
27 --- a/sys-apps/portage/portage-2.3.68.ebuild
28 +++ b/sys-apps/portage/portage-2.3.68-r1.ebuild
29 @@ -102,6 +102,10 @@ pkg_setup() {
30 python_prepare_all() {
31 distutils-r1_python_prepare_all
32
33 + # apply f4aa49bc1ba2
34 + sed -e 's|^export -n -f ___in_portage_iuse$|declare -F ___in_portage_iuse >/dev/null \&\& \0|' \
35 + -i bin/ebuild.sh || die
36 +
37 if use gentoo-dev; then
38 einfo "Disabling --dynamic-deps by default for gentoo-dev..."
39 sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \