1 |
commit: 6e4456f112b31df6b0eb493b99376fe0236c3fd9 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 30 23:57:34 2021 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 31 01:58:22 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e4456f1 |
7 |
|
8 |
net-misc/modemmanager: Drop old versions |
9 |
|
10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
11 |
|
12 |
net-misc/modemmanager/Manifest | 2 - |
13 |
.../modemmanager/modemmanager-1.14.8-r1.ebuild | 132 --------------------- |
14 |
net-misc/modemmanager/modemmanager-1.16.2.ebuild | 128 -------------------- |
15 |
3 files changed, 262 deletions(-) |
16 |
|
17 |
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest |
18 |
index 160c8b44e15..fdf4d25dc36 100644 |
19 |
--- a/net-misc/modemmanager/Manifest |
20 |
+++ b/net-misc/modemmanager/Manifest |
21 |
@@ -1,3 +1 @@ |
22 |
-DIST ModemManager-1.14.8.tar.xz 2255964 BLAKE2B 8f0e4e4747b3603795b533c41949ef7180922e92b7b26348145e18ffaa38f23cccbcb6662ac912216d33b4aef805c5f7ad10aef8029ffd16eb30b331fc2ca88e SHA512 2457214fecd7d4d9fef291f756ef19973b98a05d07721cd57bdaee704cd6b9e96d27f6741bd8d245a0495f1d338e65db12f19b2d9a8dd6a5cddfb050614381c6 |
23 |
-DIST ModemManager-1.16.2.tar.xz 2447936 BLAKE2B aafd2bde9fe72ec837a34987a698d82f4ba2aedf778c350263f8fe937ccd4b5b9b78fc66c58a39a8729c371788ab7b7782073726dc132b8f08bd2df0a9bc2da4 SHA512 c0b095972eba6e0f3a1ad22e425b412f17d8b60f0af4d423a92fdebcb6d2801f87e6af98758f8c2dc4db3586a3a15530a318805fda312443fa6abe2265ebd6b6 |
24 |
DIST ModemManager-1.16.4.tar.xz 2335908 BLAKE2B dfd3293e9b685d3b01fa3deec111aafca6f11dc27be0a69e0496036e537eecb6f51f592ce1996f47c86b5d9db2abf3c9b9a26e66e9f058ba59982caf38b28ef9 SHA512 5fb7625c9d41ce0179b4e59745b00b815038239552a5438d71ff36b019b398fc3dc6bef709e91a186f5f7427fcb59d79c0b1c3ca9c3dca867f0d5677fd979506 |
25 |
|
26 |
diff --git a/net-misc/modemmanager/modemmanager-1.14.8-r1.ebuild b/net-misc/modemmanager/modemmanager-1.14.8-r1.ebuild |
27 |
deleted file mode 100644 |
28 |
index 677d74b3a71..00000000000 |
29 |
--- a/net-misc/modemmanager/modemmanager-1.14.8-r1.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,132 +0,0 @@ |
32 |
-# Copyright 1999-2021 Gentoo Authors |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=7 |
36 |
-VALA_USE_DEPEND="vapigen" |
37 |
- |
38 |
-inherit gnome2 readme.gentoo-r1 systemd toolchain-funcs udev vala |
39 |
- |
40 |
-DESCRIPTION="Modem and mobile broadband management libraries" |
41 |
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/" |
42 |
-SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" |
43 |
- |
44 |
-LICENSE="GPL-2+" |
45 |
-SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N} |
46 |
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86" |
47 |
- |
48 |
-IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala" |
49 |
-REQUIRED_USE=" |
50 |
- ?? ( elogind systemd ) |
51 |
- vala? ( introspection ) |
52 |
-" |
53 |
- |
54 |
-DEPEND=" |
55 |
- >=dev-libs/glib-2.48.0:2 |
56 |
- udev? ( >=dev-libs/libgudev-230:= ) |
57 |
- introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) |
58 |
- mbim? ( >=net-libs/libmbim-1.24.0 ) |
59 |
- policykit? ( >=sys-auth/polkit-0.106[introspection] ) |
60 |
- qmi? ( >=net-libs/libqmi-1.26.0:= ) |
61 |
- elogind? ( sys-auth/elogind ) |
62 |
- systemd? ( >=sys-apps/systemd-209 ) |
63 |
-" |
64 |
-RDEPEND="${DEPEND} |
65 |
- policykit? ( acct-group/plugdev ) |
66 |
-" |
67 |
-BDEPEND=" |
68 |
- dev-util/gdbus-codegen |
69 |
- dev-util/glib-utils |
70 |
- >=dev-util/gtk-doc-am-1 |
71 |
- >=sys-devel/gettext-0.19.8 |
72 |
- virtual/pkgconfig |
73 |
- vala? ( $(vala_depend) ) |
74 |
-" |
75 |
- |
76 |
-S="${WORKDIR}/ModemManager-${PV}" |
77 |
- |
78 |
-src_prepare() { |
79 |
- DOC_CONTENTS=" |
80 |
- If your USB modem shows up only as a storage device when you plug it in, |
81 |
- then you should install sys-apps/usb_modeswitch, which will automatically |
82 |
- switch it over to USB modem mode whenever you plug it in.\n" |
83 |
- |
84 |
- if use policykit; then |
85 |
- DOC_CONTENTS+="\nTo control your modem without needing to enter the root password, |
86 |
- add your user account to the 'plugdev' group." |
87 |
- fi |
88 |
- |
89 |
- use vala && vala_src_prepare |
90 |
- gnome2_src_prepare |
91 |
-} |
92 |
- |
93 |
-src_configure() { |
94 |
- local myconf=( |
95 |
- --disable-Werror |
96 |
- --disable-static |
97 |
- --with-dist-version=${PVR} |
98 |
- --with-udev-base-dir="$(get_udevdir)" |
99 |
- $(use_with udev) |
100 |
- $(use_enable introspection) |
101 |
- $(use_with mbim) |
102 |
- $(use_with policykit polkit) |
103 |
- $(use_with systemd systemd-suspend-resume) |
104 |
- $(use_with systemd systemd-journal) |
105 |
- $(use_with qmi) |
106 |
- $(use_enable vala) |
107 |
- ) |
108 |
- if use elogind; then |
109 |
- local pkgconfig="$(tc-getPKG_CONFIG)" |
110 |
- myconf+=( |
111 |
- --with-systemd-suspend-resume |
112 |
- LIBSYSTEMD_LOGIN_CFLAGS="$(${pkgconfig} --cflags "libelogind")" |
113 |
- LIBSYSTEMD_LOGIN_LIBS="$(${pkgconfig} --libs "libelogind")" |
114 |
- ) |
115 |
- fi |
116 |
- gnome2_src_configure "${myconf[@]}" |
117 |
-} |
118 |
- |
119 |
-src_install() { |
120 |
- gnome2_src_install |
121 |
- |
122 |
- # Allow users in plugdev group full control over their modem |
123 |
- if use policykit; then |
124 |
- insinto /usr/share/polkit-1/rules.d/ |
125 |
- doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules |
126 |
- fi |
127 |
- |
128 |
- readme.gentoo_create_doc |
129 |
- |
130 |
- newinitd "${FILESDIR}/modemmanager.initd" modemmanager |
131 |
-} |
132 |
- |
133 |
-pkg_postinst() { |
134 |
- gnome2_pkg_postinst |
135 |
- |
136 |
- # The polkit rules file moved to /usr/share |
137 |
- old_rules="${EROOT}/etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules" |
138 |
- if [[ -f "${old_rules}" ]]; then |
139 |
- case "$(md5sum ${old_rules})" in |
140 |
- c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* ) |
141 |
- # Automatically delete the old rules.d file if the user did not change it |
142 |
- elog |
143 |
- elog "Removing old ${old_rules} ..." |
144 |
- rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually" |
145 |
- ;; |
146 |
- * ) |
147 |
- elog "The ${old_rules}" |
148 |
- elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2" |
149 |
- elog "If you edited ${old_rules}" |
150 |
- elog "without changing its behavior, you may want to remove it." |
151 |
- ;; |
152 |
- esac |
153 |
- fi |
154 |
- |
155 |
- if ! use udev; then |
156 |
- ewarn "You have built ModemManager without udev support. You may have to teach it" |
157 |
- ewarn "about your modem port manually." |
158 |
- fi |
159 |
- |
160 |
- systemd_reenable ModemManager.service |
161 |
- |
162 |
- readme.gentoo_print_elog |
163 |
-} |
164 |
|
165 |
diff --git a/net-misc/modemmanager/modemmanager-1.16.2.ebuild b/net-misc/modemmanager/modemmanager-1.16.2.ebuild |
166 |
deleted file mode 100644 |
167 |
index 5642c599e4e..00000000000 |
168 |
--- a/net-misc/modemmanager/modemmanager-1.16.2.ebuild |
169 |
+++ /dev/null |
170 |
@@ -1,128 +0,0 @@ |
171 |
-# Copyright 1999-2021 Gentoo Authors |
172 |
-# Distributed under the terms of the GNU General Public License v2 |
173 |
- |
174 |
-EAPI=7 |
175 |
-VALA_USE_DEPEND="vapigen" |
176 |
- |
177 |
-inherit gnome2 readme.gentoo-r1 systemd toolchain-funcs udev vala |
178 |
- |
179 |
-DESCRIPTION="Modem and mobile broadband management libraries" |
180 |
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/" |
181 |
-SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" |
182 |
- |
183 |
-LICENSE="GPL-2+" |
184 |
-SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N} |
185 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
186 |
- |
187 |
-IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala" |
188 |
-REQUIRED_USE=" |
189 |
- ?? ( elogind systemd ) |
190 |
- vala? ( introspection ) |
191 |
-" |
192 |
- |
193 |
-DEPEND=" |
194 |
- >=dev-libs/glib-2.48.0:2 |
195 |
- udev? ( >=dev-libs/libgudev-230:= ) |
196 |
- introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) |
197 |
- mbim? ( >=net-libs/libmbim-1.24.0 ) |
198 |
- policykit? ( >=sys-auth/polkit-0.106[introspection?] ) |
199 |
- qmi? ( >=net-libs/libqmi-1.28.0:= ) |
200 |
- elogind? ( sys-auth/elogind ) |
201 |
- systemd? ( >=sys-apps/systemd-209 ) |
202 |
-" |
203 |
-RDEPEND="${DEPEND} |
204 |
- policykit? ( acct-group/plugdev ) |
205 |
-" |
206 |
-BDEPEND=" |
207 |
- dev-util/gdbus-codegen |
208 |
- dev-util/glib-utils |
209 |
- >=dev-util/gtk-doc-am-1 |
210 |
- >=sys-devel/gettext-0.19.8 |
211 |
- virtual/pkgconfig |
212 |
- vala? ( $(vala_depend) ) |
213 |
-" |
214 |
- |
215 |
-S="${WORKDIR}/ModemManager-${PV}" |
216 |
- |
217 |
-src_prepare() { |
218 |
- DOC_CONTENTS=" |
219 |
- If your USB modem shows up only as a storage device when you plug it in, |
220 |
- then you should install sys-apps/usb_modeswitch, which will automatically |
221 |
- switch it over to USB modem mode whenever you plug it in.\n" |
222 |
- |
223 |
- if use policykit; then |
224 |
- DOC_CONTENTS+="\nTo control your modem without needing to enter the root password, |
225 |
- add your user account to the 'plugdev' group." |
226 |
- fi |
227 |
- |
228 |
- use vala && vala_src_prepare |
229 |
- gnome2_src_prepare |
230 |
-} |
231 |
- |
232 |
-src_configure() { |
233 |
- local myconf=( |
234 |
- --disable-Werror |
235 |
- --disable-static |
236 |
- --with-dist-version=${PVR} |
237 |
- --with-udev-base-dir="$(get_udevdir)" |
238 |
- $(use_with udev) |
239 |
- $(use_enable introspection) |
240 |
- $(use_with mbim) |
241 |
- $(use_with policykit polkit) |
242 |
- $(use_with systemd systemd-journal) |
243 |
- $(use_with qmi) |
244 |
- $(use_enable vala) |
245 |
- ) |
246 |
- if use systemd || use elogind; then |
247 |
- myconf+=(--with-systemd-suspend-resume) |
248 |
- else |
249 |
- myconf+=(--without-systemd-suspend-resume) |
250 |
- fi |
251 |
- gnome2_src_configure "${myconf[@]}" |
252 |
-} |
253 |
- |
254 |
-src_install() { |
255 |
- gnome2_src_install |
256 |
- |
257 |
- # Allow users in plugdev group full control over their modem |
258 |
- if use policykit; then |
259 |
- insinto /usr/share/polkit-1/rules.d/ |
260 |
- doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules |
261 |
- fi |
262 |
- |
263 |
- readme.gentoo_create_doc |
264 |
- |
265 |
- newinitd "${FILESDIR}/modemmanager.initd" modemmanager |
266 |
-} |
267 |
- |
268 |
-pkg_postinst() { |
269 |
- gnome2_pkg_postinst |
270 |
- |
271 |
- # The polkit rules file moved to /usr/share |
272 |
- old_rules="${EROOT}/etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules" |
273 |
- if [[ -f "${old_rules}" ]]; then |
274 |
- case "$(md5sum ${old_rules})" in |
275 |
- c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* ) |
276 |
- # Automatically delete the old rules.d file if the user did not change it |
277 |
- elog |
278 |
- elog "Removing old ${old_rules} ..." |
279 |
- rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually" |
280 |
- ;; |
281 |
- * ) |
282 |
- elog "The ${old_rules}" |
283 |
- elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2" |
284 |
- elog "If you edited ${old_rules}" |
285 |
- elog "without changing its behavior, you may want to remove it." |
286 |
- ;; |
287 |
- esac |
288 |
- fi |
289 |
- |
290 |
- if ! use udev; then |
291 |
- ewarn "You have built ModemManager without udev support. You may have to teach it" |
292 |
- ewarn "about your modem port manually." |
293 |
- fi |
294 |
- |
295 |
- systemd_reenable ModemManager.service |
296 |
- |
297 |
- readme.gentoo_print_elog |
298 |
-} |