commit: 58996c17fc14caab6f1a678b5d326be0e76b94a4 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Oct 31 05:05:49 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Oct 31 05:05:49 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58996c17
net-misc/spice-gtk: fix finding newer pyparsing Closes: https://bugs.gentoo.org/820074 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/spice-gtk-0.39-fix-finding-pyparsing.patch | 13 +++++++++++++ net-misc/spice-gtk/spice-gtk-0.39-r1.ebuild | 8 ++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/net-misc/spice-gtk/files/spice-gtk-0.39-fix-finding-pyparsing.patch b/net-misc/spice-gtk/files/spice-gtk-0.39-fix-finding-pyparsing.patch new file mode 100644 index 00000000000..9a3cdd09006 --- /dev/null +++ b/net-misc/spice-gtk/files/spice-gtk-0.39-fix-finding-pyparsing.patch @@ -0,0 +1,13 @@ +https://gitlab.freedesktop.org/spice/spice-common/-/issues/5 +https://bugs.gentoo.org/820074 +--- a/subprojects/spice-common/meson.build ++++ b/subprojects/spice-common/meson.build +@@ -132,7 +132,7 @@ if spice_common_generate_client_code or spice_common_generate_server_code + if get_option('python-checks') + foreach module : ['six', 'pyparsing'] + message('Checking for python module @0@'.format(module)) +- cmd = run_command(python, '-m', module) ++ cmd = run_command(python, '-c', 'import @0@'.format(module)) + if cmd.returncode() != 0 + error('Python module @0@ not found'.format(module)) + endif diff --git a/net-misc/spice-gtk/spice-gtk-0.39-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.39-r1.ebuild index 7005e220e2e..08fdbf6d9fa 100644 --- a/net-misc/spice-gtk/spice-gtk-0.39-r1.ebuild +++ b/net-misc/spice-gtk/spice-gtk-0.39-r1.ebuild @@ -79,9 +79,13 @@ BDEPEND=" ') " +PATCHES=( + "${FILESDIR}"/${PN}-0.39-fix-finding-pyparsing.patch +) + python_check_deps() { - has_version "dev-python/six[${PYTHON_USEDEP}]" && - has_version "dev-python/pyparsing[${PYTHON_USEDEP}]" + has_version -b "dev-python/six[${PYTHON_USEDEP}]" && + has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]" } src_prepare() {
