From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 12 Apr 2020 23:40:37 +0000 (-0700)
Subject: sys-apps/portage: 2.3.99-r1 revbump for bug 700830
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=01b0693dd0c5a8d20591cea805cbe4c4988585b7;p=gentoo.git

sys-apps/portage: 2.3.99-r1 revbump for bug 700830

 #700830 fix ENV_UNSET for DISPLAY variable

Bug: https://bugs.gentoo.org/711148
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.99.ebuild b/sys-apps/portage/portage-2.3.99-r1.ebuild
similarity index 97%
rename from sys-apps/portage/portage-2.3.99.ebuild
rename to sys-apps/portage/portage-2.3.99-r1.ebuild
index 5d75a62bf454..2b801329cf67 100644
--- a/sys-apps/portage/portage-2.3.99.ebuild
+++ b/sys-apps/portage/portage-2.3.99-r1.ebuild
@@ -89,6 +89,9 @@ pkg_pretend() {
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
+	# Apply 03efd1125214
+	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