1 |
commit: a0a79c79fe3edbe96b4ce829d0c6ccec951f93ca |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jun 25 19:26:29 2022 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jun 25 21:03:41 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0a79c79 |
7 |
|
8 |
net-misc/modemmanager: Version bump to 1.18.10 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/854063 |
11 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
12 |
|
13 |
net-misc/modemmanager/Manifest | 1 + |
14 |
net-misc/modemmanager/metadata.xml | 1 + |
15 |
net-misc/modemmanager/modemmanager-1.18.10.ebuild | 152 ++++++++++++++++++++++ |
16 |
profiles/arch/ia64/package.use.mask | 4 + |
17 |
profiles/arch/sparc/package.use.mask | 4 + |
18 |
5 files changed, 162 insertions(+) |
19 |
|
20 |
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest |
21 |
index d50c102766a0..8281970d3e29 100644 |
22 |
--- a/net-misc/modemmanager/Manifest |
23 |
+++ b/net-misc/modemmanager/Manifest |
24 |
@@ -1 +1,2 @@ |
25 |
+DIST ModemManager-1.18.10.tar.xz 2611480 BLAKE2B ca6c690f2365917b5c879c1bd80ec2752880fb4ffe779c0dae7e2b0852d5f77bb403b5cc1f529e254818fd3e6df2698cd77493d801f5c55d5fe60c817df1e713 SHA512 4615ddb852b750ba0ca62224b669145a408a22b841937d42271638a73bf59dff5fb8b73553388afee8e7d2b2126c61f51af3f8fcb4475a2e2ea313d438443f9b |
26 |
DIST ModemManager-1.18.8.tar.xz 2533392 BLAKE2B 7e95aa2303b55524174475ace96e0b938d2ac9abee0867bb56c6405f3460e73fad0ab68e50361c148551401ff2450abe70733616534507251cbaaee41ee02028 SHA512 fd853ad5ecd018303850f506cd75025bc0cad90d7a003b082178f7495b8763e71675ac34428d09002bf5d06963030d2ee5b84a1c888c959b03f00cddb1cdaf4c |
27 |
|
28 |
diff --git a/net-misc/modemmanager/metadata.xml b/net-misc/modemmanager/metadata.xml |
29 |
index 44a1c20ee048..97718f935bb7 100644 |
30 |
--- a/net-misc/modemmanager/metadata.xml |
31 |
+++ b/net-misc/modemmanager/metadata.xml |
32 |
@@ -9,5 +9,6 @@ |
33 |
<flag name="mbim">Enable MBIM modem protocol</flag> |
34 |
<flag name="qmi">Enable support for the QMI modem protocol used by |
35 |
devices with Qualcomm chipsets</flag> |
36 |
+ <flag name="qrtr">Enable support for the QMI over IPC Router bus (QRTR) protocol</flag> |
37 |
</use> |
38 |
</pkgmetadata> |
39 |
|
40 |
diff --git a/net-misc/modemmanager/modemmanager-1.18.10.ebuild b/net-misc/modemmanager/modemmanager-1.18.10.ebuild |
41 |
new file mode 100644 |
42 |
index 000000000000..0a04e243061b |
43 |
--- /dev/null |
44 |
+++ b/net-misc/modemmanager/modemmanager-1.18.10.ebuild |
45 |
@@ -0,0 +1,152 @@ |
46 |
+# Copyright 1999-2022 Gentoo Authors |
47 |
+# Distributed under the terms of the GNU General Public License v2 |
48 |
+ |
49 |
+EAPI=8 |
50 |
+PYTHON_COMPAT=( python3_{8..11} ) |
51 |
+inherit gnome2 python-any-r1 readme.gentoo-r1 systemd udev vala |
52 |
+ |
53 |
+DESCRIPTION="Modem and mobile broadband management libraries" |
54 |
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/" |
55 |
+SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" |
56 |
+ |
57 |
+LICENSE="GPL-2+" |
58 |
+SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N} |
59 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" |
60 |
+ |
61 |
+IUSE="elogind +introspection mbim policykit +qmi +qrtr systemd test +udev vala" |
62 |
+REQUIRED_USE=" |
63 |
+ ?? ( elogind systemd ) |
64 |
+ vala? ( introspection ) |
65 |
+" |
66 |
+RESTRICT="!test? ( test )" |
67 |
+ |
68 |
+DEPEND=" |
69 |
+ >=dev-libs/glib-2.56.0:2 |
70 |
+ udev? ( >=dev-libs/libgudev-232:= ) |
71 |
+ introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) |
72 |
+ mbim? ( >=net-libs/libmbim-1.26.0 ) |
73 |
+ policykit? ( >=sys-auth/polkit-0.106[introspection?] ) |
74 |
+ qmi? ( >=net-libs/libqmi-1.30.8:=[qrtr?] ) |
75 |
+ qrtr? ( >=net-libs/libqrtr-glib-1.0.0:= ) |
76 |
+ elogind? ( sys-auth/elogind ) |
77 |
+ systemd? ( >=sys-apps/systemd-209 ) |
78 |
+" |
79 |
+RDEPEND="${DEPEND} |
80 |
+ policykit? ( acct-group/plugdev ) |
81 |
+" |
82 |
+BDEPEND=" |
83 |
+ dev-util/gdbus-codegen |
84 |
+ dev-util/glib-utils |
85 |
+ >=dev-util/gtk-doc-am-1 |
86 |
+ >=sys-devel/gettext-0.19.8 |
87 |
+ virtual/pkgconfig |
88 |
+ test? ( |
89 |
+ ${PYTHON_DEPS} |
90 |
+ $(python_gen_any_dep ' |
91 |
+ dev-python/dbus-python[${PYTHON_USEDEP}] |
92 |
+ dev-python/pygobject:3[${PYTHON_USEDEP}] |
93 |
+ ') |
94 |
+ ) |
95 |
+ vala? ( $(vala_depend) ) |
96 |
+" |
97 |
+ |
98 |
+S="${WORKDIR}/ModemManager-${PV}" |
99 |
+ |
100 |
+python_check_deps() { |
101 |
+ has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && |
102 |
+ has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" |
103 |
+} |
104 |
+ |
105 |
+pkg_setup() { |
106 |
+ use test && python-any-r1_pkg_setup |
107 |
+} |
108 |
+ |
109 |
+src_prepare() { |
110 |
+ DOC_CONTENTS=" |
111 |
+ If your USB modem shows up only as a storage device when you plug it in, |
112 |
+ then you should install sys-apps/usb_modeswitch, which will automatically |
113 |
+ switch it over to USB modem mode whenever you plug it in.\n" |
114 |
+ |
115 |
+ if use policykit; then |
116 |
+ DOC_CONTENTS+="\nTo control your modem without needing to enter the root password, |
117 |
+ add your user account to the 'plugdev' group." |
118 |
+ fi |
119 |
+ |
120 |
+ use vala && vala_src_prepare |
121 |
+ gnome2_src_prepare |
122 |
+} |
123 |
+ |
124 |
+src_configure() { |
125 |
+ local myconf=( |
126 |
+ --disable-Werror |
127 |
+ --disable-static |
128 |
+ --with-dist-version=${PVR} |
129 |
+ --with-udev-base-dir="$(get_udevdir)" |
130 |
+ $(use_with udev) |
131 |
+ $(use_enable introspection) |
132 |
+ $(use_with mbim) |
133 |
+ $(use_with policykit polkit) |
134 |
+ $(use_with systemd systemd-journal) |
135 |
+ $(use_with qmi) |
136 |
+ $(use_with qrtr) |
137 |
+ $(use_enable vala) |
138 |
+ ) |
139 |
+ if use systemd || use elogind; then |
140 |
+ myconf+=(--with-systemd-suspend-resume) |
141 |
+ else |
142 |
+ myconf+=(--without-systemd-suspend-resume) |
143 |
+ fi |
144 |
+ gnome2_src_configure "${myconf[@]}" |
145 |
+} |
146 |
+ |
147 |
+src_install() { |
148 |
+ gnome2_src_install |
149 |
+ |
150 |
+ # Allow users in plugdev group full control over their modem |
151 |
+ if use policykit; then |
152 |
+ insinto /usr/share/polkit-1/rules.d/ |
153 |
+ doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules |
154 |
+ fi |
155 |
+ |
156 |
+ readme.gentoo_create_doc |
157 |
+ |
158 |
+ newinitd "${FILESDIR}/modemmanager.initd" modemmanager |
159 |
+} |
160 |
+ |
161 |
+pkg_postinst() { |
162 |
+ gnome2_pkg_postinst |
163 |
+ |
164 |
+ # The polkit rules file moved to /usr/share |
165 |
+ old_rules="${EROOT}/etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules" |
166 |
+ if [[ -f "${old_rules}" ]]; then |
167 |
+ case "$(md5sum ${old_rules})" in |
168 |
+ c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* ) |
169 |
+ # Automatically delete the old rules.d file if the user did not change it |
170 |
+ elog |
171 |
+ elog "Removing old ${old_rules} ..." |
172 |
+ rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually" |
173 |
+ ;; |
174 |
+ * ) |
175 |
+ elog "The ${old_rules}" |
176 |
+ elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2" |
177 |
+ elog "If you edited ${old_rules}" |
178 |
+ elog "without changing its behavior, you may want to remove it." |
179 |
+ ;; |
180 |
+ esac |
181 |
+ fi |
182 |
+ |
183 |
+ if ! use udev; then |
184 |
+ ewarn "You have built ModemManager without udev support. You may have to teach it" |
185 |
+ ewarn "about your modem port manually." |
186 |
+ fi |
187 |
+ |
188 |
+ use udev && udev_reload |
189 |
+ |
190 |
+ systemd_reenable ModemManager.service |
191 |
+ |
192 |
+ readme.gentoo_print_elog |
193 |
+} |
194 |
+ |
195 |
+pkg_postrm() { |
196 |
+ use udev && udev_reload |
197 |
+} |
198 |
|
199 |
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask |
200 |
index c741d1d2c32c..304930905334 100644 |
201 |
--- a/profiles/arch/ia64/package.use.mask |
202 |
+++ b/profiles/arch/ia64/package.use.mask |
203 |
@@ -1,6 +1,10 @@ |
204 |
# Copyright 1999-2022 Gentoo Authors |
205 |
# Distributed under the terms of the GNU General Public License v2 |
206 |
|
207 |
+# Matt Turner <mattst88@g.o> (2022-06-25) |
208 |
+# net-libs/libqrtr-glib not keyworded |
209 |
+net-misc/modemmanager qrtr |
210 |
+ |
211 |
# Sergey Torokhov <torokhov-s-a@××××××.ru> (2022-06-22) |
212 |
# media-libs/libjxl is not keyworded |
213 |
# bug https://bugs.gentoo.org/853628 |
214 |
|
215 |
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask |
216 |
index 7fe4569b7611..6298a47b94a1 100644 |
217 |
--- a/profiles/arch/sparc/package.use.mask |
218 |
+++ b/profiles/arch/sparc/package.use.mask |
219 |
@@ -1,6 +1,10 @@ |
220 |
# Copyright 1999-2022 Gentoo Authors |
221 |
# Distributed under the terms of the GNU General Public License v2 |
222 |
|
223 |
+# Matt Turner <mattst88@g.o> (2022-06-25) |
224 |
+# net-libs/libqrtr-glib not keyworded |
225 |
+net-misc/modemmanager qrtr |
226 |
+ |
227 |
# Sam James <sam@g.o> (2022-06-25) |
228 |
# sys-devel/lld lacks sparc support right now |
229 |
dev-lang/rust wasm |