commit: 3c7c7194dcd4b12cfeed0aae4222974015a97e6e Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Jan 31 03:18:06 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jan 31 03:19:02 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c7c7194
dev-util/unicorn: fix Python dependencies (BDEPEND) I'm not sure there's anything distutils-r1.eclass can do for us here, so it is what it is, but we need to inline the deps from the eclass as we've set DISTUTILS_OPTIONAL to only do the Python parts w/ USE=python. Closes: https://bugs.gentoo.org/832337 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-util/unicorn/unicorn-2.0.0_rc5.ebuild | 9 ++++++++- dev-util/unicorn/unicorn-9999.ebuild | 10 +++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dev-util/unicorn/unicorn-2.0.0_rc5.ebuild b/dev-util/unicorn/unicorn-2.0.0_rc5.ebuild index 1a1090444ff1..8687e522b5a0 100644 --- a/dev-util/unicorn/unicorn-2.0.0_rc5.ebuild +++ b/dev-util/unicorn/unicorn-2.0.0_rc5.ebuild @@ -31,7 +31,14 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" DEPEND="${PYTHON_DEPS} dev-libs/glib:2" RDEPEND="python? ( ${PYTHON_DEPS} )" -BDEPEND="virtual/pkgconfig" +# See bug #832337 re Python deps +BDEPEND="virtual/pkgconfig + python? ( + >=dev-python/installer-0.4.0_p20220124[${PYTHON_USEDEP}] + dev-python/tomli[${PYTHON_USEDEP}] + >=dev-python/setuptools-60.5.0[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + )" UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc" diff --git a/dev-util/unicorn/unicorn-9999.ebuild b/dev-util/unicorn/unicorn-9999.ebuild index 0c2d81bebca9..8687e522b5a0 100644 --- a/dev-util/unicorn/unicorn-9999.ebuild +++ b/dev-util/unicorn/unicorn-9999.ebuild @@ -5,6 +5,7 @@ EAPI=8 MY_PV=${PV/_/-} +DISTUTILS_USE_PEP517=setuptools DISTUTILS_OPTIONAL=1 PYTHON_COMPAT=( python3_{9..10} ) inherit cmake distutils-r1 @@ -30,7 +31,14 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" DEPEND="${PYTHON_DEPS} dev-libs/glib:2" RDEPEND="python? ( ${PYTHON_DEPS} )" -BDEPEND="virtual/pkgconfig" +# See bug #832337 re Python deps +BDEPEND="virtual/pkgconfig + python? ( + >=dev-python/installer-0.4.0_p20220124[${PYTHON_USEDEP}] + dev-python/tomli[${PYTHON_USEDEP}] + >=dev-python/setuptools-60.5.0[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + )" UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc"
