gentoo resync : 29.12.2022

5 files changed, 229 insertions, 81 deletions

diff --git a/dev-python/debugpy/Manifest b/dev-python/debugpy/Manifest
index 415f12c4af02..836618946979 100644
--- a/dev-python/debugpy/Manifest
+++ b/dev-python/debugpy/Manifest
@@ -1,4 +1,7 @@
-AUX debugpy-1.4.2-unbundle-pydevd.patch 2452 BLAKE2B 44cebbf0b1bd07c1abb5d8ea6489ff241ddd3bab28e8697462466c1d70160a2d7a2a7f51bcb1747fb8129854b16adb8eda7d7598741fe0c72ea6f8217878e569 SHA512 ee7b5a6125e071fe414e481633224a3e77a5f8d0cbf3fcd855932db3154f4371a92058ecb730b8f69c97a4f01601425eaa271aeb04cda5f2ac5c867c90001b95
+AUX debugpy-1.4.2-unbundle-pydevd.patch 2530 BLAKE2B 6deba4e0d3b8f4f4ce7e133308bb6a2266e1bc679a0f8e4d8006407c291672198c700fe81c72c139c1ad76908c0523ae494e341ef82f66f189aa6511aba55de2 SHA512 a9eaf4170b3b32a1749e39b8f1f8753de55886348b5fad40fac71f3e31d37aee8849643d9fab3986121b0f7a90f013bd1f07ec5b454089dc3c095e300dee972b
+AUX debugpy-1.6.0-unbundle-pydevd.patch 3342 BLAKE2B 3a95507fa1c504a910edc43be562e73afa7ff551d608b0193828ad0f6c8bfc1d97aaa0b355afdc22e9925406f8f47badad5a506ea4a6f86d86dbd31307ce7007 SHA512 0c4b4888624558289623712239019144816f3f802668d3025e2cbb33301b84d6e8c08dceb67b619ed10d1193e0f0526202822685fa3aebdb219d0f3f733be66b
 DIST debugpy-1.5.1.gh.tar.gz 6675322 BLAKE2B a8e3a07d5dbd1b5ca39301e703b279514653606f98743a396693738c9a89403c73a6b6942e5dc368dd89eb8b74277e1808f9247573f330e3a94596c26af7e5be SHA512 93ee526ca7cb3d44b85106a33d8f930f4f2b307eb26ede3ab6b5653de986a101b10f545f5de12cd8ee6ff9e9a12c5e4b57c4c40b1b3003c2f555676bd34482ce
-EBUILD debugpy-1.5.1.ebuild 1105 BLAKE2B cb76f4423658ca38e7b4a6857080a827ea35a7d0ad83dabe879640fc7b69a343d76bc06771cd58df223904ed04e578d60adab6381f7157f768b5b80b0b93f557 SHA512 495d86a186e0eab7c75ff230da8f85dbe5df175d27d39a123a0d7e43e38ea5b2e318ff0ca8dc9112aedcd5775a3c5aafd6cad204af46063dda47e1156cd4ee25
+DIST debugpy-1.6.0.gh.tar.gz 6366079 BLAKE2B 134d2adcae6ec926dcdb7161f0874b830a1d0e3c55abb991f4861fa5a58045437ee4f4cb4c9572b902e3e33634bc3f9970ae055985b983d89d0ef1d99561bda8 SHA512 fe245d4ff751a6c2ef0e75a5249f99661b78075ac62c931c20e3ccbc9389d39a08dc2fda44a33eb23a0a76e5ee339edae439b0004d130cdfe421048f3cc83962
+EBUILD debugpy-1.5.1.ebuild 1105 BLAKE2B 443f52671ea9fa4f25ff0aebbe9e3efaeeb08f3f01480550a7debc59df9724c9b5e9d14a5f110e77a95b5d74ae6fcccd790cfa676493f3b21efd33ceb03c39bd SHA512 d67ec0188c85b933f97c9a54bc4e6f70cf2686364419b20cba0aa90dd42bb90ea126d58b4cbde7a6029baf1eabb6ac4a1c98d6729a58e85d174f26dbcaf85938
+EBUILD debugpy-1.6.0.ebuild 1110 BLAKE2B 95e21670128d1d8e71c011e3b841da14beb06be1d604433710a83d327907cf3555d0d2a6b692de02f455bbc3eeee166c7e305f6e51b4790a55c945c1367b005a SHA512 94d95ed31ea65c07a6816abe9c9d8ac9909e893f39ccd1a04bead45d2cd68a0f4668c2024a2750f9b65e8c435df3181cbf15fdffa61b1640766b05c77bdd3f78
 MISC metadata.xml 451 BLAKE2B 671153316362e0394ae59824e67f5ea897615d3853552aa92fb273d4a41a88916cfe03650ab42248ffee557cb95149b21160395e0fcb2f1fd69bb3bc2c97ea55 SHA512 393d4898c3555b425c34dad5f540f42fc8e281f6299360d1192d099e73486467c92ed16ca710e34d2868aec63fca2eab4775b86e95e6dea79b8721ff70e1db87
diff --git a/dev-python/debugpy/debugpy-1.5.1.ebuild b/dev-python/debugpy/debugpy-1.5.1.ebuild
index 8c11cbf4f6e0..ab764a291aae 100644
--- a/dev-python/debugpy/debugpy-1.5.1.ebuild
+++ b/dev-python/debugpy/debugpy-1.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="An implementation of the Debug Adapter Protocol for Python"
diff --git a/dev-python/debugpy/debugpy-1.6.0.ebuild b/dev-python/debugpy/debugpy-1.6.0.ebuild
new file mode 100644
index 000000000000..783b447c47b0
--- /dev/null
+++ b/dev-python/debugpy/debugpy-1.6.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+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/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# This is completely broken
+RESTRICT="test"
+
+RDEPEND="dev-python/pydevd[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.6.0-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 -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
+}
diff --git a/dev-python/debugpy/files/debugpy-1.4.2-unbundle-pydevd.patch b/dev-python/debugpy/files/debugpy-1.4.2-unbundle-pydevd.patch
index 7047877ef279..3d60bcd18cbc 100644
--- a/dev-python/debugpy/files/debugpy-1.4.2-unbundle-pydevd.patch
+++ b/dev-python/debugpy/files/debugpy-1.4.2-unbundle-pydevd.patch
@@ -1,78 +1,78 @@
-diff --git a/setup.py b/setup.py
-index ee5bbba..f69dc95 100644
---- a/setup.py
-+++ b/setup.py
-@@ -21,12 +21,10 @@ del sys.path[0]
- 
- sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "src"))
- import debugpy
--import debugpy._vendored
- 
- del sys.path[0]
- 
- 
--PYDEVD_ROOT = debugpy._vendored.project_root("pydevd")
- DEBUGBY_ROOT = os.path.dirname(os.path.abspath(debugpy.__file__))
- 
- 
-@@ -36,27 +34,6 @@ def get_buildplatform():
-     return None
- 
- 
--def cython_build():
--    print("Compiling extension modules (set SKIP_CYTHON_BUILD=1 to omit)")
--    subprocess.call(
--        [
--            sys.executable,
--            os.path.join(PYDEVD_ROOT, "setup_cython.py"),
--            "build_ext",
--            "-i",
--        ]
--    )
--
--
--def iter_vendored_files():
--    # Add pydevd files as data files for this package. They are not
--    # treated as a package of their own, because we don't actually
--    # want to provide pydevd - just use our own copy internally.
--    for project in debugpy._vendored.list_all():
--        for filename in debugpy._vendored.iter_packaging_files(project):
--            yield filename
--
--
- # bdist_wheel determines whether the package is pure or not based on ext_modules.
- # However, all pydevd native modules are prebuilt and packaged as data, so they
- # should not be in the list.
-@@ -121,8 +98,6 @@ with open("DESCRIPTION.md", "r") as fh:
- 
- 
- if __name__ == "__main__":
--    if not os.getenv("SKIP_CYTHON_BUILD"):
--        cython_build()
- 
-     extras = {}
-     platforms = get_buildplatform()
-@@ -165,11 +140,9 @@ if __name__ == "__main__":
-             "debugpy.common",
-             "debugpy.launcher",
-             "debugpy.server",
--            "debugpy._vendored",
-         ],
-         package_data={
-             "debugpy": ["ThirdPartyNotices.txt"],
--            "debugpy._vendored": list(iter_vendored_files()),
-         },
-         ext_modules=ExtModules(),
-         has_ext_modules=lambda: True,
-diff --git a/src/debugpy/server/__init__.py b/src/debugpy/server/__init__.py
-index e6a1ad6..a79a86b 100644
---- a/src/debugpy/server/__init__.py
-+++ b/src/debugpy/server/__init__.py
-@@ -3,7 +3,3 @@
- # for license information.
- 
- from __future__ import absolute_import, division, print_function, unicode_literals
--
--# "force_pydevd" must be imported first to ensure (via side effects)
--# that the debugpy-vendored copy of pydevd gets used.
--import debugpy._vendored.force_pydevd  # noqa
+diff --git a/setup.py b/setup.py

+index ee5bbba..f69dc95 100644

+--- a/setup.py

++++ b/setup.py

+@@ -21,12 +21,10 @@ del sys.path[0]

+ 

+ sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "src"))

+ import debugpy

+-import debugpy._vendored

+ 

+ del sys.path[0]

+ 

+ 

+-PYDEVD_ROOT = debugpy._vendored.project_root("pydevd")

+ DEBUGBY_ROOT = os.path.dirname(os.path.abspath(debugpy.__file__))

+ 

+ 

+@@ -36,27 +34,6 @@ def get_buildplatform():

+     return None

+ 

+ 

+-def cython_build():

+-    print("Compiling extension modules (set SKIP_CYTHON_BUILD=1 to omit)")

+-    subprocess.call(

+-        [

+-            sys.executable,

+-            os.path.join(PYDEVD_ROOT, "setup_cython.py"),

+-            "build_ext",

+-            "-i",

+-        ]

+-    )

+-

+-

+-def iter_vendored_files():

+-    # Add pydevd files as data files for this package. They are not

+-    # treated as a package of their own, because we don't actually

+-    # want to provide pydevd - just use our own copy internally.

+-    for project in debugpy._vendored.list_all():

+-        for filename in debugpy._vendored.iter_packaging_files(project):

+-            yield filename

+-

+-

+ # bdist_wheel determines whether the package is pure or not based on ext_modules.

+ # However, all pydevd native modules are prebuilt and packaged as data, so they

+ # should not be in the list.

+@@ -121,8 +98,6 @@ with open("DESCRIPTION.md", "r") as fh:

+ 

+ 

+ if __name__ == "__main__":

+-    if not os.getenv("SKIP_CYTHON_BUILD"):

+-        cython_build()

+ 

+     extras = {}

+     platforms = get_buildplatform()

+@@ -165,11 +140,9 @@ if __name__ == "__main__":

+             "debugpy.common",

+             "debugpy.launcher",

+             "debugpy.server",

+-            "debugpy._vendored",

+         ],

+         package_data={

+             "debugpy": ["ThirdPartyNotices.txt"],

+-            "debugpy._vendored": list(iter_vendored_files()),

+         },

+         ext_modules=ExtModules(),

+         has_ext_modules=lambda: True,

+diff --git a/src/debugpy/server/__init__.py b/src/debugpy/server/__init__.py

+index e6a1ad6..a79a86b 100644

+--- a/src/debugpy/server/__init__.py

++++ b/src/debugpy/server/__init__.py

+@@ -3,7 +3,3 @@

+ # for license information.

+ 

+ from __future__ import absolute_import, division, print_function, unicode_literals

+-

+-# "force_pydevd" must be imported first to ensure (via side effects)

+-# that the debugpy-vendored copy of pydevd gets used.

+-import debugpy._vendored.force_pydevd  # noqa

diff --git a/dev-python/debugpy/files/debugpy-1.6.0-unbundle-pydevd.patch b/dev-python/debugpy/files/debugpy-1.6.0-unbundle-pydevd.patch
new file mode 100644
index 000000000000..41a0b8e39ba6
--- /dev/null
+++ b/dev-python/debugpy/files/debugpy-1.6.0-unbundle-pydevd.patch
@@ -0,0 +1,102 @@
+diff --git a/pyproject.toml b/pyproject.toml

+index 15ea7e1..d3a2764 100644

+--- a/pyproject.toml

++++ b/pyproject.toml

+@@ -8,7 +8,6 @@ exclude = '''

+ ( __pycache__

+ | ^/.tox

+ | ^/versioneer.py

+-| ^/src/debugpy/_vendored

+ | ^/src/debugpy/_version.py

+ )

+ '''

+diff --git a/setup.py b/setup.py

+index 2c0a2d6..7c22c0c 100644

+--- a/setup.py

++++ b/setup.py

+@@ -18,12 +18,10 @@ del sys.path[0]

+ 

+ sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "src"))

+ import debugpy

+-import debugpy._vendored

+ 

+ del sys.path[0]

+ 

+ 

+-PYDEVD_ROOT = debugpy._vendored.project_root("pydevd")

+ DEBUGBY_ROOT = os.path.dirname(os.path.abspath(debugpy.__file__))

+ 

+ 

+@@ -33,27 +31,6 @@ def get_buildplatform():

+     return None

+ 

+ 

+-def cython_build():

+-    print("Compiling extension modules (set SKIP_CYTHON_BUILD=1 to omit)")

+-    subprocess.call(

+-        [

+-            sys.executable,

+-            os.path.join(PYDEVD_ROOT, "setup_pydevd_cython.py"),

+-            "build_ext",

+-            "-i",

+-        ]

+-    )

+-

+-

+-def iter_vendored_files():

+-    # Add pydevd files as data files for this package. They are not

+-    # treated as a package of their own, because we don't actually

+-    # want to provide pydevd - just use our own copy internally.

+-    for project in debugpy._vendored.list_all():

+-        for filename in debugpy._vendored.iter_packaging_files(project):

+-            yield filename

+-

+-

+ # bdist_wheel determines whether the package is pure or not based on ext_modules.

+ # However, all pydevd native modules are prebuilt and packaged as data, so they

+ # should not be in the list.

+@@ -133,8 +110,6 @@ with open("DESCRIPTION.md", "r") as fh:

+ 

+ 

+ if __name__ == "__main__":

+-    if not os.getenv("SKIP_CYTHON_BUILD"):

+-        cython_build()

+ 

+     extras = {}

+     platforms = get_buildplatform()

+@@ -179,11 +154,9 @@ if __name__ == "__main__":

+             "debugpy.common",

+             "debugpy.launcher",

+             "debugpy.server",

+-            "debugpy._vendored",

+         ],

+         package_data={

+             "debugpy": ["ThirdPartyNotices.txt"],

+-            "debugpy._vendored": list(iter_vendored_files()),

+         },

+         ext_modules=ExtModules(),

+         has_ext_modules=lambda: True,

+diff --git a/src/debugpy/server/__init__.py b/src/debugpy/server/__init__.py

+index 642c776..947cd7d 100644

+--- a/src/debugpy/server/__init__.py

++++ b/src/debugpy/server/__init__.py

+@@ -3,7 +3,3 @@

+ # for license information.

+ 

+ from __future__ import absolute_import, division, print_function, unicode_literals

+-

+-# "force_pydevd" must be imported first to ensure (via side effects)

+-# that the debugpy-vendored copy of pydevd gets used.

+-import debugpy._vendored.force_pydevd  # noqa

+diff --git a/src/debugpy/server/attach_pid_injected.py b/src/debugpy/server/attach_pid_injected.py

+index 6016545..9bd2e2c 100644

+--- a/src/debugpy/server/attach_pid_injected.py

++++ b/src/debugpy/server/attach_pid_injected.py

+@@ -33,7 +33,6 @@ def attach(setup):

+                 pydevd_attach_to_process_path = os.path.join(

+                     _debugpy_dir,

+                     "debugpy",

+-                    "_vendored",

+                     "pydevd",

+                     "pydevd_attach_to_process",

+                 )