From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- sys-apps/fwupd/Manifest | 12 ++- sys-apps/fwupd/fwupd-1.2.11.ebuild | 4 +- sys-apps/fwupd/fwupd-1.2.8.ebuild | 140 -------------------------------- sys-apps/fwupd/fwupd-1.3.4.ebuild | 159 ------------------------------------ sys-apps/fwupd/fwupd-1.3.5.ebuild | 4 +- sys-apps/fwupd/fwupd-1.3.6.ebuild | 161 +++++++++++++++++++++++++++++++++++++ sys-apps/fwupd/metadata.xml | 1 + 7 files changed, 171 insertions(+), 310 deletions(-) delete mode 100644 sys-apps/fwupd/fwupd-1.2.8.ebuild delete mode 100644 sys-apps/fwupd/fwupd-1.3.4.ebuild create mode 100644 sys-apps/fwupd/fwupd-1.3.6.ebuild (limited to 'sys-apps/fwupd') diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest index b6c322d9e057..15e1e94cec60 100644 --- a/sys-apps/fwupd/Manifest +++ b/sys-apps/fwupd/Manifest @@ -1,10 +1,8 @@ AUX fwupd-r1 303 BLAKE2B c940e8272c042ce1f82817f15faa82a3fd1bcd495da187473c8409db21a5e2e10da7cbe4bfd3b89d5b51d4f4d24c7f3c10214fa93e81c78c2c021c74dfd228df SHA512 f69438b16d3fa237cec0e5b48afb37b65835cebb47c682997eb0fa8a05e1ee8872da120c4003a8c8ed0801f7b4fe6bfd252349f9aaa4efe4b9b65517e6826acb DIST fwupd-1.2.11.tar.gz 1945646 BLAKE2B 4eb6d5008d0e515880147a94b2632ed70b5f7ab1891775ac121347653c06bf4403ab7f4a1fe160000a6195d360fe06d64c8971dd53c1538aeac40d155f59979a SHA512 a8d6a76ac59937547c6866d414e95a67779574901b0a15ecfde763f49b434b284be2ade1194179225785006e5f93836667469d08f32d4c87fc85927aa0bfe9de -DIST fwupd-1.2.8.tar.gz 1911999 BLAKE2B 61a24ce24f778b96f7ad23496890f7a1d20c09e6bbd707f29d154992668d5c0a25cfd31b5d0d11519740e086c098cbdfd440fe9f5cab4dde0ac43fe6b438e911 SHA512 d603f9f4e5a4c0fc6abb0b75f7d884eff47fb8a16285aa545f7140fe98ce781d127ff3769f9c206bb3bfd084bbc5bf6abf9424f70e727ff79162416fe7881154 -DIST fwupd-1.3.4.tar.gz 2151009 BLAKE2B 3ea171d4a9498963b6082ae2e3f9b41edde862b84f3f506e403bc2dd6a08ec27ccbac6c5891bdf567860f43b008ccd36a7e6d40e72f2d252eceb913833372719 SHA512 00b6ba394c74252c1c7eba5e5e1fd92f234fb6db6de8bca69fbc578bf3b12790867b6adaef6c422c801d28990d390bbe8af67ab0f5bd3a744adbeb053708a254 DIST fwupd-1.3.5.tar.gz 2164874 BLAKE2B aa268f3d94b3c7104cad5e80de81a724ba978e3da468cd2d44833656c5b0a95b1f720f5c7a0dd9812b8afce4c58e8f777e13ea2e1f4ce0b8b582ee3c731b744a SHA512 b1944b06bed9cb10ec90219235b168a76fcf6ff7b8938dfba36259f07efed71a755d7b91fcbe8f6fda00ac971bd5d4734a49e045005e2e1c32b49fc5b86c48dd -EBUILD fwupd-1.2.11.ebuild 3793 BLAKE2B c5a9c015421ac2405f1b366869a01139f28caae2b7e57906e65493e38cafdbda7b170a53d5d49750dda0ede86b3611fd05a0031acef741d6eecc9889c4cf6c11 SHA512 9fb39992086689a325c1f931e1df1737e69689938e62f96e55177c3f582400546531b32fb3ae21e2a35c6f820bc72511d40a37932f9e462d7dbb01928c465d4e -EBUILD fwupd-1.2.8.ebuild 3683 BLAKE2B 3c1626fe3945a7b838e79ab032fec7ef02fb78b03ddcefcf845f5bc300f4938eeabe2cdc668ff342d3ced5d64f1ef6c1136e05d84e3dac24f7c8df1351cc5b53 SHA512 f81515eb238834dbeb95c8906a8c33e79d2381c455eb07c8593d9e96d223ba5d319b40dc6df55f34cbbbb16d4c29572ea06c4d8b016aff770ae8362938176a0a -EBUILD fwupd-1.3.4.ebuild 3961 BLAKE2B cd73af45cd3c45c8b98aadba4a12ddd6aca773a68048bea1330f09a73919c94eca3c7d9e375fa6199f30d0e9701cdf2ce29552de0d5c354a8be88767ffa0549f SHA512 7cee94266bb8d1f3c0ae9d9b447b6988b4f96231042eaabadd000765e13d4e0510a3bd0823cf1176a5f2a51a38b4c46da94981e5ba8f7eea258316070107e3e0 -EBUILD fwupd-1.3.5.ebuild 3963 BLAKE2B 70c276596e2e3907fb39ae5436878c9a933cfbf1e34ace19ae81a606a3c54b0069250340840c9508551c28df36c1074a9fba605c3f2561c51f8c67f8c0110c4f SHA512 afc01f9ea0b5bea531835bbe21cee21891dfe0ee446c03c022accff50c375967e47e9578b5ab5c7aa85d1fcf88e844501e0493a8d62f65d3299b65a77867099a -MISC metadata.xml 1333 BLAKE2B 7978d7232cd10e4fd6d19684077dd1ba1a7db10c4869bfffcb7bc6410134da36572bccc21bd00ed29671513f3ea1323bec4dac15fdbb94e22adf523fdcd90fae SHA512 188a5b54787b8b41a0101ec580a59e0edebb94db65c4360bfc3dd108458a8ea80d43873a1109075bdac15beb77034d3a1d4d118a29235da6c74faed5111355f7 +DIST fwupd-1.3.6.tar.gz 2207849 BLAKE2B 465055d90576d4c0a7812f2554d2bc3298a12030816a2469ce653d28f9ea81e363c401355191d41b200975a615cfc64b954e0cced6b6f6bbfbbf26f63163a25e SHA512 20a5f346563b1cb8296f31ea448f336d8b54df2e5296524e2fa040a31001838b0de4a88f0d4aad9f5eeaeb4acc46919c0effb254ce681556db00cec5a4a1bc78 +EBUILD fwupd-1.2.11.ebuild 3791 BLAKE2B f3451bde6287c540e43ec0903c060caf19f27c0f60b190e7bee5c5da66663a0c461488b1f649e7c0cdaf7f1c97169cc629b20f2e383a1c05336677829a3beeb8 SHA512 cd0af110d7bd7f8941c473bbd576a4d8df7d3b51bdb76dca1dfacf63304f9649886151dfc478800ed21ce311e1a0cce16e1c4735178f6c1748ca93de34d59a36 +EBUILD fwupd-1.3.5.ebuild 3961 BLAKE2B a5cd38338045f77dc4fdb5da17adc38c9a00ed286dc4d6c6316d3a150e07369c62e06dbe4d0613bc948407ff745feb63b01bca9d22a1dab8902ee1722e2c896e SHA512 860bc62000ad160c7c61a75bedf4ebee7bf5040776f53805dfe30d95a267bdf78fcfa64faa3fc8f97ad4dcc929cec7ec27eba85945c4f9437ad1e030f3184421 +EBUILD fwupd-1.3.6.ebuild 4024 BLAKE2B 8eecd7d737f0fa364c55da844a3d85dc632a568e65dbf3c49b98ad3aaf1b9f026a26e374008ce16ede3faeefb1e137743df8b058d04fe43d4e1363a15360b103 SHA512 b924fc66266c20e4abdcfc41c159c2bc9eddb5095dc94e31b967fc309872c3ec5040b12011d21ba6320264e4f4c0e446f3364795ec461f50eb8dfd9d73ae318c +MISC metadata.xml 1400 BLAKE2B e2baf5dbca095abc30bc3f59774d8bae41439077869ece11807d87843227d44b4d6aaa28c82809dc179a1d620b0de8fa49d23a95461658f9f4fa392e2c75e5c6 SHA512 13fe991997037e814131b4c7d5089b8aa11b43029e2a13d6708060d7c4b7c3cf8ec696eb777546242d87ede48362ddd54fe022735787b9fc7e6d31517321384d diff --git a/sys-apps/fwupd/fwupd-1.2.11.ebuild b/sys-apps/fwupd/fwupd-1.2.11.ebuild index 31f15d07c13a..8bad64accc42 100644 --- a/sys-apps/fwupd/fwupd-1.2.11.ebuild +++ b/sys-apps/fwupd/fwupd-1.2.11.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{5,6,7} ) +PYTHON_COMPAT=( python3_{6,7} ) inherit meson python-single-r1 vala xdg-utils diff --git a/sys-apps/fwupd/fwupd-1.2.8.ebuild b/sys-apps/fwupd/fwupd-1.2.8.ebuild deleted file mode 100644 index a1aaa0b451dd..000000000000 --- a/sys-apps/fwupd/fwupd-1.2.8.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{5,6,7} ) - -inherit meson python-single-r1 vala xdg-utils - -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 colorhug consolekit dell doc elogind +gpg +man nvme pkcs7 redfish systemd test thunderbolt uefi" -RESTRICT="!test? ( test )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - ^^ ( consolekit elogind systemd ) - dell? ( uefi ) -" - -RDEPEND="${PYTHON_DEPS} - app-arch/gcab - 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.7 - 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] - >=sys-auth/polkit-0.103 - virtual/libelf:0= - colorhug? ( >=x11-misc/colord-1.2.12:0= ) - 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 - ) - nvme? ( sys-libs/efivar ) - pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) - redfish? ( sys-libs/efivar ) - systemd? ( >=sys-apps/systemd-211 ) - thunderbolt? ( sys-apps/thunderbolt-software-user-space ) - uefi? ( - media-libs/fontconfig - media-libs/freetype - sys-boot/gnu-efi - >=sys-libs/efivar-33 - x11-libs/cairo - ) -" -DEPEND="${RDEPEND} - $(vala_depend) - x11-libs/pango[introspection] - nvme? ( >=sys-kernel/linux-headers-4.4 ) - test? ( net-libs/gnutls[tools] ) -" -BDEPEND=" - >=dev-util/meson-0.47.0 - virtual/pkgconfig - doc? ( dev-util/gtk-doc ) - man? ( - app-text/docbook-sgml-utils - sys-apps/help2man - ) -" - -# required for fwupd daemon to run. -# NOT a build time dependency. The build system does not check for dbus. -PDEPEND="sys-apps/dbus" - -src_prepare() { - default - sed -e "s/'--create'/'--absolute-name', '--create'/" \ - -i data/tests/builder/meson.build || die - sed -e "/'-Werror',/d" \ - -i plugins/uefi/efi/meson.build || die - vala_src_prepare -} - -src_configure() { - xdg_environment_reset - local emesonargs=( - --localstatedir "${EPREFIX}"/var - -Dagent="$(usex agent true false)" - -Dconsolekit="$(usex consolekit true false)" - -Dgtkdoc="$(usex doc true false)" - -Delogind="$(usex elogind true false)" - -Dgpg="$(usex gpg true false)" - -Dman="$(usex man true false)" - -Dpkcs7="$(usex pkcs7 true false)" - -Dplugin_dell="$(usex dell true false)" - # Dependencies are not available (yet?) - -Dplugin_modem_manager="false" - -Dplugin_nvme="$(usex nvme true false)" - -Dplugin_redfish="$(usex redfish true false)" - -Dplugin_synaptics="$(usex dell true false)" - -Dplugin_thunderbolt="$(usex thunderbolt true false)" - -Dplugin_uefi="$(usex uefi true false)" - -Dsystemd="$(usex systemd true false)" - -Dtests="$(usex test true false)" - ) - - meson_src_configure -} - -src_install() { - meson_src_install - - 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 -} - -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 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 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 = 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 Install redfish plugin Install synaptics plugin Install Thunderbolt plugin + Install Trusted Platform Module plugin Enable UEFI support -- cgit v1.2.3