commit:     0b263754b766b509b59de39106371c002317897b
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 13 03:51:20 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Aug 13 04:00:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b263754

sys-apps/portage: 3.0.2-r1 revbump for bug 736912

 #736912 Tolerate broken or missing xml support in python

Bug: https://bugs.gentoo.org/733180
Bug: https://bugs.gentoo.org/736912
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 sys-apps/portage/{portage-3.0.2.ebuild => portage-3.0.2-r1.ebuild} | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sys-apps/portage/portage-3.0.2.ebuild 
b/sys-apps/portage/portage-3.0.2-r1.ebuild
similarity index 97%
rename from sys-apps/portage/portage-3.0.2.ebuild
rename to sys-apps/portage/portage-3.0.2-r1.ebuild
index a8cc814a841..b4e9ffe6cf8 100644
--- a/sys-apps/portage/portage-3.0.2.ebuild
+++ b/sys-apps/portage/portage-3.0.2-r1.ebuild
@@ -89,6 +89,9 @@ pkg_pretend() {
 python_prepare_all() {
        distutils-r1_python_prepare_all
 
+       # Apply 7d891b78ec906bbd73a43d83abd296350678f002 for bug 736912
+       sed -e 's|from xml.parsers.expat import ExpatError|try:\n\t\0\nexcept 
Exception:\n\tExpatError = SyntaxError|' -i lib/portage/xml/metadata.py || die
+
        sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i 
lib/portage/__init__.py || die
 
        if use gentoo-dev; then

Reply via email to