Gentoo Archives: gentoo-commits

From: "Alexandre Rostovtsev (tetromino)" <tetromino@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/modemmanager: metadata.xml ChangeLog modemmanager-0.7.990.ebuild modemmanager-9999.ebuild
Date: Mon, 28 Jan 2013 07:04:28
Message-Id: 20130128070424.A0D492171D@flycatcher.gentoo.org
1 tetromino 13/01/28 07:04:24
2
3 Modified: metadata.xml ChangeLog
4 Added: modemmanager-0.7.990.ebuild
5 modemmanager-9999.ebuild
6 Log:
7 Add 0.8 development pre-release and a live git ebuild. 0.8 features improved hardware support, and has a new dbus API which is incompatible with older ModemManager releases.
8
9 (Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
10
11 Revision Changes Path
12 1.6 net-misc/modemmanager/metadata.xml
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/modemmanager/metadata.xml?rev=1.6&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/modemmanager/metadata.xml?rev=1.6&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/modemmanager/metadata.xml?r1=1.5&r2=1.6
17
18 Index: metadata.xml
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/net-misc/modemmanager/metadata.xml,v
21 retrieving revision 1.5
22 retrieving revision 1.6
23 diff -u -r1.5 -r1.6
24 --- metadata.xml 7 Oct 2012 07:56:08 -0000 1.5
25 +++ metadata.xml 28 Jan 2013 07:04:24 -0000 1.6
26 @@ -9,4 +9,10 @@
27 <email>tetromino@g.o</email>
28 <name>Alexandre Rostovtsev</name>
29 </maintainer>
30 + <use>
31 + <flag name="qmi">Enable support for the QMI modem protocol used by
32 + devices with Qualcomm chipsets</flag>
33 + <flag name="qmi-newest">Avoid deprecated QMI commands. Warning: may
34 + cause incompatibility with older devices.</flag>
35 + </use>
36 </pkgmetadata>
37
38
39
40 1.47 net-misc/modemmanager/ChangeLog
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/modemmanager/ChangeLog?rev=1.47&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/modemmanager/ChangeLog?rev=1.47&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/modemmanager/ChangeLog?r1=1.46&r2=1.47
45
46 Index: ChangeLog
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/net-misc/modemmanager/ChangeLog,v
49 retrieving revision 1.46
50 retrieving revision 1.47
51 diff -u -r1.46 -r1.47
52 --- ChangeLog 28 Jan 2013 05:11:32 -0000 1.46
53 +++ ChangeLog 28 Jan 2013 07:04:24 -0000 1.47
54 @@ -1,6 +1,15 @@
55 # ChangeLog for net-misc/modemmanager
56 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
57 -# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/ChangeLog,v 1.46 2013/01/28 05:11:32 tetromino Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/ChangeLog,v 1.47 2013/01/28 07:04:24 tetromino Exp $
59 +
60 +*modemmanager-9999 (28 Jan 2013)
61 +*modemmanager-0.7.990 (28 Jan 2013)
62 +
63 + 28 Jan 2013; Alexandre Rostovtsev <tetromino@g.o>
64 + +modemmanager-0.7.990.ebuild, +modemmanager-9999.ebuild, metadata.xml:
65 + Add 0.8 development pre-release and a live git ebuild. 0.8 features improved
66 + hardware support, and has a new dbus API which is incompatible with older
67 + ModemManager releases.
68
69 28 Jan 2013; Alexandre Rostovtsev <tetromino@g.o>
70 -modemmanager-0.4.ebuild, -modemmanager-0.5.2.0-r2.ebuild,
71
72
73
74 1.1 net-misc/modemmanager/modemmanager-0.7.990.ebuild
75
76 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/modemmanager/modemmanager-0.7.990.ebuild?rev=1.1&view=markup
77 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/modemmanager/modemmanager-0.7.990.ebuild?rev=1.1&content-type=text/plain
78
79 Index: modemmanager-0.7.990.ebuild
80 ===================================================================
81 # Copyright 1999-2013 Gentoo Foundation
82 # Distributed under the terms of the GNU General Public License v2
83 # $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-0.7.990.ebuild,v 1.1 2013/01/28 07:04:24 tetromino Exp $
84
85 EAPI="5"
86 GNOME_ORG_MODULE="ModemManager"
87
88 inherit eutils gnome.org user multilib toolchain-funcs udev virtualx
89
90 DESCRIPTION="Modem and mobile broadband management libraries"
91 HOMEPAGE="http://cgit.freedesktop.org/ModemManager/ModemManager/"
92
93 LICENSE="GPL-2+"
94 SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
95 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
96 IUSE="doc policykit test" # +qmi qmi-newest
97 # REQUIRED_USE="qmi-newest? ( qmi )"
98
99 RDEPEND=">=dev-libs/glib-2.30.2:2
100 net-dialup/ppp
101 >=virtual/udev-147[gudev]
102 policykit? ( >=sys-auth/polkit-0.106 )
103 "
104 DEPEND="${RDEPEND}
105 doc? (
106 app-office/dia
107 dev-libs/libxslt
108 dev-util/gtk-doc )
109 test? (
110 dev-lang/python:2.7
111 dev-python/dbus-python[python_targets_python2_7]
112 dev-python/pygobject:2[python_targets_python2_7] )
113 >=dev-util/intltool-0.40
114 sys-devel/gettext
115 virtual/pkgconfig
116 "
117
118 src_prepare() {
119 # Use python2.7 shebangs for test scripts
120 sed -e 's@\(^#!.*python\)@\12.7@' \
121 -i test/*.py || die
122
123 epatch_user
124 default
125 }
126
127 src_configure() {
128 # ppp-2.4.5 changes the plugin directory
129 if has_version '=net-dialup/ppp-2.4.4*'; then
130 pppd_plugin_dir="pppd/2.4.4"
131 elif has_version '=net-dialup/ppp-2.4.5*'; then
132 pppd_plugin_dir="pppd/2.4.5"
133 fi
134
135 # FIXME: add $(use_with qmi) and $(use_with qmi-newest newest-qmi-commands)
136 # when libqmi-1.0.0 is in gx86 (bug #454382)
137 econf \
138 --disable-more-warnings \
139 --with-udev-base-dir="$(udev_get_udevdir)" \
140 --disable-static \
141 --with-dist-version=${PVR} \
142 --with-pppd-plugin-dir="/usr/$(get_libdir)/${pppd_plugin_dir}" \
143 $(use_with doc docs) \
144 $(use_with policykit polkit) \
145 --without-qmi \
146 --without-newest-qmi-commands \
147 $(use_with test tests)
148 }
149
150 src_install() {
151 default
152 use doc && dohtml docs/spec.html
153
154 # Allow users in plugdev group full control over their modem
155 if use policykit; then
156 insinto /usr/share/polkit-1/rules.d/
157 doins "${FILESDIR}"/01-org.freedesktop.ModemManager.rules
158 fi
159
160 # Remove useless .la files
161 prune_libtool_files --modules
162 }
163
164 pkg_postinst() {
165 if use policykit; then
166 enewgroup plugdev
167 elog "To control your modem without needing to enter the root password,"
168 elog "add your user account to the 'plugdev' group."
169 elog
170 fi
171
172 # The polkit rules file moved to /usr/share
173 old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
174 if [[ -f "${old_rules}" ]]; then
175 case "$(md5sum ${old_rules})" in
176 c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* )
177 # Automatically delete the old rules.d file if the user did not change it
178 elog
179 elog "Removing old ${old_rules} ..."
180 rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
181 ;;
182 * )
183 elog "The ${old_rules}"
184 elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2"
185 elog "If you edited ${old_rules}"
186 elog "without changing its behavior, you may want to remove it."
187 ;;
188 esac
189 fi
190
191 elog "If your USB modem shows up as a Flash drive when you plug it in,"
192 elog "You should install sys-apps/usb_modeswitch which will automatically"
193 elog "switch it over to USB modem mode whenever you plug it in."
194 }
195
196
197
198 1.1 net-misc/modemmanager/modemmanager-9999.ebuild
199
200 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/modemmanager/modemmanager-9999.ebuild?rev=1.1&view=markup
201 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/modemmanager/modemmanager-9999.ebuild?rev=1.1&content-type=text/plain
202
203 Index: modemmanager-9999.ebuild
204 ===================================================================
205 # Copyright 1999-2013 Gentoo Foundation
206 # Distributed under the terms of the GNU General Public License v2
207 # $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-9999.ebuild,v 1.1 2013/01/28 07:04:24 tetromino Exp $
208
209 EAPI="5"
210 GNOME_ORG_MODULE="ModemManager"
211
212 inherit autotools eutils git-2 gnome.org user multilib toolchain-funcs udev virtualx
213
214 DESCRIPTION="Modem and mobile broadband management libraries"
215 HOMEPAGE="http://cgit.freedesktop.org/ModemManager/ModemManager/"
216
217 LICENSE="GPL-2+"
218 SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
219 KEYWORDS=
220 IUSE="doc policykit +qmi qmi-newest test"
221 REQUIRED_USE="qmi-newest? ( qmi )"
222 SRC_URI=
223 EGIT_REPO_URI="git://anongit.freedesktop.org/ModemManager/ModemManager"
224
225 RDEPEND=">=dev-libs/glib-2.30.2:2
226 net-dialup/ppp
227 >=virtual/udev-147[gudev]
228 policykit? ( >=sys-auth/polkit-0.106 )
229 qmi? ( net-libs/libqmi )
230 "
231 DEPEND="${RDEPEND}
232 doc? (
233 app-office/dia
234 dev-libs/libxslt
235 dev-util/gtk-doc )
236 test? (
237 dev-lang/python:2.7
238 dev-python/dbus-python[python_targets_python2_7]
239 dev-python/pygobject:2[python_targets_python2_7] )
240 >=dev-util/intltool-0.40
241 sys-devel/gettext
242 virtual/pkgconfig
243
244 dev-util/gtk-doc-am
245 "
246
247 src_unpack() {
248 git-2_src_unpack
249 }
250
251 src_prepare() {
252 # Use python2.7 shebangs for test scripts
253 sed -e 's@\(^#!.*python\)@\12.7@' \
254 -i test/*.py || die
255
256 epatch_user
257 eautoreconf # for 9999
258 default
259 }
260
261 src_configure() {
262 # ppp-2.4.5 changes the plugin directory
263 if has_version '=net-dialup/ppp-2.4.4*'; then
264 pppd_plugin_dir="pppd/2.4.4"
265 elif has_version '=net-dialup/ppp-2.4.5*'; then
266 pppd_plugin_dir="pppd/2.4.5"
267 fi
268
269 econf \
270 --disable-more-warnings \
271 --with-udev-base-dir="$(udev_get_udevdir)" \
272 --disable-static \
273 --with-dist-version=${PVR} \
274 --with-pppd-plugin-dir="/usr/$(get_libdir)/${pppd_plugin_dir}" \
275 $(use_with doc docs) \
276 $(use_with policykit polkit) \
277 $(use_with qmi) \
278 $(use_with qmi-newest newest-qmi-commands) \
279 $(use_with test tests)
280 }
281
282 src_install() {
283 default
284 use doc && dohtml docs/spec.html
285
286 # Allow users in plugdev group full control over their modem
287 if use policykit; then
288 insinto /usr/share/polkit-1/rules.d/
289 doins "${FILESDIR}"/01-org.freedesktop.ModemManager.rules
290 fi
291
292 # Remove useless .la files
293 prune_libtool_files --modules
294 }
295
296 pkg_postinst() {
297 if use policykit; then
298 enewgroup plugdev
299 elog "To control your modem without needing to enter the root password,"
300 elog "add your user account to the 'plugdev' group."
301 elog
302 fi
303
304 # The polkit rules file moved to /usr/share
305 old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
306 if [[ -f "${old_rules}" ]]; then
307 case "$(md5sum ${old_rules})" in
308 c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* )
309 # Automatically delete the old rules.d file if the user did not change it
310 elog
311 elog "Removing old ${old_rules} ..."
312 rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
313 ;;
314 * )
315 elog "The ${old_rules}"
316 elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2"
317 elog "If you edited ${old_rules}"
318 elog "without changing its behavior, you may want to remove it."
319 ;;
320 esac
321 fi
322
323 elog "If your USB modem shows up as a Flash drive when you plug it in,"
324 elog "You should install sys-apps/usb_modeswitch which will automatically"
325 elog "switch it over to USB modem mode whenever you plug it in."
326 }