sys-apps/portage: stable 2.3.89-r2 revbump for bug 700830

 #700830 fix ENV_UNSET for DISPLAY variable

Bug: https://bugs.gentoo.org/706142
Bug: https://bugs.gentoo.org/700830
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Zac Medico <zmedico@gentoo.org>

diff --git a/sys-apps/portage/portage-2.3.89-r1.ebuild b/sys-apps/portage/portage-2.3.89-r2.ebuild
similarity index 97%
rename from sys-apps/portage/portage-2.3.89-r1.ebuild
rename to sys-apps/portage/portage-2.3.89-r2.ebuild
index f3080d284367ce9c8b1f0f3cdcc00608d88a2af6..82f329575e06d8226fbc795bc16f2fb97f7d3b76 100644 (file)
--- a/sys-apps/portage/portage-2.3.89-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.89-r2.ebuild
@@ -96,6 +96,9 @@ python_prepare_all() {
        # Apply e762752a8bf5c19e0d6d7b22de86306bfa4270ba for bug 711400.
        sed -e 's|\(if\) \(graph_interface.want_update_pkg(parent, avail_pkg):\)|\1 parent is not None and \2|' -i lib/portage/dep/dep_check.py || die
 
+       # Apply 5570a96ddc859851036035baa4da65df2daa51a0 for bug 700830.
+       sed -e '50s|"EMERGE_FROM", "EPREFIX",|"EMERGE_FROM", "ENV_UNSET", "EPREFIX",|' -i lib/portage/package/ebuild/_config/special_env_vars.py || die
+
        sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
 
        if use gentoo-dev; then