gentoo resync : 25.11.2020

8 files changed, 91 insertions, 12 deletions

diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index 0dd01c66846b..fd49b224d4ce 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,10 +1,12 @@
+AUX gentoolkit-0.5.0-python3_9.patch 1425 BLAKE2B 51663e01d48f6f192cfe96972c584337e62495d553251ffe360c4e928e208d528b453faefeb3c2d1641c9e662151b8ba91ebb7f1ec6b3a2c67fcb18eaefe3495 SHA512 327ff6d6aa77293f7bff3be6e543e3bb1b4fcf226d3e913668c69fdb9de2d2e04a73d9e73526910ae4e2c3b0bce3f87249cb31d55928b58a9c4274b97525e9d3
+AUX gentoolkit-0.5.0-r1-python3_9.patch 1220 BLAKE2B ce01d9a8cdd214d585b0e4ee61ce21aba2880deb76c666f6a0fd5833d340a24b741be68e6923a942353d53ad0c4d66014290548d52fe76bad4cc0069b6322d29 SHA512 19ab5bd0bd76571106e12f361ef41a7eb4fb573afe5e5d61c547e4df1d2697c80db8307623edbdffcdaee9472ab56c1b61e133cfbf3845b174a10f4e7aec7d44
 DIST gentoolkit-0.4.6.tar.gz 3205641 BLAKE2B 7da91a313c8a9263eb7b4abd6207ece9dd602a5069a87f1e78ada13fc9f396e1f2afddaf0637c473445034cf57b5ca7631e209361a88fa3892d302b20f4cc986 SHA512 3aa3c9af7e994313400607943b9090fd813227ddd6d550b50fbcf7eeb4053da8bcdb41c9ef2579d957d2f279fdcc4e2f2ceca1091c5fd457df4204dd11792d6e
 DIST gentoolkit-0.4.7.tar.gz 3205669 BLAKE2B e5f64b85546bc10ad16e7fa42d288965539177375e8796b40df699859efa13fb98bb86aec58e60363c955b2d5e4b2e6379a7597252ee4fdbeec49559de67b328 SHA512 0fab600b4323d23e12009eeb4ade595950880a88b05bcfbfeada1a9b9af615b96d31c568285629bf6e5de7b45ed857bdf98b6261dc54974fbaf70c924e093c76
 DIST gentoolkit-0.4.8.tar.gz 3206070 BLAKE2B 7f689ae85136827b8af50401165ccd44bc824e12bec43dad786c7221ec78ee3c1f14d538d197e277a2fedc23f570440f4ec7c0cc707a146814315ff6de48c115 SHA512 689b4229c5d2b6f4440b7d3d57e4b9be5265eead53737890c17dbd0510df287f5c19f86b924735d4ad146d1a500c59a15869b718cbf805b894b0bf115b69f838
 DIST gentoolkit-0.5.0.tar.gz 3206598 BLAKE2B a379dcbbaba9d52c241fea020b87c458384e44092539947909e14fd6c63fd9cc06d076b8081874edf17fc50e80fe48ceab3400c90046867dc409e7ac39c17231 SHA512 8a5c344f3a17c4c779abbcaa35b5e3f147106dbc61310d0d1a816ec8080914271fa45c311a8feeb1bfe14195af7cf34c0b29142d6e43e2de232dae96fbd00861
-EBUILD gentoolkit-0.4.6.ebuild 2289 BLAKE2B c405f76dc529c42474e0e160df1669f036bbe1000b29ea188a777808c7530f280cfd770a27bb5414e7dfdcdcc36bccc2add5ec4c6bd0aaf9ef004948b7f83837 SHA512 67ef3bc311e4ea96e6c940d7f413fe8b05b03d0d3412cb3b75fb0f2a8a180d72f10f35991eb3ef012ee0b5b176d230007ea1a7e254883f57c9f91c4cc48b6397
-EBUILD gentoolkit-0.4.7.ebuild 2306 BLAKE2B f979fb2faab8d450bfa47ae0fc51b032f7613807048f0e6ae52c6acd7d52dc336d605a3b78ab72582b481452ef05c27de9f20a3f782e47d559c1360ec3a53c77 SHA512 046b1c64203865794811eb01ba111a593600f7bf7a4878d9c2c0e8dcb1421451cd2c6b42ac7094061807de5f056f72ef582df999bbc61a8a7d13075b2f6ee90e
-EBUILD gentoolkit-0.4.8.ebuild 2297 BLAKE2B 10d21be291c5222f70be925db74d50698d305cc591ff174842ad384a158f06d76e8b11e606bfe773970c2925ce7e15f0b2665a600bac98ae0642030aadff72b6 SHA512 6af0f28b49cde8aeba62e4f4a7d4d536609d38ec14c4d378b2e71deaca4a1b0442ba9f0b9d9dad853e7bba6d8ed7b3e099a1e7d723bbcbed7be2caa14fd0e30e
-EBUILD gentoolkit-0.5.0.ebuild 2271 BLAKE2B 3f50280e778c837894e4ca206199787b5e72dd9a946911da125474d13da752e65a25fb6e29b087233c22cbd23c8c241b2267131ce1ee191122679e45ef83eb56 SHA512 c67ed95e006ee8c2290a96e65579d71bace294890068e0fa3c9764ca50bc479b4f11160de4b0015caf5135f8adffcc346f0a5fd4da69fd8d526c29e5ba6e3eee
-EBUILD gentoolkit-9999.ebuild 2055 BLAKE2B b5afb916af8f235a53452b1cd99b369438eabedd7bb4db23893ec29d30d26695cfc4328c8da559eb7c5c3b906a353ca001d79a5b6b67b0203276d2b2517b8351 SHA512 7e782f89a184ac8bd3f4a23513fe67069ab2d3d0e20338e5337793553df850409699e24cffac872335208b5237739b7ccc9938c05644fd9c806235b94b7a4986
+EBUILD gentoolkit-0.4.6.ebuild 2251 BLAKE2B a49d44a874cff3792b16e920592362d5e5475906fa8b001d9bddb8212637581be38c2efbe7e368cf4f9cb024a2759788eff7723b3ce2106f21ea970cb66835d3 SHA512 f993a289c799aff739735f7c857eb9fc8e2af6efef8d8222d0d89990f5017f488d8f4571d88f0b5d68a6a709cbd78067a68995c14c1046c9d95da0eb1387c4dd
+EBUILD gentoolkit-0.4.7.ebuild 2268 BLAKE2B 6c746dfdbedee69288ec6ed230aac924a3012eb4431012e25ee4bf0d79ab8ea007cc60c06618d4aaf985260c1fa326a4843cee0e090d235dfd93bc86621bdf57 SHA512 53616edc36e0e7412030a93e1de75bfe664553c28e7e14a37b9b521f3fcf74ee76d1e59f375e3b9a604b219af49ecaca4efa3d4b381122b7743aace6c655ced0
+EBUILD gentoolkit-0.4.8.ebuild 2259 BLAKE2B 821ed9f054defc80e3603324c17b1670d610d4d7b8cd95d089554af8b92a83419a7ac05025d3b1afab1770b861700b2887d142247c52b87415d5442065968aa0 SHA512 1ba6938d7121e2eeb62956299eca6d50a7643f42e3e6a3473d2e99152468b867ed51684f67921bfa29d62c0b19055e24ed3874053ebf57ee8ffea49f3865bf89
+EBUILD gentoolkit-0.5.0-r2.ebuild 2337 BLAKE2B e1cb23e6df8ac2ab3540c78cf9aab8327dac34a2c44f396d3c8b7b871866124a4be65bb0132534cd5d79fb963214d5e190e96512aa60b9bbd24f44ee7fdac949 SHA512 dec299d0f23c1722ddf03ab89bbff38459ad76af3fc47963c47785b3ae1c5ba6b8aa6ea0f0c37405335176289bbc3aeb93b8b23d06b45ce0870e70776e77bfc7
+EBUILD gentoolkit-9999.ebuild 2019 BLAKE2B a3893445cfcddfef221bca63821fe3df94c56486bee08457ac7e9fc12e99fc496423b5265eae4cb3e37f9781602d1d595ff31654a965a7e97680272eb7c602fb SHA512 33169445760fb68d32fd428f90a886fd407d5c203b62f561966f7a86f784611c110d7ffbeaae525b7f7b44e582a18ee89faa03dc1946ce37bb9a3237d4943b87
 MISC metadata.xml 558 BLAKE2B 2ede18c080565469ba0be5ac6f2e34ab02f9367947ef1e380deed006c5ca2900468e142ee1d7c8664d62ed49caeb64069726f0426251a00d48a848af745128b4 SHA512 8e57275ae720065361529af42999f9bfe871007e45592ee6f539eec4ce61e6b141f44c65316ee10798bfaecc86a814fa18353becbb31ffc5e2c38df100ac3704
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/files/gentoolkit-0.5.0-r1-python3_9.patch b/app-portage/gentoolkit/files/gentoolkit-0.5.0-r1-python3_9.patch
new file mode 100644
index 000000000000..a9dae6150454
--- /dev/null
+++ b/app-portage/gentoolkit/files/gentoolkit-0.5.0-r1-python3_9.patch
@@ -0,0 +1,34 @@
+From f14b6198d1dd9cb7f4a83f3822e4a1782a5581e8 Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <dolsen@gentoo.org>
+Date: Tue, 13 Oct 2020 10:04:07 -0400
+Subject: [PATCH] metadata.py: Fix duplicated use flag text bug 748129
+
+Regression from commit: 517581df206766
+link: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=517581df206766fabf10273cde565e0a6dc62829
+Gentoo bug: https://bugs.gentoo.org/748129
+Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
+---
+ pym/gentoolkit/metadata.py | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/pym/gentoolkit/metadata.py b/pym/gentoolkit/metadata.py
+index c3dba98..0b58392 100644
+--- a/pym/gentoolkit/metadata.py
++++ b/pym/gentoolkit/metadata.py
+@@ -101,8 +101,11 @@ class _Useflag(object):
+ 		if node.text:
+ 			_desc = node.text
+ 		for child in node.iter():
+-			_desc += child.text if child.text else ''
+-			_desc += child.tail if child.tail else ''
++			# prevent duplicate text
++			if child.text and child.text not in _desc:
++				_desc += child.text
++			if child.tail and not child.tail in _desc:
++				_desc += child.tail
+ 		# This takes care of tabs and newlines left from the file
+ 		self.description = re.sub(r'\s+', ' ', _desc)
+ 
+--
+libgit2 1.0.1
+
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild
index 3c9347c0e93c..1db74e52a9a5 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild
@@ -68,7 +68,6 @@ pkg_postinst() {
 		elog "    app-admin/eclean-kernel"
 		elog "    app-portage/diffmask"
 		elog "    app-portage/flaggie"
-		elog "    app-portage/install-mask"
 		elog "    app-portage/portpeek"
 		elog "    app-portage/smart-live-rebuild"
 	fi
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild
index 34ae357f65de..318ac20f777c 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild
@@ -68,7 +68,6 @@ pkg_postinst() {
 		elog "    app-admin/eclean-kernel"
 		elog "    app-portage/diffmask"
 		elog "    app-portage/flaggie"
-		elog "    app-portage/install-mask"
 		elog "    app-portage/portpeek"
 		elog "    app-portage/smart-live-rebuild"
 	fi
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild
index d2a61bf8f622..36cbf7459fc6 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild
@@ -68,7 +68,6 @@ pkg_postinst() {
 		elog "    app-admin/eclean-kernel"
 		elog "    app-portage/diffmask"
 		elog "    app-portage/flaggie"
-		elog "    app-portage/install-mask"
 		elog "    app-portage/portpeek"
 		elog "    app-portage/smart-live-rebuild"
 	fi
diff --git a/app-portage/gentoolkit/gentoolkit-0.5.0.ebuild b/app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild
index dc74e5dd20e4..accbf346bf8b 100644
--- a/app-portage/gentoolkit/gentoolkit-0.5.0.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 PYTHON_REQ_USE="xml(+),threads(+)"
 
 inherit distutils-r1
@@ -27,6 +27,11 @@ RDEPEND="${DEPEND}
 
 distutils_enable_tests setup.py
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5.0-python3_9.patch
+	"${FILESDIR}"/${PN}-0.5.0-r1-python3_9.patch
+)
+
 python_prepare_all() {
 	python_setup
 	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
@@ -66,7 +71,6 @@ pkg_postinst() {
 		elog "    app-admin/eclean-kernel"
 		elog "    app-portage/diffmask"
 		elog "    app-portage/flaggie"
-		elog "    app-portage/install-mask"
 		elog "    app-portage/portpeek"
 		elog "    app-portage/smart-live-rebuild"
 	fi
diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild
index 39237afdc316..44c2b480a314 100644
--- a/app-portage/gentoolkit/gentoolkit-9999.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 PYTHON_REQ_USE="xml(+),threads(+)"
 
 EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoolkit.git"
@@ -67,7 +67,6 @@ pkg_postinst() {
 		elog "    app-admin/eclean-kernel"
 		elog "    app-portage/diffmask"
 		elog "    app-portage/flaggie"
-		elog "    app-portage/install-mask"
 		elog "    app-portage/portpeek"
 		elog "    app-portage/smart-live-rebuild"
 	fi