5 files changed, 10 insertions, 368 deletions
diff --git a/dev-python/pydevd/Manifest b/dev-python/pydevd/Manifest
index 21fb15b050d1..0dd9fd2b7f76 100644
--- a/dev-python/pydevd/Manifest
+++ b/dev-python/pydevd/Manifest
@@ -1,9 +1,3 @@
-DIST PyDev.Debugger-pydev_debugger_2_10_0.gh.tar.gz 4019265 BLAKE2B e72c96576588ac3cbfcdd71a1a8e96d41b9d6757b3468c372b45a9c91a887c693f7309467fe8ea27d29c4775cc8df9ebd610b015cecabaaea43c8aa75229bc25 SHA512 a475e4f4cd9f883307d30b0bb2ebd5095de426b52f0f70b1a557095c06241149ad105ca4cbb31d311fa54e4387bbed27e5cf2712ba7447b19720d46dac21a101
-DIST PyDev.Debugger-pydev_debugger_3_0_3.gh.tar.gz 4287855 BLAKE2B 2f9f9cc892a19e42a37190966f2d2897f3e5da477c88d76d4b61b3062b6482db4c4cf5672efe75a1c139aa42a6b017cb5b276cede1167d0e91ca50009706e7e7 SHA512 4a5d03ea69e9eb40ee09c8d9a2258655f1645076757fa02bf92c8ad1b4fbb0570c1ac55464d8dd44cea6187ad2fa858851e02a86dc18b2343411cd8c56dc0c6a
 DIST PyDev.Debugger-pydev_debugger_3_1_0.gh.tar.gz 4293466 BLAKE2B 2b820b44a37362dfe554f60f418ce6c94cfd9fb9b14b6d6f521e7bd2023f044129b440878a136d67249096ba8a4aa61bb465551c1d9930989ffe9fe40c68f464 SHA512 8afaab2a69cb6785c5453ce1034a70fa28ab33c3122c1e21c485d9023317785524144c76e87864a695fa1fd26b05bc6d828db22a7cbcf025bd8aafe0b9ed4d3b
-DIST pydevd-2.9.5.gh.tar.gz 3982897 BLAKE2B 06f0712301b419c472bcef2443a2ed277eb477041ff2e40e41b57f61649d84a7559dcae82c30ac572b14e90b98c2b9b9542c7360deded087eec92aeb0372ad67 SHA512 9aa38bc9a238e6f2956883a6318536382726013ea9e4a9d902b36d60df0cf924c279545bcdf92afdb435bfe36598982edd5805725860798fb3970b105254ba1d
-EBUILD pydevd-2.10.0.ebuild 4031 BLAKE2B a3cf8ec94770baf402bae877bc33d96cc6305bf6c6b3facf5b727deb725f629e667275e9f04692fe80856686d0189a925a0f005d5dce57a9e739d90c096154c3 SHA512 4100da7309d494045ee017bc0fb1d566a4b02176498fd62d21502b5e99ac5ccacd923808113033248a65754883bf18aa9e6e665d196271eb595abdafc5edb024
-EBUILD pydevd-2.9.5.ebuild 2487 BLAKE2B 6280a4631cf006bed5e2ae84f07155cdd3372e36427f66ca77f6e99aeedfb137ad9080adadd2436077181db427917c25bf688058ab50a3042f0918e2f9ff972f SHA512 122916be19c8728c0c155b23dfa8818def24fdfb66bb1806e0da6475d9eb460bb596e00c7958c4c52753f94987d05b23357e0d03d5ae5917c83e756f3e8abc66
-EBUILD pydevd-3.0.3.ebuild 3673 BLAKE2B 0f88582b01fc717cd008c3aeb29efdf0352b0881a6a3d2dae59ce6240bd89ebd97973c4535e4e3ef223e178da5b0f1d20818e3fd2743372c98e08dbac91ee07e SHA512 fbfcfc39dcd060ecd1f67ab9588b4babdf41202cf1e571e4c4fa97658429905e3b1c03369b16920bb7cca0e4c733fb0e43b46a75e5056651f374e11aa3d39738
-EBUILD pydevd-3.1.0.ebuild 3804 BLAKE2B 65533f7a910e6a641fbbb7175972fad6c3bb2dec2508336e33721da768fc3d1a74a652af962d37c3e9ed6025bea3913b52202620bb7c12a0fc1450573f81fbeb SHA512 ac6bd255e39a9fd6d8cbf686c6c72ef157fc8aa1622ccdbfef25d8af661c6f34a42391ba58fac8cfcbf2438de640abe5a95187613e57d4051966854a2ebc687c
+EBUILD pydevd-3.1.0-r1.ebuild 3961 BLAKE2B 0a3d6c522610ec67b9617e39adf4d20f33ffb80ef9a3bb875af378cef44518ee3ea2986bf9bcd3e6921af3f6749f3f47f040a915d5dc481d0b217d412379519b SHA512 f7d387ca8057007ca85388ee808c26237422bffc4c52529055aaae3bac125d95f2514e91f206db79f26ecbbdc371ce081ab1118e53686fa679be39afd302d026
 MISC metadata.xml 384 BLAKE2B 37a4caa01a28f98ec8d141129c08754e6ba4dee5910a81c26f3eafcd7ac832962e91d3e39783e4859ac7e5ae5754837c89e496c4c2c205d12626359adf7dddae SHA512 5cf80b2e0eaf21e900c83341e9bef5c74a36d3c0a7354e3b6a832184cc60c42eeef6a22236e4fd9d484dc8834e5d4f98facd2578c223da2cc187dd76f91db764
diff --git a/dev-python/pydevd/pydevd-2.10.0.ebuild b/dev-python/pydevd/pydevd-2.10.0.ebuild
deleted file mode 100644
index e4df47c1daaf..000000000000
--- a/dev-python/pydevd/pydevd-2.10.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 multiprocessing toolchain-funcs
-
-TAG="pydev_debugger_${PV//./_}"
-MY_P="PyDev.Debugger-${TAG}"
-DESCRIPTION="PyDev.Debugger (used in PyDev, PyCharm and VSCode Python)"
-HOMEPAGE="
-	https://github.com/fabioz/PyDev.Debugger/
-	https://pypi.org/project/pydevd/
-"
-SRC_URI="
-	https://github.com/fabioz/PyDev.Debugger/archive/${TAG}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="
-	dev-debug/gdb
-"
-BDEPEND="
-	test? (
-		dev-python/untangle[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Drop -O3 and -flto compiler args
-	sed -i \
-		-e 's/extra_link_args = extra_compile_args\[\:\]/pass/g' \
-		-e '/extra_compile_args/d' \
-		setup.py || die
-
-	# Disable tests incompatible with new package versions
-	sed -e '/TEST_\(DJANGO\|FLASK\)/s:True:False:' \
-		-i tests_python/debug_constants.py || die
-
-	# Clean up some prebuilt files
-	rm -r third_party || die
-	cd pydevd_attach_to_process || die
-
-	# Remove these Windows files
-	rm attach_{amd64,x86}.dll || die
-	rm inject_dll_{amd64,x86}.exe || die
-	rm run_code_on_dllmain_{amd64,x86}.dll || die
-	rm -r windows winappdbg || die
-
-	# Remove these MacOS files
-	rm attach_x86_64.dylib || die
-
-	# Remove these prebuilt linux files
-	rm attach_linux_{amd64,x86}.so || die
-
-	cd linux_and_mac || die
-	rm compile_mac.sh || die
-}
-
-src_compile() {
-	pushd pydevd_attach_to_process/linux_and_mac || die
-	# recompile removed file (extracted from compile_linux.sh)
-	$(tc-getBUILD_CXX) ${CXXFLAGS} ${CPPFLAGS} \
-		-o "../attach_linux_${ARCH}.so" \
-		${LDFLAGS} -nostartfiles attach.cpp -ldl || die
-	popd || die
-
-	distutils-r1_src_compile
-
-	rm -r _pydevd_bundle || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		# NB: upstream seems to run tests via runfiles.py but that script
-		# is a horror and it seems broken for us anyway
-		tests_python/test_debugger.py::test_attach_to_pid_halted
-		tests_python/test_debugger.py::test_attach_to_pid_no_threads
-		'tests_python/test_debugger.py::test_path_translation[False]'
-		tests_python/test_debugger.py::test_remote_debugger_threads
-		tests_python/test_debugger_json.py::test_attach_to_pid
-		tests_python/test_debugger_json.py::test_evaluate_exception_trace
-		tests_python/test_debugger_json.py::test_gui_event_loop_custom
-		tests_python/test_debugger_json.py::test_path_translation_and_source_reference
-		tests_python/test_utilities.py::test_tracing_basic
-		tests_python/test_utilities.py::test_tracing_other_threads
-		# incompatible version?
-		tests_python/test_debugger_json.py::test_pandas
-	)
-
-	case ${EPYTHON} in
-		python3.12)
-			EPYTEST_DESELECT+=(
-				tests_python/test_debugger_json.py::test_case_stop_async_iteration_exception
-				'tests_python/test_debugger.py::test_case_handled_and_unhandled_exception_generator[False-_debugger_case_unhandled_exceptions_listcomp.py]'
-				'tests_python/test_debugger_json.py::test_case_unhandled_exception_generator[_debugger_case_unhandled_exceptions_listcomp.py]'
-				tests_python/test_debugger.py::test_case_13
-				tests_python/test_debugger_json.py::test_function_breakpoints_async
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# this is only used to compare against getpid() to detect that xdist
-	# is being used
-	local -x PYDEV_MAIN_PID=1
-	epytest -p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	# Remove this duplicate that is installed directly to /usr/
-	# These files are also correctly installed to the python site-packages dir
-	rm -r "${ED}/usr/pydevd_attach_to_process" || die
-}
diff --git a/dev-python/pydevd/pydevd-2.9.5.ebuild b/dev-python/pydevd/pydevd-2.9.5.ebuild
deleted file mode 100644
index 8fd4f838ad1a..000000000000
--- a/dev-python/pydevd/pydevd-2.9.5.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 toolchain-funcs
-
-MY_P="pydev_debugger_${PV//./_}"
-
-DESCRIPTION="PyDev.Debugger (used in PyDev, PyCharm and VSCode Python)"
-HOMEPAGE="https://github.com/fabioz/PyDev.Debugger/"
-SRC_URI="
-	https://github.com/fabioz/PyDev.Debugger/archive/${MY_P}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/PyDev.Debugger-${MY_P}"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# After removing and recompiling the prebuilt lib the tests fail?
-# For some reason the test suite is executing a slightly different gdb command
-# then before, which is lacking the file name of the lib that was pre built:
-# gdb: No symbol table is loaded. Use the "file" command
-# This also happens outside of portage so it is not related to any *FLAGS
-RESTRICT="test"
-
-BDEPEND="
-	test? (
-		dev-python/untangle[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-RDEPEND="dev-debug/gdb"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Drop -O3 and -flto compiler args
-	sed -i \
-		-e 's/extra_link_args = extra_compile_args\[\:\]/pass/g' \
-		-e '/extra_compile_args/d' \
-		setup.py || die
-
-	# Clean up some prebuilt files
-	rm -r third_party || die
-	cd pydevd_attach_to_process || die
-
-	# Remove these Windows files
-	rm attach_{amd64,x86}.dll || die
-	rm inject_dll_{amd64,x86}.exe || die
-	rm run_code_on_dllmain_{amd64,x86}.dll || die
-	rm -r windows winappdbg || die
-
-	# Remove these MacOS files
-	rm attach_x86_64.dylib || die
-
-	# Remove these prebuilt linux files
-	rm attach_linux_{amd64,x86}.so || die
-
-	cd linux_and_mac || die
-	rm compile_mac.sh || die
-}
-
-src_compile() {
-	pushd pydevd_attach_to_process/linux_and_mac || die
-	# recompile removed file (extracted from compile_linux.sh)
-	$(tc-getBUILD_CXX) ${CXXFLAGS} ${CPPFLAGS} -o "attach_linux_${ARCH}.so" \
-		${LDFLAGS} -nostartfiles attach.cpp -ldl || die
-	mv "attach_linux_${ARCH}.so" ../ || die
-	popd || die
-
-	distutils-r1_src_compile
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	# Remove this duplicate that is installed directly to /usr/
-	# These files are also correctly installed to the python site-packages dir
-	rm -r "${ED}/usr/pydevd_attach_to_process" || die
-}
diff --git a/dev-python/pydevd/pydevd-3.0.3.ebuild b/dev-python/pydevd/pydevd-3.0.3.ebuild
deleted file mode 100644
index be32f4c1ae55..000000000000
--- a/dev-python/pydevd/pydevd-3.0.3.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 toolchain-funcs
-
-TAG="pydev_debugger_${PV//./_}"
-MY_P="PyDev.Debugger-${TAG}"
-DESCRIPTION="PyDev.Debugger (used in PyDev, PyCharm and VSCode Python)"
-HOMEPAGE="
-	https://github.com/fabioz/PyDev.Debugger/
-	https://pypi.org/project/pydevd/
-"
-SRC_URI="
-	https://github.com/fabioz/PyDev.Debugger/archive/${TAG}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-debug/gdb
-"
-BDEPEND="
-	test? (
-		dev-python/untangle[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Drop -O3 and -flto compiler args
-	sed -i \
-		-e 's/extra_link_args = extra_compile_args\[\:\]/pass/g' \
-		-e '/extra_compile_args/d' \
-		setup.py || die
-
-	# Disable tests incompatible with new package versions
-	sed -e '/TEST_\(DJANGO\|FLASK\)/s:True:False:' \
-		-i tests_python/debug_constants.py || die
-
-	# Clean up some prebuilt files
-	rm -r third_party || die
-	cd pydevd_attach_to_process || die
-
-	# Remove these Windows files
-	rm attach_{amd64,x86}.dll || die
-	rm inject_dll_{amd64,x86}.exe || die
-	rm run_code_on_dllmain_{amd64,x86}.dll || die
-	rm -r windows winappdbg || die
-
-	# Remove these MacOS files
-	rm attach_x86_64.dylib || die
-
-	# Remove these prebuilt linux files
-	rm attach_linux_{amd64,x86}.so || die
-
-	cd linux_and_mac || die
-	rm compile_mac.sh || die
-}
-
-src_compile() {
-	pushd pydevd_attach_to_process/linux_and_mac || die
-	# recompile removed file (extracted from compile_linux.sh)
-	$(tc-getBUILD_CXX) ${CXXFLAGS} ${CPPFLAGS} \
-		-o "../attach_linux_${ARCH}.so" \
-		${LDFLAGS} -nostartfiles attach.cpp -ldl || die
-	popd || die
-
-	distutils-r1_src_compile
-
-	# C extensions
-	rm -r _pydevd* || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		# NB: upstream seems to run tests via runfiles.py but that script
-		# is a horror and it seems broken for us anyway
-		tests_python/test_debugger.py::test_attach_to_pid_halted
-		tests_python/test_debugger.py::test_attach_to_pid_no_threads
-		'tests_python/test_debugger.py::test_path_translation[False]'
-		tests_python/test_debugger_json.py::test_attach_to_pid
-		tests_python/test_debugger_json.py::test_evaluate_exception_trace
-		tests_python/test_debugger_json.py::test_gui_event_loop_custom
-		tests_python/test_debugger_json.py::test_path_translation_and_source_reference
-		tests_python/test_utilities.py::test_tracing_basic
-		tests_python/test_utilities.py::test_tracing_other_threads
-		# incompatible with xdist
-		tests_python/test_utilities.py::test_is_main_thread
-	)
-
-	case ${EPYTHON} in
-		python3.10)
-			EPYTEST_DESELECT+=(
-				tests_python/test_debugger.py::test_frame_eval_limitations
-			)
-			;&
-		python3.11)
-			EPYTEST_DESELECT+=(
-				tests_python/test_debugger.py::test_remote_debugger_threads
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# this is only used to compare against getpid() to detect that xdist
-	# is being used
-	local -x PYDEV_MAIN_PID=1
-	epytest -p rerunfailures --reruns=5
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	# Remove this duplicate that is installed directly to /usr/
-	# These files are also correctly installed to the python site-packages dir
-	rm -r "${ED}/usr/pydevd_attach_to_process" || die
-}
diff --git a/dev-python/pydevd/pydevd-3.1.0.ebuild b/dev-python/pydevd/pydevd-3.1.0-r1.ebuild
index 6dc4edbc8458..4315a5bb2904 100644
--- a/dev-python/pydevd/pydevd-3.1.0.ebuild
+++ b/dev-python/pydevd/pydevd-3.1.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{11..12} )
 
 inherit distutils-r1 toolchain-funcs
 
@@ -45,9 +45,11 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 
 	# Drop -O3 and -flto compiler args
+	# Make extension build failures fatal
 	sed -i \
 		-e 's/extra_link_args = extra_compile_args\[\:\]/pass/g' \
 		-e '/extra_compile_args/d' \
+		-e '/except/a\    raise' \
 		setup.py || die
 
 	# Disable tests incompatible with new package versions
@@ -110,14 +112,16 @@ python_test() {
 	)
 
 	case ${EPYTHON} in
-		python3.10)
+		python3.11)
 			EPYTEST_DESELECT+=(
 				tests_python/test_debugger.py::test_frame_eval_limitations
+				tests_python/test_debugger.py::test_remote_debugger_threads
 			)
-			;&
-		python3.11)
+			;;
+		python3.12)
 			EPYTEST_DESELECT+=(
-				tests_python/test_debugger.py::test_remote_debugger_threads
+				# flaky
+				tests_python/test_debugger_json.py::test_step_next_step_in_multi_threads
 			)
 			;;
 	esac