gentoo resync : 17.02.2021

4 files changed, 73 insertions, 14 deletions

diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index ab8b5ee0759b..40e5ec81069b 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,10 +1,11 @@
 AUX fwupd-1.3.9-logind_plugin.patch 281 BLAKE2B 237c6d6f8a43408186c6707f1c373b2600bae6ad6ef750c579b7d51023615fc7f0569011aa88e73cb72030c4112f1d26e924676bc6fd1cb9e9c9a7fef76f8800 SHA512 148a5af93d2c3554239c5529d63e5f85ed70192856ca375ce0126c183babda7d7de5cf345e875f7cd88c6cce52f409f05f1689625ea6dde14bf330c9e11d98b9
 AUX fwupd-1.4.4-help2man_var.patch 2642 BLAKE2B c0a8f9f5a79c84a1521fc85feb9cd8afbb58a44b9af69726c86d4c1720a202d1721d74a83e35bb431b2c4e6e56281249353975954a69145a80f8e8b9b0152eea SHA512 f9b72f1ca470ac2e33428e03d3287420877d20597a83bf8db21510e3ab4980a26f1832091a087888f38891be4e912cf29e1568fc67d2e604622c28303cb5701e
+AUX fwupd-1.5.6-gusb_deps.patch 1553 BLAKE2B 799957e4902ae31d94a1a5f304c6a814862c7b4d4c5020e47fb24210f5ab80fca4977d9fec102c751d7944ce7f4dcc76ce8a6c712c78346f578c949783b3881d SHA512 295a00515968e4beea761f2552e4de32bb7b6028cf889412988fd4df7df61f352551c46639a4c4e5d9cf33f6d89af58711288f50d71c0215055e25eb442ef813
 AUX fwupd-r1 303 BLAKE2B c940e8272c042ce1f82817f15faa82a3fd1bcd495da187473c8409db21a5e2e10da7cbe4bfd3b89d5b51d4f4d24c7f3c10214fa93e81c78c2c021c74dfd228df SHA512 f69438b16d3fa237cec0e5b48afb37b65835cebb47c682997eb0fa8a05e1ee8872da120c4003a8c8ed0801f7b4fe6bfd252349f9aaa4efe4b9b65517e6826acb
 DIST fwupd-1.4.6.tar.gz 2368201 BLAKE2B 86f4e8a3264b69eb72a357f59db082e81534dc28822934df328b1bf94aacb7ed1a219f8e5a03a9a37a0d07c248410822a3d12c4fd6b5df3a14157795e092a095 SHA512 c456704f40e7c5a5225255dbe3e4b794819d3fa982683a31b15a81f5467f007eef00cd80dac1844eca00ebab9ae12061139ae31c1fd7e2a6e012779d2a4b59f9
-DIST fwupd-1.5.4.tar.gz 2435897 BLAKE2B 23318f5305e3f2478c866e17e150ca3863e5eebf922e81f28a35541af4d9786dada8d2084e51b51e97343bdbf132e9b9981b8bb321ad4e76fba8c42b8b1e2e64 SHA512 961c9298e7672f720f4b6865d374b6066379f0a1c1a99356a9efd9359ee737cf9f9ab2c708f81505c971484d172b8dae96bc5f06be6e6f13c4a55604e6c346e7
 DIST fwupd-1.5.5.tar.gz 2460482 BLAKE2B 79d1b34c07a0befe355e9a6c68770dfbbc575fd540802dd20ae4f65061d9fffd6245944e6f33b702539a5e88563afc7b4c619ca1507e31465dcf40138f92902f SHA512 a37f16b01e6700b0302293a916a379a89b574eed13f63577c19fa8b0ec396bd19f7f7d5c708085f3817af60fca65c02b0ddc4370de82104a5e8e65f583ff3f4a
+DIST fwupd-1.5.6.tar.gz 2480802 BLAKE2B ab9d9cffaf74b4ce6a9de47ef37aa05efae0c0b353f879eb3d0573fd4153c0893922c3a47b68188998752c2f9a75ca340ecb7af94e6c85890060f3826900f812 SHA512 6a04151b53c4446c15527f6b1396ba238b749c6f767dff4171849ccbdab8db2619fd1e3f0e146fd67681263621d55f20008709c7bac10a6d34f27f06c7118cfe
 EBUILD fwupd-1.4.6.ebuild 4056 BLAKE2B 061c425224845a2f3d3947abe7bcedcd11c3d859b111c68ee12b438a2788297e37b296d0ea8b7b2118fda490fa37a3bf9f801735ec4b2b9634b63ccd55000a9d SHA512 84b58cf5c6aef3d0bd5645cb19114b01e173049e1a263276ecb195d4925e22d2d36f248df1c3254e3fb6520e7cf72de35cffc4554bbe0353222d682b12ddc47a
-EBUILD fwupd-1.5.4.ebuild 4003 BLAKE2B 213a7af6b27788dfcc05afe402e3490e2e4ec7e9e5b249184545fcb5350f399641cd60fa05c2efed76b8c5c3592dbd31ed622227a46164db55a75f537e92e13e SHA512 8a2e31098784a8936383b8917fbc3544ba0e960ae782cf2da413a8c6c48109adaef4cd7afbf192b04d4e2c222b05616e84df6cbf2211fad681c50d621c90636c
 EBUILD fwupd-1.5.5.ebuild 4097 BLAKE2B a14977e523100693480d5aa6a60c98c20816e21e0cfbbf003675da54608737c5c4a0785fa18e145a94725458288e1753f3340262efbb250ccafa013113cb214b SHA512 2e2b9f8ccc12c66daed63404437434af2dc311e0b3569bbcb0b93e107182505942210e3badc5f7b3986cfd1511470c755ec9c95bb2fff5e7857148efc9e24c47
-MISC metadata.xml 1038 BLAKE2B e4c7d1ce48108981032cc875ed3512e16eb5ea81197380c42cbf828c67259ec42fa0623b12a4aca12015c2c72033e8edcfeab3a15f9970ad45886cb8b860e1a6 SHA512 0bc97498a83deb2d8ae85df1f7ed8d2191a4b9d0814f388fd32c5cd4efbdc86c5359eb9e8ba2e62561d73dd2af5537c5f6ec61862a2fd24606ac5a96c7fa30d2
+EBUILD fwupd-1.5.6.ebuild 4440 BLAKE2B 4c12a21a99aa943aaa16020a6ad61858c7397599654fed0cbccf5d3e644aea74e4ff8985d61bc6cf135e9769d5f7e47b9e46f94f5e6aa92d6a84b56208761ba2 SHA512 94b058117ca1707880df50ab4c4a375f58451382b6f31475f85ab5f80c027ee9b8fedc1ac49acc9ca120248073178c94923bb75809a2c6b5cf34c9b9dc32a674
+MISC metadata.xml 1198 BLAKE2B 7f11be3fdf5dd361e4e7f17cb6f14d8be875eafb2aee7a608ca351bd914f491db42437a284246e243f5899686cdf635a7e7bebfa91da98d701bbb77d20cf751d SHA512 ea5a7fdd5f33f6a51ee6e647562279aba534ef755662a519b4edc9a41c925b7463cfcc266f9611755ac88caed81eb433bcefeb9f95cdbe3c29fde7e6574dce74
diff --git a/sys-apps/fwupd/files/fwupd-1.5.6-gusb_deps.patch b/sys-apps/fwupd/files/fwupd-1.5.6-gusb_deps.patch
new file mode 100644
index 000000000000..00c79d7853b8
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.5.6-gusb_deps.patch
@@ -0,0 +1,44 @@
+From c74992c62a32080208baf137d61f7d73b0cade2d Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Tue, 16 Feb 2021 16:57:36 +0100
+Subject: [PATCH] system76-launch plugin requires gusb
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Otherwise the following build error happens:
+
+  ../fwupd-1.5.6/plugins/system76-launch/fu-system76-launch-device.c:117:9: error: ‘G_USB_DEVICE_CLAIM_INTERFACE_BIND_KERNEL_DRIVER’ undeclared (first use in this function)
+    117 |         G_USB_DEVICE_CLAIM_INTERFACE_BIND_KERNEL_DRIVER,
+        |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+  ../fwupd-1.5.6/plugins/system76-launch/fu-system76-launch-device.c:133:11: error: ‘G_USB_DEVICE_CLAIM_INTERFACE_BIND_KERNEL_DRIVER’ undeclared (first use in this function)
+    133 |           G_USB_DEVICE_CLAIM_INTERFACE_BIND_KERNEL_DRIVER,
+        |           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+---
+ plugins/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/meson.build b/plugins/meson.build
+index 138c47a4..12c7cb31 100644
+--- a/plugins/meson.build
++++ b/plugins/meson.build
+@@ -25,7 +25,6 @@ subdir('ata')
+ subdir('elantp')
+ subdir('optionrom')
+ subdir('superio')
+-subdir('system76-launch')
+ subdir('thelio-io')
+ subdir('wacom-raw')
+ endif
+@@ -59,6 +58,7 @@ subdir('solokey')
+ subdir('steelseries')
+ subdir('synaptics-cxaudio')
+ subdir('synaptics-prometheus')
++subdir('system76-launch')
+ subdir('vli')
+ subdir('wacom-usb')
+ 
+-- 
+2.30.1
+
diff --git a/sys-apps/fwupd/fwupd-1.5.4.ebuild b/sys-apps/fwupd/fwupd-1.5.6.ebuild
index 68a615fa9da6..605097ca1b75 100644
--- a/sys-apps/fwupd/fwupd-1.5.4.ebuild
+++ b/sys-apps/fwupd/fwupd-1.5.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
 
@@ -14,11 +14,12 @@ 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 dell gtk-doc elogind flashrom minimal introspection +man nvme policykit synaptics systemd test thunderbolt tpm uefi"
+IUSE="agent amt archive dell gnutls gtk-doc gusb elogind flashrom minimal introspection +man nvme policykit synaptics systemd test thunderbolt tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( elogind minimal systemd )
 	dell? ( uefi )
 	minimal? ( !introspection )
+	uefi? ( gnutls )
 "
 RESTRICT="!test? ( test )"
 
@@ -35,15 +36,13 @@ BDEPEND="$(vala_depend)
 		net-libs/gnutls[tools]
 	)
 "
-CDEPEND="${PYTHON_DEPS}
+COMMON_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.3.5[introspection?]
 	>=dev-libs/libjcat-0.1.0[gpg,pkcs7]
 	>=dev-libs/libxmlb-0.1.13:=
 	$(python_gen_cond_dep '
@@ -55,9 +54,12 @@ CDEPEND="${PYTHON_DEPS}
 	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?] )
 	policykit? ( >=sys-auth/polkit-0.103 )
 	systemd? ( >=sys-apps/systemd-211 )
 	tpm? ( app-crypt/tpm2-tss )
@@ -66,6 +68,7 @@ CDEPEND="${PYTHON_DEPS}
 		media-libs/freetype
 		sys-boot/gnu-efi
 		sys-boot/efibootmgr
+		sys-fs/udisks
 		sys-libs/efivar
 		x11-libs/cairo
 	)
@@ -73,17 +76,18 @@ CDEPEND="${PYTHON_DEPS}
 # Block sci-chemistry/chemical-mime-data for bug #701900
 RDEPEND="
 	!<sci-chemistry/chemical-mime-data-0.1.94-r4
-	${CDEPEND}
+	${COMMON_DEPEND}
 	sys-apps/dbus
 "
 
 DEPEND="
-	${CDEPEND}
+	${COMMON_DEPEND}
 	x11-libs/pango[introspection]
 "
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
+	"${FILESDIR}/${PN}-1.5.6-gusb_deps.patch"
 )
 
 pkg_setup() {
@@ -109,25 +113,33 @@ src_configure() {
 		-Dbuild="$(usex minimal standalone all)"
 		$(meson_use agent)
 		$(meson_use amt plugin_amt)
+		$(meson_use archive libarchive)
 		$(meson_use dell plugin_dell)
 		$(meson_use elogind)
 		$(meson_use flashrom plugin_flashrom)
+		$(meson_use gnutls)
 		$(meson_use gtk-doc gtkdoc)
+		$(meson_use gusb)
+		$(meson_use gusb plugin_altos)
 		$(meson_use man)
 		$(meson_use nvme plugin_nvme)
 		$(meson_use introspection)
 		$(meson_use policykit polkit)
-		$(meson_use synaptics plugin_synaptics)
+		$(meson_use synaptics plugin_synaptics_mst)
+		$(meson_use synaptics plugin_synaptics_rmi)
 		$(meson_use systemd)
 		$(meson_use test tests)
 		$(meson_use thunderbolt plugin_thunderbolt)
 		$(meson_use tpm)
-		$(meson_use uefi plugin_uefi)
+		$(meson_use uefi plugin_uefi_capsule)
+		$(meson_use uefi plugin_uefi_pk)
+		-Dconsolekit="false"
+		-Dcurl="true"
 		# Dependencies are not available (yet?)
 		-Dplugin_modem_manager="false"
-		-Dconsolekit="false"
 	)
 	use ppc64 && emesonargs+=( -Dplugin_msr="false" )
+	use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
 	export CACHE_DIRECTORY="${T}"
 	meson_src_configure
 }
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index c4fce7423fee..b2692d9a2fc8 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -7,9 +7,11 @@
   </maintainer>
   <use>
     <flag name="agent">Enable update notification agent</flag>
+    <flag name="archive">Use <pkg>app-arch/libarchive</pkg> for archives support</flag>
     <flag name="amt">Build and install Intel AMT plugin</flag>
     <flag name="dell">Enable Dell-specific support.</flag>
     <flag name="flashrom">Enable flashrom plugin via <pkg>sys-apps/flashrom</pkg></flag>
+    <flag name="gusb">Enable <pkg>dev-libs/libgusb</pkg> support</flag>
     <flag name="man">Build and install man pages</flag>
     <flag name="nvme">Build and install NVMe plugin</flag>
     <flag name="redfish">Install redfish plugin</flag>