gentoo resync : 14.05.2020

3 files changed, 40 insertions, 2 deletions

diff --git a/app-portage/elogviewer/Manifest b/app-portage/elogviewer/Manifest
index d93cb47d5b08..ec72dcb35a16 100644
--- a/app-portage/elogviewer/Manifest
+++ b/app-portage/elogviewer/Manifest
@@ -1,5 +1,6 @@
+AUX elogviewer-3.0-segfault.patch 1145 BLAKE2B 0511df907edb047ce89966d68d0bc3191e3545ca6af372485601afe7446b812573429e4d4ef4df79fb4cd3104207b3b6482a9ec196250147982772b5b1c4c30c SHA512 98f47e20c796384a04606976bd551562c152877c8c3e41268b785feeee45f1021df9f5dda90ab148949e44b17cbc6160a014f4a0b8f831cd9128dfd851ab01da
 DIST elogviewer-2.9.tar.gz 24157 BLAKE2B ff527c0198e86f7be15fce3f25f0e9677b6911cef72cfdc1f582c62f534fc15adac8c2cf612475f174561dd46b489dcaf819c8ccd1b5893adeb7a6c085ce11c2 SHA512 e5781eeaf663fafa680b0620c4a6aec63afffd05c1cb4cb5362e9eca3a35c85550ee295a6b753155b0392d69442068cf155c3ead872c457e5a3cdbcd59b1ab2e
 DIST elogviewer-3.0.tar.gz 28349 BLAKE2B 44f3ca5b28d075bb8349450cc817fd8ccdd1d1dc7eb948a9d65ab3b423191eca04cc479b2d6bec0bf6bc7f1120eccd257fdf61bb736919129ee756c2f4bd4366 SHA512 7eb59849a06632053ee0f7d1d76d9848220dbb8ad48d04c80fea5e64304f86c1a99987f525c6df682c832bd8453e07781a5c95ad2dee0539e954400730f47e36
 EBUILD elogviewer-2.9-r1.ebuild 1763 BLAKE2B 86d38970ae69a6c698e200364048ac7d54c7c459d47a53e3c192efa5e0ed10d169d5a77a388884873d1980dde59c7cc515db4cfa91bf010343499e098614e3da SHA512 33d3557e382233aac8add44b6b4b306cbc36d4e38e13b0370f71ee22055bcf1317b74bbf2d1ba6b3ed2ed0681a88a1e0160bce72fb3f5d1696551fd840976cc5
-EBUILD elogviewer-3.0-r1.ebuild 1772 BLAKE2B 01f4332f0f3c92d2641434dbbb352b568fc8e5fd885eb7eaac91cac7bb7fc232768cc0d5a26cf0aefde45367f4b12171a9d5e1e1e488074328aa61d6bf5455d9 SHA512 e489129cea55144f62bddd192842a9afbae0568e862dfde959b4ed6853e69bcde1dc1786c8200ccef52d0d70813dd7a566c5e9ae676040f9cacd33e85fa3e62d
+EBUILD elogviewer-3.0-r2.ebuild 1827 BLAKE2B 1cd1304da1087a41f182cba52ad49ccbfdd5769635a3919951f370d494ea177336d1e16ca5c9a850c38950d6a0de90e646fa2b105cf71df9e5e6ae1fc15e3006 SHA512 80c5355b63bf08752f795ee24178fb27a2a03a1ace735988f150e3045ac27433a7e6287da12039e5f102697069bccdbabc39ef0165b75f719d08fbb59b4ddbb4
 MISC metadata.xml 402 BLAKE2B 4cc6503c5c74f4f0883d2c167bb06515878ad1324931d38d9402b463c774b009d14ad2ec5b8d2611ea361e0793ffa3b4d463e88173f2f08dd0b1c0a988bed44a SHA512 77f982c8b1070592bcea3b91ae6e4c2fd815c5be0a63b7160793f7e7fbd1b1e60c3e3a993da1e7d2933b22ca621d6320955f7ac360b7ed09dc04a149ee32d567
diff --git a/app-portage/elogviewer/elogviewer-3.0-r1.ebuild b/app-portage/elogviewer/elogviewer-3.0-r2.ebuild
index aca7afc730bb..1ead5942775f 100644
--- a/app-portage/elogviewer/elogviewer-3.0-r1.ebuild
+++ b/app-portage/elogviewer/elogviewer-3.0-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Synss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -44,6 +44,9 @@ To operate properly this software needs the directory
 ${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage.
 To start the software as a user, add yourself to the portage group."
 
+PATCHES=( "${FILESDIR}/elogviewer-3.0-segfault.patch"
+)
+
 src_compile() {
 	rm -f Makefile
 }
diff --git a/app-portage/elogviewer/files/elogviewer-3.0-segfault.patch b/app-portage/elogviewer/files/elogviewer-3.0-segfault.patch
new file mode 100644
index 000000000000..cc67a0d6f198
--- /dev/null
+++ b/app-portage/elogviewer/files/elogviewer-3.0-segfault.patch
@@ -0,0 +1,34 @@
+--- a/elogviewer.py	2020-05-08 20:23:04.419257166 -0700
++++ b/elogviewer.py	2020-05-08 20:23:30.436359552 -0700
+@@ -255,15 +255,22 @@
+         return "</h2>"
+ 
+     def parse(self, line):
+-        eclass, stage = line.split(":")
+-        self.context.eclass = {
+-            "ERROR": EClass.Error,
+-            "WARN": EClass.Warning,
+-            "LOG": EClass.Log,
+-            "INFO": EClass.Info,
+-            "QA": EClass.QA,
+-        }[eclass]
+-        return "{}: {}".format(self.context.eclass.name, stage)
++        if not line:
++            return
++        parts = line.split(":")
++        if len(parts) == 2:
++            eclass, stage = parts[0:2]
++            self.context.eclass = {
++                "ERROR": EClass.Error,
++                "WARN": EClass.Warning,
++                "LOG": EClass.Log,
++                "INFO": EClass.Info,
++                "QA": EClass.QA,
++            }[eclass]
++            return "{}: {}".format(self.context.eclass.name, stage)
++        elif len(parts) > 2:
++            # Return an empty string, eclass and stage are populated anyway
++            return "" 
+ 
+ 
+ class BodyState(AbstractState):