Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/
Date: Wed, 01 Jan 2020 14:33:33
Message-Id: 1577889204.77b94a747ba10775c740b3be055a4022a1548f8d.polynomial-c@gentoo
1 commit: 77b94a747ba10775c740b3be055a4022a1548f8d
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 1 14:32:52 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 1 14:33:24 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77b94a74
7
8 sys-apps/fwupd: Removed old
9
10 Package-Manager: Portage-2.3.84, Repoman-2.3.20
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 sys-apps/fwupd/Manifest | 2 -
14 sys-apps/fwupd/fwupd-1.2.8.ebuild | 140 ---------------------------------
15 sys-apps/fwupd/fwupd-1.3.4.ebuild | 159 --------------------------------------
16 3 files changed, 301 deletions(-)
17
18 diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
19 index 85bd3c118fc..fe677ae847c 100644
20 --- a/sys-apps/fwupd/Manifest
21 +++ b/sys-apps/fwupd/Manifest
22 @@ -1,5 +1,3 @@
23 DIST fwupd-1.2.11.tar.gz 1945646 BLAKE2B 4eb6d5008d0e515880147a94b2632ed70b5f7ab1891775ac121347653c06bf4403ab7f4a1fe160000a6195d360fe06d64c8971dd53c1538aeac40d155f59979a SHA512 a8d6a76ac59937547c6866d414e95a67779574901b0a15ecfde763f49b434b284be2ade1194179225785006e5f93836667469d08f32d4c87fc85927aa0bfe9de
24 -DIST fwupd-1.2.8.tar.gz 1911999 BLAKE2B 61a24ce24f778b96f7ad23496890f7a1d20c09e6bbd707f29d154992668d5c0a25cfd31b5d0d11519740e086c098cbdfd440fe9f5cab4dde0ac43fe6b438e911 SHA512 d603f9f4e5a4c0fc6abb0b75f7d884eff47fb8a16285aa545f7140fe98ce781d127ff3769f9c206bb3bfd084bbc5bf6abf9424f70e727ff79162416fe7881154
25 -DIST fwupd-1.3.4.tar.gz 2151009 BLAKE2B 3ea171d4a9498963b6082ae2e3f9b41edde862b84f3f506e403bc2dd6a08ec27ccbac6c5891bdf567860f43b008ccd36a7e6d40e72f2d252eceb913833372719 SHA512 00b6ba394c74252c1c7eba5e5e1fd92f234fb6db6de8bca69fbc578bf3b12790867b6adaef6c422c801d28990d390bbe8af67ab0f5bd3a744adbeb053708a254
26 DIST fwupd-1.3.5.tar.gz 2164874 BLAKE2B aa268f3d94b3c7104cad5e80de81a724ba978e3da468cd2d44833656c5b0a95b1f720f5c7a0dd9812b8afce4c58e8f777e13ea2e1f4ce0b8b582ee3c731b744a SHA512 b1944b06bed9cb10ec90219235b168a76fcf6ff7b8938dfba36259f07efed71a755d7b91fcbe8f6fda00ac971bd5d4734a49e045005e2e1c32b49fc5b86c48dd
27 DIST fwupd-1.3.6.tar.gz 2207849 BLAKE2B 465055d90576d4c0a7812f2554d2bc3298a12030816a2469ce653d28f9ea81e363c401355191d41b200975a615cfc64b954e0cced6b6f6bbfbbf26f63163a25e SHA512 20a5f346563b1cb8296f31ea448f336d8b54df2e5296524e2fa040a31001838b0de4a88f0d4aad9f5eeaeb4acc46919c0effb254ce681556db00cec5a4a1bc78
28
29 diff --git a/sys-apps/fwupd/fwupd-1.2.8.ebuild b/sys-apps/fwupd/fwupd-1.2.8.ebuild
30 deleted file mode 100644
31 index a1aaa0b451d..00000000000
32 --- a/sys-apps/fwupd/fwupd-1.2.8.ebuild
33 +++ /dev/null
34 @@ -1,140 +0,0 @@
35 -# Copyright 1999-2019 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=7
39 -
40 -PYTHON_COMPAT=( python3_{5,6,7} )
41 -
42 -inherit meson python-single-r1 vala xdg-utils
43 -
44 -DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
45 -HOMEPAGE="https://fwupd.org"
46 -SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
47 -
48 -LICENSE="LGPL-2.1+"
49 -SLOT="0"
50 -KEYWORDS="amd64 ~arm x86"
51 -IUSE="agent colorhug consolekit dell doc elogind +gpg +man nvme pkcs7 redfish systemd test thunderbolt uefi"
52 -RESTRICT="!test? ( test )"
53 -
54 -REQUIRED_USE="${PYTHON_REQUIRED_USE}
55 - ^^ ( consolekit elogind systemd )
56 - dell? ( uefi )
57 -"
58 -
59 -RDEPEND="${PYTHON_DEPS}
60 - app-arch/gcab
61 - app-arch/libarchive:=
62 - dev-db/sqlite
63 - >=dev-libs/glib-2.45.8:2
64 - dev-libs/json-glib
65 - dev-libs/libgpg-error
66 - dev-libs/libgudev:=
67 - >=dev-libs/libgusb-0.2.9[introspection]
68 - >=dev-libs/libxmlb-0.1.7
69 - dev-python/pillow[${PYTHON_USEDEP}]
70 - dev-python/pycairo[${PYTHON_USEDEP}]
71 - dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
72 - >=net-libs/libsoup-2.51.92:2.4[introspection]
73 - >=sys-auth/polkit-0.103
74 - virtual/libelf:0=
75 - colorhug? ( >=x11-misc/colord-1.2.12:0= )
76 - consolekit? ( >=sys-auth/consolekit-1.0.0 )
77 - dell? (
78 - sys-libs/efivar
79 - >=sys-libs/libsmbios-2.4.0
80 - )
81 - elogind? ( sys-auth/elogind )
82 - gpg? (
83 - app-crypt/gpgme
84 - dev-libs/libgpg-error
85 - )
86 - nvme? ( sys-libs/efivar )
87 - pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
88 - redfish? ( sys-libs/efivar )
89 - systemd? ( >=sys-apps/systemd-211 )
90 - thunderbolt? ( sys-apps/thunderbolt-software-user-space )
91 - uefi? (
92 - media-libs/fontconfig
93 - media-libs/freetype
94 - sys-boot/gnu-efi
95 - >=sys-libs/efivar-33
96 - x11-libs/cairo
97 - )
98 -"
99 -DEPEND="${RDEPEND}
100 - $(vala_depend)
101 - x11-libs/pango[introspection]
102 - nvme? ( >=sys-kernel/linux-headers-4.4 )
103 - test? ( net-libs/gnutls[tools] )
104 -"
105 -BDEPEND="
106 - >=dev-util/meson-0.47.0
107 - virtual/pkgconfig
108 - doc? ( dev-util/gtk-doc )
109 - man? (
110 - app-text/docbook-sgml-utils
111 - sys-apps/help2man
112 - )
113 -"
114 -
115 -# required for fwupd daemon to run.
116 -# NOT a build time dependency. The build system does not check for dbus.
117 -PDEPEND="sys-apps/dbus"
118 -
119 -src_prepare() {
120 - default
121 - sed -e "s/'--create'/'--absolute-name', '--create'/" \
122 - -i data/tests/builder/meson.build || die
123 - sed -e "/'-Werror',/d" \
124 - -i plugins/uefi/efi/meson.build || die
125 - vala_src_prepare
126 -}
127 -
128 -src_configure() {
129 - xdg_environment_reset
130 - local emesonargs=(
131 - --localstatedir "${EPREFIX}"/var
132 - -Dagent="$(usex agent true false)"
133 - -Dconsolekit="$(usex consolekit true false)"
134 - -Dgtkdoc="$(usex doc true false)"
135 - -Delogind="$(usex elogind true false)"
136 - -Dgpg="$(usex gpg true false)"
137 - -Dman="$(usex man true false)"
138 - -Dpkcs7="$(usex pkcs7 true false)"
139 - -Dplugin_dell="$(usex dell true false)"
140 - # Dependencies are not available (yet?)
141 - -Dplugin_modem_manager="false"
142 - -Dplugin_nvme="$(usex nvme true false)"
143 - -Dplugin_redfish="$(usex redfish true false)"
144 - -Dplugin_synaptics="$(usex dell true false)"
145 - -Dplugin_thunderbolt="$(usex thunderbolt true false)"
146 - -Dplugin_uefi="$(usex uefi true false)"
147 - -Dsystemd="$(usex systemd true false)"
148 - -Dtests="$(usex test true false)"
149 - )
150 -
151 - meson_src_configure
152 -}
153 -
154 -src_install() {
155 - meson_src_install
156 -
157 - sed "s@%SEAT_MANAGER%@$(usex elogind elogind consolekit)@" \
158 - "${FILESDIR}"/${PN}-r1 \
159 - > "${T}"/${PN} || die
160 - doinitd "${T}"/${PN}
161 -
162 - if ! use systemd ; then
163 - # Don't timeout when fwupd is running (#673140)
164 - sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
165 - -i "${ED}"/etc/${PN}/daemon.conf || die
166 - fi
167 -}
168 -
169 -pkg_postinst() {
170 - elog "In case you are using openrc as init system"
171 - elog "and you're upgrading from <fwupd-1.1.0, you"
172 - elog "need to start the fwupd daemon via the openrc"
173 - elog "init script that comes with this package."
174 -}
175
176 diff --git a/sys-apps/fwupd/fwupd-1.3.4.ebuild b/sys-apps/fwupd/fwupd-1.3.4.ebuild
177 deleted file mode 100644
178 index 684e4c548a4..00000000000
179 --- a/sys-apps/fwupd/fwupd-1.3.4.ebuild
180 +++ /dev/null
181 @@ -1,159 +0,0 @@
182 -# Copyright 1999-2019 Gentoo Authors
183 -# Distributed under the terms of the GNU General Public License v2
184 -
185 -EAPI=7
186 -
187 -PYTHON_COMPAT=( python3_{5,6,7} )
188 -
189 -inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
190 -
191 -DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
192 -HOMEPAGE="https://fwupd.org"
193 -SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
194 -
195 -LICENSE="LGPL-2.1+"
196 -SLOT="0"
197 -KEYWORDS="~amd64 ~arm ~x86"
198 -IUSE="agent amt consolekit dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt uefi"
199 -REQUIRED_USE="${PYTHON_REQUIRED_USE}
200 - ^^ ( consolekit elogind minimal systemd )
201 - dell? ( uefi )
202 - minimal? ( !introspection )
203 -"
204 -RESTRICT="!test? ( test )"
205 -
206 -BDEPEND="$(vala_depend)
207 - virtual/pkgconfig
208 - gtk-doc? ( dev-util/gtk-doc )
209 - introspection? ( dev-libs/gobject-introspection )
210 - man? (
211 - app-text/docbook-sgml-utils
212 - sys-apps/help2man
213 - )
214 - test? (
215 - thunderbolt? ( dev-util/umockdev )
216 - net-libs/gnutls[tools]
217 - )
218 -"
219 -DEPEND="${PYTHON_DEPS}
220 - >=app-arch/gcab-1.0
221 - app-arch/libarchive:=
222 - dev-db/sqlite
223 - >=dev-libs/glib-2.45.8:2
224 - dev-libs/json-glib
225 - dev-libs/libgpg-error
226 - dev-libs/libgudev:=
227 - >=dev-libs/libgusb-0.2.9[introspection?]
228 - >=dev-libs/libxmlb-0.1.13
229 - dev-python/pillow[${PYTHON_USEDEP}]
230 - dev-python/pycairo[${PYTHON_USEDEP}]
231 - dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
232 - >=net-libs/libsoup-2.51.92:2.4[introspection?]
233 - virtual/libelf:0=
234 - virtual/udev
235 - consolekit? ( >=sys-auth/consolekit-1.0.0 )
236 - dell? (
237 - sys-libs/efivar
238 - >=sys-libs/libsmbios-2.4.0
239 - )
240 - elogind? ( sys-auth/elogind )
241 - gpg? (
242 - app-crypt/gpgme
243 - dev-libs/libgpg-error
244 - )
245 - !minimal? (
246 - >=sys-auth/polkit-0.103
247 - )
248 - nvme? ( sys-libs/efivar )
249 - pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
250 - redfish? ( sys-libs/efivar )
251 - systemd? ( >=sys-apps/systemd-211 )
252 - thunderbolt? (
253 - sys-apps/thunderbolt-software-user-space
254 - )
255 - uefi? (
256 - app-crypt/tpm2-tss
257 - media-libs/fontconfig
258 - media-libs/freetype
259 - sys-boot/gnu-efi
260 - sys-boot/efibootmgr
261 - >=sys-libs/efivar-33
262 - x11-libs/cairo
263 - )
264 -"
265 -RDEPEND="
266 - ${DEPEND}
267 - sys-apps/dbus
268 -"
269 -
270 -pkg_setup() {
271 - tc-ld-disable-gold # bug https://github.com/fwupd/fwupd/issues/1530
272 -
273 - python-single-r1_pkg_setup
274 - if use nvme; then
275 - kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
276 - fi
277 -}
278 -
279 -src_prepare() {
280 - default
281 - # c.f. https://github.com/fwupd/fwupd/issues/1414
282 - sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
283 - -i plugins/thunderbolt/meson.build || die
284 - vala_src_prepare
285 -}
286 -
287 -src_configure() {
288 - local emesonargs=(
289 - --localstatedir "${EPREFIX}"/var
290 - -Dbuild="$(usex minimal standalone all)"
291 - $(meson_use agent)
292 - $(meson_use amt plugin_amt)
293 - $(meson_use consolekit)
294 - $(meson_use dell plugin_dell)
295 - $(meson_use elogind)
296 - $(meson_use gpg)
297 - $(meson_use gtk-doc gtkdoc)
298 - $(meson_use man)
299 - $(meson_use nvme plugin_nvme)
300 - $(meson_use pkcs7)
301 - $(meson_use redfish plugin_redfish)
302 - $(meson_use synaptics plugin_synaptics)
303 - $(meson_use systemd)
304 - $(meson_use test tests)
305 - $(meson_use thunderbolt plugin_thunderbolt)
306 - $(meson_use uefi plugin_uefi)
307 - # Requires libflashrom which our sys-apps/flashrom
308 - # package does not provide
309 - -Dplugin_flashrom="false"
310 - # Dependencies are not available (yet?)
311 - -Dplugin_modem_manager="false"
312 - )
313 - export CACHE_DIRECTORY="${T}"
314 - meson_src_configure
315 -}
316 -
317 -src_install() {
318 - meson_src_install
319 -
320 - if ! use minimal ; then
321 - sed "s@%SEAT_MANAGER%@$(usex elogind elogind consolekit)@" \
322 - "${FILESDIR}"/${PN}-r1 \
323 - > "${T}"/${PN} || die
324 - doinitd "${T}"/${PN}
325 -
326 - if ! use systemd ; then
327 - # Don't timeout when fwupd is running (#673140)
328 - sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
329 - -i "${ED}"/etc/${PN}/daemon.conf || die
330 - fi
331 - fi
332 -}
333 -
334 -pkg_postinst() {
335 - xdg_pkg_postinst
336 - elog "In case you are using openrc as init system"
337 - elog "and you're upgrading from <fwupd-1.1.0, you"
338 - elog "need to start the fwupd daemon via the openrc"
339 - elog "init script that comes with this package."
340 -}