gentoo resync : 20.10.2021

3 files changed, 31 insertions, 30 deletions

diff --git a/dev-python/debugpy/Manifest b/dev-python/debugpy/Manifest
index 8e6082043fb6..6f917a507408 100644
--- a/dev-python/debugpy/Manifest
+++ b/dev-python/debugpy/Manifest
@@ -1,6 +1,6 @@
 AUX debugpy-1.4.2-unbundle-pydevd.patch 2452 BLAKE2B 44cebbf0b1bd07c1abb5d8ea6489ff241ddd3bab28e8697462466c1d70160a2d7a2a7f51bcb1747fb8129854b16adb8eda7d7598741fe0c72ea6f8217878e569 SHA512 ee7b5a6125e071fe414e481633224a3e77a5f8d0cbf3fcd855932db3154f4371a92058ecb730b8f69c97a4f01601425eaa271aeb04cda5f2ac5c867c90001b95
-DIST debugpy-1.4.1.tar.gz 6687670 BLAKE2B c7761f354700d366d49365b0294ba1f07f357283c7527fc961c702bf99d808835741a899909e37092026c81ff19f6d96ef09c06512c8315ccad158b6e8e47697 SHA512 aef7779cb3a1af76b5cd3d6e8c7e0b78ffe08d1ebe25cf617ca3eb00966d5b3920358809c018f5f1f9eb56b913211134acfdba7d4c0d0174e4d6cfdae058d5f5
-DIST debugpy-1.4.2.tar.gz 6673987 BLAKE2B c61d09bc036f3a12e343be3d81b2e834bd69d33df80a6b9e4111d11a2eaea221feea3ac093ca06ad1a840dcab7d53d7b321276c4103420f34adac7a4a4ac8141 SHA512 7c0908ab9202cebb020ca72c558f3c1abc28b44fb968cce4387750f18e67198ad52dd6743061888610ed733e0f7334f986c2655ec7b0a2631acc4919cd9e6c20
-EBUILD debugpy-1.4.1.ebuild 1082 BLAKE2B b38825f28ea2ca053bfeb38bae603247acf21185a1238aa11d2cefc00a52d3bacb178770c954de4034a56fb910e82f6bc3df1bb3441a3cb80e2ab6a52140d599 SHA512 7f62f46b2adc89e417ece3c386704e3c3531b68adec444feedde30cf8f6412db1f656dc5abaff9521d25ab0e5375178ec16dd68f6b9fa966e36620b711047796
-EBUILD debugpy-1.4.2.ebuild 1083 BLAKE2B b2a4088b34e8b282ff83293478f11a5d96a5a3238e221af5744869546f478dd853becb804e97cec161ede3c1e1b56bfb55d402de18909e21c3b79ce84e2fbc8e SHA512 7bb59468a600dfe0448ecc70a3934f16ef3c98d9483094c08433b91ea0b2c3d0c406482221002e1e6be1605be06d272f0655464c82bd0225ae416cbf1fd74922
+DIST debugpy-1.5.0.gh.tar.gz 6676475 BLAKE2B a8aa0afe7b76beb6ba539e23558d6a0c8babfd55de9a4a0bc9aabbec8a2318e600df62b063a8d674d9402e35fd595b030efca570b4a67ec82dadb98875261e13 SHA512 b5ca216aede744a9b1e067056601470e78b8af1fabb181dc0bf6e87bc166cc8d6cad24f5695986686cac69f8ce41246bb0f074078ef3750f6e65b4d8fe55e869
+DIST debugpy-1.5.1.gh.tar.gz 6675322 BLAKE2B a8e3a07d5dbd1b5ca39301e703b279514653606f98743a396693738c9a89403c73a6b6942e5dc368dd89eb8b74277e1808f9247573f330e3a94596c26af7e5be SHA512 93ee526ca7cb3d44b85106a33d8f930f4f2b307eb26ede3ab6b5653de986a101b10f545f5de12cd8ee6ff9e9a12c5e4b57c4c40b1b3003c2f555676bd34482ce
+EBUILD debugpy-1.5.0.ebuild 1082 BLAKE2B 1b6872ef5807bd04cbade54e856bfd56d87499d4462ca818cc8b399a9183171cc34e102cffb3cbfb53bc1c4b708a4a5e853d5118d1c2ae5d5698912548363f8f SHA512 331ce02ea0ca32f3ae967375fd40ed6efa58128f46ab70a1d1d3c26ec7dec0b758762d5bbeaea57f101bcf857ba972befd7b004847339dbbbb7ac49e9cbf4786
+EBUILD debugpy-1.5.1.ebuild 1082 BLAKE2B 1b6872ef5807bd04cbade54e856bfd56d87499d4462ca818cc8b399a9183171cc34e102cffb3cbfb53bc1c4b708a4a5e853d5118d1c2ae5d5698912548363f8f SHA512 331ce02ea0ca32f3ae967375fd40ed6efa58128f46ab70a1d1d3c26ec7dec0b758762d5bbeaea57f101bcf857ba972befd7b004847339dbbbb7ac49e9cbf4786
 MISC metadata.xml 451 BLAKE2B 671153316362e0394ae59824e67f5ea897615d3853552aa92fb273d4a41a88916cfe03650ab42248ffee557cb95149b21160395e0fcb2f1fd69bb3bc2c97ea55 SHA512 393d4898c3555b425c34dad5f540f42fc8e281f6299360d1192d099e73486467c92ed16ca710e34d2868aec63fca2eab4775b86e95e6dea79b8721ff70e1db87
diff --git a/dev-python/debugpy/debugpy-1.4.2.ebuild b/dev-python/debugpy/debugpy-1.5.0.ebuild
index b4f0af0ccd61..cbb6127cca56 100644
--- a/dev-python/debugpy/debugpy-1.4.2.ebuild
+++ b/dev-python/debugpy/debugpy-1.5.0.ebuild
@@ -3,27 +3,28 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
-
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="An implementation of the Debug Adapter Protocol for Python"
 HOMEPAGE="https://github.com/microsoft/debugpy/ https://pypi.org/project/debugpy/"
-SRC_URI="https://github.com/microsoft/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="
+	https://github.com/microsoft/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 # There is not enough time in the universe for this test suite
 RESTRICT="test"
 
-BDEPEND="test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )"
-
 RDEPEND="dev-python/pydevd[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )"
 
 PATCHES=(
-	"${FILESDIR}/${P}-unbundle-pydevd.patch"
+	"${FILESDIR}/${PN}-1.4.2-unbundle-pydevd.patch"
 )
 
 distutils_enable_tests pytest
@@ -32,10 +33,7 @@ python_prepare_all() {
 	# Drop unnecessary and unrecognized option
 	# __main__.py: error: unrecognized arguments: -n8
 	# Do not timeout
-	sed -i \
-		-e 's/-n8//g' \
-		-e '/timeout/d' \
-		pytest.ini || die
+	sed -e '/addopts/d' -e '/timeout/d' -i pytest.ini || die
 
 	# Unbundle dev-python/pydevd
 	rm -r src/debugpy/_vendored || die
diff --git a/dev-python/debugpy/debugpy-1.4.1.ebuild b/dev-python/debugpy/debugpy-1.5.1.ebuild
index 9e2e9b284cd9..cbb6127cca56 100644
--- a/dev-python/debugpy/debugpy-1.4.1.ebuild
+++ b/dev-python/debugpy/debugpy-1.5.1.ebuild
@@ -3,37 +3,40 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
-
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="An implementation of the Debug Adapter Protocol for Python"
 HOMEPAGE="https://github.com/microsoft/debugpy/ https://pypi.org/project/debugpy/"
-SRC_URI="https://github.com/microsoft/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="
+	https://github.com/microsoft/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 # There is not enough time in the universe for this test suite
 RESTRICT="test"
 
-# These files are included pre-built in the sources
-# TODO: Investigate what this is and if/how we can compile this properly
-QA_PREBUILT="
-	/usr/lib/python*/site-packages/${PN}/_vendored/pydevd/pydevd_attach_to_process/attach_linux_*.so
-"
+RDEPEND="dev-python/pydevd[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.2-unbundle-pydevd.patch"
+)
+
+distutils_enable_tests pytest
 
 python_prepare_all() {
 	# Drop unnecessary and unrecognized option
 	# __main__.py: error: unrecognized arguments: -n8
 	# Do not timeout
-	sed -i \
-		-e 's/-n8//g' \
-		-e '/timeout/d' \
-		pytest.ini || die
+	sed -e '/addopts/d' -e '/timeout/d' -i pytest.ini || die
+
+	# Unbundle dev-python/pydevd
+	rm -r src/debugpy/_vendored || die
 
 	distutils-r1_python_prepare_all
 }
-
-distutils_enable_tests pytest