From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 21 Apr 2020 03:45:58 +0000 (-0700)
Subject: sys-apps/portage: revbump to 2.3.99-r2 for bug 718578
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8dca612ca4c7e32e51bda62943a224b717decf33;p=gentoo.git

sys-apps/portage: revbump to 2.3.99-r2 for bug 718578

 #718578 ModuleNotFoundError for portage.util.netlink

Bug: https://bugs.gentoo.org/711148
Closes: https://bugs.gentoo.org/718578
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-r1.ebuild b/sys-apps/portage/portage-2.3.99-r2.ebuild
similarity index 96%
rename from sys-apps/portage/portage-2.3.99-r1.ebuild
rename to sys-apps/portage/portage-2.3.99-r2.ebuild
index 2b801329cf67..9944a9afe0fe 100644
--- a/sys-apps/portage/portage-2.3.99-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.99-r2.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( pypy3 python3_6 python3_7 python3_8 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
-inherit distutils-r1 linux-info systemd prefix
+inherit distutils-r1 epatch linux-info systemd prefix
 
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
@@ -78,7 +78,8 @@ prefix_src_archives() {
 
 TARBALL_PV=${PV}
 SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
+	https://github.com/gentoo/portage/commit/9738a404e876270cbdef2514f66915bce35d7435.patch -> portage-2.3.89-bug-718578.patch"
 
 pkg_pretend() {
 	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
@@ -89,6 +90,8 @@ pkg_pretend() {
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
+	epatch "${DISTDIR}/portage-2.3.89-bug-718578.patch"
+
 	# Apply 03efd1125214
 	sed -e '50s|"EMERGE_FROM", "EPREFIX",|"EMERGE_FROM", "ENV_UNSET", "EPREFIX",|' -i lib/portage/package/ebuild/_config/special_env_vars.py || die