summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2020-04-12 16:54:31 -0700
committerZac Medico <zmedico@gentoo.org>2020-04-12 16:55:01 -0700
commitd291d12dfcfca0a5b8ed6bf3535488f50a94efc8 (patch)
treee16469153f6c2b553b83d83c30ba379bbdfb979c /sys-apps
parentsys-apps/portage: 2.3.99-r1 revbump for bug 700830 (diff)
downloadgentoo-d291d12dfcfca0a5b8ed6bf3535488f50a94efc8.tar.gz
gentoo-d291d12dfcfca0a5b8ed6bf3535488f50a94efc8.tar.bz2
gentoo-d291d12dfcfca0a5b8ed6bf3535488f50a94efc8.zip
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>
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/portage/portage-2.3.89-r2.ebuild (renamed from sys-apps/portage/portage-2.3.89-r1.ebuild)3
1 files changed, 3 insertions, 0 deletions
diff --git a/sys-apps/portage/portage-2.3.89-r1.ebuild b/sys-apps/portage/portage-2.3.89-r2.ebuild
index f3080d284367..82f329575e06 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