gentoo resync : 31.10.2017

3 files changed, 1 insertions, 114 deletions

diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index 9a314cfcb1f7..0e6f023cef30 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,8 +1,6 @@
 AUX 01-org.freedesktop.ModemManager1.rules 293 SHA256 f97f132097feefc39608acf10b6cdc4b161ec6beaba5a0582e54fc1f09721e6d SHA512 1839bd770dfaf4c85048a16e41389c7ef43fac1cd36b81cf9129877444db1e0bc00cdbd2344b577316858f13a103d6007be6467d19de075060cab78c40859460 WHIRLPOOL ac1abd043698ff194869926ae2fa33646fde755ad3c30e8a5642aa4a0117b6809152508ba8cc0dd247d18c4f61e021e80407a1bebb0202ade43647d3d7d80fd1
-DIST ModemManager-1.4.14.tar.xz 1417092 SHA256 abe6cdd515a774bcba3afdcdb1e504569801e79282ccdf26099f33cbb8731ba2 SHA512 2fb5517cd3fbd98cf4048cec326fabf18fb26d88b75e56208d1ed64d70d72d6e826ef30391c86fbcfe4d69661194bcfbb55d545db10ebe8baf8ef16a3c580446 WHIRLPOOL 30c9e1e388c91f8aab73044634e3d122636f526cb9b437a597dc2f35cfd85e61917a568cfa572404f734eb19eb90c2e21bc85e16d6cc9b53518f590981f6efa4
 DIST ModemManager-1.6.4.tar.xz 1464276 SHA256 cdd5b4cb1e4d7643643a28ccbfc4bb354bfa9cb89a77ea160ebdf7926171c668 SHA512 6b31ce186adce445cec8964df751b6146a86271e6c14d860740ae66cfe296ac2ac4df21079357775ac5f7a5837c80a7f8db21a2680bc6b45802f9928565f1c73 WHIRLPOOL 3e3b16299ed5d9179e7d7bd38040d061df21fdde558032c8362110d098d3931f106988a0992a64936d969e008c83d699b85e71211bc0684d9bafb2dbc6b4baa9
-EBUILD modemmanager-1.4.14.ebuild 3051 SHA256 7d79b51e22234608c65c15774169bd29ce67e761c1c9677c5d382b87bc9ac6b3 SHA512 ec62991fdb60a0ca6b6bb3750a509da3fa909bd1b3c8647f7647fe414448eaec5577c0a13a3f58985a8f673004c59b944c5bafc827e29f8b728e2dbbb125919a WHIRLPOOL e3d6a1a0c2414298f10aab07a121cc0f387debc5c61cb29f75bc79b2eda3d6a7b8ee83659fe29755f0c3119d8bae5e4688f0daa5f7bd91a08706ca410145341e
 EBUILD modemmanager-1.6.4.ebuild 3143 SHA256 8bedc8d7a9878d8290d84a4bc99e0a68e3dfcb0e2a100d76c51ef600bade4d83 SHA512 edbe21effd6e22319d1f859d0f8c868725d6574633f2b311c191fd57d33ad6930547b84fbab8cc7a39303748b61dbc990fff63181e1710ca17b02ac72352376d WHIRLPOOL 111d5a46df52a675cffa50594b1ca22f255bdbf844b255832d6f4ebbded82e85f9b4f9e98ee63366bc75db7aa4cf39fb1adb58ffca1830f23e12c838157d3391
 MISC ChangeLog 7083 SHA256 cd1fc50937af9f0f255524437f6d6c3e54259659451ccfd1a8aa294417aaf6f4 SHA512 88e4a9efeb6de5437ae1a773a16de3ce1137c7035feff84d925f2c1a2816d4cb06c314f5539d4c655eb01622bd4fac9b6afd76102a8b0fd52e53e0cfa319fc00 WHIRLPOOL 9381ff17d989a9614e522834c6525b4736b6336f95899477fd1e6f9a1671bcc59edf3a733ae6a6a292466439bf45dc1c828f238181563547c18f75071dcdbff1
 MISC ChangeLog-2015 16358 SHA256 524df33ab8e46a303c95cda7eabc878be919012966e32f6c7c25949f0d109ff2 SHA512 80d112612565b72a5ba242cb66bc6421d3aeb7d2e08ee0e172b4d745d22d3e6825b6bb555b6209d829a7092741e551a690ce328cb261c795e5b2862739d9547f WHIRLPOOL 51f8addd67fd6706007a537c0ffb7e5556aa83db7a3a7228bc8d9cda0beedb2f12e86de9f542195eb522320465ff5a83e4c7261a6ee113e28a034d47974e6ead
-MISC metadata.xml 553 SHA256 1adf832aa4cc1217e02c3d12a96ae2a7207e57f0e128b8e35f43eeb738702e4a SHA512 14c8333f81e15f63452b1eaba2c17ad469bbd00132dcdeb4aeb9dcf25f8ec69d543685a8cd4bca3b2cb4d2e8b2ff9dd0d94e0add4fe7413316d76b2443e231c5 WHIRLPOOL d8f711d81c5b4457271d18d8800c29f8240304e0e1b02a24c9f3e9155710136ca1374a0fae1df20ae21ca9749e19edf66ef3955fd88ab285ce5c93d5ac04a4ef
+MISC metadata.xml 431 SHA256 6712d447d459356b84c0ea2f45f5b6267f7382eae48ae58f7b6ff3bf9cfea11d SHA512 dd79c43f378b564769087531ce871d7daf0b07d15720b375e9f3114e5794c692c19ac4d3cfa5b041e88cbf3dca78bf51de9dee861aba3f717eb77248a4d8edde WHIRLPOOL 08f9133a4c644021e70a8f872d5cb765e3291733bb2108b466783ee48260bee15be5b3b641e6d5879d63a76cea6b145b58283decc2c8069d939efa24ca2723c1
diff --git a/net-misc/modemmanager/metadata.xml b/net-misc/modemmanager/metadata.xml
index 2e8801cb40a8..8d49dd5a7e8d 100644
--- a/net-misc/modemmanager/metadata.xml
+++ b/net-misc/modemmanager/metadata.xml
@@ -9,7 +9,5 @@
 		<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
-			cause incompatibility with older devices.</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/modemmanager/modemmanager-1.4.14.ebuild b/net-misc/modemmanager/modemmanager-1.4.14.ebuild
deleted file mode 100644
index 905986820896..000000000000
--- a/net-misc/modemmanager/modemmanager-1.4.14.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 user readme.gentoo-r1 systemd udev vala
-
-DESCRIPTION="Modem and mobile broadband management libraries"
-HOMEPAGE="https://cgit.freedesktop.org/ModemManager/ModemManager/"
-SRC_URI="https://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
-
-	systemd_reenable ModemManager.service
-
-	readme.gentoo_print_elog
-}