From: Zac Medico Date: Tue, 3 Mar 2020 09:15:17 +0000 (-0800) Subject: sys-apps/portage: stable revbump to 2.3.89-r1 for bug 711400 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4a96d5d727207cfd5ce35d9c897e59440ed3f1ce;p=gentoo.git sys-apps/portage: stable revbump to 2.3.89-r1 for bug 711400 #711400 emerge AttributeError: 'NoneType' object has no attribute 'depth' Bug: https://bugs.gentoo.org/706142 Bug: https://bugs.gentoo.org/711400 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Zac Medico --- diff --git a/sys-apps/portage/portage-2.3.89.ebuild b/sys-apps/portage/portage-2.3.89-r1.ebuild similarity index 97% rename from sys-apps/portage/portage-2.3.89.ebuild rename to sys-apps/portage/portage-2.3.89-r1.ebuild index 959994c33c8b..211204f0ae8a 100644 --- a/sys-apps/portage/portage-2.3.89.ebuild +++ b/sys-apps/portage/portage-2.3.89-r1.ebuild @@ -101,6 +101,9 @@ pkg_pretend() { python_prepare_all() { distutils-r1_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 + sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die if use gentoo-dev; then