Add a patch to prevent multiple plugins from simultaneously controlling one modem port (bug #456782, thanks to Tony Vroon). Drop old.

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

4 files changed, 58 insertions, 111 deletions

diff --git a/net-misc/modemmanager/ChangeLog b/net-misc/modemmanager/ChangeLog
index 6006d840ca5c..05e021e998d9 100644
--- a/net-misc/modemmanager/ChangeLog
+++ b/net-misc/modemmanager/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/modemmanager
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/ChangeLog,v 1.50 2013/02/03 19:38:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/ChangeLog,v 1.51 2013/02/12 04:59:21 tetromino Exp $
+
+*modemmanager-0.6.0.0-r1 (12 Feb 2013)
+
+  12 Feb 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -files/modemmanager-0.5-glib-2.31.patch, -modemmanager-0.5.2.0-r3.ebuild,
+  +modemmanager-0.6.0.0-r1.ebuild,
+  +files/modemmanager-0.6.0.0-multi-plugin-probing.patch:
+  Add a patch to prevent multiple plugins from simultaneously controlling one
+  modem port (bug #456782, thanks to Tony Vroon). Drop old.
 
   03 Feb 2013; Agostino Sarubbo <ago@gentoo.org> modemmanager-0.6.0.0.ebuild:
   Stable for arm, wrt bug #448006
diff --git a/net-misc/modemmanager/files/modemmanager-0.5-glib-2.31.patch b/net-misc/modemmanager/files/modemmanager-0.5-glib-2.31.patch
deleted file mode 100644
index a8aa19184756..000000000000
--- a/net-misc/modemmanager/files/modemmanager-0.5-glib-2.31.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 6406f9eb7042f63a38343412864b6a129be7fe75 Mon Sep 17 00:00:00 2001
-From: Aleksander Morgado <aleksander@lanedo.com>
-Date: Mon, 24 Oct 2011 21:09:11 +0200
-Subject: [PATCH] core: don't include private headers from glib
-
-The "glib/gtypes.h" is now considered private, and only "glib.h" should be
-included directly.
----
- src/mm-at-serial-port.h   |    1 -
- src/mm-manager.h          |    1 -
- src/mm-modem-base.h       |    1 -
- src/mm-plugin-base.h      |    1 -
- src/mm-port.h             |    1 -
- src/mm-qcdm-serial-port.h |    1 -
- src/mm-serial-port.h      |    1 -
- 7 files changed, 0 insertions(+), 7 deletions(-)
-
-diff --git a/src/mm-at-serial-port.h b/src/mm-at-serial-port.h
-index 5d5f13f..cec5dc3 100644
---- a/src/mm-at-serial-port.h
-+++ b/src/mm-at-serial-port.h
-@@ -18,7 +18,6 @@
- #define MM_AT_SERIAL_PORT_H
- 
- #include <glib.h>
--#include <glib/gtypes.h>
- #include <glib-object.h>
- 
- #include "mm-serial-port.h"
-diff --git a/src/mm-manager.h b/src/mm-manager.h
-index 1c98458..c6a64bd 100644
---- a/src/mm-manager.h
-+++ b/src/mm-manager.h
-@@ -17,7 +17,6 @@
- #ifndef MM_MANAGER_H
- #define MM_MANAGER_H
- 
--#include <glib/gtypes.h>
- #include <glib-object.h>
- #include <dbus/dbus-glib.h>
- #include "mm-modem.h"
-diff --git a/src/mm-modem-base.h b/src/mm-modem-base.h
-index 0409957..d0cda3d 100644
---- a/src/mm-modem-base.h
-+++ b/src/mm-modem-base.h
-@@ -18,7 +18,6 @@
- #define MM_MODEM_BASE_H
- 
- #include <glib.h>
--#include <glib/gtypes.h>
- #include <glib-object.h>
- 
- #include "mm-port.h"
-diff --git a/src/mm-plugin-base.h b/src/mm-plugin-base.h
-index 799f681..e69ad17 100644
---- a/src/mm-plugin-base.h
-+++ b/src/mm-plugin-base.h
-@@ -17,7 +17,6 @@
- #define MM_PLUGIN_BASE_H
- 
- #include <glib.h>
--#include <glib/gtypes.h>
- #include <glib-object.h>
- 
- #define G_UDEV_API_IS_SUBJECT_TO_CHANGE
-diff --git a/src/mm-port.h b/src/mm-port.h
-index 4bcffd4..df935db 100644
---- a/src/mm-port.h
-+++ b/src/mm-port.h
-@@ -17,7 +17,6 @@
- #define MM_PORT_H
- 
- #include <glib.h>
--#include <glib/gtypes.h>
- #include <glib-object.h>
- 
- typedef enum {
-diff --git a/src/mm-qcdm-serial-port.h b/src/mm-qcdm-serial-port.h
-index 2786ee8..605016d 100644
---- a/src/mm-qcdm-serial-port.h
-+++ b/src/mm-qcdm-serial-port.h
-@@ -18,7 +18,6 @@
- #define MM_QCDM_SERIAL_PORT_H
- 
- #include <glib.h>
--#include <glib/gtypes.h>
- #include <glib-object.h>
- 
- #include "mm-serial-port.h"
-diff --git a/src/mm-serial-port.h b/src/mm-serial-port.h
-index ae38017..f988af3 100644
---- a/src/mm-serial-port.h
-+++ b/src/mm-serial-port.h
-@@ -18,7 +18,6 @@
- #define MM_SERIAL_PORT_H
- 
- #include <glib.h>
--#include <glib/gtypes.h>
- #include <glib-object.h>
- 
- #include "mm-port.h"
--- 
-1.7.8.6
-
diff --git a/net-misc/modemmanager/files/modemmanager-0.6.0.0-multi-plugin-probing.patch b/net-misc/modemmanager/files/modemmanager-0.6.0.0-multi-plugin-probing.patch
new file mode 100644
index 000000000000..43dd652c5313
--- /dev/null
+++ b/net-misc/modemmanager/files/modemmanager-0.6.0.0-multi-plugin-probing.patch
@@ -0,0 +1,37 @@
+From f6d9f53369200ba277a48de3a24c377799765559 Mon Sep 17 00:00:00 2001
+From: Dan Williams <dcbw@redhat.com>
+Date: Wed, 3 Oct 2012 18:35:07 -0500
+Subject: [PATCH] core: stop probing if a Modem has already been created for a
+ port (bgo #685398)
+
+If a port finishes probing from the first plugin, and then starts
+being probed by a second plugin, and then a different port finishes
+probing and creates a Modem object for that device, always let the
+Modem object's plugin grab the port and ignore any other plugin.
+Only one plugin may control modem ports.
+---
+ src/mm-manager.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/mm-manager.c b/src/mm-manager.c
+index 728a115..e13d1f7 100644
+--- a/src/mm-manager.c
++++ b/src/mm-manager.c
+@@ -703,6 +703,14 @@ supports_callback (MMPlugin *plugin,
+              * supports it.
+              */
+             next_plugin = existing_plugin;
++        } else if (plugin != existing_plugin) {
++            /* A modem object may have been created by one of this device's other
++             * ports while this port was getting probed; now that we have a
++             * modem, just use the modem's plugin and ignore this plugin
++             * completely.  All ports of a modem must be handled by the same
++             * plugin.
++             */
++            next_plugin = NULL;
+         } else {
+             mm_dbg ("(%s/%s): plugin %p (%s) existing %p (%s) info->best %p (%s)",
+                     info->subsys, info->name,
+-- 
+1.8.1.2
+
diff --git a/net-misc/modemmanager/modemmanager-0.5.2.0-r3.ebuild b/net-misc/modemmanager/modemmanager-0.6.0.0-r1.ebuild
index d1ed335d720c..6da864f665ad 100644
--- a/net-misc/modemmanager/modemmanager-0.5.2.0-r3.ebuild
+++ b/net-misc/modemmanager/modemmanager-0.6.0.0-r1.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2013 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-r3.ebuild,v 1.7 2013/01/28 05:11:32 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-0.6.0.0-r1.ebuild,v 1.1 2013/02/12 04:59:21 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GNOME_ORG_MODULE="ModemManager"
 
-inherit gnome.org user multilib toolchain-funcs udev
+inherit eutils gnome.org user multilib toolchain-funcs udev
 
 DESCRIPTION="Modem and mobile broadband management libraries"
 HOMEPAGE="http://cgit.freedesktop.org/ModemManager/ModemManager/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc policykit test"
 
 RDEPEND=">=dev-libs/glib-2.18:2
@@ -26,7 +26,12 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig"
 
-DOCS="AUTHORS ChangeLog NEWS README"
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.6.0.0-multi-plugin-probing.patch" #456782
+
+	epatch_user
+	default
+}
 
 src_configure() {
 	# ppp-2.4.5 changes the plugin directory
@@ -62,7 +67,7 @@ src_install() {
 	fi
 
 	# Remove useless .la files
-	find "${D}" -name '*.la' -delete
+	prune_libtool_files --modules
 }
 
 pkg_postinst() {