commit: 14cd2a833a30f155d035134b4cc97d706184a2a1 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Feb 10 09:32:20 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Feb 10 09:36:17 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14cd2a83
dev-python/ipykernel: Remove optional dev-python/debugpy dep Bug: https://bugs.gentoo.org/924221 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> .../{ipykernel-6.29.0.ebuild => ipykernel-6.29.0-r1.ebuild} | 11 ++++++----- .../{ipykernel-6.29.1.ebuild => ipykernel-6.29.1-r1.ebuild} | 11 ++++++----- .../{ipykernel-6.29.2.ebuild => ipykernel-6.29.2-r1.ebuild} | 11 ++++++----- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dev-python/ipykernel/ipykernel-6.29.0.ebuild b/dev-python/ipykernel/ipykernel-6.29.0-r1.ebuild similarity index 94% rename from dev-python/ipykernel/ipykernel-6.29.0.ebuild rename to dev-python/ipykernel/ipykernel-6.29.0-r1.ebuild index ac04c7e89795..bd572e177a81 100644 --- a/dev-python/ipykernel/ipykernel-6.29.0.ebuild +++ b/dev-python/ipykernel/ipykernel-6.29.0-r1.ebuild @@ -21,11 +21,6 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc RDEPEND=" >=dev-python/comm-0.1.1[${PYTHON_USEDEP}] - !elibc_Darwin? ( - $(python_gen_cond_dep ' - >=dev-python/debugpy-1.6.5[${PYTHON_USEDEP}] - ' 'python*') - ) >=dev-python/ipython-7.23.1[${PYTHON_USEDEP}] >=dev-python/jupyter-client-8[${PYTHON_USEDEP}] >=dev-python/jupyter-core-4.12[${PYTHON_USEDEP}] @@ -51,6 +46,12 @@ BDEPEND=" distutils_enable_tests pytest +src_prepare() { + # debugpy is actually optional + sed -i -e '/debugpy/d' pyproject.toml || die + distutils-r1_src_prepare +} + python_compile() { distutils-r1_python_compile # Use python3 in kernel.json configuration, bug #784764 diff --git a/dev-python/ipykernel/ipykernel-6.29.1.ebuild b/dev-python/ipykernel/ipykernel-6.29.1-r1.ebuild similarity index 94% rename from dev-python/ipykernel/ipykernel-6.29.1.ebuild rename to dev-python/ipykernel/ipykernel-6.29.1-r1.ebuild index 1bd0e3b093fe..a4f467fb5400 100644 --- a/dev-python/ipykernel/ipykernel-6.29.1.ebuild +++ b/dev-python/ipykernel/ipykernel-6.29.1-r1.ebuild @@ -21,11 +21,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 RDEPEND=" >=dev-python/comm-0.1.1[${PYTHON_USEDEP}] - !elibc_Darwin? ( - $(python_gen_cond_dep ' - >=dev-python/debugpy-1.6.5[${PYTHON_USEDEP}] - ' 'python*') - ) >=dev-python/ipython-7.23.1[${PYTHON_USEDEP}] >=dev-python/jupyter-client-8[${PYTHON_USEDEP}] >=dev-python/jupyter-core-4.12[${PYTHON_USEDEP}] @@ -51,6 +46,12 @@ BDEPEND=" distutils_enable_tests pytest +src_prepare() { + # debugpy is actually optional + sed -i -e '/debugpy/d' pyproject.toml || die + distutils-r1_src_prepare +} + python_compile() { distutils-r1_python_compile # Use python3 in kernel.json configuration, bug #784764 diff --git a/dev-python/ipykernel/ipykernel-6.29.2.ebuild b/dev-python/ipykernel/ipykernel-6.29.2-r1.ebuild similarity index 94% rename from dev-python/ipykernel/ipykernel-6.29.2.ebuild rename to dev-python/ipykernel/ipykernel-6.29.2-r1.ebuild index 1bd0e3b093fe..a4f467fb5400 100644 --- a/dev-python/ipykernel/ipykernel-6.29.2.ebuild +++ b/dev-python/ipykernel/ipykernel-6.29.2-r1.ebuild @@ -21,11 +21,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 RDEPEND=" >=dev-python/comm-0.1.1[${PYTHON_USEDEP}] - !elibc_Darwin? ( - $(python_gen_cond_dep ' - >=dev-python/debugpy-1.6.5[${PYTHON_USEDEP}] - ' 'python*') - ) >=dev-python/ipython-7.23.1[${PYTHON_USEDEP}] >=dev-python/jupyter-client-8[${PYTHON_USEDEP}] >=dev-python/jupyter-core-4.12[${PYTHON_USEDEP}] @@ -51,6 +46,12 @@ BDEPEND=" distutils_enable_tests pytest +src_prepare() { + # debugpy is actually optional + sed -i -e '/debugpy/d' pyproject.toml || die + distutils-r1_src_prepare +} + python_compile() { distutils-r1_python_compile # Use python3 in kernel.json configuration, bug #784764
