From 9ee6d97c2883d42f204a533a8bc1f4562df778fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 16 Sep 2020 09:32:48 +0100 Subject: gentoo resync : 16.09.2020 --- sys-apps/fwupd/Manifest | 4 +- sys-apps/fwupd/fwupd-1.4.4.ebuild | 165 -------------------------------------- sys-apps/fwupd/fwupd-1.4.6.ebuild | 165 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 167 insertions(+), 167 deletions(-) delete mode 100644 sys-apps/fwupd/fwupd-1.4.4.ebuild create mode 100644 sys-apps/fwupd/fwupd-1.4.6.ebuild (limited to 'sys-apps/fwupd') diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest index 5b633731bfae..c78b4ced2278 100644 --- a/sys-apps/fwupd/Manifest +++ b/sys-apps/fwupd/Manifest @@ -3,10 +3,10 @@ AUX fwupd-1.4.4-help2man_var.patch 2642 BLAKE2B c0a8f9f5a79c84a1521fc85feb9cd8af AUX fwupd-r1 303 BLAKE2B c940e8272c042ce1f82817f15faa82a3fd1bcd495da187473c8409db21a5e2e10da7cbe4bfd3b89d5b51d4f4d24c7f3c10214fa93e81c78c2c021c74dfd228df SHA512 f69438b16d3fa237cec0e5b48afb37b65835cebb47c682997eb0fa8a05e1ee8872da120c4003a8c8ed0801f7b4fe6bfd252349f9aaa4efe4b9b65517e6826acb 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.4.4.tar.gz 2311975 BLAKE2B 04ba05e157a1662dcd5fa8a3835701ff6c39935aa5e2d91e2aad3f7c7f5449ce56ac8f85bd4df4c3f4901c1d55d036f159eaf761761086bb1eda770021d38160 SHA512 9ce2ee8963789b99e43ebd3a76ba2851339bde6bda0c85198bbac11ebca76525385f41223956410bc1cff72318de463031f7e38b784fc5a4bf9bc2a85788db1a DIST fwupd-1.4.5.tar.gz 2318208 BLAKE2B 1e46137f5b72ff104d920771e54e3123bd0665cafd20c75327682a7e4284be93f8e284947db91892c29a153803013bab8ac45e5a0263fcda33b7491c53dd5558 SHA512 47eb40e8d84dc49af783b661db0fce0fb800c4581929becffb03b79c41ed8bfb0987f40fbb8262292b24af85b7f91978a6979ea7458058ee2bfc1a4353d0bd31 +DIST fwupd-1.4.6.tar.gz 2368201 BLAKE2B 86f4e8a3264b69eb72a357f59db082e81534dc28822934df328b1bf94aacb7ed1a219f8e5a03a9a37a0d07c248410822a3d12c4fd6b5df3a14157795e092a095 SHA512 c456704f40e7c5a5225255dbe3e4b794819d3fa982683a31b15a81f5467f007eef00cd80dac1844eca00ebab9ae12061139ae31c1fd7e2a6e012779d2a4b59f9 EBUILD fwupd-1.3.10.ebuild 4245 BLAKE2B c010711add27bf1c2526f4d3663d01b7cc0326f0099234f50c06f2e792eb59c59dcf510ee18354c5f4f214cf66f8b41faa2f535573400f07f1f16a266010fe07 SHA512 d99af54dc6d51b030d1515db64a8c3d13311fa6cedd8ac3b367b86671aa86205ac2cdac1219da2a27c555679764b6182fd3e2cb76752dc07a8fb750462bca523 EBUILD fwupd-1.3.11.ebuild 4247 BLAKE2B 61bf6e25d7217e6025669d98086ad77d774ff310662f3335e711e60f6521ab40d1ba2de37058c0630174cb4d7c81ca79d8857c5b49addeb2c73da899ee6daa91 SHA512 94abbbfc2ab9265b0feda0e2e7d67206abff0a2938a11b08ef5e5c861d88e942c034dd0a5dcfa894cb53cb9dabed0106fcd364e643bfe1ce753757c88703560e -EBUILD fwupd-1.4.4.ebuild 4159 BLAKE2B 36ec02aeb790d9be563a14b22c99cf725d103100e379872dd4dd3e7fc5f46893c161e0e4497d099bb93635e9559ede0c0e118520270f7bd3ff05fe153f7f7d7e SHA512 0e7cff54bc091018f9fa92c2e8c9d03b65bae73906fdfb5ac69920522d8ca7819164376f81864c217338bbeb44accd6662559bdc776cbbcd85aeeca2ab2a3515 EBUILD fwupd-1.4.5.ebuild 4157 BLAKE2B bf0ffae31ef8c9d1e79f0f108f6f457722ed0c8c5791ba27964d09e6fd9a9867d18cc0aec12604666099ab3ccb3228186326053000184616f872fa326c3b047c SHA512 1535f9a7d1361322bedb87e1668aa8f95385f221e4eb4170739c5aa8f7ae505ede416b06fa0747d6ff423de585e557a5ed4ec1bc8b0daae37b8b45a5ab31a098 +EBUILD fwupd-1.4.6.ebuild 4157 BLAKE2B bf0ffae31ef8c9d1e79f0f108f6f457722ed0c8c5791ba27964d09e6fd9a9867d18cc0aec12604666099ab3ccb3228186326053000184616f872fa326c3b047c SHA512 1535f9a7d1361322bedb87e1668aa8f95385f221e4eb4170739c5aa8f7ae505ede416b06fa0747d6ff423de585e557a5ed4ec1bc8b0daae37b8b45a5ab31a098 MISC metadata.xml 1183 BLAKE2B 1d98b79674b3d37f961dfa5f783d12f024865d2f29e53bb5e3de3daa47dbbc7993d0371ac93a7f1fd4411cee9dd0187a31d5904df23ea03ef4cd61e7a75f22dd SHA512 5357a5c7dd3e6578d5eb37296d484b8f5c89b0c619f0da783f642237cb00e72e8c6adc4c463c825959f2dcf58f52fe2f56623a4864b0bd41f26f530b7af51d42 diff --git a/sys-apps/fwupd/fwupd-1.4.4.ebuild b/sys-apps/fwupd/fwupd-1.4.4.ebuild deleted file mode 100644 index 16576fceb82f..000000000000 --- a/sys-apps/fwupd/fwupd-1.4.4.ebuild +++ /dev/null @@ -1,165 +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 introspection +man nvme 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] - ) -" -CDEPEND="${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/libjcat-0.1.0[gpg,pkcs7] - >=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 ) - !minimal? ( - >=sys-auth/polkit-0.103 - ) - nvme? ( sys-libs/efivar ) - 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=" - != 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 gtk-doc gtkdoc) - $(meson_use man) - $(meson_use nvme plugin_nvme) - $(meson_use introspection) - $(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) - # Although our sys-apps/flashrom package now provides - # libflashrom.a, meson still can't find it - -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 = 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 gtk-doc gtkdoc) + $(meson_use man) + $(meson_use nvme plugin_nvme) + $(meson_use introspection) + $(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) + # Although our sys-apps/flashrom package now provides + # libflashrom.a, meson still can't find it + -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