Re: [gentoo-dev] [PATCH 29/30] dev-libs/libwacom: Use python_has_version for verbose output

[Matt Turner]

On Sun, Feb 6, 2022 at 4:57 AM Michał Górny <mgorny@g.o> wrote:
>
> Signed-off-by: Michał Górny <mgorny@g.o>
> ---
>  dev-libs/libwacom/libwacom-1.11.ebuild | 6 +++---
>  dev-libs/libwacom/libwacom-1.12.ebuild | 6 +++---
>  2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/dev-libs/libwacom/libwacom-1.11.ebuild b/dev-libs/libwacom/libwacom-1.11.ebuild
> index acfda32d8405..3e406d573b91 100644
> --- a/dev-libs/libwacom/libwacom-1.11.ebuild
> +++ b/dev-libs/libwacom/libwacom-1.11.ebuild
> @@ -35,9 +35,9 @@ BDEPEND="
>  "
>
>  python_check_deps() {
> -       has_version -b "dev-python/python-libevdev[${PYTHON_USEDEP}]" &&
> -       has_version -b "dev-python/pyudev[${PYTHON_USEDEP}]" &&
> -       has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
> +       python_has_version -b "dev-python/python-libevdev[${PYTHON_USEDEP}]" &&
> +       python_has_version -b "dev-python/pyudev[${PYTHON_USEDEP}]" &&
> +       python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
>  }
>
>  pkg_setup() {
> diff --git a/dev-libs/libwacom/libwacom-1.12.ebuild b/dev-libs/libwacom/libwacom-1.12.ebuild
> index acfda32d8405..3e406d573b91 100644
> --- a/dev-libs/libwacom/libwacom-1.12.ebuild
> +++ b/dev-libs/libwacom/libwacom-1.12.ebuild
> @@ -35,9 +35,9 @@ BDEPEND="
>  "
>
>  python_check_deps() {
> -       has_version -b "dev-python/python-libevdev[${PYTHON_USEDEP}]" &&
> -       has_version -b "dev-python/pyudev[${PYTHON_USEDEP}]" &&
> -       has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
> +       python_has_version -b "dev-python/python-libevdev[${PYTHON_USEDEP}]" &&
> +       python_has_version -b "dev-python/pyudev[${PYTHON_USEDEP}]" &&
> +       python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
>  }
>

I like this, but just a question -- is this patch just an example of
how we can transition other ebuilds, or are you planning a
larger-scale replacement?

Also, I've always felt a little uncomfortable with the
python_check_deps() functions because of how easy it is to mess them
up. E.g., app-emulation/spice/spice-0.15.0.ebuild contains:

python_check_deps() {
    has_version -b ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
    has_version -b "dev-python/six[${PYTHON_USEDEP}]"
}

It should have a &&, right? There are many more instances of this in ::gentoo.

I wonder if this wouldn't be a good opportunity to change the API a
little. Could we make python_has_version take multiple arguments and
return true iff all are satisfied? Maybe like this?

python_check_deps() {
        has_version \
            -b ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]" \
            -b "dev-python/six[${PYTHON_USEDEP}]"
}

What do you think?