Add 0.8 development pre-release and a live git ebuild. 0.8 features improved hardware support, and has a new dbus API which is incompatible with older ModemManager releases.

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

4 files changed, 252 insertions, 1 deletions

diff --git a/net-misc/modemmanager/ChangeLog b/net-misc/modemmanager/ChangeLog
index 246fe15541cf..a7acbc293164 100644
--- a/net-misc/modemmanager/ChangeLog
+++ b/net-misc/modemmanager/ChangeLog
@@ -1,6 +1,15 @@
 # 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.46 2013/01/28 05:11:32 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/ChangeLog,v 1.47 2013/01/28 07:04:24 tetromino Exp $
+
+*modemmanager-9999 (28 Jan 2013)
+*modemmanager-0.7.990 (28 Jan 2013)
+
+  28 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +modemmanager-0.7.990.ebuild, +modemmanager-9999.ebuild, metadata.xml:
+  Add 0.8 development pre-release and a live git ebuild. 0.8 features improved
+  hardware support, and has a new dbus API which is incompatible with older
+  ModemManager releases.
 
   28 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
   -modemmanager-0.4.ebuild, -modemmanager-0.5.2.0-r2.ebuild,
diff --git a/net-misc/modemmanager/metadata.xml b/net-misc/modemmanager/metadata.xml
index 15983c56a87e..a7b5d0e6a96f 100644
--- a/net-misc/modemmanager/metadata.xml
+++ b/net-misc/modemmanager/metadata.xml
@@ -9,4 +9,10 @@
 		<email>tetromino@gentoo.org</email>
 		<name>Alexandre Rostovtsev</name>
 	</maintainer>
+	<use>
+		<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-0.7.990.ebuild b/net-misc/modemmanager/modemmanager-0.7.990.ebuild
new file mode 100644
index 000000000000..c4d6f764b38a
--- /dev/null
+++ b/net-misc/modemmanager/modemmanager-0.7.990.ebuild
@@ -0,0 +1,114 @@
+# 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 $
+
+EAPI="5"
+GNOME_ORG_MODULE="ModemManager"
+
+inherit eutils gnome.org user multilib 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="doc policykit test" # +qmi qmi-newest
+# 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 )
+"
+DEPEND="${RDEPEND}
+	doc? (
+		app-office/dia
+		dev-libs/libxslt
+		dev-util/gtk-doc )
+	test? (
+		dev-lang/python:2.7
+		dev-python/dbus-python[python_targets_python2_7]
+		dev-python/pygobject:2[python_targets_python2_7] )
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Use python2.7 shebangs for test scripts
+	sed -e 's@\(^#!.*python\)@\12.7@' \
+		-i test/*.py || die
+
+	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
+
+	# 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)" \
+		--disable-static \
+		--with-dist-version=${PVR} \
+		--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 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
+	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-9999.ebuild b/net-misc/modemmanager/modemmanager-9999.ebuild
new file mode 100644
index 000000000000..e21ea04bbd16
--- /dev/null
+++ b/net-misc/modemmanager/modemmanager-9999.ebuild
@@ -0,0 +1,122 @@
+# 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 $
+
+EAPI="5"
+GNOME_ORG_MODULE="ModemManager"
+
+inherit autotools eutils git-2 gnome.org user multilib 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=
+IUSE="doc policykit +qmi qmi-newest test"
+REQUIRED_USE="qmi-newest? ( qmi )"
+SRC_URI=
+EGIT_REPO_URI="git://anongit.freedesktop.org/ModemManager/ModemManager"
+
+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? (
+		app-office/dia
+		dev-libs/libxslt
+		dev-util/gtk-doc )
+	test? (
+		dev-lang/python:2.7
+		dev-python/dbus-python[python_targets_python2_7]
+		dev-python/pygobject:2[python_targets_python2_7] )
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-util/gtk-doc-am
+"
+
+src_unpack() {
+	git-2_src_unpack
+}
+
+src_prepare() {
+	# Use python2.7 shebangs for test scripts
+	sed -e 's@\(^#!.*python\)@\12.7@' \
+		-i test/*.py || die
+
+	epatch_user
+	eautoreconf # for 9999
+	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 qmi) \
+		$(use_with qmi-newest newest-qmi-commands) \
+		$(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
+	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."
+}