Version bump, improves QMI robustness against various device quirks. Blacklist additions for non-modem devices. Herd approval by Gilles "eva" Dartiguelongue.

Package-Manager: portage-2.2.20/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 735f81df17c0..6797ba4767a0 100644
--- a/net-misc/modemmanager/ChangeLog
+++ b/net-misc/modemmanager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/modemmanager
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/ChangeLog,v 1.92 2015/07/07 20:51:01 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/ChangeLog,v 1.93 2015/07/14 11:39:29 chainsaw Exp $
+
+*modemmanager-1.4.10 (14 Jul 2015)
+
+  14 Jul 2015; Tony Vroon <chainsaw@gentoo.org> +modemmanager-1.4.10.ebuild:
+  Version bump, improves QMI robustness against various device quirks.
+  Blacklist additions for non-modem devices. Herd approval by Gilles "eva"
+  Dartiguelongue.
 
   07 Jul 2015; Markus Meier <maekke@gentoo.org> modemmanager-1.4.8.ebuild:
   arm stable, bug #551814
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index a163d52d442d..1107f739956a 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -3,21 +3,23 @@ Hash: SHA256
 
 AUX 01-org.freedesktop.ModemManager1.rules 293 SHA256 f97f132097feefc39608acf10b6cdc4b161ec6beaba5a0582e54fc1f09721e6d SHA512 1839bd770dfaf4c85048a16e41389c7ef43fac1cd36b81cf9129877444db1e0bc00cdbd2344b577316858f13a103d6007be6467d19de075060cab78c40859460 WHIRLPOOL ac1abd043698ff194869926ae2fa33646fde755ad3c30e8a5642aa4a0117b6809152508ba8cc0dd247d18c4f61e021e80407a1bebb0202ade43647d3d7d80fd1
 DIST ModemManager-1.4.0.tar.xz 1313396 SHA256 efe12c30d4660a4694dec2a1ea68ea176f4dc3cb4b9e843929115943dc189ca0 SHA512 4c6ab92f6151c190585f83cbd5a50f283f1bea9a98207d81a9cc577a26ff9ff32b0b1efade0a1f44dfc5f77d96da999aede1626a1ddb2a97a9741884408685fb WHIRLPOOL 1c75bc86dea1fa9d5a7510cbc5cfdc2ea1a23e28a9d42ed30a7124f4f13535703eec3b240b9de2398562af11cfa3fa55c24cc5a5a55f4b1817e4a58217c98c22
+DIST ModemManager-1.4.10.tar.xz 1408036 SHA256 107ba0b4d0749aebb0347691a39f60891cc6004aeca8b2128d69c50557049a63 SHA512 b76d0cf5ece5c711fec183f5d2297ea5c35e61bee3f0e1165cf5ff5b52ee6d8d749266cc9232a214cc9141fb736973055959593f03a18e0389d41de01a4857d3 WHIRLPOOL d44afd0e61f4ec94f4ecd53093a613fade19eac204acb1c7e2ab17ee98ade6e201f8b3aa96642ed607c9727cdea2d46c637b5b6e568b565035669ef89fd253a8
 DIST ModemManager-1.4.2.tar.xz 1350604 SHA256 07d332fbe6f45f788f740810951e04042aaf023bd5ecf8ef0b3a06e37703585d SHA512 8be9387f78de5213ff77374ee2cba67c08301b29b2cd957c8bab86446d1227759833b9ecafb3caef590701f6422bae587db848391cf15c1dd16b5421e976a4c6 WHIRLPOOL 6a554a80ce53d1eb41f993ee5113a8f5606f20dde5c415f4c3375510bd5acb655f84ff5a17a5d678ba615810bcbc1366005b3d72dbab2b087a50f5e5352641a2
 DIST ModemManager-1.4.4.tar.xz 1395696 SHA256 1bf88861259772dc81e864e2faccfff0590d41676451a128c5f4e73550dd14d8 SHA512 66cc177b1fa0fef9da4c61a0019278fdcf00580b48ec4b0a01202b6132f887d64858871dcdc5965f8833eb85e49fe50f9406398961569d8e9a5d15003d1205cf WHIRLPOOL a9e960024c46bd3eeb39efaedd53a9401ebe88b3f158afc66908d0bdf4175b1ea31dadd229f9c9251167267e970ae3df177df26ab8075a0baf38d5794116d7ff
 DIST ModemManager-1.4.6.tar.xz 1396764 SHA256 0cedabf46310f8c56630b116944f54ee64369c76c2f35f5f460ca19a8bb5a5cd SHA512 fb74961df2e3e1604de58838da6e8dd7cf80fee97dbfd71eb7f2df60cc319bf38df8c5706a5933856c500b014d3156066e608bb0820c967ddbd964bd9fc2fdec WHIRLPOOL 4f63ac160a4d4acddd2064a58204e6ba410543aefc936ffb753fbb15e004d089cf874ee2390df174638ae15f26f4cf7c7e720de793e69f0cd0b6a923558b0af1
 DIST ModemManager-1.4.8.tar.xz 1397444 SHA256 d951eaffbe513bcde54f90602c6c423a49593f656d6485ba95f6fcb4bc1e8003 SHA512 6dfbdbf579d1b7dd624836877d6556cdb15eec73c60c329d1d6200563495f8943d90f55e2d4e98b7741c05a19f11ac2de61dcabb4aec16a2ae61db453eafc3b5 WHIRLPOOL 47ff7cc8a1f89996110eb0932274fdeceb940f63b2991cf7a1b96541b30e8c39e52cf7f30b4947c8670ca787e10698093cf4e0401aed3ec2564228e9cfdcb8c8
 EBUILD modemmanager-1.4.0.ebuild 3168 SHA256 0f2725cadea0a9144b7169e0b3a7a9955ed4d2ca16ed313720842ec557b8c11f SHA512 8076d9e2c2ee540a396e2a7969f1d68979cef3de91cb7d48b03779207f500ffc15109e9210b20e823587b477634d8cd705380393dd6feed09f26768939ae64aa WHIRLPOOL 9ff34a669fdcbce406a513ba9a57667165f5bf6e2269a2b007c93a0da7f7d32255ebb0d27ff04f7584ae2023465edf8297d0aa1580c69a9e5de4d92fb7abb547
+EBUILD modemmanager-1.4.10.ebuild 3144 SHA256 236091c7980e984567714b353e5c1c2aec8f47fe048e570db8e6224bc99c4fe4 SHA512 ca85a7e6adb2939b984ae16cc071bddcb39c9092cc0745690a760a920409611f9d3a83bd2a27189a5dead0c86463896376b55de2f86c9b9b7d46809b7d2174ed WHIRLPOOL 530732539f354ede7f9ed1e2ed1ce1dc3410be9cdfc5496af2946cceacec5dca78a9eb8664a2d96f4a0cf2fca5a93a85320530ec07ceb951601aee7274568865
 EBUILD modemmanager-1.4.2.ebuild 3135 SHA256 af3d1b0f9c2a54b5242d221a0c069e9036eca67345868d398258f68f12cd59f5 SHA512 2def45aba78c5d09c12062fee2d6a5b8ffc340d10257b3cb2abd4f75e1087f8ba841d60e657505e920ce8d00e98dca0b502e8a46ccb64927a5492d863853cba9 WHIRLPOOL 077d8d27939ddcd17b6f4e4094e5d697d1f6a165c93104de95e14b8fc70cc281577f3e7c0953f30829e70f72f36516a6e9c86ec5e45bb6b346f470e6b4d18ed4
 EBUILD modemmanager-1.4.4.ebuild 3140 SHA256 38861103fd43f2c55a97e5ef97f1da6f2bed8dc89f74ac53b173eeec00da3e49 SHA512 a6c7c8356c496a5c8d6bdcedaf4f0571e70929d1d213777103fe45ed6a35a5ae8a31c6c163e0a740ef81d368159be648c5ce9b167dcfcb826e4cbf73c5d082df WHIRLPOOL 08cacee7ea9314f4de9afe4f43fa39bfa24e60aea7db7a224a94b14bdace40d5ebaa5bba8b08d0b441be4f053c8d06e85018415722a1f5d1bbad5443e6df1610
 EBUILD modemmanager-1.4.6.ebuild 3143 SHA256 48d6112781649c6ba4fc97f68d564757dca692086e2b42546fd1e86a7aabcef1 SHA512 d564a7666f605b004f3df7bbbd27b0066542f6e4a8830127ad865022119daabb4a370792052ac850d8cd46bba54f574e79a088a7d1b9ca0e280bbbf8ef8b6f3e WHIRLPOOL 7677b709a3c9b07b63d33feda89f1f2a6c48af48a5ca281ad7d0aa54b27c961e59daaf14a736eab1b3680245b168314d8bbf9b401c230cb3ec88279b5903d45a
 EBUILD modemmanager-1.4.8.ebuild 3137 SHA256 268859f7f52d49bf0868ae38ade0fb759cf222d13125b453e7371c886933ab7b SHA512 54c17889a8bbaf67a8902567468052b65143c59c4ccfdf742438e5c1ee99fd1c9f0b70db1ce47cb3015ec010c827daca839c4ccce6b584ffc7b148a1fca1e2e9 WHIRLPOOL 0340c0c1ea8ac3bfbb1656665b1006ff946741a41ce249786386a2624e71122bb68cb8639320b2ecbebe9360c76031590c2b08d4b515966b134ee497067f7a6e
-MISC ChangeLog 15978 SHA256 485f1b485d02445f42ae5a9927e18b8c490f0f62c80cfdfefcb350ccd0cacccd SHA512 13dcf4f7e86a6fd82b735b5a5f23e7713c1bdbcfc2011f8c817a4c8dee8a49da1a6eb74d75e042c0c00f15204f5e3b7addedf5e1e27708365e50d10e1b1816d2 WHIRLPOOL 909de476340fad5d6b090ae4a4227f853f6719d32bcb57b712ae52fdc35559f20c3568ac5568196d664e4ef5b81aac82da154c37f8aebc292cf222f3f0ad6911
+MISC ChangeLog 16258 SHA256 ade10d11077317fd6227316b1b2e6e1f466ad840cf9eb813f7136ebbd2d3c58c SHA512 b13ff0ecab3f334976b3b36f336b85d8f1f9ed61123dbbcb67d702af22b8fab541fd50637932ce036b92aa7c3c515c3ee80e808fd679bea5f9cdf62a05ba0703 WHIRLPOOL 475283dde11651fa719ae9166821b585fae145be5e82a13fa681fb5cec4a33933944a7a91358f0dc34cf310357830643025adffea634e20778c829653e488304
 MISC metadata.xml 459 SHA256 65595a7dd593bd3791400cfba990ae5cc0796e57b54f6398c053de4d27e67d2c SHA512 e3c4e33e025345dbf17a2cdfbb32abd19ae8a6e1c859bb5caa984f2ee86593d7a09512f735f2bbde49d73767732312e99d179347cb56303e664dafc046273f39 WHIRLPOOL b2f89ff8e929f95014e9c3cd72d913134a5e031f1c8067b606c6c9ca1f332dc381c1488b890fd56a6362cc91ea6500bfd08c1085a197389eada2e4befbfe83de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlWcO7gACgkQkKaRLQcq0GLWewCgjG0QVC9PVc3sLzaVy9Fb7SST
-er4AoIskByhVsi68HuGi9gVyd07h/AAj
-=66W8
+iEYEAREIAAYFAlWk9PEACgkQp5vW4rUFj5p6dwCfTt7KeOdRL2smXYCtrVK0mayZ
+FMoAoK3rl5yjxLTLCQCwkCjMrguu9djo
+=3GLP
 -----END PGP SIGNATURE-----
diff --git a/net-misc/modemmanager/modemmanager-1.4.10.ebuild b/net-misc/modemmanager/modemmanager-1.4.10.ebuild
new file mode 100644
index 000000000000..88a26c5229c9
--- /dev/null
+++ b/net-misc/modemmanager/modemmanager-1.4.10.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-1.4.10.ebuild,v 1.1 2015/07/14 11:39:29 chainsaw Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+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 ~mips ~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/libgudev:=
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
+	mbim? ( >=net-libs/libmbim-1.10 )
+	policykit? ( >=sys-auth/polkit-0.106[introspection] )
+	qmi? ( >=net-libs/libqmi-1.12.4:= )
+"
+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="$(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
+}