gentoo auto-resync : 27:07:2022 - 21:02:43

6 files changed, 219 insertions, 2 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index e3837b7a0021..180ed1d2b78d 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/fwupd-efi/Manifest b/sys-apps/fwupd-efi/Manifest
index 698bc4259a8f..abf98fceec03 100644
--- a/sys-apps/fwupd-efi/Manifest
+++ b/sys-apps/fwupd-efi/Manifest
@@ -3,5 +3,5 @@ DIST fwupd-efi-1.2.tar.gz 38867 BLAKE2B aa1a877db06dcf8347dff9411f9c9475b40e9a5f
 DIST fwupd-efi-1.3.tar.gz 39122 BLAKE2B f295869038f485026b8e60977faf76ad81f1ad11474d13be9a635b1a014daf79ee4250a44dcdb4b79f887a3093ba70a470dde6e8376bc4c064cd30c64c76cddc SHA512 3f17bc990de15e48d7be7302992d51c12b510a793b556ac269fcf3b63f83cc3c257bc852de23ee44a0de1b96eea324277015265c42ee41a11b88368a3f4b38eb
 EBUILD fwupd-efi-1.1.ebuild 1067 BLAKE2B 2dd3c612da1d7fa6603aa6df5589c6d04f3d73a2256952c991114e93842bb0a9f020843416a9fecd44af2361b62a76c91a8dcec8abf97c55717bd58a26a49694 SHA512 014fb50779f0f0dced8f8a6affe6cc4b12171f1e24562f6c27539e458e9ca6396a59e9db18ac1e320cfd05d1a413674be3099b6331087e13ac2b82271ae0bc48
 EBUILD fwupd-efi-1.2.ebuild 1039 BLAKE2B bbf5723c4961a0b883b8d6f48a594c665167d959fd0515bb776d9edf8de3ff48301d1ec037e937dee472f03f36c74e4c57b9ebebd9767190ab033938bd2dbe23 SHA512 7a202e3dc391e038e8083be7ee9c80043786247c9cde956019197359fa5511ed6fe9cd0fa8ca2991dea8d146b2249a4676c0923e7257806ae40299899c114a4c
-EBUILD fwupd-efi-1.3.ebuild 1038 BLAKE2B 3109f7169d322bddd664356c95b22af57d85457ed232c5504ae1be5a3f045fc8ff084e4e2387ad838eb95b38b4a9aa64f78c483e3847dcb4aece7be7b29d68a4 SHA512 ec5da400eb41424ad363f873285b97f4e5dc9959e86e904b6041fbad20ecaf722a81bae9fe0b1ee149e34d975d27af54e1db181a87449ccaed31b3536e2fbd37
+EBUILD fwupd-efi-1.3.ebuild 1038 BLAKE2B 198002a15e3a073a641061bb31f7154bf1c86d1f88381d628af3840ac856daacc45e571815029d5fa2e25b0b827ce152202799821564ec812133c6037ddaee80 SHA512 99e3d83cde5d20f9ebf96fd186f67d4ef2eacb1b4f4fdb2d731890fbacdf77b471acabf7f636792e7622c3b928134b74a60810ad04cc12149b7ffe658a1087c9
 MISC metadata.xml 502 BLAKE2B 37525a0056ad72eab2b2b7b15436181a8581075053704012670e1f0434c8af74bd0780f16f31fa5cd2c8836bc2e4d8f55dfd5a77140be83ebffda5ca9e1a1382 SHA512 70ccf403ddb8e4d33ee9cc6ba438583d42ab313784c3251919b74a6596c4e3593263a6400513605c1004bc0d3ebb1677febc31449096b825f688ed1cc7052c31
diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild
index 936f5457e1d6..7fff4de7760f 100644
--- a/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild
+++ b/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit meson python-any-r1 toolchain-funcs
 
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 24ce40ef54ef..332451f2cb67 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,10 +1,13 @@
+AUX fwupd-1.8.3-docgen_deps_test.patch 671 BLAKE2B 3a39ca3d9c70fc0f18ce4d3b9efaaf2c9cba8ef11b3e9cf9501ba32a1a2e0ef6b6e59dadd0a13bffea77f227d917893609033764c0cad268fbe65826f5f6a11c SHA512 7a81b69349fecf0b9730e3c11e33044a4ee1728f8b61ee0d1e737c74f33fde737111eb7f55fc8e0975e2b72b4df08b4f9c466c4c2ab2c586f2bc1c18e046c648
 AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7
 DIST fwupd-1.7.5.tar.gz 4014523 BLAKE2B b7297bbf3358209464691b928b928fa029c68ae6a3bc413d514409e4382bf8a3b0d57f4febc29a24d6351481474dd8111406ffdcb11125139fbc04a33ea00321 SHA512 1c2d99d905f76ebfce65db310ba0f6c1305ecf662b58bd9f6f6597ccc79cbabed126c97f2142207c99d8373ed42575363a58d9f053f390780b7c9a19c614fb31
 DIST fwupd-1.7.7.tar.gz 4057638 BLAKE2B 197d7b8a8de64094d267bb4e2de30101373bcc52fd54d12dc2590a50f2bcebbcfe00847d19c0088d2c778743d219ee73c0237db711ad27e36f7126f7c615ccf7 SHA512 a787ffdff93f483ad97547d335c50a4db7b61bce1bc27d737b077bbedfa4676c8d6d37db94ac24083c50e3bfde8aefd4d1adb3d0e473303f454a46dde136df0a
 DIST fwupd-1.8.0.tar.gz 4103239 BLAKE2B 15d06a261be1f529573a0f3b21a54066b1b286e1d1c68ac24f3862f7e3a8855661775b369016d67fbc9797fd13dea88000e78d1a6973e489ecaa6f7f6855b3cf SHA512 8977e0b0878e46480565a32935cc008d57d3978609c01877e3a90dc594b122bed0c94613a53f0f2d3f50d8a039b09cb93787aaf7e0b5d8cf1ec1a6247fe1610b
 DIST fwupd-1.8.1.tar.gz 4143691 BLAKE2B 1606bc35e0bf15efe202ec906161e5c526d4fdd1ef1469da6aeb141539c3196cbdd603b124e805c4eb43c020fed5049b1813d6301211fa02fa4c0c2c2b8222b3 SHA512 9f3e15b977b335058d1430049f19de8a17260cdbc4e84aa728ff4e6db3deebc8725f532e9b3edb7d51a0ddc9cc9f8272449417e7345009d447b9f4b3378a4819
+DIST fwupd-1.8.3.tar.gz 4267315 BLAKE2B 35e5855ea0d314fa5b1cc33ed4efa71e54c35b57c742748a5d6c7f4c1f88bfd9c2e5a84f2af72f6e5e63ddfc4f6521312fb7b1446922c76917f9abdd4d90e618 SHA512 271a1c2547f35322a7a7d83adc84d729ba73d810f6ac526d1c6aa2a9774dea1edc986b7d62481ebb70d43653577ced19f13f695dedf4012c82d814da70cb83f4
 EBUILD fwupd-1.7.5.ebuild 4666 BLAKE2B 947d030a4e6e65f90ce120d7c8f1b74c2096eeea9ea522da715e4ffa5359e2dc23315a79b823f016723b3f68507bf272fca29a8471e5c2388b1a1f1c6146231b SHA512 1899b4041033e23d658cc7991aed0c94252186a737616baa8d09595e97cf4cf16369478286ab2947441b81779227f48bf10b490ce3faae821e489f29a25053c2
 EBUILD fwupd-1.7.7-r2.ebuild 4684 BLAKE2B 2febf3c31449381b94a4c46589017fd7ba00f262a9fb22c9dfd660018ce2acdff582116984e5e21f8f7181345c013b8eb88f14df1052633a3c29a9cb6546af50 SHA512 677ee8f9c19fc7bcc016b301d0abc9277c3ec20f8fe21cf407f68acab52f2067bb6a3366afc8dfe175ebfdd71c5c701c27d8fc8f75e47a4544f5e7ce5cee2b1a
 EBUILD fwupd-1.8.0-r1.ebuild 4784 BLAKE2B eec6be280d70d15750bf9c15f875bcd5e09f4d77cb4c3b7f7f21707d45d935554cfd531dcb416fb9480849c6ce3534a31b1b78463b4bfed7f2fd79b197ea8ca1 SHA512 c1e21ddb6d20e994a7720bbcc546f1a84dfda34a813cd408ac96ba379a9d3cc2a77c5c447bc1733771dcf5553172b532fda48a9cfc2d002436c3fdf735c48588
 EBUILD fwupd-1.8.1.ebuild 4922 BLAKE2B 99f3888b9c3c2ce2f793f14ccfdf7a4ce725a6c9a026cf6cb9090aaad0e800d2524932fbfccd92b6f9c1753d06aa0de010beed72dec663fb384edc376accd831 SHA512 f333e07a813fd0e25d9b48731454f450f8467e60db6732a40855c4934e9e1354da4e6f6bbab6fb0991d3502445c694b329d40eabd4ce7104a27d5c54ab84a213
+EBUILD fwupd-1.8.3.ebuild 5136 BLAKE2B 1e0987b45a9b6b65c60eeba06f3aaa31821a207346383945e296a37c403d818076777f4ab54f51b37393aa8b628cf42ef372f6621d0847c3fbf0e528e8bf8445 SHA512 d45622d5bd055e365db269071917b8d2e129aeff988d7f25d11dfdf4c6879b2aa4ec0c01f1f1b837277c4a682bd1d1dc2bfef7c5b8e2215a607e98a7a4ffbcdf
 MISC metadata.xml 1527 BLAKE2B 0cbeb805ede86d77bbd736349c84de642534059b2c90d938bd68c3caf0ff90257f3579d20eb38313f10a99f72780accd242601d778fd73386a727cad362a9f48 SHA512 9a541ecead0fc13a5cd78bcbcda425b9b2f4029dd921f01dc0ab1d2055ffcb0690d1fefdfbb98c68ef168c150178f75d085eeedf0699d35fd440d0b4d730a8d2
diff --git a/sys-apps/fwupd/files/fwupd-1.8.3-docgen_deps_test.patch b/sys-apps/fwupd/files/fwupd-1.8.3-docgen_deps_test.patch
new file mode 100644
index 000000000000..297bde7d1740
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.8.3-docgen_deps_test.patch
@@ -0,0 +1,16 @@
+test-deps.py attempts to check the version of dev-python/markdown used
+by dev-util/gi-docgen by importing it. However, on Gentoo there is no
+guarantee that the gi-docgen executable and fwupd build scripts use
+the same Python interpreter.
+
+--- a/meson.build
++++ b/meson.build
+@@ -542,7 +542,7 @@
+ fwupd_gir = []
+ introspection = get_option('introspection').disable_auto_if(host_machine.system() != 'linux')
+ r = run_command([python3, 'docs/test-deps.py'])
+-docs_python_deps = get_option('docs').require(r.returncode() == 0, error_message: r.stdout())
++docs_python_deps = get_option('docs')
+ gidocgen_dep = dependency('gi-docgen',
+   version: '>= 2021.1',
+   native: true,
diff --git a/sys-apps/fwupd/fwupd-1.8.3.ebuild b/sys-apps/fwupd/fwupd-1.8.3.ebuild
new file mode 100644
index 000000000000..6e7df4eaa3c8
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.8.3.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit linux-info meson python-single-r1 vala udev 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="amt archive bash-completion bluetooth cbor dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi +sqlite synaptics systemd test tpm uefi"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	^^ ( elogind minimal systemd )
+	dell? ( uefi )
+	fastboot? ( gusb )
+	logitech? ( gusb )
+	minimal? ( !introspection )
+	modemmanager? ( gusb )
+	spi? ( lzma )
+	synaptics? ( gnutls )
+	uefi? ( gnutls )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="$(vala_depend)
+	>=dev-util/meson-0.60.0
+	virtual/pkgconfig
+	gtk-doc? (
+		>=dev-util/gi-docgen-2021.1
+	)
+	bash-completion? ( >=app-shells/bash-completion-2.0 )
+	introspection? ( dev-libs/gobject-introspection )
+	man? (
+		app-text/docbook-sgml-utils
+		sys-apps/help2man
+	)
+	test? (
+		dev-util/umockdev
+		net-libs/gnutls[tools]
+	)
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-arch/gcab-1.0
+	app-arch/xz-utils
+	>=dev-libs/glib-2.58:2
+	dev-libs/json-glib
+	dev-libs/libgudev:=
+	>=dev-libs/libjcat-0.1.4[gpg,pkcs7]
+	>=dev-libs/libxmlb-0.1.13:=[introspection?]
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	')
+	>=net-libs/libsoup-2.51.92:2.4[introspection?]
+	net-misc/curl
+	archive? ( app-arch/libarchive:= )
+	cbor? ( dev-libs/libcbor )
+	dell? (
+		>=app-crypt/tpm2-tss-2.0
+		>=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.114 )
+	sqlite? ( dev-db/sqlite )
+	systemd? ( >=sys-apps/systemd-211 )
+	tpm? ( app-crypt/tpm2-tss:= )
+	uefi? (
+		sys-apps/fwupd-efi
+		sys-boot/efibootmgr
+		sys-fs/udisks
+		sys-libs/efivar
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	sys-apps/dbus
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	x11-libs/pango[introspection]
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.3-docgen_deps_test.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	vala_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
+	sed -e "/install_dir.*'doc'/s/doc/gtk-doc/" \
+		-i docs/meson.build || die
+}
+
+src_configure() {
+	# TODO (maybe): acpi_phat, bcm57xx, cfu, cpu, emmc, ep963x, mtd, nitrokey,
+	#   parade_lspcon, pixart_rf, realtek_mst, scsi, redfish, upower
+	local plugins=(
+		-Dplugin_gpio="enabled"
+		$(meson_feature amt plugin_amt)
+		$(meson_feature dell plugin_dell)
+		$(meson_feature fastboot plugin_fastboot)
+		$(meson_feature flashrom plugin_flashrom)
+		$(meson_feature gusb plugin_uf2)
+		$(meson_feature logitech plugin_logitech_bulkcontroller)
+		$(meson_feature modemmanager plugin_modem_manager)
+		$(meson_feature nvme plugin_nvme)
+		$(meson_use spi plugin_intel_spi)
+		$(meson_feature synaptics plugin_synaptics_mst)
+		$(meson_feature synaptics plugin_synaptics_rmi)
+		$(meson_feature tpm plugin_tpm)
+		$(meson_feature uefi plugin_uefi_capsule)
+		$(meson_use uefi plugin_uefi_capsule_splash)
+		$(meson_feature uefi plugin_uefi_pk)
+	)
+	if use ppc64 || use riscv ; then
+		plugins+=( -Dplugin_msr="disabled" )
+	fi
+
+	local emesonargs=(
+		--localstatedir "${EPREFIX}"/var
+		-Dbuild="$(usex minimal standalone all)"
+		-Dconsolekit="disabled"
+		-Dcurl="enabled"
+		-Defi_binary="false"
+		-Dsupported_build="enabled"
+		-Dudevdir="${EPREFIX}$(get_udevdir)"
+		$(meson_feature archive libarchive)
+		$(meson_use bash-completion bash_completion)
+		$(meson_feature bluetooth bluez)
+		$(meson_feature cbor)
+		$(meson_feature elogind)
+		$(meson_feature gnutls)
+		$(meson_feature gtk-doc docs)
+		$(meson_feature gusb)
+		$(meson_feature lzma)
+		$(meson_use man)
+		$(meson_feature introspection)
+		$(meson_feature policykit polkit)
+		$(meson_feature sqlite)
+		$(meson_feature 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
+}
+
+pkg_postinst() {
+	use minimal || udev_reload
+}
+
+pkg_postrm() {
+	use minimal || udev_reload
+}