Diff fwupd-1.9.3 with a fwupd-1.9.5

/usr/portage/sys-apps/fwupd/fwupd-1.9.5.ebuild 2023-10-09 14:52:35.372368498 +0300
13 13

  
14 14
LICENSE="LGPL-2.1+"
15 15
SLOT="0"
16
KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
17
IUSE="amt +archive bash-completion bluetooth cbor dell elogind fastboot flashrom gnutls gtk-doc +gusb introspection logitech lzma minimal modemmanager nvme policykit spi +sqlite synaptics systemd test tpm uefi"
16
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
17
IUSE="amt +archive bash-completion bluetooth cbor dell elogind fastboot flashrom gnutls gtk-doc +gusb introspection logitech lzma minimal modemmanager nvme policykit spi +sqlite synaptics systemd test test-full tpm uefi"
18 18
REQUIRED_USE="${PYTHON_REQUIRED_USE}
19 19
	^^ ( elogind minimal systemd )
20 20
	dell? ( uefi )
......
25 25
	spi? ( lzma )
26 26
	synaptics? ( gnutls )
27 27
	test? ( archive gusb )
28
	test-full? ( test )
28 29
	uefi? ( gnutls )
29 30
"
30 31
RESTRICT="!test? ( test )"
......
41 42
	bash-completion? ( >=app-shells/bash-completion-2.0 )
42 43
	introspection? ( dev-libs/gobject-introspection )
43 44
	test? (
44
		dev-util/umockdev
45 45
		net-libs/gnutls[tools]
46
		test-full? ( dev-util/umockdev )
46 47
	)
47 48
"
48 49
COMMON_DEPEND="${PYTHON_DEPS}
......
91 92
	x11-libs/pango[introspection]
92 93
"
93 94

  
95
PATCHES=(
96
	"${FILESDIR}"/${PN}-1.9.4-fragile_tests.patch
97
	"${FILESDIR}"/${PN}-1.9.5-parallel_build.patch
98
)
99

  
100
pkg_pretend() {
101
	if [[ ${MERGE_TYPE} != buildonly ]]; then
102
		if use test-full && has sandbox ${FEATURES}; then
103
			ewarn "Certain ${PN} tests are fragile with sandboxing enabled,"
104
			ewarn "see https://github.com/fwupd/fwupd/issues/1414."
105
			ewarn "When in doubt, emerge ${PN} with USE=-test-full."
106
		fi
107
	fi
108
}
109

  
94 110
src_prepare() {
95 111
	default
96 112

  
97 113
	vala_setup
98 114

  
99
	# c.f. https://github.com/fwupd/fwupd/issues/1414
100
	sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
101
		-i plugins/thunderbolt/meson.build || die
102

  
103 115
	sed -e "/install_dir.*'doc'/s/doc/gtk-doc/" \
104 116
		-i docs/meson.build || die
105 117

  
......
152 164
		$(meson_feature sqlite)
153 165
		$(meson_feature systemd)
154 166
		$(meson_use test tests)
167
		$(meson_use test-full)
155 168

  
156 169
		${plugins[@]}
157 170
	)
Thank you!