From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/, sys-apps/fwupd/files/
Date: Fri, 12 Nov 2021 18:59:31 +0000 (UTC) [thread overview]
Message-ID: <1636743544.93027e7e5bdddce470fa96c6cda0d34142f6d263.floppym@gentoo> (raw)
commit: 93027e7e5bdddce470fa96c6cda0d34142f6d263
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 12 18:23:09 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Nov 12 18:59:04 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93027e7e
sys-apps/fwupd: drop 1.6.2, 1.6.3, 1.7.0
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/fwupd/Manifest | 3 -
...-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch | 27 ----
.../fwupd-1.6.2-dell-dock-requires-gusb.patch | 24 ---
.../files/fwupd-1.7.0-elanfp-requires-gusb.patch | 22 ---
.../files/fwupd-1.7.0-fix-test-configure.patch | 20 ---
sys-apps/fwupd/fwupd-1.6.2.ebuild | 176 --------------------
sys-apps/fwupd/fwupd-1.6.3.ebuild | 175 --------------------
sys-apps/fwupd/fwupd-1.7.0.ebuild | 180 ---------------------
8 files changed, 627 deletions(-)
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 9163bf9246a..97b203eccf0 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,6 +1,3 @@
DIST fwupd-1.5.9.tar.gz 3712637 BLAKE2B 17429bdc3073a92b94de9bc67ce1955e928e8d6aeefa5f0ad39a9d15457f96c562ce5cfbc47e1fc450c31c2b9334ca3902ed63ef809e8d2cb5b5459cc54dec28 SHA512 ccd1246ab5b3c876251924a14d1c2c553b2df5702c6673978b1d627ea1028c3950241f73dd54e2fecb5cc204a1dc77e6597f7514eff6467beb50be7874352d78
-DIST fwupd-1.6.2.tar.gz 3885963 BLAKE2B 183abc4d620b884a276dece39ad1e57f606c2237a5fa03b76ede2e1c93bb9548d6641e35490d96e22abbbfb3c1852697a688091f62086f6b2e9d3366e796888e SHA512 a743b37c5969939cc3eb708b0af2e8f6c665848868473c29edf9db110cef5ac62da3c042cfa9617a2f10b2a9d153d0d4146a1832a18bc71fadcbf9a7b5cea1b0
-DIST fwupd-1.6.3.tar.gz 3888812 BLAKE2B 08d24fde80010d50e2396f59d743a00e640c1fcc06f6ada566ebcff48d25f1dc33676a40d13e1b684e45fd9483af1d9755ef3ac00bdaa8a37236589c03bb8a4c SHA512 837bcfe57873315ade8f3ff82d290d492dcb047387db5a642e6e7fc8e9ff7c3cabe5892692e2d4b5b0c5bd69f8a253bc364c61f23013c161a350b39de7d58e67
DIST fwupd-1.6.4.tar.gz 3891113 BLAKE2B b4f3a629c0594ee69a0e2ea727c8080f63e970a6e9964b53d007e490d6b538f5441a65de20412673ded181611342c7c1c1ec16eb0d05c69c149f635fed325269 SHA512 d0c788313f8cf00c6e0e238436668ab5885133933cd74202d3eb4a3377d1b123689dd7f3827d45853c92b98196d5d896027b471117af461356e2f3c3ec82f58e
-DIST fwupd-1.7.0.tar.gz 4102985 BLAKE2B 9a29621e029c526d513304863294ee69f14ff1cf069b388fe5dc6037b2f030ea24136f18d9096abcc449376295996e3184c1c969f8dda329f2786622ba1300a7 SHA512 148f161f0e8d008fa20091c747baf4a205bc2e76ddc5dbb3676e3f2a15ca5d6d1454b572ea0336f185b5ef3a8ca8bfd3ad1098649e095a58c9822d4dbffe2987
DIST fwupd-1.7.1.tar.gz 4025627 BLAKE2B 035796e8ebaafe139b8b6e7014f51c6e16a228d0ef697984f86e31c28f38aa62bc7d3bd64466b3f3c83c2605b229d7b3063287373c83ec4d962adca3c85cc6de SHA512 c695b66ebbe23908f5d6ef6d6084c092af8754e0677f094ee4d09b02d904f3f3cca0e460c5345a835c16b7303bba72209e216ba28285e44bce4872fffa136a5e
diff --git a/sys-apps/fwupd/files/fwupd-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch b/sys-apps/fwupd/files/fwupd-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch
deleted file mode 100644
index 99434fe226f..00000000000
--- a/sys-apps/fwupd/files/fwupd-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 196cc6d9b445ee4246c7ff18d98d616aef286550 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Wed, 4 Aug 2021 15:38:59 +0200
-Subject: [PATCH] plugin modem-manager: XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY is
- only available in >=libxmlb-0.2.2
-
-Closes: https://github.com/fwupd/fwupd/issues/3600
----
- plugins/modem-manager/fu-firehose-updater.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/plugins/modem-manager/fu-firehose-updater.c b/plugins/modem-manager/fu-firehose-updater.c
-index 00fcdf607..076aa79cc 100644
---- a/plugins/modem-manager/fu-firehose-updater.c
-+++ b/plugins/modem-manager/fu-firehose-updater.c
-@@ -630,7 +630,11 @@ fu_firehose_updater_run_action (FuFirehoseUpdater *self, XbNode *node, guint max
-
- action = xb_node_get_element (node);
-
-+#if LIBXMLB_CHECK_VERSION(0,2,2)
- cmd_str = xb_node_export (node, XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY, error);
-+#else
-+ cmd_str = xb_node_export (node, XB_NODE_EXPORT_FLAG_NONE, error);
-+#endif
- if (cmd_str == NULL)
- return FALSE;
- cmd_bytearray = g_byte_array_new_take ((guint8 *)cmd_str, strlen (cmd_str));
diff --git a/sys-apps/fwupd/files/fwupd-1.6.2-dell-dock-requires-gusb.patch b/sys-apps/fwupd/files/fwupd-1.6.2-dell-dock-requires-gusb.patch
deleted file mode 100644
index 162cc194a2a..00000000000
--- a/sys-apps/fwupd/files/fwupd-1.6.2-dell-dock-requires-gusb.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 4f5961a389698844117e70601ccf4c9e3ae1cb86 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Wed, 4 Aug 2021 15:11:26 +0200
-Subject: [PATCH] dell-dock plugin requires gusb
-
-Closes: https://github.com/fwupd/fwupd/issues/3598
----
- plugins/dell-dock/meson.build | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/plugins/dell-dock/meson.build b/plugins/dell-dock/meson.build
-index 829771de1..ae8f67f33 100644
---- a/plugins/dell-dock/meson.build
-+++ b/plugins/dell-dock/meson.build
-@@ -1,3 +1,4 @@
-+if get_option('gusb')
- cargs = ['-DG_LOG_DOMAIN="FuPluginDellDock"']
-
- install_data(['dell-dock.quirk'],
-@@ -34,3 +35,4 @@ shared_module('fu_plugin_dell_dock',
- gudev,
- ],
- )
-+endif
diff --git a/sys-apps/fwupd/files/fwupd-1.7.0-elanfp-requires-gusb.patch b/sys-apps/fwupd/files/fwupd-1.7.0-elanfp-requires-gusb.patch
deleted file mode 100644
index fec6aab4a3c..00000000000
--- a/sys-apps/fwupd/files/fwupd-1.7.0-elanfp-requires-gusb.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit fa403db414301c247aef1bc895795a04b06d9298
-Author: Thomas Deutschmann <whissi@gentoo.org>
-AuthorDate: Fri Oct 15 15:45:55 2021 +0200
-Commit: Thomas Deutschmann <whissi@gentoo.org>
-CommitDate: Fri Oct 15 15:45:55 2021 +0200
-
- elanfp plugin requires gusb
-
-diff --git a/plugins/elanfp/meson.build b/plugins/elanfp/meson.build
-index e8bb8255..2b5d7fde 100644
---- a/plugins/elanfp/meson.build
-+++ b/plugins/elanfp/meson.build
-@@ -1,3 +1,4 @@
-+if get_option('gusb')
- cargs = ['-DG_LOG_DOMAIN="FuPluginElanfp"']
-
- install_data(['elanfp.quirk'],
-@@ -27,3 +28,4 @@ shared_module('fu_plugin_elanfp',
- plugin_deps,
- ],
- )
-+endif
diff --git a/sys-apps/fwupd/files/fwupd-1.7.0-fix-test-configure.patch b/sys-apps/fwupd/files/fwupd-1.7.0-fix-test-configure.patch
deleted file mode 100644
index 4974a82bdf5..00000000000
--- a/sys-apps/fwupd/files/fwupd-1.7.0-fix-test-configure.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# https://bugs.gentoo.org/791760
-# https://github.com/fwupd/fwupd/pull/3921
-
-diff --git a/plugins/synaptics-rmi/meson.build b/plugins/synaptics-rmi/meson.build
-index acbb6b92..10ac3047 100644
---- a/plugins/synaptics-rmi/meson.build
-+++ b/plugins/synaptics-rmi/meson.build
-@@ -38,7 +38,6 @@ shared_module('fu_plugin_synaptics_rmi',
- fwupdplugin,
- ],
- )
--endif
-
- if get_option('tests')
- e = executable(
-@@ -67,3 +66,4 @@ if get_option('tests')
- )
- test('synaptics-rmi-self-test', e)
- endif
-+endif
diff --git a/sys-apps/fwupd/fwupd-1.6.2.ebuild b/sys-apps/fwupd/fwupd-1.6.2.ebuild
deleted file mode 100644
index aa776823c5e..00000000000
--- a/sys-apps/fwupd/fwupd-1.6.2.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="agent amt archive bluetooth dell elogind flashrom gnutls gtk-doc gusb introspection lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- ^^ ( elogind minimal systemd )
- dell? ( uefi )
- minimal? ( !introspection )
- spi? ( lzma )
- synaptics? ( gnutls )
- uefi? ( gnutls )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(vala_depend)
- virtual/pkgconfig
- gtk-doc? ( dev-util/gtk-doc )
- introspection? ( dev-libs/gobject-introspection )
- man? (
- app-text/docbook-sgml-utils
- sys-apps/help2man
- )
- test? (
- thunderbolt? ( dev-util/umockdev )
- net-libs/gnutls[tools]
- )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- >=app-arch/gcab-1.0
- dev-db/sqlite
- >=dev-libs/glib-2.45.8:2
- dev-libs/json-glib
- dev-libs/libgpg-error
- dev-libs/libgudev:=
- >=dev-libs/libjcat-0.1.0[gpg,pkcs7]
- >=dev-libs/libxmlb-0.1.13:=
- $(python_gen_cond_dep '
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
- ')
- >=net-libs/libsoup-2.51.92:2.4[introspection?]
- net-misc/curl
- virtual/libelf:0=
- virtual/udev
- archive? ( app-arch/libarchive:= )
- dell? ( >=sys-libs/libsmbios-2.4.0 )
- elogind? ( >=sys-auth/elogind-211 )
- flashrom? ( >=sys-apps/flashrom-1.2-r3 )
- gnutls? ( net-libs/gnutls )
- gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
- lzma? ( app-arch/xz-utils )
- modemmanager? ( net-misc/modemmanager[qmi] )
- policykit? ( >=sys-auth/polkit-0.103 )
- systemd? ( >=sys-apps/systemd-211 )
- tpm? ( app-crypt/tpm2-tss )
- uefi? (
- sys-apps/fwupd-efi
- sys-boot/efibootmgr
- sys-fs/udisks
- sys-libs/efivar
- )
-"
-# Block sci-chemistry/chemical-mime-data for bug #701900
-RDEPEND="
- !<sci-chemistry/chemical-mime-data-0.1.94-r4
- ${COMMON_DEPEND}
- sys-apps/dbus
-"
-
-DEPEND="
- ${COMMON_DEPEND}
- x11-libs/pango[introspection]
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.5.7-logind_plugin.patch
- "${FILESDIR}"/${P}-dell-dock-requires-gusb.patch
- "${FILESDIR}"/${P}-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
- if use nvme ; then
- kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
- fi
-}
-
-src_prepare() {
- default
- # c.f. https://github.com/fwupd/fwupd/issues/1414
- sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
- -i plugins/thunderbolt/meson.build || die
-
- sed -e '/platform-integrity/d' \
- -i plugins/meson.build || die #753521
-
- sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \
- -i data/builder/meson.build || die
-
- vala_src_prepare
-}
-
-src_configure() {
- local plugins=(
- $(meson_use amt plugin_amt)
- $(meson_use dell plugin_dell)
- $(meson_use flashrom plugin_flashrom)
- $(meson_use gusb plugin_altos)
- $(meson_use modemmanager plugin_modem_manager)
- $(meson_use nvme plugin_nvme)
- $(meson_use spi plugin_intel_spi)
- $(meson_use synaptics plugin_synaptics_mst)
- $(meson_use synaptics plugin_synaptics_rmi)
- $(meson_use thunderbolt plugin_thunderbolt)
- $(meson_use tpm plugin_tpm)
- $(meson_use uefi plugin_uefi_capsule)
- $(meson_use uefi plugin_uefi_capsule_splash)
- $(meson_use uefi plugin_uefi_pk)
- )
- use ppc64 && plugins+=( -Dplugin_msr="false" )
-
- local emesonargs=(
- --localstatedir "${EPREFIX}"/var
- -Dbuild="$(usex minimal standalone all)"
- -Dconsolekit="false"
- -Dcurl="true"
- -Ddocs="$(usex gtk-doc gtkdoc none)"
- -Defi_binary="false"
- -Dsupported_build="true"
- $(meson_use agent)
- $(meson_use archive libarchive)
- $(meson_use bluetooth bluez)
- $(meson_use elogind)
- $(meson_use gnutls)
- $(meson_use gusb)
- $(meson_use lzma)
- $(meson_use man)
- $(meson_use introspection)
- $(meson_use policykit polkit)
- $(meson_use systemd)
- $(meson_use test tests)
-
- ${plugins[@]}
- )
- use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
- export CACHE_DIRECTORY="${T}"
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- if ! use minimal ; then
- newinitd "${FILESDIR}"/${PN}-r2 ${PN}
-
- if ! use systemd ; then
- # Don't timeout when fwupd is running (#673140)
- sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
- -i "${ED}"/etc/${PN}/daemon.conf || die
- fi
- fi
-}
diff --git a/sys-apps/fwupd/fwupd-1.6.3.ebuild b/sys-apps/fwupd/fwupd-1.6.3.ebuild
deleted file mode 100644
index 39ff4e2e07d..00000000000
--- a/sys-apps/fwupd/fwupd-1.6.3.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="agent amt archive bluetooth dell elogind flashrom gnutls gtk-doc gusb introspection lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- ^^ ( elogind minimal systemd )
- dell? ( uefi )
- minimal? ( !introspection )
- spi? ( lzma )
- synaptics? ( gnutls )
- uefi? ( gnutls )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(vala_depend)
- virtual/pkgconfig
- gtk-doc? ( dev-util/gtk-doc )
- introspection? ( dev-libs/gobject-introspection )
- man? (
- app-text/docbook-sgml-utils
- sys-apps/help2man
- )
- test? (
- thunderbolt? ( dev-util/umockdev )
- net-libs/gnutls[tools]
- )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- >=app-arch/gcab-1.0
- dev-db/sqlite
- >=dev-libs/glib-2.45.8:2
- dev-libs/json-glib
- dev-libs/libgpg-error
- dev-libs/libgudev:=
- >=dev-libs/libjcat-0.1.0[gpg,pkcs7]
- >=dev-libs/libxmlb-0.1.13:=
- $(python_gen_cond_dep '
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
- ')
- >=net-libs/libsoup-2.51.92:2.4[introspection?]
- net-misc/curl
- virtual/libelf:0=
- virtual/udev
- archive? ( app-arch/libarchive:= )
- dell? ( >=sys-libs/libsmbios-2.4.0 )
- elogind? ( >=sys-auth/elogind-211 )
- flashrom? ( >=sys-apps/flashrom-1.2-r3 )
- gnutls? ( net-libs/gnutls )
- gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
- lzma? ( app-arch/xz-utils )
- modemmanager? ( net-misc/modemmanager[qmi] )
- policykit? ( >=sys-auth/polkit-0.103 )
- systemd? ( >=sys-apps/systemd-211 )
- tpm? ( app-crypt/tpm2-tss )
- uefi? (
- sys-apps/fwupd-efi
- sys-boot/efibootmgr
- sys-fs/udisks
- sys-libs/efivar
- )
-"
-# Block sci-chemistry/chemical-mime-data for bug #701900
-RDEPEND="
- !<sci-chemistry/chemical-mime-data-0.1.94-r4
- ${COMMON_DEPEND}
- sys-apps/dbus
-"
-
-DEPEND="
- ${COMMON_DEPEND}
- x11-libs/pango[introspection]
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.5.7-logind_plugin.patch
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
- if use nvme ; then
- kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
- fi
-}
-
-src_prepare() {
- default
- # c.f. https://github.com/fwupd/fwupd/issues/1414
- sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
- -i plugins/thunderbolt/meson.build || die
-
- sed -e '/platform-integrity/d' \
- -i plugins/meson.build || die #753521
-
- sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \
- -i data/builder/meson.build || die
-
- vala_src_prepare
-}
-
-src_configure() {
- local plugins=(
- $(meson_use amt plugin_amt)
- $(meson_use dell plugin_dell)
- $(meson_use flashrom plugin_flashrom)
- $(meson_use gusb plugin_altos)
- $(meson_use modemmanager plugin_modem_manager)
- $(meson_use nvme plugin_nvme)
- $(meson_use spi plugin_intel_spi)
- $(meson_use synaptics plugin_synaptics_mst)
- $(meson_use synaptics plugin_synaptics_rmi)
- $(meson_use thunderbolt plugin_thunderbolt)
- $(meson_use tpm plugin_tpm)
- $(meson_use uefi plugin_uefi_capsule)
- $(meson_use uefi plugin_uefi_capsule_splash)
- $(meson_use uefi plugin_uefi_pk)
- )
- use ppc64 && plugins+=( -Dplugin_msr="false" )
- use riscv && plugins+=( -Dplugin_msr="false" )
-
- local emesonargs=(
- --localstatedir "${EPREFIX}"/var
- -Dbuild="$(usex minimal standalone all)"
- -Dconsolekit="false"
- -Dcurl="true"
- -Ddocs="$(usex gtk-doc gtkdoc none)"
- -Defi_binary="false"
- -Dsupported_build="true"
- $(meson_use agent)
- $(meson_use archive libarchive)
- $(meson_use bluetooth bluez)
- $(meson_use elogind)
- $(meson_use gnutls)
- $(meson_use gusb)
- $(meson_use lzma)
- $(meson_use man)
- $(meson_use introspection)
- $(meson_use policykit polkit)
- $(meson_use systemd)
- $(meson_use test tests)
-
- ${plugins[@]}
- )
- use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
- export CACHE_DIRECTORY="${T}"
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- if ! use minimal ; then
- newinitd "${FILESDIR}"/${PN}-r2 ${PN}
-
- if ! use systemd ; then
- # Don't timeout when fwupd is running (#673140)
- sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
- -i "${ED}"/etc/${PN}/daemon.conf || die
- fi
- fi
-}
diff --git a/sys-apps/fwupd/fwupd-1.7.0.ebuild b/sys-apps/fwupd/fwupd-1.7.0.ebuild
deleted file mode 100644
index aa0388af005..00000000000
--- a/sys-apps/fwupd/fwupd-1.7.0.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit linux-info meson python-single-r1 vala xdg
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="agent amt archive bluetooth dell elogind flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- ^^ ( elogind minimal systemd )
- dell? ( uefi )
- logitech? ( gusb )
- minimal? ( !introspection )
- spi? ( lzma )
- synaptics? ( gnutls )
- uefi? ( gnutls )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(vala_depend)
- virtual/pkgconfig
- gtk-doc? ( dev-util/gtk-doc )
- introspection? ( dev-libs/gobject-introspection )
- man? (
- app-text/docbook-sgml-utils
- sys-apps/help2man
- )
- test? (
- thunderbolt? ( dev-util/umockdev )
- net-libs/gnutls[tools]
- )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- >=app-arch/gcab-1.0
- dev-db/sqlite
- >=dev-libs/glib-2.45.8:2
- dev-libs/json-glib
- dev-libs/libgpg-error
- dev-libs/libgudev:=
- >=dev-libs/libjcat-0.1.0[gpg,pkcs7]
- >=dev-libs/libxmlb-0.1.13:=[introspection?]
- $(python_gen_cond_dep '
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
- ')
- >=net-libs/libsoup-2.51.92:2.4[introspection?]
- net-misc/curl
- virtual/libelf:0=
- virtual/udev
- archive? ( app-arch/libarchive:= )
- dell? ( >=sys-libs/libsmbios-2.4.0 )
- elogind? ( >=sys-auth/elogind-211 )
- flashrom? ( >=sys-apps/flashrom-1.2-r3 )
- gnutls? ( net-libs/gnutls )
- gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
- logitech? ( dev-libs/protobuf-c:= )
- lzma? ( app-arch/xz-utils )
- modemmanager? ( net-misc/modemmanager[qmi] )
- policykit? ( >=sys-auth/polkit-0.103 )
- systemd? ( >=sys-apps/systemd-211 )
- tpm? ( app-crypt/tpm2-tss )
- uefi? (
- sys-apps/fwupd-efi
- sys-boot/efibootmgr
- sys-fs/udisks
- sys-libs/efivar
- )
-"
-# Block sci-chemistry/chemical-mime-data for bug #701900
-RDEPEND="
- !<sci-chemistry/chemical-mime-data-0.1.94-r4
- ${COMMON_DEPEND}
- sys-apps/dbus
-"
-
-DEPEND="
- ${COMMON_DEPEND}
- x11-libs/pango[introspection]
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.5.7-logind_plugin.patch
- "${FILESDIR}"/${P}-elanfp-requires-gusb.patch
- "${FILESDIR}"/${P}-fix-test-configure.patch # bug 791760
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
- if use nvme ; then
- kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
- fi
-}
-
-src_prepare() {
- default
- # c.f. https://github.com/fwupd/fwupd/issues/1414
- sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
- -i plugins/thunderbolt/meson.build || die
-
- sed -e '/platform-integrity/d' \
- -i plugins/meson.build || die #753521
-
- sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \
- -i data/builder/meson.build || die
-
- vala_src_prepare
-}
-
-src_configure() {
- local plugins=(
- $(meson_use amt plugin_amt)
- $(meson_use dell plugin_dell)
- $(meson_use flashrom plugin_flashrom)
- $(meson_use gusb plugin_altos)
- $(meson_use logitech plugin_logitech_bulkcontroller)
- $(meson_use modemmanager plugin_modem_manager)
- $(meson_use nvme plugin_nvme)
- $(meson_use spi plugin_intel_spi)
- $(meson_use synaptics plugin_synaptics_mst)
- $(meson_use synaptics plugin_synaptics_rmi)
- $(meson_use thunderbolt plugin_thunderbolt)
- $(meson_use tpm plugin_tpm)
- $(meson_use uefi plugin_uefi_capsule)
- $(meson_use uefi plugin_uefi_capsule_splash)
- $(meson_use uefi plugin_uefi_pk)
- )
- use ppc64 && plugins+=( -Dplugin_msr="false" )
- use riscv && plugins+=( -Dplugin_msr="false" )
-
- local emesonargs=(
- --localstatedir "${EPREFIX}"/var
- -Dbuild="$(usex minimal standalone all)"
- -Dconsolekit="false"
- -Dcurl="true"
- -Ddocs="$(usex gtk-doc gtkdoc none)"
- -Defi_binary="false"
- -Dsupported_build="true"
- $(meson_use agent)
- $(meson_use archive libarchive)
- $(meson_use bluetooth bluez)
- $(meson_use elogind)
- $(meson_use gnutls)
- $(meson_use gusb)
- $(meson_use lzma)
- $(meson_use man)
- $(meson_use introspection)
- $(meson_use policykit polkit)
- $(meson_use systemd)
- $(meson_use test tests)
-
- ${plugins[@]}
- )
- use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
- export CACHE_DIRECTORY="${T}"
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- if ! use minimal ; then
- newinitd "${FILESDIR}"/${PN}-r2 ${PN}
-
- if ! use systemd ; then
- # Don't timeout when fwupd is running (#673140)
- sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
- -i "${ED}"/etc/${PN}/daemon.conf || die
- fi
- fi
-}
next reply other threads:[~2021-11-12 18:59 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-12 18:59 Mike Gilbert [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-10-03 2:00 [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/, sys-apps/fwupd/files/ Sam James
2025-10-03 1:44 Sam James
2025-05-23 6:15 Sam James
2023-05-21 11:25 Marek Szuba
2023-02-24 16:50 Marek Szuba
2023-02-24 16:50 Marek Szuba
2023-01-24 11:01 Marek Szuba
2022-11-10 0:42 Marek Szuba
2022-10-13 9:31 Marek Szuba
2022-08-21 1:16 Marek Szuba
2022-07-27 22:43 Marek Szuba
2022-07-27 13:10 Marek Szuba
2022-01-17 16:08 Lars Wendler
2022-01-10 14:13 Lars Wendler
2021-10-31 2:46 Sam James
2021-06-15 12:21 Thomas Deutschmann
2021-04-13 21:53 Lars Wendler
2021-03-24 16:07 Matt Turner
2020-06-19 6:35 Lars Wendler
2019-05-20 14:13 Lars Wendler
2019-02-25 12:01 Andreas Sturmlechner
2019-02-14 1:30 Lars Wendler
2017-12-03 13:55 Lars Wendler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1636743544.93027e7e5bdddce470fa96c6cda0d34142f6d263.floppym@gentoo \
--to=floppym@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox