commit: c8a5cbef56c5183138749757d234593a49f94936
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 30 21:14:46 2017 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Oct 30 22:25:28 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8a5cbef
net-misc/modemmanager: remove old
Package-Manager: Portage-2.3.8, Repoman-2.3.2
net-misc/modemmanager/Manifest | 1 -
net-misc/modemmanager/metadata.xml | 2 -
net-misc/modemmanager/modemmanager-1.4.14.ebuild | 109 -----------------------
3 files changed, 112 deletions(-)
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index f00a54e7018..9a2f8ecd55c 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,2 +1 @@
-DIST ModemManager-1.4.14.tar.xz 1417092 SHA256
abe6cdd515a774bcba3afdcdb1e504569801e79282ccdf26099f33cbb8731ba2 SHA512
2fb5517cd3fbd98cf4048cec326fabf18fb26d88b75e56208d1ed64d70d72d6e826ef30391c86fbcfe4d69661194bcfbb55d545db10ebe8baf8ef16a3c580446
WHIRLPOOL
30c9e1e388c91f8aab73044634e3d122636f526cb9b437a597dc2f35cfd85e61917a568cfa572404f734eb19eb90c2e21bc85e16d6cc9b53518f590981f6efa4
DIST ModemManager-1.6.4.tar.xz 1464276 SHA256
cdd5b4cb1e4d7643643a28ccbfc4bb354bfa9cb89a77ea160ebdf7926171c668 SHA512
6b31ce186adce445cec8964df751b6146a86271e6c14d860740ae66cfe296ac2ac4df21079357775ac5f7a5837c80a7f8db21a2680bc6b45802f9928565f1c73
WHIRLPOOL
3e3b16299ed5d9179e7d7bd38040d061df21fdde558032c8362110d098d3931f106988a0992a64936d969e008c83d699b85e71211bc0684d9bafb2dbc6b4baa9
diff --git a/net-misc/modemmanager/metadata.xml
b/net-misc/modemmanager/metadata.xml
index 2e8801cb40a..8d49dd5a7e8 100644
--- a/net-misc/modemmanager/metadata.xml
+++ b/net-misc/modemmanager/metadata.xml
@@ -9,7 +9,5 @@
<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 90598682089..00000000000
--- a/net-misc/modemmanager/modemmanager-1.4.14.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2017 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 systemd 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() {
- 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
-
- systemd_reenable ModemManager.service
-
- readme.gentoo_print_elog
-}
