commit:     fb6dd4afe2540de3ae7de4b6d7ffdd776b14712b
Author:     Zac Medico <zachary.medico <AT> sony <DOT> com>
AuthorDate: Wed Jul  3 21:40:27 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Jul  3 21:49:28 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb6dd4af

sys-apps/portage: revbump to 2.3.68-r1

Suppress export error messages like this for eix-update:

/usr/lib/portage/python3.6/ebuild.sh: line 11: export: ___in_portage_iuse: not 
a function

Bug: https://bugs.gentoo.org/680810#c10
Bug: https://bugs.gentoo.org/689128#c3
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 sys-apps/portage/{portage-2.3.68.ebuild => portage-2.3.68-r1.ebuild} | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sys-apps/portage/portage-2.3.68.ebuild 
b/sys-apps/portage/portage-2.3.68-r1.ebuild
similarity index 98%
rename from sys-apps/portage/portage-2.3.68.ebuild
rename to sys-apps/portage/portage-2.3.68-r1.ebuild
index 841947dcfff..951420b89ea 100644
--- a/sys-apps/portage/portage-2.3.68.ebuild
+++ b/sys-apps/portage/portage-2.3.68-r1.ebuild
@@ -102,6 +102,10 @@ pkg_setup() {
 python_prepare_all() {
        distutils-r1_python_prepare_all
 
+       # apply f4aa49bc1ba2
+       sed -e 's|^export -n -f ___in_portage_iuse$|declare -F 
___in_portage_iuse >/dev/null \&\& \0|' \
+               -i bin/ebuild.sh || die
+
        if use gentoo-dev; then
                einfo "Disabling --dynamic-deps by default for gentoo-dev..."
                sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \

Reply via email to