gentoo resync : 25.08.2020

3 files changed, 18 insertions, 23 deletions

diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index f337cf240fc1..780858debcc1 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,6 +1,6 @@
 AUX dulwich-0.18.3-skip-failing-test.patch 695 BLAKE2B 27ad8e5037931859e8dc138cc1c4c760051d544aa6212270978fa57bf66b8f0a401e5e005975904f07f775bfb7085c5fb7df16a0f3c743a902028bb8c7ff35cd SHA512 765c9942b0d46d9da5a78a972e4277bf55febcb9ab3991cc1c9561f84ce0c22bd37a5ccca75cc804db51436676393e5e6528e83ef4d599ba9859cc1e4efd98f4
 DIST dulwich-0.19.15.tar.gz 369491 BLAKE2B ffaabbd68ee228e771b8a56c9a5b70498e49a4547f3f0ff87225ca4ee0a222fca5cd75a36293fb0d111615f4fe9550acd2825732a178f67d9f6b538abf9fc37f SHA512 ae56cf4748ea5f9d275f2d1456bf9fce77859ad2eeba6b7d8f34283e212404ba385f377f4fb86b88dc40982649ec8cfb12ea407dd25ada7cb2b0e862568ac7da
-DIST dulwich-0.19.6.tar.gz 349939 BLAKE2B a88836c8a6fa3f732643f88cb94ec37c138146336709651f7fbc604fe80ff3dcf88b24ffca5e5d14c3c947b847a9678fa8b431ef6be0b78e6046bcd3f7ed29bc SHA512 7e13b465672c5eee4f6d14f28e9cba63ceddf1ad119822fabd17b01ad6b89c6dd8c0bbf562bdf50e0ada5ce17bcad531549054417d744e5cf64a610e8a1740bc
-EBUILD dulwich-0.19.15.ebuild 1700 BLAKE2B 006e9e58a776a8fc8ee8f191dbb4337972d298a6cb282b89c6ef6bc0e8e7cd29243c39869e56d6e2aaa2d5f419b26f0f4aaeb8949704b3524487babc01ae8e3a SHA512 fbc2a8d54f636bd049333f7bb15dd94606b08d011a9b1f450593b1f136cf7e6faecb17586d86fa916ad26446fafed6d622b3d5214246cbb602b6096edf0ff8bf
-EBUILD dulwich-0.19.6.ebuild 1650 BLAKE2B a0b85675f324c58bf431473b415662c08ffbaabadf98af804df3fadfdbb4fb310fe1e53a612ffb0fb2c8ae4440a4cc42fff79a0b2e5014f4bf053e6f1b74927c SHA512 0eabe7132be1153034559feced4a68a9d0dbabd6552c7418d8585fea535b5af0deb37919cfab2ca78d5f858ef35f1d144590a461cdfc7635133fdc66d7759ad3
+DIST dulwich-0.20.5.tar.gz 384166 BLAKE2B f11ef1467a7f850666a850c42871b2bb798cdad54b4ad5a7d6fef8171cb5378982537574f9d2c783e2c9e7357624eec4c617c0b014d789d9f40f5bdfd56d8b39 SHA512 88c546fdc6cb4fbde1ebab5160e1f226259d85c934bee456c8a93b14f4c292550e685696fd25c27635f3342f82b0c67572059fb90e3e9b339aa0d11b9e010c25
+EBUILD dulwich-0.19.15.ebuild 1701 BLAKE2B 181fac6e54d4dfa2d34bb8ced0e1eb5d037c85fdc0ffc0c51fe395e90b626dc3a98fe47e6a59ec904b6c5d8d1827a5c5000cac0de94dddf0d6f51bb50694fbaf SHA512 8cf6577504fdbcfb4045ea633c8a990a7be0af26a4b80b400435f72e668b284494ef89d74a60fb0478bad255cb3bc730b7f3958a7b9a18cd5f23d11150d00c18
+EBUILD dulwich-0.20.5.ebuild 1604 BLAKE2B 0f5eab76c7fd88680bb3782ec6ee16743caffbdaa53e266fe45045e51f0f5f2294dd6cd9dd282123f281687a9e6eb61e6b26e51f93e23dccc96229dc826345e5 SHA512 eda5203d4bba40c13c8474b64962448f3e35ee26c31aa3277105bb6e177374e2df6bf350a852af340ca42ae52e5c8aed2acfdc73523394bb5addd22740de0d28
 MISC metadata.xml 448 BLAKE2B 15b62d6a9a252067a63c02db94a906b0da6b72cf8287997252e8fab9cc6f52059ea966d915449a9bd4c64a5bf045e0725d62ff14baf6864cd5212c1765cb5738 SHA512 3a490b46094e92d66e7e0f8e2d0282b75cb33ee2a7a21e4f89029b0a454909466ff5ab4732193480203da9d2481c6134494ccef95953906f6a9da66cc9834830
diff --git a/dev-python/dulwich/dulwich-0.19.15.ebuild b/dev-python/dulwich/dulwich-0.19.15.ebuild
index 4b0785701595..0d01a5efa511 100644
--- a/dev-python/dulwich/dulwich-0.19.15.ebuild
+++ b/dev-python/dulwich/dulwich-0.19.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/dulwich/dulwich-0.19.6.ebuild b/dev-python/dulwich/dulwich-0.20.5.ebuild
index 27d31728a85c..bea5ab1da2bd 100644
--- a/dev-python/dulwich/dulwich-0.19.6.ebuild
+++ b/dev-python/dulwich/dulwich-0.20.5.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+# ready for 3_9, but fastimport isn't yet, #733838
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -13,44 +14,38 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.21[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
 "
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+BDEPEND="
 	test? (
 		${RDEPEND}
-		dev-python/gevent[${PYTHON_USEDEP}]
-		dev-python/geventhttpclient[${PYTHON_USEDEP}]
+		!hppa? ( !ia64? (
+			dev-python/gevent[${PYTHON_USEDEP}]
+			dev-python/geventhttpclient[${PYTHON_USEDEP}]
+		) )
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/python-fastimport[${PYTHON_USEDEP}]
 	)"
 
-DISTUTILS_IN_SOURCE_BUILD=1
-
-# One test sometimes fails
-# https://github.com/jelmer/dulwich/issues/541
-PATCHES=( "${FILESDIR}/${PN}-0.18.3-skip-failing-test.patch" )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
+distutils_enable_sphinx docs
 
 python_test() {
+	# remove interference from the tests that do stuff like user.name
+	unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE \
+		GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE EMAIL
 	# Do not use make check which rebuilds the extension and uses -Werror,
 	# causing unexpected failures.
-	"${EPYTHON}" -m unittest dulwich.tests.test_suite \
+	"${EPYTHON}" -m unittest -v dulwich.tests.test_suite \
 		|| die "tests failed with ${EPYTHON}"
 }
 
 python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
 	if use examples; then
 		docompress -x "/usr/share/doc/${PF}/examples"
 		dodoc -r examples