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 42761138359 for ; Fri, 9 Oct 2020 06:24:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1A624E082F; Fri, 9 Oct 2020 06:24:08 +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 DEEC5E0826 for ; Fri, 9 Oct 2020 06:24:07 +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 97AD4340E5C for ; Fri, 9 Oct 2020 06:24:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 266FE39E for ; Fri, 9 Oct 2020 06:24:05 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1602224586.5198c0b71084c57b42ca1a070813afab2da2985e.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-portage/gentoolkit/files/, app-portage/gentoolkit/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-portage/gentoolkit/files/gentoolkit-0.5.0-python3_9.patch app-portage/gentoolkit/gentoolkit-0.5.0-r1.ebuild app-portage/gentoolkit/gentoolkit-0.5.0.ebuild X-VCS-Directories: app-portage/gentoolkit/files/ app-portage/gentoolkit/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 5198c0b71084c57b42ca1a070813afab2da2985e X-VCS-Branch: master Date: Fri, 9 Oct 2020 06:24:05 +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: d7ac6147-5a01-494f-8b31-4ce8369e170a X-Archives-Hash: 2e86c598de0496b793ab4aabb6867b63 commit: 5198c0b71084c57b42ca1a070813afab2da2985e Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Fri Oct 9 05:02:00 2020 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Fri Oct 9 06:23:06 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5198c0b7 app-portage/gentoolkit: Bug #747034 Closes: https://bugs.gentoo.org/747034 Thanks to https://github.com/gentoo/gentoolkit/pull/11 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/17855 Signed-off-by: Georgy Yakovlev gentoo.org> .../files/gentoolkit-0.5.0-python3_9.patch | 43 ++++++++++++++++++++++ ...kit-0.5.0.ebuild => gentoolkit-0.5.0-r1.ebuild} | 2 + 2 files changed, 45 insertions(+) diff --git a/app-portage/gentoolkit/files/gentoolkit-0.5.0-python3_9.patch b/app-portage/gentoolkit/files/gentoolkit-0.5.0-python3_9.patch new file mode 100644 index 00000000000..6a50db9ca66 --- /dev/null +++ b/app-portage/gentoolkit/files/gentoolkit-0.5.0-python3_9.patch @@ -0,0 +1,43 @@ +# https://github.com/gentoo/gentoolkit/pull/11 +# https://bugs.gentoo.org/747034 +diff --git a/pym/gentoolkit/metadata.py b/pym/gentoolkit/metadata.py +index 22c249e..c3dba98 100644 +--- a/pym/gentoolkit/metadata.py ++++ b/pym/gentoolkit/metadata.py +@@ -73,8 +73,7 @@ class _Maintainer(object): + self.description = None + self.restrict = node.get('restrict') + self.status = node.get('status') +- maint_attrs = node.getchildren() +- for attr in maint_attrs: ++ for attr in node.iter(): + setattr(self, attr.tag, attr.text) + + def __repr__(self): +@@ -101,7 +100,7 @@ class _Useflag(object): + _desc = '' + if node.text: + _desc = node.text +- for child in node.getchildren(): ++ for child in node.iter(): + _desc += child.text if child.text else '' + _desc += child.tail if child.tail else '' + # This takes care of tabs and newlines left from the file +@@ -213,7 +212,7 @@ class MetaData(object): + if herd in ('no-herd', 'maintainer-wanted', 'maintainer-needed'): + return None + +- for node in self._herdstree.getiterator('herd'): ++ for node in self._herdstree.iter('herd'): + if node.findtext('name') == herd: + return node.findtext('email') + +@@ -283,7 +282,7 @@ class MetaData(object): + return self._useflags + + self._useflags = [] +- for node in self._xml_tree.getiterator('flag'): ++ for node in self._xml_tree.iter('flag'): + self._useflags.append(_Useflag(node)) + + return self._useflags diff --git a/app-portage/gentoolkit/gentoolkit-0.5.0.ebuild b/app-portage/gentoolkit/gentoolkit-0.5.0-r1.ebuild similarity index 97% rename from app-portage/gentoolkit/gentoolkit-0.5.0.ebuild rename to app-portage/gentoolkit/gentoolkit-0.5.0-r1.ebuild index efc5e8be7d4..18ac36af876 100644 --- a/app-portage/gentoolkit/gentoolkit-0.5.0.ebuild +++ b/app-portage/gentoolkit/gentoolkit-0.5.0-r1.ebuild @@ -27,6 +27,8 @@ RDEPEND="${DEPEND} distutils_enable_tests setup.py +PATCHES=( "${FILESDIR}"/${PN}-0.5.0-python3_9.patch) + python_prepare_all() { python_setup echo VERSION="${PVR}" "${PYTHON}" setup.py set_version