Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/modemmanager/
Date: Mon, 30 Oct 2017 22:26:22
Message-Id: 1509402328.c8a5cbef56c5183138749757d234593a49f94936.leio@gentoo
1 commit: c8a5cbef56c5183138749757d234593a49f94936
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 30 21:14:46 2017 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 30 22:25:28 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8a5cbef
7
8 net-misc/modemmanager: remove old
9
10 Package-Manager: Portage-2.3.8, Repoman-2.3.2
11
12 net-misc/modemmanager/Manifest | 1 -
13 net-misc/modemmanager/metadata.xml | 2 -
14 net-misc/modemmanager/modemmanager-1.4.14.ebuild | 109 -----------------------
15 3 files changed, 112 deletions(-)
16
17 diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
18 index f00a54e7018..9a2f8ecd55c 100644
19 --- a/net-misc/modemmanager/Manifest
20 +++ b/net-misc/modemmanager/Manifest
21 @@ -1,2 +1 @@
22 -DIST ModemManager-1.4.14.tar.xz 1417092 SHA256 abe6cdd515a774bcba3afdcdb1e504569801e79282ccdf26099f33cbb8731ba2 SHA512 2fb5517cd3fbd98cf4048cec326fabf18fb26d88b75e56208d1ed64d70d72d6e826ef30391c86fbcfe4d69661194bcfbb55d545db10ebe8baf8ef16a3c580446 WHIRLPOOL 30c9e1e388c91f8aab73044634e3d122636f526cb9b437a597dc2f35cfd85e61917a568cfa572404f734eb19eb90c2e21bc85e16d6cc9b53518f590981f6efa4
23 DIST ModemManager-1.6.4.tar.xz 1464276 SHA256 cdd5b4cb1e4d7643643a28ccbfc4bb354bfa9cb89a77ea160ebdf7926171c668 SHA512 6b31ce186adce445cec8964df751b6146a86271e6c14d860740ae66cfe296ac2ac4df21079357775ac5f7a5837c80a7f8db21a2680bc6b45802f9928565f1c73 WHIRLPOOL 3e3b16299ed5d9179e7d7bd38040d061df21fdde558032c8362110d098d3931f106988a0992a64936d969e008c83d699b85e71211bc0684d9bafb2dbc6b4baa9
24
25 diff --git a/net-misc/modemmanager/metadata.xml b/net-misc/modemmanager/metadata.xml
26 index 2e8801cb40a..8d49dd5a7e8 100644
27 --- a/net-misc/modemmanager/metadata.xml
28 +++ b/net-misc/modemmanager/metadata.xml
29 @@ -9,7 +9,5 @@
30 <flag name="mbim">Enable MBIM modem protocol</flag>
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 diff --git a/net-misc/modemmanager/modemmanager-1.4.14.ebuild b/net-misc/modemmanager/modemmanager-1.4.14.ebuild
39 deleted file mode 100644
40 index 90598682089..00000000000
41 --- a/net-misc/modemmanager/modemmanager-1.4.14.ebuild
42 +++ /dev/null
43 @@ -1,109 +0,0 @@
44 -# Copyright 1999-2017 Gentoo Foundation
45 -# Distributed under the terms of the GNU General Public License v2
46 -
47 -EAPI=6
48 -GNOME2_LA_PUNT="yes"
49 -VALA_USE_DEPEND="vapigen"
50 -
51 -inherit gnome2 user readme.gentoo-r1 systemd udev vala
52 -
53 -DESCRIPTION="Modem and mobile broadband management libraries"
54 -HOMEPAGE="https://cgit.freedesktop.org/ModemManager/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 ~ia64 ~mips ppc ppc64 ~sparc x86"
60 -
61 -IUSE="+introspection mbim policykit +qmi qmi-newest vala"
62 -REQUIRED_USE="
63 - qmi-newest? ( qmi )
64 - vala? ( introspection )
65 -"
66 -
67 -RDEPEND="
68 - >=dev-libs/glib-2.32:2
69 - virtual/libgudev:=
70 - introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
71 - mbim? ( >=net-libs/libmbim-1.10 )
72 - policykit? ( >=sys-auth/polkit-0.106[introspection] )
73 - qmi? ( >=net-libs/libqmi-1.12.4:= )
74 -"
75 -DEPEND="${RDEPEND}
76 - dev-util/gdbus-codegen
77 - >=dev-util/intltool-0.40
78 - sys-devel/gettext
79 - virtual/pkgconfig
80 - vala? ( $(vala_depend) )
81 -"
82 -
83 -S="${WORKDIR}/ModemManager-${PV}"
84 -
85 -src_prepare() {
86 - DOC_CONTENTS="If your USB modem shows up as a Flash drive when you plug it in,
87 - You should install sys-apps/usb_modeswitch which will automatically
88 - switch it over to USB modem mode whenever you plug it in.\n"
89 -
90 - if use policykit; then
91 - DOC_CONTENTS+="\nTo control your modem without needing to enter the root password,
92 - add your user account to the 'plugdev' group."
93 - fi
94 -
95 - use vala && vala_src_prepare
96 - gnome2_src_prepare
97 -}
98 -
99 -src_configure() {
100 - gnome2_src_configure \
101 - --disable-more-warnings \
102 - --with-udev-base-dir="$(get_udevdir)" \
103 - --disable-static \
104 - --with-dist-version=${PVR} \
105 - $(use_enable introspection) \
106 - $(use_with mbim) \
107 - $(use_with policykit polkit) \
108 - $(use_with qmi) \
109 - $(use_with qmi-newest newest-qmi-commands) \
110 - $(use_enable vala)
111 -}
112 -
113 -src_install() {
114 - gnome2_src_install
115 -
116 - # Allow users in plugdev group full control over their modem
117 - if use policykit; then
118 - insinto /usr/share/polkit-1/rules.d/
119 - doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules
120 - fi
121 -
122 - readme.gentoo_create_doc
123 -}
124 -
125 -pkg_postinst() {
126 - gnome2_pkg_postinst
127 -
128 - use policykit && enewgroup plugdev
129 -
130 - # The polkit rules file moved to /usr/share
131 - old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
132 - if [[ -f "${old_rules}" ]]; then
133 - case "$(md5sum ${old_rules})" in
134 - c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* )
135 - # Automatically delete the old rules.d file if the user did not change it
136 - elog
137 - elog "Removing old ${old_rules} ..."
138 - rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
139 - ;;
140 - * )
141 - elog "The ${old_rules}"
142 - elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2"
143 - elog "If you edited ${old_rules}"
144 - elog "without changing its behavior, you may want to remove it."
145 - ;;
146 - esac
147 - fi
148 -
149 - systemd_reenable ModemManager.service
150 -
151 - readme.gentoo_print_elog
152 -}