diff options
| author |   Volkmar W. Pogatzki <gentoo@pogatzki.net> | 2020-10-09 07:02:00 +0200 |
|---|---|---|
| committer |   Georgy Yakovlev <gyakovlev@gentoo.org> | 2020-10-08 23:23:06 -0700 |
| commit | 5198c0b71084c57b42ca1a070813afab2da2985e (patch) | |
| tree | 6842d75b8eca095a3dc3815d400802183bf5e262 | |
| parent | virtual/rust: bump to 1.47.0 (diff) | |
| download | gentoo-5198c0b71084c57b42ca1a070813afab2da2985e.tar.gz gentoo-5198c0b71084c57b42ca1a070813afab2da2985e.tar.bz2 gentoo-5198c0b71084c57b42ca1a070813afab2da2985e.zip | |
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 <gentoo@pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/17855
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
| -rw-r--r-- | app-portage/gentoolkit/files/gentoolkit-0.5.0-python3_9.patch | 43 | ||||
| -rw-r--r-- | app-portage/gentoolkit/gentoolkit-0.5.0-r1.ebuild (renamed from app-portage/gentoolkit/gentoolkit-0.5.0.ebuild) | 2 |
2 files changed, 45 insertions, 0 deletions
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 000000000000..6a50db9ca669 --- /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 index efc5e8be7d40..18ac36af8767 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 |