gentoo resync : 25.11.2020

5 files changed, 3 insertions, 141 deletions

diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 05f24c624139..96e6f1b1a1bd 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,8 +1,3 @@
-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.20.5.tar.gz 384166 BLAKE2B f11ef1467a7f850666a850c42871b2bb798cdad54b4ad5a7d6fef8171cb5378982537574f9d2c783e2c9e7357624eec4c617c0b014d789d9f40f5bdfd56d8b39 SHA512 88c546fdc6cb4fbde1ebab5160e1f226259d85c934bee456c8a93b14f4c292550e685696fd25c27635f3342f82b0c67572059fb90e3e9b339aa0d11b9e010c25
 DIST dulwich-0.20.6.tar.gz 388660 BLAKE2B 1a193d03e0f21a9fdd125617823742b87e9bea74c73734da10eb79f1ecbec0263cb90224f78413c724db8998f4d06ff6c448e7a6d50ce760ba1545f3321b95d8 SHA512 2f11ce9a1c716fb4242f1f93fce92f756bd93ed8f0951fc2e6b3fb18b0a495b0f372966149fca587efcafc0eaf00e9fbfcfd957442a96cc2004eb66cb7f0773e
-EBUILD dulwich-0.19.15-r1.ebuild 1695 BLAKE2B 608ec071662ec6ddb02005e56ac4cc3aa09d11196b22b9ec310d7a918e720bdc05cb8f87c97c6ff77cb3da802c0e6357bc6c2cb2d38deb1414deb01beb42d750 SHA512 89bf210e86385c9b28dfd6e72f09f095aaf754d122b8191e28850e8afbe97481ea88d7d31cb5d3f92ee905a183153e675e3fd32f33af63abeb638d697c917957
-EBUILD dulwich-0.20.5-r1.ebuild 1553 BLAKE2B 87306720ca73d3bb62cb912507eb4b357b606bb14ec8e5fb944d78afdc5203eb55191ec2efa2af9cb67999f4a7f4b75af7266f7e79f28c895e9a552f49f58aed SHA512 f2a97d98cab952b3e5e99ea4f715b50cb66253e7d6a6c3c3e76f1568d99ee9e0bf83e0d267317430a7f13dff29c15ba1fd6d3b4ebf45186ba1d9e55257fc7f89
-EBUILD dulwich-0.20.6.ebuild 1555 BLAKE2B 6b26219ff99b9c4926679fb4cfda6109350dba96798d17ed8e3be4e4ebecf9292c9f1535c262d6772030fd0f3ccc7adb7fec6e963bb6ed1a564d3b2cfeda7215 SHA512 74ffff22a945dbdc46ce4d20fece16062dcd8cf100336ad34b8293d7e2c3527f0e142a0da38151483fc07b022327b3a6372a9cc1e08d37fe7ecc109750f6b016
+EBUILD dulwich-0.20.6.ebuild 1629 BLAKE2B 442f1ae67267b89da34bfac860ae2fab0f04e8d255fe584e63fef042fd5b234f22e2179fb09c5095223dd73e9c8f534e049d48845125879c52bfae86d5eb7d00 SHA512 f84e91a012104d467a226e99a00d00db6e831dd0770952e0b4c5f77219c3b65f4b7cc709f21ef35d7b7bd095875d114185f1663bf7ac43d7a1c3b331a9c46525
 MISC metadata.xml 448 BLAKE2B 15b62d6a9a252067a63c02db94a906b0da6b72cf8287997252e8fab9cc6f52059ea966d915449a9bd4c64a5bf045e0725d62ff14baf6864cd5212c1765cb5738 SHA512 3a490b46094e92d66e7e0f8e2d0282b75cb33ee2a7a21e4f89029b0a454909466ff5ab4732193480203da9d2481c6134494ccef95953906f6a9da66cc9834830
diff --git a/dev-python/dulwich/dulwich-0.19.15-r1.ebuild b/dev-python/dulwich/dulwich-0.19.15-r1.ebuild
deleted file mode 100644
index 45305d3af9cd..000000000000
--- a/dev-python/dulwich/dulwich-0.19.15-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="https://github.com/jelmer/dulwich/ https://pypi.org/project/dulwich/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-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.23[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		!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
-}
-
-python_test() {
-	# Do not use make check which rebuilds the extension and uses -Werror,
-	# causing unexpected failures.
-	"${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
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dulwich/dulwich-0.20.5-r1.ebuild b/dev-python/dulwich/dulwich-0.20.5-r1.ebuild
deleted file mode 100644
index fe78bc73abb1..000000000000
--- a/dev-python/dulwich/dulwich-0.20.5-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="https://github.com/jelmer/dulwich/ https://pypi.org/project/dulwich/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-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[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		!hppa? ( !ia64? (
-			dev-python/gevent[${PYTHON_USEDEP}]
-			dev-python/geventhttpclient[${PYTHON_USEDEP}]
-		) )
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/python-fastimport[${PYTHON_USEDEP}]
-	)"
-
-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 -v dulwich.tests.test_suite \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dulwich/dulwich-0.20.6.ebuild b/dev-python/dulwich/dulwich-0.20.6.ebuild
index 28c16b903611..20fba49d37fb 100644
--- a/dev-python/dulwich/dulwich-0.20.6.ebuild
+++ b/dev-python/dulwich/dulwich-0.20.6.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend  # tests use setuptools, setup uses if found
 
 inherit distutils-r1
 
@@ -13,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-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"
+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/files/dulwich-0.18.3-skip-failing-test.patch b/dev-python/dulwich/files/dulwich-0.18.3-skip-failing-test.patch
deleted file mode 100644
index 210908591dc2..000000000000
--- a/dev-python/dulwich/files/dulwich-0.18.3-skip-failing-test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/dulwich/tests/test_porcelain.py b/dulwich/tests/test_porcelain.py
-index aa8587f..d1ffb9c 100644
---- a/dulwich/tests/test_porcelain.py
-+++ b/dulwich/tests/test_porcelain.py
-@@ -41,6 +41,7 @@ from dulwich.objects import (
-     )
- from dulwich.repo import Repo
- from dulwich.tests import (
-+    SkipTest,
-     TestCase,
-     )
- from dulwich.tests.utils import (
-@@ -634,6 +635,7 @@ class ResetTests(PorcelainTestCase):
- class PushTests(PorcelainTestCase):
-
-     def test_simple(self):
-+        raise SkipTest("broken")
-         """
-         Basic test of porcelain push where self.repo is the remote.  First
-         clone the remote, commit a file to the clone, then push the changes