diff options
author | 2017-09-03 17:52:06 +0200 | |
---|---|---|
committer | 2017-09-03 16:54:09 -0400 | |
commit | 2738246bcb8fd2cce25028db99d2003e9d08a86f (patch) | |
tree | 39ad3e708942392e519115a2bbc031ab39e98a2c /net-misc | |
parent | net-misc/modemmanager: delete old version and sync keywords (diff) | |
download | musl-2738246bcb8fd2cce25028db99d2003e9d08a86f.tar.gz musl-2738246bcb8fd2cce25028db99d2003e9d08a86f.tar.bz2 musl-2738246bcb8fd2cce25028db99d2003e9d08a86f.zip |
net-misc/modemmanager: latest in tree version works and is stablized on all musl arches
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/modemmanager/Manifest | 5 | ||||
-rw-r--r-- | net-misc/modemmanager/files/01-org.freedesktop.ModemManager1.rules | 7 | ||||
-rw-r--r-- | net-misc/modemmanager/files/modemmanager-1.4.8-musl-XCASE.patch | 45 | ||||
-rw-r--r-- | net-misc/modemmanager/metadata.xml | 15 | ||||
-rw-r--r-- | net-misc/modemmanager/modemmanager-1.4.14.ebuild | 109 |
5 files changed, 0 insertions, 181 deletions
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest deleted file mode 100644 index 4b767dbb..00000000 --- a/net-misc/modemmanager/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -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.14.tar.xz 1417092 SHA256 abe6cdd515a774bcba3afdcdb1e504569801e79282ccdf26099f33cbb8731ba2 SHA512 2fb5517cd3fbd98cf4048cec326fabf18fb26d88b75e56208d1ed64d70d72d6e826ef30391c86fbcfe4d69661194bcfbb55d545db10ebe8baf8ef16a3c580446 WHIRLPOOL 30c9e1e388c91f8aab73044634e3d122636f526cb9b437a597dc2f35cfd85e61917a568cfa572404f734eb19eb90c2e21bc85e16d6cc9b53518f590981f6efa4 -EBUILD modemmanager-1.4.14.ebuild 3055 SHA256 aacd17a0edf2c92bf5d550ff191f54de29d6ee7f1e3255efba25dee5851da50c SHA512 404802fb24da71464ec207da707d7a51325ea5f27cbd74299891172cd177ac406809572302d1bf3974513f0c27566a13c6a1d4776372772aea72da8a9c692cc8 WHIRLPOOL 946ede56c13468f946649993403ac53fac2f02162a97a8d79ae7fe6b7180363b7f1620a60f2b086b2385719f2fe2a07abb214b421eb3db8d6869e9140694b43b -MISC metadata.xml 553 SHA256 1adf832aa4cc1217e02c3d12a96ae2a7207e57f0e128b8e35f43eeb738702e4a SHA512 14c8333f81e15f63452b1eaba2c17ad469bbd00132dcdeb4aeb9dcf25f8ec69d543685a8cd4bca3b2cb4d2e8b2ff9dd0d94e0add4fe7413316d76b2443e231c5 WHIRLPOOL d8f711d81c5b4457271d18d8800c29f8240304e0e1b02a24c9f3e9155710136ca1374a0fae1df20ae21ca9749e19edf66ef3955fd88ab285ce5c93d5ac04a4ef diff --git a/net-misc/modemmanager/files/01-org.freedesktop.ModemManager1.rules b/net-misc/modemmanager/files/01-org.freedesktop.ModemManager1.rules deleted file mode 100644 index 7fca6472..00000000 --- a/net-misc/modemmanager/files/01-org.freedesktop.ModemManager1.rules +++ /dev/null @@ -1,7 +0,0 @@ -// 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 deleted file mode 100644 index 7ed4aaeb..00000000 --- a/net-misc/modemmanager/files/modemmanager-1.4.8-musl-XCASE.patch +++ /dev/null @@ -1,45 +0,0 @@ -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 deleted file mode 100644 index 2e8801cb..00000000 --- a/net-misc/modemmanager/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <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.14.ebuild b/net-misc/modemmanager/modemmanager-1.4.14.ebuild deleted file mode 100644 index 578effa3..00000000 --- a/net-misc/modemmanager/modemmanager-1.4.14.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2016 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 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() { - eapply "${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 -} |