commit: 13fa3e549974f769e9a888c9c712daa57c83386e
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 18 15:26:30 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jul 18 15:26:30 2015 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=13fa3e54
net-misc/modemmanager: musl's <bits/termios.h> lacks XCASE.
Package-Manager: portage-2.2.18
RepoMan-Options: --force
Manifest-Sign-Key: 0xF52D4BBA
net-misc/modemmanager/Manifest | 7 ++
.../files/01-org.freedesktop.ModemManager1.rules | 7 ++
.../files/modemmanager-1.4.8-musl-XCASE.patch | 45 +++++++++
net-misc/modemmanager/metadata.xml | 12 +++
.../modemmanager/modemmanager-1.4.10-r99.ebuild | 110 +++++++++++++++++++++
.../modemmanager/modemmanager-1.4.8-r99.ebuild | 110 +++++++++++++++++++++
6 files changed, 291 insertions(+)
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
new file mode 100644
index 0000000..a346da6
--- /dev/null
+++ b/net-misc/modemmanager/Manifest
@@ -0,0 +1,7 @@
+AUX 01-org.freedesktop.ModemManager1.rules 293 SHA256
f97f132097feefc39608acf10b6cdc4b161ec6beaba5a0582e54fc1f09721e6d SHA512
1839bd770dfaf4c85048a16e41389c7ef43fac1cd36b81cf9129877444db1e0bc00cdbd2344b577316858f13a103d6007be6467d19de075060cab78c40859460
WHIRLPOOL
ac1abd043698ff194869926ae2fa33646fde755ad3c30e8a5642aa4a0117b6809152508ba8cc0dd247d18c4f61e021e80407a1bebb0202ade43647d3d7d80fd1
+AUX modemmanager-1.4.8-musl-XCASE.patch 1446 SHA256
af3953bf71067840592dfe4794db0ba44f83395c573749d89b221d8141394a8f SHA512
90ed71dbce38a21f813c2ba93647f5a754896907131885f94b89d58efbcff39b40e23ab53e8763c17d942f4d952172bf098ac95ddc32962acb49b646f3137329
WHIRLPOOL
cd81fdd4978a7f81d88a4f9f9122a68680bc1814a036736f55c02661efc951772f90601aa3751d2309c6e5fc7c52beb65bb833efba78bc9dfa6a129e306bc4d2
+DIST ModemManager-1.4.10.tar.xz 1408036 SHA256
107ba0b4d0749aebb0347691a39f60891cc6004aeca8b2128d69c50557049a63 SHA512
b76d0cf5ece5c711fec183f5d2297ea5c35e61bee3f0e1165cf5ff5b52ee6d8d749266cc9232a214cc9141fb736973055959593f03a18e0389d41de01a4857d3
WHIRLPOOL
d44afd0e61f4ec94f4ecd53093a613fade19eac204acb1c7e2ab17ee98ade6e201f8b3aa96642ed607c9727cdea2d46c637b5b6e568b565035669ef89fd253a8
+DIST ModemManager-1.4.8.tar.xz 1397444 SHA256
d951eaffbe513bcde54f90602c6c423a49593f656d6485ba95f6fcb4bc1e8003 SHA512
6dfbdbf579d1b7dd624836877d6556cdb15eec73c60c329d1d6200563495f8943d90f55e2d4e98b7741c05a19f11ac2de61dcabb4aec16a2ae61db453eafc3b5
WHIRLPOOL
47ff7cc8a1f89996110eb0932274fdeceb940f63b2991cf7a1b96541b30e8c39e52cf7f30b4947c8670ca787e10698093cf4e0401aed3ec2564228e9cfdcb8c8
+EBUILD modemmanager-1.4.10-r99.ebuild 3203 SHA256
6b160fd90e5474b990ab5c76b9cf06ebd085c1ba072856236550eb8ba7e9f143 SHA512
1c408b8923a45aa764ec657af200239ba3cfc8732f5799da12f8d0cf4d86644818043a9db3c252cf3c5ab54e59a048294ff71db5adfc1ea38a9f618693c1beba
WHIRLPOOL
58d243980b53e172a879f80c91fa99b65d6cc0e5008a55eaa948ada9ce180577195bbee8457bad77b0f265eb0e8329913ac0b4caf6d8da177a99a6ab29a54832
+EBUILD modemmanager-1.4.8-r99.ebuild 3189 SHA256
cf775343efba645081e29b618d0326ed7c1c1a65f330e82956d84b0683a4df27 SHA512
667dcc48f2c3fff3af81d796d8488ae5a403ebb03665be235c995489788bbcd930a75ff543eb9466294e63cacef2f1ad9d2086c1ee92a2b1d7c288109eed8c30
WHIRLPOOL
6c5bd576f8f4a159d5dae689dcfbf7b17837fc470f9d76a8e589281ff88f79861121380b8c8a4c1bc067752aa7f40fc8b8eded69abf421af9f4fe8e512878db4
+MISC metadata.xml 459 SHA256
65595a7dd593bd3791400cfba990ae5cc0796e57b54f6398c053de4d27e67d2c SHA512
e3c4e33e025345dbf17a2cdfbb32abd19ae8a6e1c859bb5caa984f2ee86593d7a09512f735f2bbde49d73767732312e99d179347cb56303e664dafc046273f39
WHIRLPOOL
b2f89ff8e929f95014e9c3cd72d913134a5e031f1c8067b606c6c9ca1f332dc381c1488b890fd56a6362cc91ea6500bfd08c1085a197389eada2e4befbfe83de
diff --git a/net-misc/modemmanager/files/01-org.freedesktop.ModemManager1.rules
b/net-misc/modemmanager/files/01-org.freedesktop.ModemManager1.rules
new file mode 100644
index 0000000..7fca647
--- /dev/null
+++ b/net-misc/modemmanager/files/01-org.freedesktop.ModemManager1.rules
@@ -0,0 +1,7 @@
+// Let users in plugdev group modify ModemManager
+polkit.addRule(function(action, subject) {
+ if
(/^org\.freedesktop\.ModemManager1\.(Device\.Control|Contacts|Messaging|Location)$/.test(action.id)
&&
+ subject.isInGroup("plugdev") && subject.active) {
+ return "yes";
+ }
+});
diff --git a/net-misc/modemmanager/files/modemmanager-1.4.8-musl-XCASE.patch
b/net-misc/modemmanager/files/modemmanager-1.4.8-musl-XCASE.patch
new file mode 100644
index 0000000..7ed4aae
--- /dev/null
+++ b/net-misc/modemmanager/files/modemmanager-1.4.8-musl-XCASE.patch
@@ -0,0 +1,45 @@
+diff -Naur ModemManager-1.4.8.orig/libqcdm/src/com.c
ModemManager-1.4.8/libqcdm/src/com.c
+--- ModemManager-1.4.8.orig/libqcdm/src/com.c 2015-01-20 21:54:08.000000000
+0000
++++ ModemManager-1.4.8/libqcdm/src/com.c 2015-07-18 15:13:40.044214647
+0000
+@@ -23,6 +23,11 @@
+ #include "com.h"
+ #include "errors.h"
+
++/* Missing from musl */
++#ifndef XCASE
++#define XCASE 0000004
++#endif
++
+ int
+ qcdm_port_setup (int fd)
+ {
+diff -Naur ModemManager-1.4.8.orig/libwmc/src/com.c
ModemManager-1.4.8/libwmc/src/com.c
+--- ModemManager-1.4.8.orig/libwmc/src/com.c 2015-01-20 21:54:08.000000000
+0000
++++ ModemManager-1.4.8/libwmc/src/com.c 2015-07-18 15:13:00.584216132
+0000
+@@ -23,6 +23,11 @@
+ #include "com.h"
+ #include "errors.h"
+
++/* Missing from musl */
++#ifndef XCASE
++#define XCASE 0000004
++#endif
++
+ int
+ wmc_port_setup (int fd)
+ {
+diff -Naur ModemManager-1.4.8.orig/src/mm-port-serial.c
ModemManager-1.4.8/src/mm-port-serial.c
+--- ModemManager-1.4.8.orig/src/mm-port-serial.c 2015-02-07
19:28:58.000000000 +0000
++++ ModemManager-1.4.8/src/mm-port-serial.c 2015-07-18 15:13:22.992215289
+0000
+@@ -36,6 +36,11 @@
+ #include "mm-port-serial.h"
+ #include "mm-log.h"
+
++/* Missing from musl */
++#ifndef XCASE
++#define XCASE 0000004
++#endif
++
+ static gboolean port_serial_queue_process (gpointer data);
+ static void port_serial_schedule_queue_process (MMPortSerial *self,
+ guint timeout_ms);
diff --git a/net-misc/modemmanager/metadata.xml
b/net-misc/modemmanager/metadata.xml
new file mode 100644
index 0000000..c10566d
--- /dev/null
+++ b/net-misc/modemmanager/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
+<pkgmetadata>
+<herd>gnome</herd>
+ <use>
+ <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.10-r99.ebuild
b/net-misc/modemmanager/modemmanager-1.4.10-r99.ebuild
new file mode 100644
index 0000000..c30fd34
--- /dev/null
+++ b/net-misc/modemmanager/modemmanager-1.4.10-r99.ebuild
@@ -0,0 +1,110 @@
+# 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 eutils 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() {
+ epatch "${FILESDIR}"/${PN}-1.4.8-musl-XCASE.patch
+
+ 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
+}
diff --git a/net-misc/modemmanager/modemmanager-1.4.8-r99.ebuild
b/net-misc/modemmanager/modemmanager-1.4.8-r99.ebuild
new file mode 100644
index 0000000..7dcaff8
--- /dev/null
+++ b/net-misc/modemmanager/modemmanager-1.4.8-r99.ebuild
@@ -0,0 +1,110 @@
+# 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.8.ebuild,v 1.5
2015/07/07 20:51:01 maekke Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+
+inherit eutils 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() {
+ epatch "${FILESDIR}"/${P}-musl-XCASE.patch
+
+ 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
+}
