| 1 |
commit: 568d17e75c85695747fdbc0a84f93125fec7614c |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 6 19:12:10 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 6 19:12:59 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=568d17e7 |
| 7 |
|
| 8 |
sys-apps/fwupd: call vala_prepare in src_prepare to avoid binpkg use |
| 9 |
|
| 10 |
It's ambiguous whether vala_prepare is supposed to do anything |
| 11 |
for binpkg merges, but the convention has been to just |
| 12 |
shove it in to src_prepare for now, so let's do that |
| 13 |
to avoid trying to find Vala for binpkg installs. |
| 14 |
|
| 15 |
Bug: https://bugs.gentoo.org/837857 |
| 16 |
Bug: https://bugs.gentoo.org/837965 |
| 17 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 18 |
|
| 19 |
sys-apps/fwupd/fwupd-1.7.7-r2.ebuild | 5 ++++- |
| 20 |
sys-apps/fwupd/fwupd-1.8.3.ebuild | 4 +++- |
| 21 |
sys-apps/fwupd/fwupd-1.8.4.ebuild | 4 +++- |
| 22 |
3 files changed, 10 insertions(+), 3 deletions(-) |
| 23 |
|
| 24 |
diff --git a/sys-apps/fwupd/fwupd-1.7.7-r2.ebuild b/sys-apps/fwupd/fwupd-1.7.7-r2.ebuild |
| 25 |
index dc4a17a94fad..cc687abf943b 100644 |
| 26 |
--- a/sys-apps/fwupd/fwupd-1.7.7-r2.ebuild |
| 27 |
+++ b/sys-apps/fwupd/fwupd-1.7.7-r2.ebuild |
| 28 |
@@ -88,7 +88,7 @@ DEPEND=" |
| 29 |
|
| 30 |
pkg_setup() { |
| 31 |
python-single-r1_pkg_setup |
| 32 |
- vala_setup |
| 33 |
+ |
| 34 |
if use nvme ; then |
| 35 |
kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4" |
| 36 |
fi |
| 37 |
@@ -96,6 +96,9 @@ pkg_setup() { |
| 38 |
|
| 39 |
src_prepare() { |
| 40 |
default |
| 41 |
+ |
| 42 |
+ vala_setup |
| 43 |
+ |
| 44 |
# c.f. https://github.com/fwupd/fwupd/issues/1414 |
| 45 |
sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \ |
| 46 |
-i plugins/thunderbolt/meson.build || die |
| 47 |
|
| 48 |
diff --git a/sys-apps/fwupd/fwupd-1.8.3.ebuild b/sys-apps/fwupd/fwupd-1.8.3.ebuild |
| 49 |
index a07f8fae44aa..6dd2394f80cf 100644 |
| 50 |
--- a/sys-apps/fwupd/fwupd-1.8.3.ebuild |
| 51 |
+++ b/sys-apps/fwupd/fwupd-1.8.3.ebuild |
| 52 |
@@ -100,7 +100,7 @@ PATCHES=( |
| 53 |
|
| 54 |
pkg_setup() { |
| 55 |
python-single-r1_pkg_setup |
| 56 |
- vala_setup |
| 57 |
+ |
| 58 |
if use nvme ; then |
| 59 |
kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4" |
| 60 |
fi |
| 61 |
@@ -109,6 +109,8 @@ pkg_setup() { |
| 62 |
src_prepare() { |
| 63 |
default |
| 64 |
|
| 65 |
+ vala_setup |
| 66 |
+ |
| 67 |
# c.f. https://github.com/fwupd/fwupd/issues/1414 |
| 68 |
sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \ |
| 69 |
-i plugins/thunderbolt/meson.build || die |
| 70 |
|
| 71 |
diff --git a/sys-apps/fwupd/fwupd-1.8.4.ebuild b/sys-apps/fwupd/fwupd-1.8.4.ebuild |
| 72 |
index 995724a81068..4d97b8c02eb5 100644 |
| 73 |
--- a/sys-apps/fwupd/fwupd-1.8.4.ebuild |
| 74 |
+++ b/sys-apps/fwupd/fwupd-1.8.4.ebuild |
| 75 |
@@ -99,7 +99,7 @@ PATCHES=( |
| 76 |
|
| 77 |
pkg_setup() { |
| 78 |
python-single-r1_pkg_setup |
| 79 |
- vala_setup |
| 80 |
+ |
| 81 |
if use nvme ; then |
| 82 |
kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4" |
| 83 |
fi |
| 84 |
@@ -108,6 +108,8 @@ pkg_setup() { |
| 85 |
src_prepare() { |
| 86 |
default |
| 87 |
|
| 88 |
+ vala_setup |
| 89 |
+ |
| 90 |
# c.f. https://github.com/fwupd/fwupd/issues/1414 |
| 91 |
sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \ |
| 92 |
-i plugins/thunderbolt/meson.build || die |
Archives