1 |
commit: 1bc6adfae6cdd8e45b3a90ccbfecb43f74cdf2e2 |
2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Oct 6 19:06:09 2020 +0000 |
4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 6 19:10:10 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bc6adfa |
7 |
|
8 |
sys-apps/fwupd: remove consolekit support |
9 |
|
10 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
11 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
12 |
|
13 |
sys-apps/fwupd/fwupd-1.3.10.ebuild | 9 ++++----- |
14 |
sys-apps/fwupd/fwupd-1.3.11.ebuild | 9 ++++----- |
15 |
sys-apps/fwupd/fwupd-1.4.5.ebuild | 9 ++++----- |
16 |
sys-apps/fwupd/fwupd-1.4.6.ebuild | 9 ++++----- |
17 |
sys-apps/fwupd/metadata.xml | 1 - |
18 |
5 files changed, 16 insertions(+), 21 deletions(-) |
19 |
|
20 |
diff --git a/sys-apps/fwupd/fwupd-1.3.10.ebuild b/sys-apps/fwupd/fwupd-1.3.10.ebuild |
21 |
index f0c9fd71429..a75d878756b 100644 |
22 |
--- a/sys-apps/fwupd/fwupd-1.3.10.ebuild |
23 |
+++ b/sys-apps/fwupd/fwupd-1.3.10.ebuild |
24 |
@@ -14,9 +14,9 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
25 |
LICENSE="LGPL-2.1+" |
26 |
SLOT="0" |
27 |
KEYWORDS="amd64 ~arm x86" |
28 |
-IUSE="agent amt consolekit dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi" |
29 |
+IUSE="agent amt dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi" |
30 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
31 |
- ^^ ( consolekit elogind minimal systemd ) |
32 |
+ ^^ ( elogind minimal systemd ) |
33 |
dell? ( uefi ) |
34 |
minimal? ( !introspection ) |
35 |
" |
36 |
@@ -53,7 +53,6 @@ CDEPEND="${PYTHON_DEPS} |
37 |
>=net-libs/libsoup-2.51.92:2.4[introspection?] |
38 |
virtual/libelf:0= |
39 |
virtual/udev |
40 |
- consolekit? ( >=sys-auth/consolekit-1.0.0 ) |
41 |
dell? ( |
42 |
sys-libs/efivar |
43 |
>=sys-libs/libsmbios-2.4.0 |
44 |
@@ -119,7 +118,6 @@ src_configure() { |
45 |
-Dbuild="$(usex minimal standalone all)" |
46 |
$(meson_use agent) |
47 |
$(meson_use amt plugin_amt) |
48 |
- $(meson_use consolekit) |
49 |
$(meson_use dell plugin_dell) |
50 |
$(meson_use elogind) |
51 |
$(meson_use gpg) |
52 |
@@ -140,6 +138,7 @@ src_configure() { |
53 |
-Dplugin_flashrom="false" |
54 |
# Dependencies are not available (yet?) |
55 |
-Dplugin_modem_manager="false" |
56 |
+ -Dconsolekit="false" |
57 |
) |
58 |
export CACHE_DIRECTORY="${T}" |
59 |
meson_src_configure |
60 |
@@ -149,7 +148,7 @@ src_install() { |
61 |
meson_src_install |
62 |
|
63 |
if ! use minimal ; then |
64 |
- sed "s@%SEAT_MANAGER%@$(usex elogind elogind consolekit)@" \ |
65 |
+ sed "s@%SEAT_MANAGER%@elogind@" \ |
66 |
"${FILESDIR}"/${PN}-r1 \ |
67 |
> "${T}"/${PN} || die |
68 |
doinitd "${T}"/${PN} |
69 |
|
70 |
diff --git a/sys-apps/fwupd/fwupd-1.3.11.ebuild b/sys-apps/fwupd/fwupd-1.3.11.ebuild |
71 |
index dd8d595a589..378dc300978 100644 |
72 |
--- a/sys-apps/fwupd/fwupd-1.3.11.ebuild |
73 |
+++ b/sys-apps/fwupd/fwupd-1.3.11.ebuild |
74 |
@@ -14,9 +14,9 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
75 |
LICENSE="LGPL-2.1+" |
76 |
SLOT="0" |
77 |
KEYWORDS="~amd64 ~arm ~x86" |
78 |
-IUSE="agent amt consolekit dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi" |
79 |
+IUSE="agent amt dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi" |
80 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
81 |
- ^^ ( consolekit elogind minimal systemd ) |
82 |
+ ^^ ( elogind minimal systemd ) |
83 |
dell? ( uefi ) |
84 |
minimal? ( !introspection ) |
85 |
" |
86 |
@@ -53,7 +53,6 @@ CDEPEND="${PYTHON_DEPS} |
87 |
>=net-libs/libsoup-2.51.92:2.4[introspection?] |
88 |
virtual/libelf:0= |
89 |
virtual/udev |
90 |
- consolekit? ( >=sys-auth/consolekit-1.0.0 ) |
91 |
dell? ( |
92 |
sys-libs/efivar |
93 |
>=sys-libs/libsmbios-2.4.0 |
94 |
@@ -119,7 +118,6 @@ src_configure() { |
95 |
-Dbuild="$(usex minimal standalone all)" |
96 |
$(meson_use agent) |
97 |
$(meson_use amt plugin_amt) |
98 |
- $(meson_use consolekit) |
99 |
$(meson_use dell plugin_dell) |
100 |
$(meson_use elogind) |
101 |
$(meson_use gpg) |
102 |
@@ -140,6 +138,7 @@ src_configure() { |
103 |
-Dplugin_flashrom="false" |
104 |
# Dependencies are not available (yet?) |
105 |
-Dplugin_modem_manager="false" |
106 |
+ -Dconsolekit="false" |
107 |
) |
108 |
export CACHE_DIRECTORY="${T}" |
109 |
meson_src_configure |
110 |
@@ -149,7 +148,7 @@ src_install() { |
111 |
meson_src_install |
112 |
|
113 |
if ! use minimal ; then |
114 |
- sed "s@%SEAT_MANAGER%@$(usex elogind elogind consolekit)@" \ |
115 |
+ sed "s@%SEAT_MANAGER%@elogind@" \ |
116 |
"${FILESDIR}"/${PN}-r1 \ |
117 |
> "${T}"/${PN} || die |
118 |
doinitd "${T}"/${PN} |
119 |
|
120 |
diff --git a/sys-apps/fwupd/fwupd-1.4.5.ebuild b/sys-apps/fwupd/fwupd-1.4.5.ebuild |
121 |
index 246c5406ba1..10d29cf18bc 100644 |
122 |
--- a/sys-apps/fwupd/fwupd-1.4.5.ebuild |
123 |
+++ b/sys-apps/fwupd/fwupd-1.4.5.ebuild |
124 |
@@ -14,9 +14,9 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
125 |
LICENSE="LGPL-2.1+" |
126 |
SLOT="0" |
127 |
KEYWORDS="~amd64 ~arm ~x86" |
128 |
-IUSE="agent amt consolekit dell gtk-doc elogind minimal introspection +man nvme redfish synaptics systemd test thunderbolt tpm uefi" |
129 |
+IUSE="agent amt dell gtk-doc elogind minimal introspection +man nvme redfish synaptics systemd test thunderbolt tpm uefi" |
130 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
131 |
- ^^ ( consolekit elogind minimal systemd ) |
132 |
+ ^^ ( elogind minimal systemd ) |
133 |
dell? ( uefi ) |
134 |
minimal? ( !introspection ) |
135 |
" |
136 |
@@ -54,7 +54,6 @@ CDEPEND="${PYTHON_DEPS} |
137 |
>=net-libs/libsoup-2.51.92:2.4[introspection?] |
138 |
virtual/libelf:0= |
139 |
virtual/udev |
140 |
- consolekit? ( >=sys-auth/consolekit-1.0.0 ) |
141 |
dell? ( |
142 |
sys-libs/efivar |
143 |
>=sys-libs/libsmbios-2.4.0 |
144 |
@@ -115,7 +114,6 @@ src_configure() { |
145 |
-Dbuild="$(usex minimal standalone all)" |
146 |
$(meson_use agent) |
147 |
$(meson_use amt plugin_amt) |
148 |
- $(meson_use consolekit) |
149 |
$(meson_use dell plugin_dell) |
150 |
$(meson_use elogind) |
151 |
$(meson_use gtk-doc gtkdoc) |
152 |
@@ -134,6 +132,7 @@ src_configure() { |
153 |
-Dplugin_flashrom="false" |
154 |
# Dependencies are not available (yet?) |
155 |
-Dplugin_modem_manager="false" |
156 |
+ -Dconsolekit="false" |
157 |
) |
158 |
export CACHE_DIRECTORY="${T}" |
159 |
meson_src_configure |
160 |
@@ -143,7 +142,7 @@ src_install() { |
161 |
meson_src_install |
162 |
|
163 |
if ! use minimal ; then |
164 |
- sed "s@%SEAT_MANAGER%@$(usex elogind elogind consolekit)@" \ |
165 |
+ sed "s@%SEAT_MANAGER%@elogind@" \ |
166 |
"${FILESDIR}"/${PN}-r1 \ |
167 |
> "${T}"/${PN} || die |
168 |
doinitd "${T}"/${PN} |
169 |
|
170 |
diff --git a/sys-apps/fwupd/fwupd-1.4.6.ebuild b/sys-apps/fwupd/fwupd-1.4.6.ebuild |
171 |
index 246c5406ba1..10d29cf18bc 100644 |
172 |
--- a/sys-apps/fwupd/fwupd-1.4.6.ebuild |
173 |
+++ b/sys-apps/fwupd/fwupd-1.4.6.ebuild |
174 |
@@ -14,9 +14,9 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
175 |
LICENSE="LGPL-2.1+" |
176 |
SLOT="0" |
177 |
KEYWORDS="~amd64 ~arm ~x86" |
178 |
-IUSE="agent amt consolekit dell gtk-doc elogind minimal introspection +man nvme redfish synaptics systemd test thunderbolt tpm uefi" |
179 |
+IUSE="agent amt dell gtk-doc elogind minimal introspection +man nvme redfish synaptics systemd test thunderbolt tpm uefi" |
180 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
181 |
- ^^ ( consolekit elogind minimal systemd ) |
182 |
+ ^^ ( elogind minimal systemd ) |
183 |
dell? ( uefi ) |
184 |
minimal? ( !introspection ) |
185 |
" |
186 |
@@ -54,7 +54,6 @@ CDEPEND="${PYTHON_DEPS} |
187 |
>=net-libs/libsoup-2.51.92:2.4[introspection?] |
188 |
virtual/libelf:0= |
189 |
virtual/udev |
190 |
- consolekit? ( >=sys-auth/consolekit-1.0.0 ) |
191 |
dell? ( |
192 |
sys-libs/efivar |
193 |
>=sys-libs/libsmbios-2.4.0 |
194 |
@@ -115,7 +114,6 @@ src_configure() { |
195 |
-Dbuild="$(usex minimal standalone all)" |
196 |
$(meson_use agent) |
197 |
$(meson_use amt plugin_amt) |
198 |
- $(meson_use consolekit) |
199 |
$(meson_use dell plugin_dell) |
200 |
$(meson_use elogind) |
201 |
$(meson_use gtk-doc gtkdoc) |
202 |
@@ -134,6 +132,7 @@ src_configure() { |
203 |
-Dplugin_flashrom="false" |
204 |
# Dependencies are not available (yet?) |
205 |
-Dplugin_modem_manager="false" |
206 |
+ -Dconsolekit="false" |
207 |
) |
208 |
export CACHE_DIRECTORY="${T}" |
209 |
meson_src_configure |
210 |
@@ -143,7 +142,7 @@ src_install() { |
211 |
meson_src_install |
212 |
|
213 |
if ! use minimal ; then |
214 |
- sed "s@%SEAT_MANAGER%@$(usex elogind elogind consolekit)@" \ |
215 |
+ sed "s@%SEAT_MANAGER%@elogind@" \ |
216 |
"${FILESDIR}"/${PN}-r1 \ |
217 |
> "${T}"/${PN} || die |
218 |
doinitd "${T}"/${PN} |
219 |
|
220 |
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml |
221 |
index 9ff465d6aed..70be5575b0f 100644 |
222 |
--- a/sys-apps/fwupd/metadata.xml |
223 |
+++ b/sys-apps/fwupd/metadata.xml |
224 |
@@ -8,7 +8,6 @@ |
225 |
<use> |
226 |
<flag name="agent">Enable update notification agent</flag> |
227 |
<flag name="amt">Build and install Intel AMT plugin</flag> |
228 |
- <flag name="consolekit">Use <pkg>sys-auth/consolekit</pkg> for session tracking</flag> |
229 |
<flag name="dell">Enable Dell-specific support.</flag> |
230 |
<flag name="gpg">Enable GPG support.</flag> |
231 |
<flag name="man">Build and install man pages</flag> |