[gentoo-commits] repo/gentoo:master commit in: app-portage/gentoolkit/files/, app-portage/gentoolkit/

["Georgy Yakovlev" <gyakovlev@gentoo.org>]

commit:     5198c0b71084c57b42ca1a070813afab2da2985e
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri Oct  9 05:02:00 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> 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 <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/17855
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> 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