Исправлена поддержка модемов

atratsevskiy
Alexander Tratsevskiy 8 years ago
parent 59410dfdcb
commit 9c47f0cb66

@ -1 +0,0 @@
DIST ModemManager-1.2.0.tar.xz 1306972 SHA256 8bd9d8c3b506f34a9f927e95784026d1fe132c9d60fc426a892b690f7d6408bc SHA512 42e94e9bac7224ecdb7502d2542a84b3952a38054845bc87530914369c0c4ff5c15e1b892a54e39a20d3ef115c287f6976256912c076c320adbb9161cb6adce3 WHIRLPOOL 5be964dbf8a324a392d4fedf1aefedd88a5d09cea31b343c20f1f0b4524d2bec68f4668a0f4eb2b1d1a213551fd85b572b19a88632d2f0fcc0cad6bdbee622bd

@ -1,7 +0,0 @@
// Let users in plugdev group modify ModemManager
polkit.addRule(function(action, subject) {
if (/^org\.freedesktop\.ModemManager1\.(Device\.Control|Contacts|Messaging|Location)$/.test(action.id) &&
subject.isInGroup("plugdev") && subject.active) {
return "yes";
}
});

@ -1,109 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-1.2.0-r1.ebuild,v 1.8 2014/10/11 12:29:23 maekke Exp $
EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
VALA_MIN_API_VERSION="0.18"
VALA_USE_DEPEND="vapigen"
inherit gnome2 user readme.gentoo udev vala
DESCRIPTION="Modem and mobile broadband management libraries"
HOMEPAGE="http://cgit.freedesktop.org/ModemManager/ModemManager/"
SRC_URI="http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
LICENSE="GPL-2+"
SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc x86"
IUSE="+introspection mbim policykit +qmi qmi-newest vala"
REQUIRED_USE="
qmi-newest? ( qmi )
vala? ( introspection )
"
RDEPEND="
>=dev-libs/glib-2.32:2
virtual/libgudev:=
introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
mbim? ( >=net-libs/libmbim-1.4 )
policykit? ( >=sys-auth/polkit-0.106[introspection] )
qmi? ( >=net-libs/libqmi-1.6.0:= )
"
DEPEND="${RDEPEND}
dev-util/gdbus-codegen
>=dev-util/intltool-0.40
sys-devel/gettext
virtual/pkgconfig
vala? ( $(vala_depend) )
"
S="${WORKDIR}/ModemManager-${PV}"
src_prepare() {
DOC_CONTENTS="If your USB modem shows up as a Flash drive when you plug it in,
You should install sys-apps/usb_modeswitch which will automatically
switch it over to USB modem mode whenever you plug it in.\n"
if use policykit; then
DOC_CONTENTS+="\nTo control your modem without needing to enter the root password,
add your user account to the 'plugdev' group."
fi
use vala && vala_src_prepare
gnome2_src_prepare
}
src_configure() {
gnome2_src_configure \
--disable-more-warnings \
--with-udev-base-dir="$(get_udevdir)" \
--disable-static \
--with-dist-version=${PVR} \
$(use_enable introspection) \
$(use_with mbim) \
$(use_with policykit polkit) \
$(use_with qmi) \
$(use_with qmi-newest newest-qmi-commands) \
$(use_enable vala)
}
src_install() {
gnome2_src_install
# Allow users in plugdev group full control over their modem
if use policykit; then
insinto /usr/share/polkit-1/rules.d/
doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules
fi
readme.gentoo_create_doc
}
pkg_postinst() {
gnome2_pkg_postinst
use policykit && enewgroup plugdev
# The polkit rules file moved to /usr/share
old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
if [[ -f "${old_rules}" ]]; then
case "$(md5sum ${old_rules})" in
c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* )
# Automatically delete the old rules.d file if the user did not change it
elog
elog "Removing old ${old_rules} ..."
rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
;;
* )
elog "The ${old_rules}"
elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2"
elog "If you edited ${old_rules}"
elog "without changing its behavior, you may want to remove it."
;;
esac
fi
readme.gentoo_print_elog
}

@ -100,7 +100,6 @@ dev-lang/php -imap -spell
dev-libs/folks -bluetooth
dev-util/cmake -qt4
dev-vcs/git -gtk
gnome-extra/nm-applet -bluetooth
gnome-extra/zenity -webkit
kde-apps/kdebase-runtime-meta -crash-reporter
kde-apps/print-manager -gtk
@ -504,3 +503,6 @@ media-video/mediainfo wxwidgets
# use postgresql database for not using '-secure-delete' sqlite USE flag
net-irc/quassel postgres qt5
# enable support for mobile broadband devices
gnome-extra/nm-applet-1.4.0 modemmanager

@ -1,8 +1,3 @@
=gnome-extra/gnome-user-share-3.18.2
# it does not create the ppp interface
>=net-misc/modemmanager-1.4.0
# Does not display the status icon in the system tray
>=xfce-extra/xfce4-power-manager-1.3.0

Loading…
Cancel
Save