Version bump, add mbim support (#507188 by Leho Kraav)

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

4 files changed, 125 insertions, 6 deletions

diff --git a/net-misc/modemmanager/ChangeLog b/net-misc/modemmanager/ChangeLog
index cea24765738b..92041bff3490 100644
--- a/net-misc/modemmanager/ChangeLog
+++ b/net-misc/modemmanager/ChangeLog
@@ -1,6 +1,12 @@
 # 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.63 2014/03/08 11:23:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/ChangeLog,v 1.64 2014/04/12 10:19:02 pacho Exp $
+
+*modemmanager-1.2.0 (12 Apr 2014)
+
+  12 Apr 2014; Pacho Ramos <pacho@gentoo.org> +modemmanager-1.2.0.ebuild,
+  metadata.xml:
+  Version bump, add mbim support (#507188 by Leho Kraav)
 
   08 Mar 2014; Pacho Ramos <pacho@gentoo.org> -modemmanager-0.6.0.0-r1.ebuild,
   -modemmanager-0.7.991.ebuild, -modemmanager-1.0.0-r1.ebuild,
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index e9cc0e7e3862..4573b4b1db9d 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -9,14 +9,16 @@ AUX modemmanager-1.0.0-dbus-generation.patch 1120 SHA256 192988f6eb9081972901eb7
 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
 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
-MISC ChangeLog 11624 SHA256 76dad2fa6311475228ded2ad18450cd5e35d67dccd76aff9af1f4d6e3f366327 SHA512 af6f217c1aae15167db736f34ed1dc2bedaea5a0c76fec897c9d054892085638bff73728bc6cdeb611a70ae5c23ec04a59b841100cd13be90909f5bd0e24f5bc WHIRLPOOL 8a6d54a66becdff86a445b9ac7689d066c332574d5855660387b027c6dd4c1f98acc5029871ae74ed3b86fa6e97326b1b2233c81d8733eb4f2268c34632a2c07
-MISC metadata.xml 405 SHA256 b070a02c4fd1f11e8d10235dc909d84736456dfb0eab24ce3c137bcd4baae387 SHA512 fc0719588a723e97fd53abdf2bb81c1e4ea4a5e80dc565a24f2c67fb2b1c7cb7c8e522f1d375425fbb98bb509fa53f1ac79a1d437e6fd2c0cd72d4f2afb260e6 WHIRLPOOL 18ed92bda630903c41e06fef5f1ce9ca90b1bd0603b5f880b1f6cccfb30a9104567e5a66acaa71245f2594ec474157107c139063530186669dfe460046d693c7
+EBUILD modemmanager-1.2.0.ebuild 3191 SHA256 bb96ab0ed2f48bfc8de704a4438cf0d640f379d8d94041a9b4b62e0adf5d7197 SHA512 c771e830bab50a16255b13e81083d7e8f5e0c270b54537be309c7f681b6707574b9abd9a408fb91e9cb13660fcbb3e4aad4927f0e015d3f96408a6b637fa9f68 WHIRLPOOL 71c475d20b8ae52cb0ef5a18080971f580ca86cb18f4b60badfd6eb9896619df44af555e8ac54c47c45e2c4341c73eb3530d535b2904f163e53b71997c2efbfb
+MISC ChangeLog 11807 SHA256 cb2033f2940faa8d89132edda13e37ea34876a71cfe9b9bc4406f90101f50b07 SHA512 674fc3751db85007ac4326f9fa68af118c117b129b7349e1b9ea1b9fdc06c5496ca6fc28f57f0ac807b75a2915784a70eedc531b5c68027eef773d60de9b66c1 WHIRLPOOL 7151ab5455ae07f2c17f62e94407f6efbaa8a942ac46f53dc5291fd9f06c2800116d3c6f447cbf6ef55a858a9449c3036bc406ab1c757772333095e8836e21a7
+MISC metadata.xml 459 SHA256 65595a7dd593bd3791400cfba990ae5cc0796e57b54f6398c053de4d27e67d2c SHA512 e3c4e33e025345dbf17a2cdfbb32abd19ae8a6e1c859bb5caa984f2ee86593d7a09512f735f2bbde49d73767732312e99d179347cb56303e664dafc046273f39 WHIRLPOOL b2f89ff8e929f95014e9c3cd72d913134a5e031f1c8067b606c6c9ca1f332dc381c1488b890fd56a6362cc91ea6500bfd08c1085a197389eada2e4befbfe83de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMa/cEACgkQCaWpQKGI+9QWzgCfZqk1sBSwPRCebvkygY3jTMTK
-WXMAmwbLvzN4ZkZzrr32Gdu1DxmmLKY6
-=wkT2
+iEYEAREIAAYFAlNJExcACgkQCaWpQKGI+9TgpQCdEOnHY6BnpQraQJJDHNreVaev
+2mcAmwfIrCKTYaWrqS483pA+jgsTi1vQ
+=K0rT
 -----END PGP SIGNATURE-----
diff --git a/net-misc/modemmanager/metadata.xml b/net-misc/modemmanager/metadata.xml
index 7b86c484fc0d..c10566d5d9a6 100644
--- a/net-misc/modemmanager/metadata.xml
+++ b/net-misc/modemmanager/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 <herd>gnome</herd>
 	<use>
+		<flag name="mbim">Enable MBIM modem protocol</flag>
 		<flag name="qmi">Enable support for the QMI modem protocol used by
 			devices with Qualcomm chipsets</flag>
 		<flag name="qmi-newest">Avoid deprecated QMI commands. Warning: may
diff --git a/net-misc/modemmanager/modemmanager-1.2.0.ebuild b/net-misc/modemmanager/modemmanager-1.2.0.ebuild
new file mode 100644
index 000000000000..ee4053f4930c
--- /dev/null
+++ b/net-misc/modemmanager/modemmanager-1.2.0.ebuild
@@ -0,0 +1,110 @@
+# 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.1 2014/04/12 10:19:02 pacho 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) \
+		--without-mbim
+}
+
+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
+}