commit: 4fc968b0903d9f7c074b65d33f32ba553b4c49df Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Thu Jun 18 16:17:19 2020 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Thu Jun 18 16:35:22 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fc968b0
sys-apps/fwupd: Removed old Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> sys-apps/fwupd/Manifest | 1 - .../fwupd/files/fwupd-1.3.9-fwupdtool_path.patch | 20 --- .../fwupd-1.3.9-optional_agent_man_page.patch | 57 ------- sys-apps/fwupd/fwupd-1.3.9-r1.ebuild | 166 --------------------- 4 files changed, 244 deletions(-) diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest index a155d6738c3..79f3f3a7349 100644 --- a/sys-apps/fwupd/Manifest +++ b/sys-apps/fwupd/Manifest @@ -1,6 +1,5 @@ DIST fwupd-1.2.11.tar.gz 1945646 BLAKE2B 4eb6d5008d0e515880147a94b2632ed70b5f7ab1891775ac121347653c06bf4403ab7f4a1fe160000a6195d360fe06d64c8971dd53c1538aeac40d155f59979a SHA512 a8d6a76ac59937547c6866d414e95a67779574901b0a15ecfde763f49b434b284be2ade1194179225785006e5f93836667469d08f32d4c87fc85927aa0bfe9de DIST fwupd-1.3.10.tar.gz 2255394 BLAKE2B 39f517b7648236f39df6f41b5950fcba45a1184f269e533facd752f8e132bb979b32a1420ce4bfcad5bb5d5546ea3f28b357603f7754267550fc02c2125642c5 SHA512 a30ef2933fc01136a9296e99a0b1b9220f952a058aa28339ff944633a8966678b374f479b3a93a1e63bd97491679d3ce304cb621f6e63b86238a8746768daac2 DIST fwupd-1.3.11.tar.gz 2255359 BLAKE2B 0f91c32602459d31e53c63647762307cfe2313c553e16836cc646eb04e3ac54ebd53d2e8615afb7f43b8cd79b7e6315ed688ae04b57de851be62ed6065579ebf SHA512 e300a84a1c2d7e44e2a1d5d86300487783fc3990b20b540065f9899705569bee8996eae951f32b6fac559e76955ff9b661aa9b181e4dc0211a33a514613ffddd -DIST fwupd-1.3.9.tar.gz 2254260 BLAKE2B ead64be3eca00fd2d045fb6c5ccd42d8913fa056736e6ae039feef70b6edababe50fb0552db39bf057750d3f0d2224b18b7ecf5a5a408a1f1ac3023d89687f68 SHA512 b81ef1f683082e4c49ab8acd8848118fed1383d4e3e73967daaa68927e553a5bc4973004d3dd26b268b901c5deb1f9238a98537d24cfd957162f508c9622e1e4 DIST fwupd-1.4.2.tar.gz 2304086 BLAKE2B 9a725cc49479984c3a98b75e9c52211a26f81d4a7ecec3b261ff4486201a967a6c82df9a1dbd591b91d9cd6eb9d1a8cd8cccfd2c8dd98d5bb3f82cb03bbd0a52 SHA512 b092eedf3e5e84874de1fddb7f14ca87975d5895721ac4f87b6c88ec7c7b2367e573b30906588f9adad4cea52da5ebbaaa4a9c38a2273e8f31d26399e719166e DIST fwupd-1.4.4.tar.gz 2311975 BLAKE2B 04ba05e157a1662dcd5fa8a3835701ff6c39935aa5e2d91e2aad3f7c7f5449ce56ac8f85bd4df4c3f4901c1d55d036f159eaf761761086bb1eda770021d38160 SHA512 9ce2ee8963789b99e43ebd3a76ba2851339bde6bda0c85198bbac11ebca76525385f41223956410bc1cff72318de463031f7e38b784fc5a4bf9bc2a85788db1a diff --git a/sys-apps/fwupd/files/fwupd-1.3.9-fwupdtool_path.patch b/sys-apps/fwupd/files/fwupd-1.3.9-fwupdtool_path.patch deleted file mode 100644 index a01e5fbe570..00000000000 --- a/sys-apps/fwupd/files/fwupd-1.3.9-fwupdtool_path.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 4e381f2a61c6ea4eb7438c14f76b8301762a800c Mon Sep 17 00:00:00 2001 -From: Dennis Kadioglu <[email protected]> -Date: Thu, 5 Mar 2020 09:37:56 +0100 -Subject: [PATCH] fix fwupd.shutdown.in according to the movement of fwupdtool - to bindir - ---- - data/fwupd.shutdown.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/fwupd.shutdown.in b/data/fwupd.shutdown.in -index 4c027e7ab..53b334555 100755 ---- a/data/fwupd.shutdown.in -+++ b/data/fwupd.shutdown.in -@@ -4,4 +4,4 @@ - [ -f @localstatedir@/lib/fwupd/pending.db ] || exit 0 - - # activate firmware when we have a read-only filesysten --@libexecdir@/fwupd/fwupdtool activate -+@bindir@/fwupdtool activate diff --git a/sys-apps/fwupd/files/fwupd-1.3.9-optional_agent_man_page.patch b/sys-apps/fwupd/files/fwupd-1.3.9-optional_agent_man_page.patch deleted file mode 100644 index 6c9898557ff..00000000000 --- a/sys-apps/fwupd/files/fwupd-1.3.9-optional_agent_man_page.patch +++ /dev/null @@ -1,57 +0,0 @@ -From bacd3a44fe6f06ddd8bb65a3a56eb1738a65ed8c Mon Sep 17 00:00:00 2001 -From: Lars Wendler <[email protected]> -Date: Fri, 6 Mar 2020 16:00:23 +0100 -Subject: [PATCH] Don't build/install fwupdagent man page if agent build is not - requested - -Otherwise build fails with: - - src/meson.build:196:2: ERROR: Unknown variable "fwupdagent". - -Gentoo-bug: https://bugs.gentoo.org/711682 -Signed-off-by: Lars Wendler <[email protected]> ---- - src/meson.build | 30 ++++++++++++++++-------------- - 1 file changed, 16 insertions(+), 14 deletions(-) - -diff --git a/src/meson.build b/src/meson.build -index 46a9c4ded..e9aac607e 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -193,20 +193,22 @@ if build_daemon and get_option('man') - install : true, - install_dir : join_paths(mandir, 'man1'), - ) -- custom_target('fwupdagent-man', -- input : fwupdagent, -- output : 'fwupdagent.1', -- command : [ -- help2man, '@INPUT@', -- '--no-info', -- '--output', '@OUTPUT@', -- '--name', 'Firmware updating agent', -- '--manual', 'User Commands', -- '--version-string', fwupd_version, -- ], -- install : true, -- install_dir : join_paths(mandir, 'man1'), -- ) -+ if get_option('agent') -+ custom_target('fwupdagent-man', -+ input : fwupdagent, -+ output : 'fwupdagent.1', -+ command : [ -+ help2man, '@INPUT@', -+ '--no-info', -+ '--output', '@OUTPUT@', -+ '--name', 'Firmware updating agent', -+ '--manual', 'User Commands', -+ '--version-string', fwupd_version, -+ ], -+ install : true, -+ install_dir : join_paths(mandir, 'man1'), -+ ) -+ endif - endif - if get_option('man') - custom_target('fwupdtool-man', diff --git a/sys-apps/fwupd/fwupd-1.3.9-r1.ebuild b/sys-apps/fwupd/fwupd-1.3.9-r1.ebuild deleted file mode 100644 index 9e00025905c..00000000000 --- a/sys-apps/fwupd/fwupd-1.3.9-r1.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -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/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="agent amt consolekit dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - ^^ ( consolekit elogind minimal systemd ) - dell? ( uefi ) - minimal? ( !introspection ) -" -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] - ) -" -DEPEND="${PYTHON_DEPS} - >=app-arch/gcab-1.0 - app-arch/libarchive:= - dev-db/sqlite - >=dev-libs/glib-2.45.8:2 - dev-libs/json-glib - dev-libs/libgpg-error - dev-libs/libgudev:= - >=dev-libs/libgusb-0.2.9[introspection?] - >=dev-libs/libxmlb-0.1.13 - $(python_gen_cond_dep ' - dev-python/pillow[${PYTHON_MULTI_USEDEP}] - dev-python/pycairo[${PYTHON_MULTI_USEDEP}] - dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}] - ') - >=net-libs/libsoup-2.51.92:2.4[introspection?] - virtual/libelf:0= - virtual/udev - consolekit? ( >=sys-auth/consolekit-1.0.0 ) - dell? ( - sys-libs/efivar - >=sys-libs/libsmbios-2.4.0 - ) - elogind? ( sys-auth/elogind ) - gpg? ( - app-crypt/gpgme - dev-libs/libgpg-error - ) - !minimal? ( - >=sys-auth/polkit-0.103 - ) - nvme? ( sys-libs/efivar ) - pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) - redfish? ( sys-libs/efivar ) - systemd? ( >=sys-apps/systemd-211 ) - tpm? ( app-crypt/tpm2-tss ) - uefi? ( - app-crypt/tpm2-tss - media-libs/fontconfig - media-libs/freetype - sys-boot/gnu-efi - sys-boot/efibootmgr - >=sys-libs/efivar-33 - x11-libs/cairo - ) -" -# Block sci-chemistry/chemical-mime-data for bug #701900 -RDEPEND=" - !<sci-chemistry/chemical-mime-data-0.1.94-r4 - ${DEPEND} - sys-apps/dbus -" - -PATCHES=( - "${FILESDIR}/${PN}-1.3.9-logind_plugin.patch" - "${FILESDIR}/${P}-optional_agent_man_page.patch" - "${FILESDIR}/${P}-fwupdtool_path.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 - vala_src_prepare -} - -src_configure() { - local emesonargs=( - --localstatedir "${EPREFIX}"/var - -Dbuild="$(usex minimal standalone all)" - $(meson_use agent) - $(meson_use amt plugin_amt) - $(meson_use consolekit) - $(meson_use dell plugin_dell) - $(meson_use elogind) - $(meson_use gpg) - $(meson_use gtk-doc gtkdoc) - $(meson_use man) - $(meson_use nvme plugin_nvme) - $(meson_use pkcs7) - $(meson_use redfish plugin_redfish) - $(meson_use synaptics plugin_synaptics) - $(meson_use systemd) - $(meson_use test tests) - $(meson_use thunderbolt plugin_thunderbolt) - $(meson_use tpm plugin_tpm) - $(meson_use uefi plugin_uefi) - # Requires libflashrom which our sys-apps/flashrom - # package does not provide - -Dplugin_flashrom="false" - # Dependencies are not available (yet?) - -Dplugin_modem_manager="false" - ) - export CACHE_DIRECTORY="${T}" - meson_src_configure -} - -src_install() { - meson_src_install - - if ! use minimal ; then - sed "s@%SEAT_MANAGER%@$(usex elogind elogind consolekit)@" \ - "${FILESDIR}"/${PN}-r1 \ - > "${T}"/${PN} || die - doinitd "${T}"/${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 -} - -pkg_postinst() { - xdg_pkg_postinst - elog "In case you are using openrc as init system" - elog "and you're upgrading from <fwupd-1.1.0, you" - elog "need to start the fwupd daemon via the openrc" - elog "init script that comes with this package." -}
