Install polkit-1/rules.d file for polkit-0.106 support (bug #421581, thanks to Samuli Suominen).

Package-Manager: portage-2.2.0_alpha115/cvs/Linux x86_64

4 files changed, 104 insertions, 9 deletions

diff --git a/net-misc/modemmanager/ChangeLog b/net-misc/modemmanager/ChangeLog
index b824625408c9..94c589e4e3f6 100644
--- a/net-misc/modemmanager/ChangeLog
+++ b/net-misc/modemmanager/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/modemmanager
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/ChangeLog,v 1.28 2012/06/27 14:44:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/ChangeLog,v 1.29 2012/07/04 06:53:25 tetromino Exp $
+
+*modemmanager-0.5.2.0-r1 (04 Jul 2012)
+
+  04 Jul 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +files/01-org.freedesktop.ModemManager.rules,
+  +modemmanager-0.5.2.0-r1.ebuild:
+  Install polkit-1/rules.d file for polkit-0.106 support (bug #421581, thanks
+  to Samuli Suominen).
 
   27 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> modemmanager-0.4.ebuild,
   modemmanager-0.4_p20110205-r1.ebuild, modemmanager-0.5.ebuild,
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index c9fe6034875e..5727ce2bc542 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 AUX 01-org.freedesktop.ModemManager.pkla 285 RMD160 7ac809452d98472958212ff1cbddf4a3f012ee5f SHA1 eaa96c037f9424f84c4a6c461cfa331b89b4a2e5 SHA256 c4eeb956c5bfa0dfe30efe1ae1c88e60674425dcc786c080da0d17f245c0e5f5
+AUX 01-org.freedesktop.ModemManager.rules 236 RMD160 1ed6f6916f3e2517e5a767d8b8608048edc5a136 SHA1 aa44e9e69c366ae507c847d7acbb67422a7e51ec SHA256 d622aa8e2b76e1709f83fbf4ef490bc4b2a2d64269d61649a88119c0fbe507e0
 AUX modemmanager-0.5-glib-2.31.patch 2648 RMD160 47bb67ca734c829c4d2042b5b078bf531953e437 SHA1 b2f306628e83e4639a29febb35282297f278dd5e SHA256 7a59df7d4db579ca5b794410956733002ea509b67f0180353a92573a9b9e8671
 DIST ModemManager-0.4.tar.bz2 444746 RMD160 c2d82f746bc3611e11b7f0c4504fa4cc14fa0788 SHA1 786231841cfa3824ff69ad2c9a6a40b881689012 SHA256 8b5415ae8597726f82e9fd09237c02b5c8af7e9f4fc4cba00f9fe183cc2c6c5f
 DIST ModemManager-0.4_p20110205.tar.bz2 482484 RMD160 7ef84838751685c2d731285b9ea78c0cadcdd684 SHA1 26a624c4a1a133a6b0817ed81fe1fa3e207647bc SHA256 fe3e9ab797e60bf4ead90c40ea88c33c81d36e991408f62276cb30111f66d051
@@ -9,18 +10,19 @@ DIST ModemManager-0.5.2.0.tar.xz 492728 RMD160 32abe19a16b543049925539a59ffa3155
 DIST ModemManager-0.5.tar.xz 461608 RMD160 093321c2ac43e00117ade3bd9cdd9dca5790d47f SHA1 550959ca02af9970a0bdd19a72810ed9f065b9dd SHA256 e7c7aed7c1484adee22f04dac358c1f971985f8413096c4d412d084aa2cd7c7f
 EBUILD modemmanager-0.4.ebuild 2020 RMD160 0310757f68ee14df963a0b9470c8eb8ce1ed9374 SHA1 84784a97e491e56e4dceff7e3d469a94ea8ab3d3 SHA256 62b537cb7dc3837bd9ef91e349bd023dc2eec54e8a8973d833cc7dbdc413d8e0
 EBUILD modemmanager-0.4_p20110205-r1.ebuild 2107 RMD160 54ed4b19f0afc49c6fec134259c9291f4c883745 SHA1 5a21fa5d29e9be1bb4cf48b6fcf487b82682ba1f SHA256 18dc059eb4621c02b22536911aca35d9f9b2f85d0517b5d64a3872d7d8a6863f
+EBUILD modemmanager-0.5.2.0-r1.ebuild 2257 RMD160 4cef61ffa85417a734b70e6cc60bc38dd21920ec SHA1 19b1edf21638fb9af474d7af56bd9b204d27040d SHA256 55407c6fd146afa6560a137c9586b2a52f7caeaae4288423d6ddd2eff6b1b3de
 EBUILD modemmanager-0.5.2.0.ebuild 2162 RMD160 d9776f9102c62a6190c4d53fc8d8b9274c73df0b SHA1 c74ccf2cd97b50f35a290ad5c7a6d5e74cf8a706 SHA256 c7d2891ae53c35e281abc1cf7ee01fd48d98b6fab880be9dfdfdf2d71fca6b2f
 EBUILD modemmanager-0.5.ebuild 1826 RMD160 0fcbca735791a76ae3e6f818322cdd18967b9d94 SHA1 8e2d300d51f183809a552581a3e0efc8921dffbd SHA256 bf98462e75d5aa3668d0d6ce224a743260e753c7612c6aad1c34cd04849689f3
-MISC ChangeLog 5402 RMD160 558882aa67946ceb0aca1da091a215b8f8346a3b SHA1 cc414fc64b47c733ccf1e98a1e49459c886ea588 SHA256 bf5392bd7ef38f59900361bb0aba944c3a948703abd62d2ca523a014cd623117
+MISC ChangeLog 5686 RMD160 a150ba6aca2bd755c90e52999284927ccf50820f SHA1 29ef8c1ab377da71a65ff539ad7ff93ba62ea7e2 SHA256 64e6d223626110d1a8798b83436d052270cb2f9ba7f781e2671343fbc02f6311
 MISC metadata.xml 433 RMD160 4e1de171ef3d57f25cbb69731a50dc2f7373487b SHA1 fd2e36d9b7bf7d3b52e95d041e4f5f8c256d645b SHA256 fd7d12efce57e4ab207b1d38c879211dad38e99c2cf785c5d8ba49e76b4859b2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP6xsTAAoJEEdUh39IaPFNEwwH/0UtsLWs3DG/BZLlVErpJFTs
-iqVGo71kwN3n3a61nFBoN8SeLcRxRk30DVYApaXFrlY2UeYNP/E7cuyt4c8BBV2D
-QZAxeP7K2KAwgITgFE1MEoliCmR6G9Xtnd+RrLf5E6vFDUpnqL3KbdItp7+vkvhi
-NMNjgFoUgmer18FXeel13j4aN4TCKDRFfo/sYQea5yWjL09h+yGiuD3h6Z1Fkjxs
-f41l7cBraRQIR/L3BqlW1jZ85YljADXoOX5EVLimNJAj+teoTu1Ohv30BeE/fMLB
-jClPDlGIq2En+VOIjpLHQurj04tgsvVI7ftos6cTqIgxle8xJY29xdLy0kniDjk=
-=5R+X
+iQEcBAEBAgAGBQJP8+hqAAoJEJ0WA1zPCt1heAEIAJ6mqfROlS6O4SHENppJ1ndV
+CRTFXxm/GQ9itIWQAP7Rk0dDKhZTCkQ1ER0e839fccSNpVttdaOcbM9mPb+TiWAa
+6WW9pG3UPOBSRB1Z668bgCQCNzCIcQLO+AyqZBRDODTlIG1Ukk9V1rzHzIOOk5U1
+ajSsV8KjLgcGjT5HQ3HicqFCQLFo6DkyxQaTf0xfOIJRfD5e88et0T2DN/GsfbqR
+nBjLmX1csUUGjaXmxwMASeaWSUGh3MfLjzyD9WbAZq6aCV5PdJxo9OB8hKf2p5/e
+kcyjLrK5kyytkbGukydPYom8SCiKCXndlaNUCwwnPc/mQspjLnaQ32iSryFQplQ=
+=wxqQ
 -----END PGP SIGNATURE-----
diff --git a/net-misc/modemmanager/files/01-org.freedesktop.ModemManager.rules b/net-misc/modemmanager/files/01-org.freedesktop.ModemManager.rules
new file mode 100644
index 000000000000..afac7a5d8335
--- /dev/null
+++ b/net-misc/modemmanager/files/01-org.freedesktop.ModemManager.rules
@@ -0,0 +1,6 @@
+polkit.addRule(function(action, subject) {
+    if (/^org\.freedesktop\.ModemManager\.(Device\.Control|Contacts|SMS|Location)$/.test(action.id) &&
+        subject.isInGroup("plugdev") && subject.active) {
+        return "yes";
+    }
+});
diff --git a/net-misc/modemmanager/modemmanager-0.5.2.0-r1.ebuild b/net-misc/modemmanager/modemmanager-0.5.2.0-r1.ebuild
new file mode 100644
index 000000000000..840f3b92bf65
--- /dev/null
+++ b/net-misc/modemmanager/modemmanager-0.5.2.0-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-0.5.2.0-r1.ebuild,v 1.1 2012/07/04 06:53:25 tetromino Exp $
+
+EAPI="4"
+GNOME_ORG_MODULE="ModemManager"
+
+inherit gnome.org user multilib
+
+DESCRIPTION="Modem and mobile broadband management libraries"
+HOMEPAGE="http://cgit.freedesktop.org/ModemManager/ModemManager/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="doc policykit test"
+
+RDEPEND=">=dev-libs/glib-2.18:2
+	|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] )
+	>=dev-libs/dbus-glib-0.86
+	net-dialup/ppp
+	policykit? ( >=sys-auth/polkit-0.99 )"
+DEPEND="${RDEPEND}
+	doc? ( dev-libs/libxslt )
+	>=dev-util/intltool-0.35.0
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_configure() {
+	# ppp-2.4.5 changes the plugin directory
+	if has_version '=net-dialup/ppp-2.4.4*'; then
+		pppd_plugin_dir="pppd/2.4.4"
+	elif has_version '=net-dialup/ppp-2.4.5*'; then
+		pppd_plugin_dir="pppd/2.4.5"
+	fi
+
+	econf \
+		--disable-more-warnings \
+		--with-udev-base-dir=/lib/udev/ \
+		--disable-static \
+		--with-dist-version=${PVR} \
+		--with-pppd-plugin-dir="/usr/$(get_libdir)/${pppd_plugin_dir}" \
+		$(use_with doc docs) \
+		$(use_with policykit polkit) \
+		$(use_with test tests)
+}
+
+src_install() {
+	default
+	use doc && dohtml docs/spec.html
+
+	# Allow users in plugdev group full control over their modem
+	if use policykit; then
+		insinto /etc/polkit-1/rules.d
+		doins "${FILESDIR}"/01-org.freedesktop.ModemManager.rules
+		if has_version '<sys-auth/polkit-0.106'; then
+			insinto /etc/polkit-1/localauthority/10-vendor.d
+			doins "${FILESDIR}/01-org.freedesktop.ModemManager.pkla"
+		fi
+	fi
+
+	# Remove useless .la files
+	find "${D}" -name '*.la' -delete
+}
+
+pkg_postinst() {
+	if use policykit; then
+		enewgroup plugdev
+		elog "To control your modem without needing to enter the root password,"
+		elog "add your user account to the 'plugdev' group."
+		elog
+	fi
+
+	elog "If your USB modem shows up as a Flash drive when you plug it in,"
+	elog "You should install sys-apps/usb_modeswitch which will automatically"
+	elog "switch it over to USB modem mode whenever you plug it in."
+}