sys-apps/fwupd: update min ver for jcat, move pygobject dep

- jcat was updated to require >=0.2.0, otherwise build failures
- dev-python/pygobject:3[cairo] is required only for make-images.py,
  which is needed only during build time for plugin_uefi_capsule, which
  is behind IUSE="uefi". I'm not sure if dev-python/pygobject is needed
  for somehting else, so I just remove the [cairo] dep for now.

Closes: https://bugs.gentoo.org/953391
Closes: https://bugs.gentoo.org/946608
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
This commit is contained in:
Arthur Zamarin
2025-05-08 11:05:03 +03:00
parent b9094111eb
commit e75cac1457
2 changed files with 17 additions and 8 deletions

View File

@@ -1,9 +1,9 @@
# Copyright 1999-2024 Gentoo Authors
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{10..13} )
PYTHON_COMPAT=( python3_{11..13} )
inherit meson python-single-r1 vala udev xdg
@@ -43,16 +43,21 @@ BDEPEND="$(vala_depend)
test? (
net-libs/gnutls[tools]
)
uefi? (
$(python_gen_cond_dep '
dev-python/pygobject:3[cairo]
')
)
"
COMMON_DEPEND="${PYTHON_DEPS}
>=app-arch/gcab-1.0
app-arch/xz-utils
>=dev-libs/glib-2.72:2
>=dev-libs/json-glib-1.6.0
>=dev-libs/libjcat-0.1.4[gpg,pkcs7]
>=dev-libs/libjcat-0.2.0[gpg,pkcs7]
>=dev-libs/libxmlb-0.3.19:=[introspection?]
$(python_gen_cond_dep '
dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
dev-python/pygobject:3[${PYTHON_USEDEP}]
')
>=net-misc/curl-7.62.0
archive? ( app-arch/libarchive:= )

View File

@@ -3,7 +3,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..13} )
PYTHON_COMPAT=( python3_{11..13} )
inherit meson python-single-r1 vala udev xdg
@@ -44,16 +44,21 @@ BDEPEND="$(vala_depend)
test? (
net-libs/gnutls[tools]
)
uefi? (
$(python_gen_cond_dep '
dev-python/pygobject:3[cairo]
')
)
"
COMMON_DEPEND="${PYTHON_DEPS}
>=app-arch/gcab-1.0
app-arch/xz-utils
>=dev-libs/glib-2.72:2
>=dev-libs/json-glib-1.6.0
>=dev-libs/libjcat-0.1.4[gpg,pkcs7]
>=dev-libs/libjcat-0.2.0[gpg,pkcs7]
>=dev-libs/libxmlb-0.3.19:=[introspection?]
$(python_gen_cond_dep '
dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
dev-python/pygobject:3[${PYTHON_USEDEP}]
')
>=net-misc/curl-7.62.0
archive? ( app-arch/libarchive:= )
@@ -145,7 +150,6 @@ src_configure() {
$(meson_feature policykit polkit)
$(meson_feature sqlite)
$(meson_feature systemd)
$(meson_use seccomp systemd_syscall_filter)
$(meson_use test tests)
${plugins[@]}