commit: d291d12dfcfca0a5b8ed6bf3535488f50a94efc8 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Sun Apr 12 23:54:31 2020 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Sun Apr 12 23:55:01 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d291d12d
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 <AT> gentoo.org> .../portage/{portage-2.3.89-r1.ebuild => portage-2.3.89-r2.ebuild} | 3 +++ 1 file changed, 3 insertions(+) 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 f3080d28436..82f329575e0 100644 --- 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
