| 1 |
commit: 5470d0a54d0057cddb5352d9c438cf661e7e2430 |
| 2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 30 22:07:46 2020 +0000 |
| 4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 30 22:08:00 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5470d0a5 |
| 7 |
|
| 8 |
sys-apps/bolt: fix building with gcc-10 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/706958 |
| 11 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 12 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
| 13 |
|
| 14 |
sys-apps/bolt/Manifest | 2 +- |
| 15 |
sys-apps/bolt/bolt-0.7.ebuild | 42 ---------------------- |
| 16 |
.../bolt/{bolt-0.8.ebuild => bolt-0.8-r1.ebuild} | 9 +++-- |
| 17 |
3 files changed, 8 insertions(+), 45 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sys-apps/bolt/Manifest b/sys-apps/bolt/Manifest |
| 20 |
index 9a9183fe2ac..9cb76e1b17c 100644 |
| 21 |
--- a/sys-apps/bolt/Manifest |
| 22 |
+++ b/sys-apps/bolt/Manifest |
| 23 |
@@ -1,2 +1,2 @@ |
| 24 |
-DIST bolt-0.7.tar.gz 188158 BLAKE2B c51588ed746fd2aef15c79c278efe73e78ed8a029d2234b7a6ce717a6a3287ad0e9db82f93661c552a6a35c76a0e16a2712681f45e53f876b3b4f5bd839005b3 SHA512 6786f701501cc2680fac52cda7cdfe37971044abcf058b5c83bfa9f1d0a0381ba00e3377cfc97fcccf53760a2eafc1f8f6d0754f0e121d94201711ad8e40a135 |
| 25 |
DIST bolt-0.8.tar.gz 219317 BLAKE2B 9d76f3630d7f690c96447a894e54095deb7a19e46f2b02d7fbd9e584376d6b1a19391007a3a80e293adc8c9de6470279b587807d08006bbc12c7179bf0501e40 SHA512 0fdbc026178a4ca6a8c53aa46933d1c411eb04e350955f8b10c7faff814576d0796dd28e56b968648e549c79cf5fa13d43970d797595af0f66457abaef8ace09 |
| 26 |
+DIST bolt-210.patch 694 BLAKE2B 237d314aa8e4b1ed92931b5cef3079c23a55eca0cbb15038a92acf49b6563152229ff2bca8b9e30088d24a2ffb6c206dac5f3d73b69531182f0639675af36d56 SHA512 307b7c7efc18d2a22311e15e314604bd7d9721b18dfb8a3bab0e1147c3109c65313c3f7fe788431e64e6b26796b8a1da7f1963f9c2cdd8199d0f54349c2f60ce |
| 27 |
|
| 28 |
diff --git a/sys-apps/bolt/bolt-0.7.ebuild b/sys-apps/bolt/bolt-0.7.ebuild |
| 29 |
deleted file mode 100644 |
| 30 |
index 28823c01d33..00000000000 |
| 31 |
--- a/sys-apps/bolt/bolt-0.7.ebuild |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,42 +0,0 @@ |
| 34 |
-# Copyright 1999-2019 Gentoo Authors |
| 35 |
-# Distributed under the terms of the GNU General Public License v2 |
| 36 |
- |
| 37 |
-EAPI=6 |
| 38 |
- |
| 39 |
-inherit meson systemd |
| 40 |
- |
| 41 |
-DESCRIPTION="Userspace system daemon to enable security levels for Thunderbolt 3." |
| 42 |
-HOMEPAGE="https://gitlab.freedesktop.org/bolt/bolt" |
| 43 |
-SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz" |
| 44 |
- |
| 45 |
-LICENSE="LGPL-2.1" |
| 46 |
-SLOT="0" |
| 47 |
-KEYWORDS="~amd64" |
| 48 |
-IUSE="doc systemd" |
| 49 |
- |
| 50 |
-DEPEND=" |
| 51 |
- >=dev-libs/glib-2.50.0:2 |
| 52 |
- dev-util/glib-utils |
| 53 |
- virtual/libudev |
| 54 |
- virtual/udev |
| 55 |
- dev-util/umockdev |
| 56 |
- sys-auth/polkit[introspection] |
| 57 |
- systemd? ( sys-apps/systemd:0= ) |
| 58 |
- doc? ( app-text/asciidoc )" |
| 59 |
-RDEPEND="${DEPEND}" |
| 60 |
- |
| 61 |
-src_configure() { |
| 62 |
- local emesonargs=( |
| 63 |
- -Dman=$(usex doc true false) |
| 64 |
- --sysconfdir=/etc |
| 65 |
- --localstatedir=/var |
| 66 |
- --sharedstatedir=/var/lib |
| 67 |
- -Dsystemd=$(usex systemd true false) |
| 68 |
- ) |
| 69 |
- meson_src_configure |
| 70 |
-} |
| 71 |
- |
| 72 |
-src_install() { |
| 73 |
- meson_src_install |
| 74 |
- keepdir /var/lib/boltd |
| 75 |
-} |
| 76 |
|
| 77 |
diff --git a/sys-apps/bolt/bolt-0.8.ebuild b/sys-apps/bolt/bolt-0.8-r1.ebuild |
| 78 |
similarity index 83% |
| 79 |
rename from sys-apps/bolt/bolt-0.8.ebuild |
| 80 |
rename to sys-apps/bolt/bolt-0.8-r1.ebuild |
| 81 |
index 7adce26d5ac..816710f173b 100644 |
| 82 |
--- a/sys-apps/bolt/bolt-0.8.ebuild |
| 83 |
+++ b/sys-apps/bolt/bolt-0.8-r1.ebuild |
| 84 |
@@ -5,9 +5,10 @@ EAPI=6 |
| 85 |
|
| 86 |
inherit meson systemd |
| 87 |
|
| 88 |
-DESCRIPTION="Userspace system daemon to enable security levels for Thunderbolt 3." |
| 89 |
+DESCRIPTION="Userspace system daemon to enable security levels for Thunderbolt 3" |
| 90 |
HOMEPAGE="https://gitlab.freedesktop.org/bolt/bolt" |
| 91 |
-SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz" |
| 92 |
+SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz |
| 93 |
+ https://gitlab.freedesktop.org/bolt/bolt/merge_requests/210.patch -> ${PN}-210.patch" |
| 94 |
|
| 95 |
LICENSE="LGPL-2.1" |
| 96 |
SLOT="0" |
| 97 |
@@ -25,6 +26,10 @@ DEPEND=" |
| 98 |
doc? ( app-text/asciidoc )" |
| 99 |
RDEPEND="${DEPEND}" |
| 100 |
|
| 101 |
+PATCHES=( |
| 102 |
+ "${DISTDIR}/${PN}-210.patch" |
| 103 |
+) |
| 104 |
+ |
| 105 |
src_configure() { |
| 106 |
local emesonargs=( |
| 107 |
-Dman=$(usex doc true false) |
Archives