From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ECD82139360 for ; Wed, 4 Aug 2021 06:06:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A5C89E08F0; Wed, 4 Aug 2021 06:06:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7C1C2E08EF for ; Wed, 4 Aug 2021 06:06:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A83BB342CE6 for ; Wed, 4 Aug 2021 06:06:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 44D0E857 for ; Wed, 4 Aug 2021 06:06:48 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1628057173.1eab4e8a062e8fbd94a2cb4980b81977057f692e.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-portage/elogviewer/files/, app-portage/elogviewer/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-portage/elogviewer/Manifest app-portage/elogviewer/elogviewer-3.0-r2.ebuild app-portage/elogviewer/elogviewer-3.1.ebuild app-portage/elogviewer/files/elogviewer-3.0-segfault.patch X-VCS-Directories: app-portage/elogviewer/files/ app-portage/elogviewer/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 1eab4e8a062e8fbd94a2cb4980b81977057f692e X-VCS-Branch: master Date: Wed, 4 Aug 2021 06:06:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bae2db20-2cab-4366-b2e5-688cbe32cbe9 X-Archives-Hash: 022936ab78610b40ae80580f2fdb47cc commit: 1eab4e8a062e8fbd94a2cb4980b81977057f692e Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Aug 3 12:31:57 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Aug 4 06:06:13 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eab4e8a app-portage/elogviewer: Drop 3.0-r2 and 3.1, EAPI6-- Closes: https://bugs.gentoo.org/788010 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> app-portage/elogviewer/Manifest | 2 - app-portage/elogviewer/elogviewer-3.0-r2.ebuild | 68 ---------------------- app-portage/elogviewer/elogviewer-3.1.ebuild | 68 ---------------------- .../elogviewer/files/elogviewer-3.0-segfault.patch | 34 ----------- 4 files changed, 172 deletions(-) diff --git a/app-portage/elogviewer/Manifest b/app-portage/elogviewer/Manifest index 13aa5f945d6..8b04f1c45bf 100644 --- a/app-portage/elogviewer/Manifest +++ b/app-portage/elogviewer/Manifest @@ -1,3 +1 @@ -DIST elogviewer-3.0.tar.gz 28349 BLAKE2B 44f3ca5b28d075bb8349450cc817fd8ccdd1d1dc7eb948a9d65ab3b423191eca04cc479b2d6bec0bf6bc7f1120eccd257fdf61bb736919129ee756c2f4bd4366 SHA512 7eb59849a06632053ee0f7d1d76d9848220dbb8ad48d04c80fea5e64304f86c1a99987f525c6df682c832bd8453e07781a5c95ad2dee0539e954400730f47e36 -DIST elogviewer-3.1.tar.gz 28650 BLAKE2B b15d94095def5fb7fdcf77ad1e7bf1fc35af6bbd999d89b7f90bed8ef9739182c8e4af0033aee92453d6b0731ac5d8c168e3900abe0a4466d584bfd9bc64917a SHA512 b99bc165ab08755273ead73fdd3602c9266a9bb243c46d99805c1f8b07f7e8ea9b0583aedb9b7ab717461f2ed3bd27dcf0a5677f2d908d3fcc03769794a64d5b DIST elogviewer-3.2.tar.gz 29046 BLAKE2B a880fde71df3c688572c33abbc163f3ac10a53c672b01b3139d02effa5e59a05f7ae1df35a4505b1a48d7a0cb6166a21b18d1d969e1eaebab03e3620298d4f38 SHA512 2503482f14e21c7b6f69ac0d6305c7c126fa3ac944b68acef7edec0c464d2e45bc2dc348f8d38033dbc276afc132d75863c737e222f66ad5ebe870b30fec2f39 diff --git a/app-portage/elogviewer/elogviewer-3.0-r2.ebuild b/app-portage/elogviewer/elogviewer-3.0-r2.ebuild deleted file mode 100644 index a74707ed46a..00000000000 --- a/app-portage/elogviewer/elogviewer-3.0-r2.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_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 ~arm64 ~ppc x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] - >=sys-apps/portage-2.1[${PYTHON_USEDEP}] - ') -" -DEPEND="${RDEPEND} - $(python_gen_cond_dep ' - dev-python/setuptools[${PYTHON_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/elogviewer-3.1.ebuild b/app-portage/elogviewer/elogviewer-3.1.ebuild deleted file mode 100644 index 3a21c008fa2..00000000000 --- a/app-portage/elogviewer/elogviewer-3.1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9} ) - -DISABLE_AUTOFORMATTING=true - -inherit desktop python-single-r1 readme.gentoo-r1 - -DESCRIPTION="Elog viewer for Gentoo" -HOMEPAGE="https://github.com/Synss/elogviewer" -SRC_URI="https://github.com/Synss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ~x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] - >=sys-apps/portage-2.1[${PYTHON_USEDEP}] - ') -" -DEPEND="${RDEPEND} - $(python_gen_cond_dep ' - dev-python/setuptools[${PYTHON_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 deleted file mode 100644 index cc67a0d6f19..00000000000 --- a/app-portage/elogviewer/files/elogviewer-3.0-segfault.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- 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 "" - - 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):