From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 00377158095 for ; Tue, 6 Sep 2022 19:13:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3BCDCE076B; Tue, 6 Sep 2022 19:13:10 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1FCCEE076B for ; Tue, 6 Sep 2022 19:13:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D8A3833BDD0 for ; Tue, 6 Sep 2022 19:13:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 493295A2 for ; Tue, 6 Sep 2022 19:13:07 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1662491579.568d17e75c85695747fdbc0a84f93125fec7614c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/fwupd/fwupd-1.7.7-r2.ebuild sys-apps/fwupd/fwupd-1.8.3.ebuild sys-apps/fwupd/fwupd-1.8.4.ebuild X-VCS-Directories: sys-apps/fwupd/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 568d17e75c85695747fdbc0a84f93125fec7614c X-VCS-Branch: master Date: Tue, 6 Sep 2022 19:13:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 55409c46-90ed-4f3c-b2f2-dfc1c3cbb3e7 X-Archives-Hash: a03a8b74c732b8f52186982ffa741a6d commit: 568d17e75c85695747fdbc0a84f93125fec7614c Author: Sam James gentoo org> AuthorDate: Tue Sep 6 19:12:10 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Sep 6 19:12:59 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=568d17e7 sys-apps/fwupd: call vala_prepare in src_prepare to avoid binpkg use It's ambiguous whether vala_prepare is supposed to do anything for binpkg merges, but the convention has been to just shove it in to src_prepare for now, so let's do that to avoid trying to find Vala for binpkg installs. Bug: https://bugs.gentoo.org/837857 Bug: https://bugs.gentoo.org/837965 Signed-off-by: Sam James gentoo.org> sys-apps/fwupd/fwupd-1.7.7-r2.ebuild | 5 ++++- sys-apps/fwupd/fwupd-1.8.3.ebuild | 4 +++- sys-apps/fwupd/fwupd-1.8.4.ebuild | 4 +++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/sys-apps/fwupd/fwupd-1.7.7-r2.ebuild b/sys-apps/fwupd/fwupd-1.7.7-r2.ebuild index dc4a17a94fad..cc687abf943b 100644 --- a/sys-apps/fwupd/fwupd-1.7.7-r2.ebuild +++ b/sys-apps/fwupd/fwupd-1.7.7-r2.ebuild @@ -88,7 +88,7 @@ DEPEND=" 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 @@ -96,6 +96,9 @@ pkg_setup() { src_prepare() { default + + vala_setup + # 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 diff --git a/sys-apps/fwupd/fwupd-1.8.3.ebuild b/sys-apps/fwupd/fwupd-1.8.3.ebuild index a07f8fae44aa..6dd2394f80cf 100644 --- a/sys-apps/fwupd/fwupd-1.8.3.ebuild +++ b/sys-apps/fwupd/fwupd-1.8.3.ebuild @@ -100,7 +100,7 @@ PATCHES=( 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 @@ -109,6 +109,8 @@ pkg_setup() { src_prepare() { default + vala_setup + # 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 diff --git a/sys-apps/fwupd/fwupd-1.8.4.ebuild b/sys-apps/fwupd/fwupd-1.8.4.ebuild index 995724a81068..4d97b8c02eb5 100644 --- a/sys-apps/fwupd/fwupd-1.8.4.ebuild +++ b/sys-apps/fwupd/fwupd-1.8.4.ebuild @@ -99,7 +99,7 @@ PATCHES=( 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 @@ -108,6 +108,8 @@ pkg_setup() { src_prepare() { default + vala_setup + # 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