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 <zmedico@gentoo.org>

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 1e0dc18322bebf6396b4a90715f888d2593144de..3c6d08531c7fddb0d4bcb0006bc444c00e9946cc 100644 (file)
--- 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