[gentoo-commits] repo/gentoo:master commit in: app-portage/elogviewer/, app-portage/elogviewer/files/
commit: a7d3a01ae62b55d4e4f0ada9b8b5a9466565371d
Author: Brian Dolbec gentoo org>
AuthorDate: Sat May 9 03:46:35 2020 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat May 9 03:48:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7d3a01a
app-portage/elogviewer: Revision bump 3.0, add patch
Add a patch to fix a HeaderState.parse segfault for a newer line format
Bug: https://bugs.gentoo.org/721522
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Brian Dolbec gentoo.org>
app-portage/elogviewer/elogviewer-3.0-r2.ebuild| 69 ++
.../elogviewer/files/elogviewer-3.0-segfault.patch | 34 +++
2 files changed, 103 insertions(+)
diff --git a/app-portage/elogviewer/elogviewer-3.0-r2.ebuild
b/app-portage/elogviewer/elogviewer-3.0-r2.ebuild
new file mode 100644
index 000..f733ba8a7fe
--- /dev/null
+++ b/app-portage/elogviewer/elogviewer-3.0-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISABLE_AUTOFORMATTING=true
+
+inherit desktop python-single-r1 readme.gentoo-r1
+
+DESCRIPTION="Elog viewer for Gentoo"
+HOMEPAGE="https://sourceforge.net/projects/elogviewer;
+SRC_URI="https://github.com/Synss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
+ >=sys-apps/portage-2.1[${PYTHON_MULTI_USEDEP}]
+ ')
+ $(python_gen_cond_dep 'dev-python/enum34[${PYTHON_MULTI_USEDEP}]'
python2_7)
+"
+DEPEND="${RDEPEND}
+ $(python_gen_cond_dep '
+ dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+ ')
+"
+
+DOC_CONTENTS="In order to use this software, you need to activate
+Portage's elog features. Required is
+ PORTAGE_ELOG_SYSTEM=\"save\"
+and at least one of
+ PORTAGE_ELOG_CLASSES=\"warn error info log qa\"
+More information on the elog system can be found in
+/usr/share/portage/config/make.conf.example
+
+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
+}
+
+src_install() {
+ python_newscript elogviewer.py elogviewer
+
+ make_desktop_entry ${PN} ${PN} ${PN} System
+
+ doman elogviewer.1
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+
+ ewarn "The elogviewer's configuration file is now saved in:"
+ ewarn "~/.config/elogviewer/ (was ~/.config/Mathias\ Laurin/)."
+ ewarn "Please migrate any user specific settings to the new config
file."
+}
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 000..cc67a0d6f19
--- /dev/null
+++ b/app-portage/elogviewer/files/elogviewer-3.0-segfault.patch
@@ -0,0 +1,34 @@
+--- a/elogviewer.py2020-05-08 20:23:04.419257166 -0700
b/elogviewer.py2020-05-08 20:23:30.436359552 -0700
+@@ -255,15 +255,22 @@
+ return ""
+
+ 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):
[gentoo-commits] repo/gentoo:master commit in: app-portage/elogviewer/, app-portage/elogviewer/files/
commit: b0a893d6d0d0f259fc9a29859deb45b571fede00
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu May 10 11:58:12 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu May 10 14:48:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0a893d6
app-portage/elogviewer: Drop old
Package-Manager: Portage-2.3.36, Repoman-2.3.9
app-portage/elogviewer/Manifest| 3 --
app-portage/elogviewer/elogviewer-0.6.2-r3.ebuild | 57 -
app-portage/elogviewer/elogviewer-2.1-r1.ebuild| 49 --
app-portage/elogviewer/elogviewer-2.1-r2.ebuild| 49 --
app-portage/elogviewer/elogviewer-2.6-r1.ebuild| 50 --
app-portage/elogviewer/elogviewer-2.6-r2.ebuild| 59 --
app-portage/elogviewer/elogviewer-2.6.ebuild | 48 --
.../files/elogviewer-0.6.2-missing_newline.patch | 23 -
8 files changed, 338 deletions(-)
diff --git a/app-portage/elogviewer/Manifest b/app-portage/elogviewer/Manifest
index f3698a79f2a..7a7e855c280 100644
--- a/app-portage/elogviewer/Manifest
+++ b/app-portage/elogviewer/Manifest
@@ -1,4 +1 @@
-DIST elogviewer-0.6.2.tar.gz 13904 BLAKE2B
9612fafd14e1561a1172fa45aa44a3dda19ccb74ce56b8dfa6f8e6cd2103c80a34e278a3ea788a26b64da0d8deeb6b2b7cfdeb73cbc1d791629ce40e7bbfc4bd
SHA512
dccf4dffb87fefb7d9e0609b3312d63b73c1b9c5933819c38b775b049e222687e9da06e63fe8194560f4bb631fa586b4746af9e0a7575eefa782b57d9c1c6e04
-DIST elogviewer-2.1.tar.gz 14968 BLAKE2B
027ed77deafa3646c2d20e9f7f048d723178ccef84d07839c814e10ab9047ff997917cc5704d73a48a4b56da8f93bebb46c6701ca985c10c5240550e4dcf607c
SHA512
27a34ce67e16a51055246b7169c11c248310b2a1d987018938094301b2602839e48909e3224f7d791343bb691de8e2f0ca7b00bd1477e2b3b43d61a24b4e688f
-DIST elogviewer-2.6.tar.gz 16093 BLAKE2B
9b8b22e6e2ae772d2051a528867b139d33557279ab8349270afd497031599cbec27313287cda4cfa48529973672e4dbd28e4e51f29b1922380ece30980ae3279
SHA512
1ca43c0ddc7dcab6a9e753644866b0a8ec8ddb5a56d2b8a25ab06f9ee1fc759910ef7af6257c3c98b886700121f078409931aada67b2aad03a43f440a0b8f233
DIST elogviewer-2.7.tar.gz 19936 BLAKE2B
530c3324666089af93712a17f01cc9b6284b2639b4e768a41461da35d615ee1a75870a4138587d85d4eff4925945dee45dbc1af848b7fc500165c8e96d3c7d01
SHA512
81cf20e8e5509d83634d601f0920bd369e1974c843b600b54faa433dc9927a0df6c9820d2b1f35b241bcd86ea891945f16ec2b0d1b65d08c085a3b245c8b038d
diff --git a/app-portage/elogviewer/elogviewer-0.6.2-r3.ebuild
b/app-portage/elogviewer/elogviewer-0.6.2-r3.ebuild
deleted file mode 100644
index de0a0d95ee4..000
--- a/app-portage/elogviewer/elogviewer-0.6.2-r3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-r1
-
-DESCRIPTION="GTK+ based utility to parse the contents of elogs created by
Portage"
-HOMEPAGE="https://sourceforge.net/projects/elogviewer/;
-
-SRC_URI="mirror://sourceforge/elogviewer/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}
- >=sys-apps/portage-2.1
- >=dev-python/pygtk-2.0"
-
-S="${WORKDIR}"
-
-src_prepare() {
- # Apply patch from Bug 349071 to restore missing newline
- epatch "${FILESDIR}/${P}-missing_newline.patch"
- # Fix bug #453016
- sed -e 's|is not ""|!= ""|' -i elogviewer || die
-}
-
-src_install() {
- python_foreach_impl python_doscript "${WORKDIR}"/elogviewer
- dodoc "${WORKDIR}"/CHANGELOG
- doman "${WORKDIR}"/elogviewer.1
- make_desktop_entry elogviewer Elogviewer "" "System" ||
- die "Couldn't make desktop entry"
-}
-
-pkg_postinst() {
- elog
- elog "In order to use this software, you need to activate"
- elog "Portage's elog features. Required is"
- elog " PORTAGE_ELOG_SYSTEM=\"save\" "
- elog "and at least one out of "
- elog " PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
- elog "More information on the elog system can be found"
- elog "in /usr/share/portage/config/make.conf.example"
- elog
- elog "To operate properly this software needs the directory"
- elog "${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group
portage."
- elog "To start the software as a user, add yourself to the portage"
- elog "group."
- elog
-}
diff --git a/app-portage/elogviewer/elogviewer-2.1-r1.ebuild
b/app-portage/elogviewer/elogviewer-2.1-r1.ebuild
deleted file mode 100644
index 3d151f53b65..000
--- a/app-portage/elogviewer/elogviewer-2.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=(python2_7)
-
-inherit
