RDEPEND on libqmi subslot (if it's added in the future there), drop old

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

5 files changed, 8 insertions, 322 deletions

diff --git a/net-misc/modemmanager/ChangeLog b/net-misc/modemmanager/ChangeLog
index e3d1054b2d97..cea24765738b 100644
--- a/net-misc/modemmanager/ChangeLog
+++ b/net-misc/modemmanager/ChangeLog
@@ -1,6 +1,11 @@
 # 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.62 2014/02/22 22:32:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/ChangeLog,v 1.63 2014/03/08 11:23:44 pacho Exp $
+
+  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,
+  modemmanager-1.0.0-r2.ebuild:
+  RDEPEND on libqmi subslot (if it's added in the future there), drop old
 
   22 Feb 2014; Pacho Ramos <pacho@gentoo.org> modemmanager-0.6.0.0-r1.ebuild:
   Fix wrong commit, bug 502160
diff --git a/net-misc/modemmanager/modemmanager-0.6.0.0-r1.ebuild b/net-misc/modemmanager/modemmanager-0.6.0.0-r1.ebuild
deleted file mode 100644
index 5c648bae7859..000000000000
--- a/net-misc/modemmanager/modemmanager-0.6.0.0-r1.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-0.6.0.0-r1.ebuild,v 1.3 2014/02/22 22:32:28 pacho Exp $
-
-EAPI="5"
-GNOME_ORG_MODULE="ModemManager"
-
-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="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc policykit test"
-
-RDEPEND=">=dev-libs/glib-2.18:2
-	virtual/udev[gudev]
-	>=dev-libs/dbus-glib-0.86
-	net-dialup/ppp
-	policykit? ( >=sys-auth/polkit-0.99 )"
-DEPEND="${RDEPEND}
-	doc? ( dev-libs/libxslt )
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-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
-	if has_version '=net-dialup/ppp-2.4.4*'; then
-		pppd_plugin_dir="pppd/2.4.4"
-	elif has_version '=net-dialup/ppp-2.4.5*'; then
-		pppd_plugin_dir="pppd/2.4.5"
-	fi
-
-	econf \
-		--disable-more-warnings \
-		--with-udev-base-dir="$(udev_get_udevdir)" \
-		--disable-static \
-		--with-dist-version=${PVR} \
-		--with-pppd-plugin-dir="/usr/$(get_libdir)/${pppd_plugin_dir}" \
-		$(use_with doc docs) \
-		$(use_with policykit polkit) \
-		$(use_with test tests)
-}
-
-src_install() {
-	default
-	use doc && dohtml docs/spec.html
-
-	# 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.ModemManager.rules
-		if has_version '<sys-auth/polkit-0.106'; then
-			insinto /etc/polkit-1/localauthority/10-vendor.d
-			doins "${FILESDIR}/01-org.freedesktop.ModemManager.pkla"
-		fi
-	fi
-
-	# Remove useless .la files
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	if use policykit; then
-		enewgroup plugdev
-		elog "To control your modem without needing to enter the root password,"
-		elog "add your user account to the 'plugdev' group."
-		elog
-	fi
-
-	# 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
-
-	elog "If your USB modem shows up as a Flash drive when you plug it in,"
-	elog "You should install sys-apps/usb_modeswitch which will automatically"
-	elog "switch it over to USB modem mode whenever you plug it in."
-}
diff --git a/net-misc/modemmanager/modemmanager-0.7.991.ebuild b/net-misc/modemmanager/modemmanager-0.7.991.ebuild
deleted file mode 100644
index a2fca8149021..000000000000
--- a/net-misc/modemmanager/modemmanager-0.7.991.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# 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.7.991.ebuild,v 1.2 2013/06/10 18:45:57 pacho Exp $
-
-EAPI="5"
-GNOME_ORG_MODULE="ModemManager"
-
-inherit eutils gnome.org user multilib readme.gentoo toolchain-funcs udev virtualx
-
-DESCRIPTION="Modem and mobile broadband management libraries"
-HOMEPAGE="http://cgit.freedesktop.org/ModemManager/ModemManager/"
-
-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="policykit +qmi qmi-newest test"
-REQUIRED_USE="qmi-newest? ( qmi )"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	net-dialup/ppp
-	>=virtual/udev-147[gudev]
-	policykit? ( >=sys-auth/polkit-0.106 )
-	qmi? ( net-libs/libqmi )
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-lang/python:2.7
-		dev-python/dbus-python[python_targets_python2_7]
-		dev-python/pygobject:2[python_targets_python2_7] )
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-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 python2.7 shebangs for test scripts
-	sed -e 's@\(^#!.*python\)@\12.7@' \
-		-i test/*.py || die
-
-	epatch_user
-}
-
-src_configure() {
-	# ppp-2.4.5 changes the plugin directory
-	if has_version '=net-dialup/ppp-2.4.4*'; then
-		pppd_plugin_dir="pppd/2.4.4"
-	elif has_version '=net-dialup/ppp-2.4.5*'; then
-		pppd_plugin_dir="pppd/2.4.5"
-	fi
-
-	# We don't have mbim in the tree
-	econf \
-		--disable-more-warnings \
-		--with-udev-base-dir="$(udev_get_udevdir)" \
-		--disable-static \
-		--with-dist-version=${PVR} \
-		--with-pppd-plugin-dir="/usr/$(get_libdir)/${pppd_plugin_dir}" \
-		$(use_with policykit polkit) \
-		$(use_with qmi) \
-		$(use_with qmi-newest newest-qmi-commands) \
-		$(use_with test tests) \
-		--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.ModemManager.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.0.0-r1.ebuild b/net-misc/modemmanager/modemmanager-1.0.0-r1.ebuild
deleted file mode 100644
index 64f604cefcd5..000000000000
--- a/net-misc/modemmanager/modemmanager-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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-1.0.0-r1.ebuild,v 1.1 2013/07/24 05:40:11 pacho 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 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="policykit +qmi qmi-newest"
-REQUIRED_USE="qmi-newest? ( qmi )"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=virtual/udev-147[gudev]
-	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="$(udev_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.ModemManager.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.0.0-r2.ebuild b/net-misc/modemmanager/modemmanager-1.0.0-r2.ebuild
index 661070c547c7..b3f68112e935 100644
--- a/net-misc/modemmanager/modemmanager-1.0.0-r2.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.0.0-r2.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.0.0-r2.ebuild,v 1.5 2014/02/22 22:31:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-1.0.0-r2.ebuild,v 1.6 2014/03/08 11:23:44 pacho Exp $
 
 EAPI="5"
 inherit autotools eutils user multilib readme.gentoo toolchain-funcs udev virtualx
@@ -19,7 +19,7 @@ RDEPEND="
 	>=dev-libs/glib-2.32:2
 	>=virtual/udev-147[gudev]
 	policykit? ( >=sys-auth/polkit-0.106[introspection] )
-	qmi? ( >=net-libs/libqmi-1.4.0 )
+	qmi? ( >=net-libs/libqmi-1.4.0:= )
 "
 DEPEND="${RDEPEND}
 	dev-util/gdbus-codegen