Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/net-misc/modemmanager
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc/modemmanager')
-rw-r--r--net-misc/modemmanager/ChangeLog11
-rw-r--r--net-misc/modemmanager/Manifest16
-rw-r--r--net-misc/modemmanager/files/modemmanager-0.6.0.0-multi-plugin-probing.patch37
-rw-r--r--net-misc/modemmanager/files/modemmanager-1.0.0-dbus-generation.patch35
-rw-r--r--net-misc/modemmanager/files/modemmanager-1.0.0-logging-serial.patch76
-rw-r--r--net-misc/modemmanager/modemmanager-1.0.0-r2.ebuild103
-rw-r--r--net-misc/modemmanager/modemmanager-1.4.0.ebuild (renamed from net-misc/modemmanager/modemmanager-1.2.0.ebuild)7
7 files changed, 19 insertions, 266 deletions
diff --git a/net-misc/modemmanager/ChangeLog b/net-misc/modemmanager/ChangeLog
index 360a778ce9fb..d25d3ee350b2 100644
--- a/net-misc/modemmanager/ChangeLog
+++ b/net-misc/modemmanager/ChangeLog
@@ -1,6 +1,15 @@
# 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.71 2014/09/12 19:28:47 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/ChangeLog,v 1.72 2014/09/23 12:28:41 pacho Exp $
+
+*modemmanager-1.4.0 (23 Sep 2014)
+
+ 23 Sep 2014; Pacho Ramos <pacho@gentoo.org> +modemmanager-1.4.0.ebuild,
+ -files/modemmanager-0.6.0.0-multi-plugin-probing.patch,
+ -files/modemmanager-1.0.0-dbus-generation.patch,
+ -files/modemmanager-1.0.0-logging-serial.patch, -modemmanager-1.0.0-r2.ebuild,
+ -modemmanager-1.2.0.ebuild:
+ Version bump, drop old
12 Sep 2014; Vicente Olivert Riera <vincent@gentoo.org>
modemmanager-0.6.0.0.ebuild, modemmanager-1.0.0-r2.ebuild,
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index bf1c77ae21c5..a9a2108fdf35 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -4,22 +4,18 @@ Hash: SHA256
AUX 01-org.freedesktop.ModemManager.pkla 285 SHA256 c4eeb956c5bfa0dfe30efe1ae1c88e60674425dcc786c080da0d17f245c0e5f5 SHA512 e1b1e6a0cbfea979782141fc477381ea72a9e3bf75152b393aa322ebae520dbaf2b5907e817ee29f0744fc79f3217fe6a0994ebc1873e83e9d747df65ebea533 WHIRLPOOL 3fac122700eb0f643e64ac05edbe41abf48d88cbc6227619faaf567fde8df7981f38d523b183bf0deaa2b90fbd1617fb97ebdfefe615b12cb44dc36eaedaa4e4
AUX 01-org.freedesktop.ModemManager.rules 286 SHA256 a47b769279c128633d150899e10f6a3795523212d56603c4396500b15e04ebfe SHA512 184897bbee83f852e91d66d6a4ec4eabbe40f72f6a32573f59e19d9d86d9d12ae07e4386c7427e64ea5edfa73b5fa8e37acc785daca9a3565b8bd1fc8c5ee909 WHIRLPOOL 6016d01ea05feb85c249257a0b3a7e4154a1abcfc830d54eb70de090cb58253c478d5bd77db951ecb93ca2a3f35f188b7b0c11bc5303faab9c6843475e8fa94b
AUX 01-org.freedesktop.ModemManager1.rules 293 SHA256 f97f132097feefc39608acf10b6cdc4b161ec6beaba5a0582e54fc1f09721e6d SHA512 1839bd770dfaf4c85048a16e41389c7ef43fac1cd36b81cf9129877444db1e0bc00cdbd2344b577316858f13a103d6007be6467d19de075060cab78c40859460 WHIRLPOOL ac1abd043698ff194869926ae2fa33646fde755ad3c30e8a5642aa4a0117b6809152508ba8cc0dd247d18c4f61e021e80407a1bebb0202ade43647d3d7d80fd1
-AUX modemmanager-0.6.0.0-multi-plugin-probing.patch 1490 SHA256 ba0d64f488c01ec7e73230082e0e8d537884d6684440328cac4e8c9d36e64775 SHA512 6fb5a44784d9d4a14c12d1de2704eaebc76c65ae2805232472a4efbb9b6bd23f1ceea56bafde94c629c4f782f7ecd44bdf7b8a35261bc4496599bdca81cfe73b WHIRLPOOL ec0321424a69a94c028485ab9efc33200fe23498308f9cbba846e93445f9570227b3ed709497a04be54e34fd5bf156c446b205fb0b1f6c81104353a72a107dc7
-AUX modemmanager-1.0.0-dbus-generation.patch 1120 SHA256 192988f6eb9081972901eb7a92b8a7b34f39de1c6fe8585c8d9bedc75d6c2221 SHA512 9f8c6a3d9d7a82e3f02ffc2f2fb1e6b7f9cf0ee0c1cdb242d6a59458d16033b25cc3e37c0a2163a4750b4a108cdd7f42a40652f472320dcd3538b260c7f9432c WHIRLPOOL 98c5e4201594e5f66f482283e3adde31d41777459d11733e8aead069c529f545269f2f7c167648022ca0154fff6b7c32653c104a5ac037f84f29b88857eae146
-AUX modemmanager-1.0.0-logging-serial.patch 3171 SHA256 5071e7f1cd739c8e4b14e9a4360fca1b08568c1d1080716c3958c1f10f144f54 SHA512 6c6aab03fa7b2b5ad574d777176ba497f2fdfe65ad8a12ba6a3c364732e32156371dcd07cb43a084e99b60091197e5aba8f69f7cb363e0efc5455b723d01c644 WHIRLPOOL b6d85419f364c67d630a34d618720ad74f891e69b64a7666b111a6646867148a8f5ee9a3f844c81553021c8412791d11ab915fa1ed5ab4e309c89cb587677309
DIST ModemManager-0.6.0.0.tar.xz 531136 SHA256 d4468300cf4aa7baf21c8564fa515e578056f34de5a64f452b053331f89e8ae2 SHA512 c4c823a422ee458b70ad5c78feb61de4007507050e8c4789e4397b7bd476ea14b68f9a6b1c95820ec437b97310e34c0396912ea936474638651d868d3828eb4a WHIRLPOOL 2434b39c53f5233c0e03a6b27afa00f0d46927bf29794a643f42b7b797f8c018f69019769903f08398a49093f788f26d2882a735b46be374f903d50752228225
-DIST ModemManager-1.0.0.tar.xz 1141504 SHA256 e0f3bbd9a7353f7d87be2391b8718a81d11f9ff8b1c067d640928322f8808563 SHA512 bb5230914f00b90d34ecc96d738a56b841ccd5d8d05662388a1c3623cfdea64c7e18344cd91bd9e71aa93aad1994d94a66ff6e411fcaed361f55c9868b51e2a5 WHIRLPOOL c4bc9fadf720a3143b5a221b2659eb99e994fa03cefc448a34787b5896130e18e8653e72d4daa0b7aab006d5798683d04055f0ba54eb5ef6c83babf9c8513101
DIST ModemManager-1.2.0.tar.xz 1306972 SHA256 8bd9d8c3b506f34a9f927e95784026d1fe132c9d60fc426a892b690f7d6408bc SHA512 42e94e9bac7224ecdb7502d2542a84b3952a38054845bc87530914369c0c4ff5c15e1b892a54e39a20d3ef115c287f6976256912c076c320adbb9161cb6adce3 WHIRLPOOL 5be964dbf8a324a392d4fedf1aefedd88a5d09cea31b343c20f1f0b4524d2bec68f4668a0f4eb2b1d1a213551fd85b572b19a88632d2f0fcc0cad6bdbee622bd
+DIST ModemManager-1.4.0.tar.xz 1313396 SHA256 efe12c30d4660a4694dec2a1ea68ea176f4dc3cb4b9e843929115943dc189ca0 SHA512 4c6ab92f6151c190585f83cbd5a50f283f1bea9a98207d81a9cc577a26ff9ff32b0b1efade0a1f44dfc5f77d96da999aede1626a1ddb2a97a9741884408685fb WHIRLPOOL 1c75bc86dea1fa9d5a7510cbc5cfdc2ea1a23e28a9d42ed30a7124f4f13535703eec3b240b9de2398562af11cfa3fa55c24cc5a5a55f4b1817e4a58217c98c22
EBUILD modemmanager-0.6.0.0.ebuild 2986 SHA256 fd1e5c5c4cba89369af5b7a69fe8f412828d2abf75e4a85bc08b1d26d1776aa5 SHA512 a4196af63ed8353d6891edaa9f99f1f89d128a46479a4377d166fa4d91918ea0f304e0bf73f924b92f20d82a6a5872eb287fcc3a3b31c7518f7ef91af7be953d WHIRLPOOL 479e8f2955fb3684ca910a8c7d8ebf0c88725b4da82192313ef3ac30bd4d758c3ec1aba4e2af345ae8a43c94455c63d924939c20ba3a3b630dcb89535fce372a
-EBUILD modemmanager-1.0.0-r2.ebuild 3093 SHA256 9eb08308e3ac6a4061568553eaa38e788f7162c80f76e7187fbca19b031fd610 SHA512 8485e272bf47222766b0116af69c28920a4084f80a351f732fefb0a5da5cceea1bbc6fc581447a4ce58a8e331903e701dedeeee093ff141024f3c17fc39d5fc2 WHIRLPOOL 616f4bf4ba2c40ed8284d33cbdfafcdbb4b95952058b7b1dcc8b62f7f2a3b46ed9cd62a6a180c3236e0fc506add801a484dd4f4c7df2d525744469878a40724c
EBUILD modemmanager-1.2.0-r1.ebuild 3167 SHA256 da6a95228034c88accc4e84bc783ed120418d3dcaad1f7d26da4270e67397931 SHA512 1f3b4bf8a5cc636dee093498ac1b8b06262848923880f45101f15b31887fb28b9a1d364d2375f463a6f3c1d220f60609a2bf9131de8fa6970b6681946c5460c8 WHIRLPOOL 6a67fd810f38354c925c9cebc8cebc6db80b5af16e500210ce4590660d00c71e1729ec96e12d12fe15253d15652436eb136175254b39282af31c8c99394f5f43
-EBUILD modemmanager-1.2.0.ebuild 3187 SHA256 40acda1023551f1a2af6d3461a5d06f0fd57b1a6e88bb7597b0bc98f4cf3e8ef SHA512 dcd19a0402357e9d7549c148412cd469a8371509254d4b4eb0a8b9af4ce0b4afd10461b6591c1f869c303f3652679038b026d01f88bd133906f0db07b4dce079 WHIRLPOOL 1e756d516bcbe388bc961646610417b2f93f0d0d23f69f9515d81fb9327abe310a78356be0983a6f1dcea239b974a0858154d775e60051dfe2bbd9995b65a6e8
-MISC ChangeLog 13050 SHA256 7b7c1de39e7c4f8fc13ad57c325161edb2a5d3672d9d46a97c6ee0c546ae8ce3 SHA512 6a2efe289bd268f2261cc9a0989c355d6a66da14c182d8a8ee2f1eef2bc7c64599609b5b989167d76f534f76218ac4d1baf83e0bae6717f7098752fa6a9e038a WHIRLPOOL 86786ce05f07322c912daa6cfbfe88042c394cb7788881df56b3e7213dbdc14e0664fef2ac7fe145d4d9715c3c9bc4efe72a0be2aa63fb2e3c14c808fd4e6aae
+EBUILD modemmanager-1.4.0.ebuild 3167 SHA256 1ddf4cae9223cac0bd225d289f3fea48efadef9a6868c0cbfc04f467fcf8feb8 SHA512 45db6abae31855a4ada87d17fa7a8ad006c26ad825c41f9da5a90a6cc1357bd5717843597834c24b677786409b262f73baeb7256f619533b02705ca8fe1469b6 WHIRLPOOL 5d00b59c8fc741f4809130747218a4f02e5f27eb4f83c5091e54a50a83550aad71f5fc30e453fee8b96f3108b82e7ab8e6c0824b1f9dd467da856be6760482d1
+MISC ChangeLog 13403 SHA256 e986b64d22877a5c3e2174600386cddf0447e606b31da5c22b074bf922dbc2a2 SHA512 b6e6c303df6fda3d7b92190a6337f7226b67561d8007b4e939564e79daef5ba83c97ad0478312c6c864c390200891def34f917241805da05095a239ba2a7f2c4 WHIRLPOOL adedd44d0c84eeb58a701afef43bcd9421c08d3a24bf93a4c1074d61da62a7ae629092639aa609f0da9bda188364df68094ca55e7a8d02eff068a1bc6e81581c
MISC metadata.xml 459 SHA256 65595a7dd593bd3791400cfba990ae5cc0796e57b54f6398c053de4d27e67d2c SHA512 e3c4e33e025345dbf17a2cdfbb32abd19ae8a6e1c859bb5caa984f2ee86593d7a09512f735f2bbde49d73767732312e99d179347cb56303e664dafc046273f39 WHIRLPOOL b2f89ff8e929f95014e9c3cd72d913134a5e031f1c8067b606c6c9ca1f332dc381c1488b890fd56a6362cc91ea6500bfd08c1085a197389eada2e4befbfe83de
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iEYEAREIAAYFAlQTSXcACgkQWunnsum7y6jNgwCdG4lKzt8/xcjuNwyQaa/Re7rY
-5GAAn0QVvfTy//PpypdMZXBabbRkI8iW
-=Sif+
+iEYEAREIAAYFAlQhZ3oACgkQCaWpQKGI+9RO6ACdGPk18JyX4/FCJBR+zNKRg6kJ
+X5sAniw/0Pz7LRhYucsdsIMM53bm51fg
+=raPC
-----END PGP SIGNATURE-----
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
deleted file mode 100644
index 43dd652c5313..000000000000
--- a/net-misc/modemmanager/files/modemmanager-0.6.0.0-multi-plugin-probing.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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/files/modemmanager-1.0.0-dbus-generation.patch b/net-misc/modemmanager/files/modemmanager-1.0.0-dbus-generation.patch
deleted file mode 100644
index 51d65f1ef606..000000000000
--- a/net-misc/modemmanager/files/modemmanager-1.0.0-dbus-generation.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 7cda349c384c847fe838d418c1f83e85495d54d4 Mon Sep 17 00:00:00 2001
-From: Aleksander Morgado <aleksander@lanedo.com>
-Date: Tue, 23 Jul 2013 09:04:29 +0000
-Subject: build: fix dbus activation file generation
-
-https://bugzilla.gnome.org/show_bug.cgi?id=704711
----
-diff --git a/configure.ac b/configure.ac
-index 34ef0c7..242b248 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -265,7 +265,6 @@ data/Makefile
- data/ModemManager.pc
- data/mm-glib.pc
- data/org.freedesktop.ModemManager1.policy.in
--data/org.freedesktop.ModemManager1.service
- include/Makefile
- include/ModemManager-version.h
- build-aux/Makefile
-diff --git a/data/Makefile.am b/data/Makefile.am
-index 3a31ec5..70a92ee 100644
---- a/data/Makefile.am
-+++ b/data/Makefile.am
-@@ -35,6 +35,9 @@ endif
- dbusactivationdir = $(datadir)/dbus-1/system-services
- dbusactivation_DATA = org.freedesktop.ModemManager1.service
- dbusactivation_in_files = org.freedesktop.ModemManager1.service.in
-+org.freedesktop.ModemManager1.service: org.freedesktop.ModemManager1.service.in
-+ $(edit) $< >$@
-+
-
- # Icon
- icondir=${datadir}/icons/hicolor/22x22/apps
---
-cgit v0.9.0.2-2-gbebe
diff --git a/net-misc/modemmanager/files/modemmanager-1.0.0-logging-serial.patch b/net-misc/modemmanager/files/modemmanager-1.0.0-logging-serial.patch
deleted file mode 100644
index 6114a9ea13a2..000000000000
--- a/net-misc/modemmanager/files/modemmanager-1.0.0-logging-serial.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From e900ed645afe5d8d871152fb264994ecfab77778 Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Tue, 23 Jul 2013 15:00:23 +0000
-Subject: serial: add logging to serial port open failures
-
----
-diff --git a/src/mm-serial-port.c b/src/mm-serial-port.c
-index 0f81c7b..8774d40 100644
---- a/src/mm-serial-port.c
-+++ b/src/mm-serial-port.c
-@@ -868,6 +868,7 @@ mm_serial_port_open (MMSerialPort *self, GError **error)
- const char *device;
- struct serial_struct sinfo = { 0 };
- GTimeVal tv_start, tv_end;
-+ int errno_save;
-
- g_return_val_if_fail (MM_IS_SERIAL_PORT (self), FALSE);
-
-@@ -897,6 +898,7 @@ mm_serial_port_open (MMSerialPort *self, GError **error)
- devfile = g_strdup_printf ("/dev/%s", device);
- errno = 0;
- priv->fd = open (devfile, O_RDWR | O_EXCL | O_NONBLOCK | O_NOCTTY);
-+ errno_save = errno;
- g_free (devfile);
- }
-
-@@ -908,13 +910,16 @@ mm_serial_port_open (MMSerialPort *self, GError **error)
- g_set_error (error,
- MM_SERIAL_ERROR,
- (errno == ENODEV) ? MM_SERIAL_ERROR_OPEN_FAILED_NO_DEVICE : MM_SERIAL_ERROR_OPEN_FAILED,
-- "Could not open serial device %s: %s", device, strerror (errno));
-+ "Could not open serial device %s: %s", device, strerror (errno_save));
-+ mm_warn ("(%s) could not open serial device (%d)", device, errno_save);
- return FALSE;
- }
-
- if (ioctl (priv->fd, TIOCEXCL) < 0) {
-+ errno_save = errno;
- g_set_error (error, MM_SERIAL_ERROR, MM_SERIAL_ERROR_OPEN_FAILED,
-- "Could not lock serial device %s: %s", device, strerror (errno));
-+ "Could not lock serial device %s: %s", device, strerror (errno_save));
-+ mm_warn ("(%s) could not lock serial device (%d)", device, errno_save);
- goto error;
- }
-
-@@ -922,14 +927,18 @@ mm_serial_port_open (MMSerialPort *self, GError **error)
- tcflush (priv->fd, TCIOFLUSH);
-
- if (tcgetattr (priv->fd, &priv->old_t) < 0) {
-+ errno_save = errno;
- g_set_error (error, MM_SERIAL_ERROR, MM_SERIAL_ERROR_OPEN_FAILED,
-- "Could not open serial device %s: %s", device, strerror (errno));
-+ "Could not set attributes on serial device %s: %s", device, strerror (errno_save));
-+ mm_warn ("(%s) could not set attributes on serial device (%d)", device, errno_save);
- goto error;
- }
-
- g_warn_if_fail (MM_SERIAL_PORT_GET_CLASS (self)->config_fd);
-- if (!MM_SERIAL_PORT_GET_CLASS (self)->config_fd (self, priv->fd, error))
-+ if (!MM_SERIAL_PORT_GET_CLASS (self)->config_fd (self, priv->fd, error)) {
-+ mm_dbg ("(%s) failed to configure serial device", device);
- goto error;
-+ }
-
- /* Don't wait for pending data when closing the port; this can cause some
- * stupid devices that don't respond to URBs on a particular port to hang
-@@ -966,6 +975,7 @@ success:
- return TRUE;
-
- error:
-+ mm_warn ("(%s) failed to open serial device", device);
- close (priv->fd);
- priv->fd = -1;
- return FALSE;
---
-cgit v0.9.0.2-2-gbebe
diff --git a/net-misc/modemmanager/modemmanager-1.0.0-r2.ebuild b/net-misc/modemmanager/modemmanager-1.0.0-r2.ebuild
deleted file mode 100644
index 6084916f3a80..000000000000
--- a/net-misc/modemmanager/modemmanager-1.0.0-r2.ebuild
+++ /dev/null
@@ -1,103 +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.0.0-r2.ebuild,v 1.8 2014/09/12 19:28:47 vincent Exp $
-
-EAPI="5"
-inherit autotools eutils user multilib readme.gentoo toolchain-funcs udev virtualx
-
-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="policykit +qmi qmi-newest"
-REQUIRED_USE="qmi-newest? ( qmi )"
-
-RDEPEND="
- >=dev-libs/glib-2.32:2
- virtual/libgudev:=
- policykit? ( >=sys-auth/polkit-0.106[introspection] )
- qmi? ( >=net-libs/libqmi-1.4.0:= )
-"
-DEPEND="${RDEPEND}
- dev-util/gdbus-codegen
- >=dev-util/intltool-0.40
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-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
-
- # Fix dbus activation file generation, bug #477710
- epatch "${FILESDIR}/${P}-dbus-generation.patch"
-
- # Add logging to serial port open failures (from 1.0 branch)
- epatch "${FILESDIR}/${P}-logging-serial.patch"
-
- epatch_user
- eautoreconf
-}
-
-src_configure() {
- # We don't have mbim in the tree
- econf \
- --disable-more-warnings \
- --with-udev-base-dir="$(get_udevdir)" \
- --disable-static \
- --with-dist-version=${PVR} \
- $(use_with policykit polkit) \
- $(use_with qmi) \
- $(use_with qmi-newest newest-qmi-commands) \
- --without-mbim
-}
-
-src_install() {
- default
-
- # 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
-
- prune_libtool_files --modules
-
- readme.gentoo_create_doc
-}
-
-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
-}
diff --git a/net-misc/modemmanager/modemmanager-1.2.0.ebuild b/net-misc/modemmanager/modemmanager-1.4.0.ebuild
index a548087f8861..d2d2880b20ce 100644
--- a/net-misc/modemmanager/modemmanager-1.2.0.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.4.0.ebuild
@@ -1,6 +1,6 @@
# 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.ebuild,v 1.3 2014/09/12 19:28:47 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-1.4.0.ebuild,v 1.1 2014/09/23 12:28:41 pacho Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -27,7 +27,7 @@ RDEPEND="
>=dev-libs/glib-2.32:2
virtual/libgudev:=
introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
- mbim? ( >=net-libs/libmbim-1.4 )
+ mbim? ( >=net-libs/libmbim-1.10 )
policykit? ( >=sys-auth/polkit-0.106[introspection] )
qmi? ( >=net-libs/libqmi-1.6.0:= )
"
@@ -66,8 +66,7 @@ src_configure() {
$(use_with policykit polkit) \
$(use_with qmi) \
$(use_with qmi-newest newest-qmi-commands) \
- $(use_enable vala) \
- --without-mbim
+ $(use_enable vala)
}
src_install() {