4 files changed, 127 insertions, 2 deletions
diff --git a/dev-python/debugpy/Manifest b/dev-python/debugpy/Manifest
index f92ff145fd51..e8189a04c53f 100644
--- a/dev-python/debugpy/Manifest
+++ b/dev-python/debugpy/Manifest
@@ -1,3 +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
-EBUILD debugpy-1.4.1.ebuild 1066 BLAKE2B 8478e6501827d67153b629617c6f3cffaf53d20c8faa8883212cd27b51d98201148b29966920483cad33dcfb8550f00d6691199b690c38c17b87a5abaa6d7df0 SHA512 ed66d5d7e4f134db2f367f8c893d70704d50efb17e997aba96bc4ed008afc09e202ba51d3e194288b3f6e2d43f2400d3b7f10a5ad5a31c081f91474ee233d2db
+DIST debugpy-1.4.2.tar.gz 6673987 BLAKE2B c61d09bc036f3a12e343be3d81b2e834bd69d33df80a6b9e4111d11a2eaea221feea3ac093ca06ad1a840dcab7d53d7b321276c4103420f34adac7a4a4ac8141 SHA512 7c0908ab9202cebb020ca72c558f3c1abc28b44fb968cce4387750f18e67198ad52dd6743061888610ed733e0f7334f986c2655ec7b0a2631acc4919cd9e6c20
+EBUILD debugpy-1.4.1.ebuild 1083 BLAKE2B 19445922e0d6e48ac10bfe105fe95dea9240d2e4b1f2296dec762f98fc460025ef6f004adeabdfb8e59020f3987ec24ee4e9c73d9d4a7ab67a3534b7d4a822e3 SHA512 3ef7d2625b53969759c8bb62e77486705fd29e8181a231cb0fc0635fe95e6d005dc37428184f929acdcc3bd693b49af298e977e5f8d161f5ffa2c1d817a56422
+EBUILD debugpy-1.4.2.ebuild 1039 BLAKE2B 047ff850e0d19173859d4593734130d427a84b1e7d4c62db7326e6e160aa32465f74cac833d538ae6691a6a63e5a3ab22a75bfc6eddf6910b41212b1ddf3abe7 SHA512 161cc90e4e3828cefc5eedd1bccb08f1d277db31faa7b02c597cc0ba9ec88282d2b290f4d092332dad0a04f8dbbac00b099d81ce6a4d6da2d773e32043b95e4a
 MISC metadata.xml 450 BLAKE2B 3f79fb2dc3ce19630fa2a268272de24b44618ffeb3ff71751976f83a76ddfa1a8f1266b09064228872ec1c26cb5124d520b835d93fc193c9138b12d54301cc22 SHA512 d41d73a2d79ea72997317b30526904e900becdddf0896e633bde612d0079e3e48d7449625f6117abfa2ec24a561bae1c1442b789935b42f6e3132fe21efc24f0
diff --git a/dev-python/debugpy/debugpy-1.4.1.ebuild b/dev-python/debugpy/debugpy-1.4.1.ebuild
index 91ed0c5562a6..096d5d66653c 100644
--- a/dev-python/debugpy/debugpy-1.4.1.ebuild
+++ b/dev-python/debugpy/debugpy-1.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/microsoft/${PN}/archive/refs/tags/v${PV}.tar.gz -> $
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~sparc"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc"
 
 # There is not enough time in the universe for this test suite
 RESTRICT="test"
diff --git a/dev-python/debugpy/debugpy-1.4.2.ebuild b/dev-python/debugpy/debugpy-1.4.2.ebuild
new file mode 100644
index 000000000000..1d2e0eec0d00
--- /dev/null
+++ b/dev-python/debugpy/debugpy-1.4.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+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"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+
+# 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}]"
+
+PATCHES=(
+	"${FILESDIR}/${P}-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
+
+	# 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
new file mode 100644
index 000000000000..7047877ef279
--- /dev/null
+++ b/dev-python/debugpy/files/debugpy-1.4.2-unbundle-pydevd.patch
@@ -0,0 +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