From: Zac Medico Date: Wed, 25 Mar 2020 19:23:25 +0000 (-0700) Subject: sys-apps/portage: Revbump to 2.3.96-r1 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ab3a65311eaae2242a5b04d06daec7daea90e5da;p=gentoo.git sys-apps/portage: Revbump to 2.3.96-r1 This applies a small fixup to the changes for bug 714480. Bug: https://bugs.gentoo.org/711148 Bug: https://bugs.gentoo.org/714480 See: https://gitweb.gentoo.org/proj/portage.git/commit/?id=2b3fc2be07ad897b7df6b77f79616c143a353275 Package-Manager: Portage-2.3.96, Repoman-2.3.21 Signed-off-by: Zac Medico --- diff --git a/sys-apps/portage/portage-2.3.96.ebuild b/sys-apps/portage/portage-2.3.96-r1.ebuild similarity index 98% rename from sys-apps/portage/portage-2.3.96.ebuild rename to sys-apps/portage/portage-2.3.96-r1.ebuild index 1e0dc18322be..3c6d08531c7f 100644 --- a/sys-apps/portage/portage-2.3.96.ebuild +++ b/sys-apps/portage/portage-2.3.96-r1.ebuild @@ -97,6 +97,9 @@ pkg_pretend() { python_prepare_all() { distutils-r1_python_prepare_all + # Apply 2b3fc2be07ad + sed -e '422s/return True/return (True, None)/' -i lib/portage/locks.py || die + sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die if use gentoo-dev; then