gentoo resync : 20.03.2022

7 files changed, 7 insertions, 234 deletions

diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 6abd1c47a364..8f419a876956 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,13 +1,5 @@
-DIST dulwich-0.20.23.tar.gz 414150 BLAKE2B 0f7bfb237acc6bad874465a5bfed21adc29a2ef23875fbcbb92e7e3ff0ed6a4191a30b3975f90ef20b8320575e42abf31f8ec2199d558382c917d0510c2a8d96 SHA512 8bad3528dc87e70b39b59b2f7218579327db4dbd15937b63db76c9b8e7ba6d22e963eaec45b8d675c92f250516a541c395fdac391db68d0932dc5d8cd7ed9fb9
-DIST dulwich-0.20.27.tar.gz 416618 BLAKE2B 73ed04d9fc871a82126e212bdac0eaf235e44aa76f3e54c98bd50f71379fdd3082b2a3af12a22f3276a45909ef17e38a116deb6adfd650cdbfa19afa41803dd1 SHA512 dc82250c5b3cbccc1ccbb55ca2d871f4d17ddb3616cd92146468fc5f0d805d3fe349b2cedfb4e814e027c07f9352e87c72ca7e97ed6218aa621fa9311dc075c5
-DIST dulwich-0.20.28.tar.gz 416723 BLAKE2B ddbb36c65e1372e1c2fbab5d85ef26a77f40e4763eee8dc5d2ba249a6b4e37bd6e38197eaebbcb46f16df577c0ff4730ec69fff39a549adf2e5d147e7a3eabfc SHA512 5eb90dd888909f787ef5e9f0a79d7db9a31c5897e334a862c1d0593c4f115ff30047f108c7b315e0145e267f581ba0f4fd0fafb7b1b2316d3def4f70697f2e20
-DIST dulwich-0.20.30.tar.gz 417219 BLAKE2B 6b5b10a37f2901424b632dad081b9972da5af7475e11389c73f8a64a57ebf421700c6591bfddc5418b9c02d61916894aeeb2371a3ceb514532fd1b9e63dffb2c SHA512 1dd18c047e8bfe9f23a10c0c55b57be7b4d89d93af4a682265dac3bf495d1594057ed755e7caad926100d35e3603006377163dc6ae71bc51a500c744064f8bbc
-DIST dulwich-0.20.31.tar.gz 418063 BLAKE2B 7b914ce6509227b48fc716ed4ecabfead8b95fa17661564b3dc6b9abedb2c444d026d1261de9bb7195a14f5ffea9dfcb3103f32784f07731d2101a7c60f1abda SHA512 1f181aa62493fc8cdb2a18183f0aa2f5bb0963c1739423fc6790080bcec9d10368689934bfe8828b502bbe319ade4846428f3c4262666be01ccbce55a8803efa
 DIST dulwich-0.20.32.tar.gz 418100 BLAKE2B 21d41a7b1e491848a11ab3e3b1b63bfbe1798b38ef331136b07609f004e780672477e91a637dd3b1ccd3b26e359461e1a16d759ac2cb98d1091fbdb1968c00a9 SHA512 9af4cb4462ab9a69bea9074aace81eeb8d33087f2c53e64145991913ad132e076b62f7958551729c758cd6eeae029a278723872771ef36b046331c85ebf2fcf4
-EBUILD dulwich-0.20.23.ebuild 1588 BLAKE2B 8f042ad848f62019a8522e80d50698015fcf0a0a88eade0368a04c1daa3e6ba129d41e70fb967b3bc5b3fc49b0b034bb6c6e315e29fd010a761e0f1fc2c138ed SHA512 3304d877079090d89300bba68e08b6b9bebe98fc10d30c184d7b97c42bc3b48e040fda9ed7cea6568a585eaa37eb67189e069cc529e8b87e53e6f549e3a297a6
-EBUILD dulwich-0.20.27.ebuild 1592 BLAKE2B 37af2761b526bb4d41c4708fc7c237822bcf4027ee0c47773960e033e6a5e844be6ae8590de5148a0365a6a9bd7ad4c8bbbcc14e26a3297d0aafd2654cd7b3d6 SHA512 1f2f03fff9e1198897cc07c3e618e794b6da173aa182f6fa62686e216cd4bea1dc72af3dbca5892e63acd8c4c0212a9adfcd77f9c66a4f56539f9cb658cee2b5
-EBUILD dulwich-0.20.28.ebuild 1592 BLAKE2B 37af2761b526bb4d41c4708fc7c237822bcf4027ee0c47773960e033e6a5e844be6ae8590de5148a0365a6a9bd7ad4c8bbbcc14e26a3297d0aafd2654cd7b3d6 SHA512 1f2f03fff9e1198897cc07c3e618e794b6da173aa182f6fa62686e216cd4bea1dc72af3dbca5892e63acd8c4c0212a9adfcd77f9c66a4f56539f9cb658cee2b5
-EBUILD dulwich-0.20.30.ebuild 1592 BLAKE2B 37af2761b526bb4d41c4708fc7c237822bcf4027ee0c47773960e033e6a5e844be6ae8590de5148a0365a6a9bd7ad4c8bbbcc14e26a3297d0aafd2654cd7b3d6 SHA512 1f2f03fff9e1198897cc07c3e618e794b6da173aa182f6fa62686e216cd4bea1dc72af3dbca5892e63acd8c4c0212a9adfcd77f9c66a4f56539f9cb658cee2b5
-EBUILD dulwich-0.20.31.ebuild 1592 BLAKE2B 37af2761b526bb4d41c4708fc7c237822bcf4027ee0c47773960e033e6a5e844be6ae8590de5148a0365a6a9bd7ad4c8bbbcc14e26a3297d0aafd2654cd7b3d6 SHA512 1f2f03fff9e1198897cc07c3e618e794b6da173aa182f6fa62686e216cd4bea1dc72af3dbca5892e63acd8c4c0212a9adfcd77f9c66a4f56539f9cb658cee2b5
-EBUILD dulwich-0.20.32.ebuild 1622 BLAKE2B 5e4f668dd9ac9e4cc4ed0d2e2a96f55724e3838cfba36aa4729af95d6e8c9e40603accfab50df5b105b269756fdb15c46dee53a0d99d352c26b43a3deae5ca9f SHA512 f487b2e6e0ad1245b7cb85fa93d3274284ed9ce179c59eec89b60d72180b2c8129e0e11e80db342c08ff1e772116d2d64966d80bd64f97024a536ce995b63a35
+DIST dulwich-0.20.33.tar.gz 419863 BLAKE2B 57b7a05f7a23745ba63e2faba9cd3772637a61cf9f2077eaf7ec799f5e3d25de7245aabbebf22cb58f5cb45318b653335251fc46b136b108770aaa6c2b09e099 SHA512 f2d0f8875dc4cd4ac4629f2884a5e68938d14218ef96a19ce322559a16eb64cdee92ed0bc07790e9d527a20fdcd29f6fe1f95479d0055cdab88f509bc318368c
+EBUILD dulwich-0.20.32.ebuild 1618 BLAKE2B 7f39288d500bdfe1e2b7820d1482b3d336f9612dcc861e2d20a33ef7a0ed68a8790d6de3e7c6e19f6c4439fe2ee97d682d3b73c8e95d85f49b819df1cd80f8e6 SHA512 102f5b2a6d10f3c4e3b65b38678998138c17e491adbc5695353978229d0b5d776fe2d7409519861d176eb053e0d5c6f89ec86bb0e83904bb5151a17af2415497
+EBUILD dulwich-0.20.33.ebuild 1622 BLAKE2B 5e4f668dd9ac9e4cc4ed0d2e2a96f55724e3838cfba36aa4729af95d6e8c9e40603accfab50df5b105b269756fdb15c46dee53a0d99d352c26b43a3deae5ca9f SHA512 f487b2e6e0ad1245b7cb85fa93d3274284ed9ce179c59eec89b60d72180b2c8129e0e11e80db342c08ff1e772116d2d64966d80bd64f97024a536ce995b63a35
 MISC metadata.xml 558 BLAKE2B 72c574d6eb1a3d94686fe9aeeb53fa8d96532f4477ee94bfcd6c0dd3e0d6fc9e313dba9642b68a57ba0b38830fbe1f8d953c3ae79bcafcb6bbf6eba0e35f61a1 SHA512 de70aed32ec0b362668a6fd33d8be5251d57048bd6396e09608f040fe71fe8e3262f1c96fbc8058ea776e09a59ac465652f4f7d778fb4e3933c7fea4bf64d7f4
diff --git a/dev-python/dulwich/dulwich-0.20.23.ebuild b/dev-python/dulwich/dulwich-0.20.23.ebuild
deleted file mode 100644
index e773306dfad7..000000000000
--- a/dev-python/dulwich/dulwich-0.20.23.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="
-	https://github.com/dulwich/dulwich/
-	https://pypi.org/project/dulwich/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+ Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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}]
-		) )
-		app-crypt/gpgme[python,${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-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.27.ebuild b/dev-python/dulwich/dulwich-0.20.27.ebuild
deleted file mode 100644
index e282dc27d571..000000000000
--- a/dev-python/dulwich/dulwich-0.20.27.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="
-	https://github.com/dulwich/dulwich/
-	https://pypi.org/project/dulwich/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+ Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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}]
-		) )
-		app-crypt/gpgme[python,${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-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.28.ebuild b/dev-python/dulwich/dulwich-0.20.28.ebuild
deleted file mode 100644
index e282dc27d571..000000000000
--- a/dev-python/dulwich/dulwich-0.20.28.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="
-	https://github.com/dulwich/dulwich/
-	https://pypi.org/project/dulwich/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+ Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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}]
-		) )
-		app-crypt/gpgme[python,${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-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.30.ebuild b/dev-python/dulwich/dulwich-0.20.30.ebuild
deleted file mode 100644
index e282dc27d571..000000000000
--- a/dev-python/dulwich/dulwich-0.20.30.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="
-	https://github.com/dulwich/dulwich/
-	https://pypi.org/project/dulwich/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+ Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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}]
-		) )
-		app-crypt/gpgme[python,${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-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.32.ebuild b/dev-python/dulwich/dulwich-0.20.32.ebuild
index db9d32133a7a..c0e390ffa35c 100644
--- a/dev-python/dulwich/dulwich-0.20.32.ebuild
+++ b/dev-python/dulwich/dulwich-0.20.32.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/dulwich/dulwich-0.20.31.ebuild b/dev-python/dulwich/dulwich-0.20.33.ebuild
index e282dc27d571..db9d32133a7a 100644
--- a/dev-python/dulwich/dulwich-0.20.31.ebuild
+++ b/dev-python/dulwich/dulwich-0.20.33.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
@@ -42,8 +43,8 @@ python_test() {
 		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}"
+	"${EPYTHON}" -m unittest -v dulwich.tests.test_suite ||
+		die "tests failed with ${EPYTHON}"
 }
 
 python_install_all() {