Add qmi USE flags to 0.7.990 ebuild since libqmi-1.0.0 is now in portage. Add missing gdbus-codegen dependency.

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

3 files changed, 15 insertions, 9 deletions

diff --git a/net-misc/modemmanager/ChangeLog b/net-misc/modemmanager/ChangeLog
index a7acbc293164..09132fc1f81d 100644
--- a/net-misc/modemmanager/ChangeLog
+++ b/net-misc/modemmanager/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/modemmanager
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/ChangeLog,v 1.47 2013/01/28 07:04:24 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/ChangeLog,v 1.48 2013/01/31 06:00:34 tetromino Exp $
+
+  31 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  modemmanager-0.7.990.ebuild, modemmanager-9999.ebuild:
+  Add qmi USE flags to 0.7.990 ebuild since libqmi-1.0.0 is now in portage. Add
+  missing gdbus-codegen dependency.
 
 *modemmanager-9999 (28 Jan 2013)
 *modemmanager-0.7.990 (28 Jan 2013)
diff --git a/net-misc/modemmanager/modemmanager-0.7.990.ebuild b/net-misc/modemmanager/modemmanager-0.7.990.ebuild
index c4d6f764b38a..cfdb5f71477a 100644
--- a/net-misc/modemmanager/modemmanager-0.7.990.ebuild
+++ b/net-misc/modemmanager/modemmanager-0.7.990.ebuild
@@ -1,6 +1,6 @@
 # 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.990.ebuild,v 1.1 2013/01/28 07:04:24 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-0.7.990.ebuild,v 1.2 2013/01/31 06:00:34 tetromino Exp $
 
 EAPI="5"
 GNOME_ORG_MODULE="ModemManager"
@@ -13,13 +13,14 @@ 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="doc policykit test" # +qmi qmi-newest
-# REQUIRED_USE="qmi-newest? ( qmi )"
+IUSE="doc policykit +qmi qmi-newest test"
+REQUIRED_USE="qmi-newest? ( qmi )"
 
 RDEPEND=">=dev-libs/glib-2.30.2:2
 	net-dialup/ppp
 	>=virtual/udev-147[gudev]
 	policykit? ( >=sys-auth/polkit-0.106 )
+	qmi? ( net-libs/libqmi )
 "
 DEPEND="${RDEPEND}
 	doc? (
@@ -30,6 +31,7 @@ DEPEND="${RDEPEND}
 		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
@@ -52,8 +54,6 @@ src_configure() {
 		pppd_plugin_dir="pppd/2.4.5"
 	fi
 
-	# FIXME: add $(use_with qmi) and $(use_with qmi-newest newest-qmi-commands)
-	# when libqmi-1.0.0 is in gx86 (bug #454382)
 	econf \
 		--disable-more-warnings \
 		--with-udev-base-dir="$(udev_get_udevdir)" \
@@ -62,8 +62,8 @@ src_configure() {
 		--with-pppd-plugin-dir="/usr/$(get_libdir)/${pppd_plugin_dir}" \
 		$(use_with doc docs) \
 		$(use_with policykit polkit) \
-		--without-qmi \
-		--without-newest-qmi-commands \
+		$(use_with qmi) \
+		$(use_with qmi-newest newest-qmi-commands) \
 		$(use_with test tests)
 }
 
diff --git a/net-misc/modemmanager/modemmanager-9999.ebuild b/net-misc/modemmanager/modemmanager-9999.ebuild
index e21ea04bbd16..1d8564d7f658 100644
--- a/net-misc/modemmanager/modemmanager-9999.ebuild
+++ b/net-misc/modemmanager/modemmanager-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.1 2013/01/28 07:04:24 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-9999.ebuild,v 1.2 2013/01/31 06:00:34 tetromino Exp $
 
 EAPI="5"
 GNOME_ORG_MODULE="ModemManager"
@@ -33,6 +33,7 @@ DEPEND="${RDEPEND}
 		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