Enable MBIM support as well as introducing the dependency, closes bug #509186. A stale --without-mbim line got left behind. Gnome herd commit approval from tetromino.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB5058F9A

3 files changed, 122 insertions, 5 deletions

diff --git a/net-misc/modemmanager/ChangeLog b/net-misc/modemmanager/ChangeLog
index 92041bff3490..a40f6b31d73d 100644
--- a/net-misc/modemmanager/ChangeLog
+++ b/net-misc/modemmanager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/modemmanager
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/ChangeLog,v 1.64 2014/04/12 10:19:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/ChangeLog,v 1.65 2014/04/30 14:51:26 chainsaw Exp $
+
+*modemmanager-1.2.0-r1 (30 Apr 2014)
+
+  30 Apr 2014; Tony Vroon <chainsaw@gentoo.org> +modemmanager-1.2.0-r1.ebuild:
+  Enable MBIM support as well as introducing the dependency, closes bug
+  #509186. A stale --without-mbim line got left behind. Gnome herd commit
+  approval from tetromino.
 
 *modemmanager-1.2.0 (12 Apr 2014)
 
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index 4573b4b1db9d..43c684a03401 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -12,13 +12,14 @@ DIST ModemManager-1.0.0.tar.xz 1141504 SHA256 e0f3bbd9a7353f7d87be2391b8718a81d1
 DIST ModemManager-1.2.0.tar.xz 1306972 SHA256 8bd9d8c3b506f34a9f927e95784026d1fe132c9d60fc426a892b690f7d6408bc SHA512 42e94e9bac7224ecdb7502d2542a84b3952a38054845bc87530914369c0c4ff5c15e1b892a54e39a20d3ef115c287f6976256912c076c320adbb9161cb6adce3 WHIRLPOOL 5be964dbf8a324a392d4fedf1aefedd88a5d09cea31b343c20f1f0b4524d2bec68f4668a0f4eb2b1d1a213551fd85b572b19a88632d2f0fcc0cad6bdbee622bd
 EBUILD modemmanager-0.6.0.0.ebuild 2984 SHA256 97648ee02d5fc25049a0b259013e591ce15d46a0d632d1b8f6e9ff2d645771ff SHA512 5b99d00098f472dc7234bb6889ee53155b064c588e30a3bb7e19e8370b3b713eca55b47aa6232498a0d9302759c6550420d1a30752087e797b3da939591b9842 WHIRLPOOL 58e92639fa8637fcb0ef8c48cad887f4e59d571bdf1f766336c1ff578512cd268fab05564e2e60c7c9a6851e09d83298112e3ff716add5f1aecbedb60701bbe5
 EBUILD modemmanager-1.0.0-r2.ebuild 3097 SHA256 a99f803ccd521c25c071af87faa36d8244dc5040c817f173a9af1e5264d53294 SHA512 6527d684bdfae4756b717b06f56aa842de428ba6fccc04208b7f90105c6ef407d426d9df097caac7660dd854bfc9ffe799a9a4b4ced06bcee32216c86e48b237 WHIRLPOOL c95e684c50f88c0321d7120a8107ae996aea4aad549ce5357e3886e1fc495a86cc609a15300cfed72c5982d3172529975815e0fad6b66b5e089bb9c1f947e836
+EBUILD modemmanager-1.2.0-r1.ebuild 3178 SHA256 62dcf6bd5f795702e4b66303b577061e1703fbdc17b5ffb06551982a4316b657 SHA512 889da3f0357980f96f9852135daf3f5c0d19f7d69c1ede7c15640d831b41c173bd425020c2f224434a5724e0c1c390c01c3c3ed4f1742a62a1a0ab7896d194c7 WHIRLPOOL a9ead5d962da357865c3ad8c4618c744a23a9632198f6a18626a9957a69272cee4a95664e4aadb7efb1e1b9c476e69fa2ea32f5d522ddb13ddbcf4dd556e473a
 EBUILD modemmanager-1.2.0.ebuild 3191 SHA256 bb96ab0ed2f48bfc8de704a4438cf0d640f379d8d94041a9b4b62e0adf5d7197 SHA512 c771e830bab50a16255b13e81083d7e8f5e0c270b54537be309c7f681b6707574b9abd9a408fb91e9cb13660fcbb3e4aad4927f0e015d3f96408a6b637fa9f68 WHIRLPOOL 71c475d20b8ae52cb0ef5a18080971f580ca86cb18f4b60badfd6eb9896619df44af555e8ac54c47c45e2c4341c73eb3530d535b2904f163e53b71997c2efbfb
-MISC ChangeLog 11807 SHA256 cb2033f2940faa8d89132edda13e37ea34876a71cfe9b9bc4406f90101f50b07 SHA512 674fc3751db85007ac4326f9fa68af118c117b129b7349e1b9ea1b9fdc06c5496ca6fc28f57f0ac807b75a2915784a70eedc531b5c68027eef773d60de9b66c1 WHIRLPOOL 7151ab5455ae07f2c17f62e94407f6efbaa8a942ac46f53dc5291fd9f06c2800116d3c6f447cbf6ef55a858a9449c3036bc406ab1c757772333095e8836e21a7
+MISC ChangeLog 12101 SHA256 82662c32963dc38afba3663e66140ad8802958e6b3ac2c56eee2745a89c3665b SHA512 76a44cb8f161a94f35f036a022c482aabc38a6bbb00b139761726829fa0e3e07e3c5430b1d11345ad3780de73c9fc65160af2ec2af47cabff8a7a6c434a63e38 WHIRLPOOL 9f243c8ccf51f21f1c13d45efc20f5f161e62bbe644482e98e600d14a7263ead088ed3f51b9f6ec511630b5771fa1646560dda5e672d616dfa80ce936d9dd71c
 MISC metadata.xml 459 SHA256 65595a7dd593bd3791400cfba990ae5cc0796e57b54f6398c053de4d27e67d2c SHA512 e3c4e33e025345dbf17a2cdfbb32abd19ae8a6e1c859bb5caa984f2ee86593d7a09512f735f2bbde49d73767732312e99d179347cb56303e664dafc046273f39 WHIRLPOOL b2f89ff8e929f95014e9c3cd72d913134a5e031f1c8067b606c6c9ca1f332dc381c1488b890fd56a6362cc91ea6500bfd08c1085a197389eada2e4befbfe83de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNJExcACgkQCaWpQKGI+9TgpQCdEOnHY6BnpQraQJJDHNreVaev
-2mcAmwfIrCKTYaWrqS483pA+jgsTi1vQ
-=K0rT
+iEYEAREIAAYFAlNhDe4ACgkQp5vW4rUFj5oJGgCgvosY3YTfvqCLIaTtdIUDYiZ7
+VcMAoL0oDP7CLPHVX1ddnM+clX8I9Yki
+=j2sZ
 -----END PGP SIGNATURE-----
diff --git a/net-misc/modemmanager/modemmanager-1.2.0-r1.ebuild b/net-misc/modemmanager/modemmanager-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..355519381151
--- /dev/null
+++ b/net-misc/modemmanager/modemmanager-1.2.0-r1.ebuild
@@ -0,0 +1,109 @@
+# 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.1 2014/04/30 14:51:26 chainsaw 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 ~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/udev-147[gudev]
+	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="$(udev_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
+}