commit: a0a79c79fe3edbe96b4ce829d0c6ccec951f93ca Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Sat Jun 25 19:26:29 2022 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sat Jun 25 21:03:41 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0a79c79
net-misc/modemmanager: Version bump to 1.18.10 Closes: https://bugs.gentoo.org/854063 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> net-misc/modemmanager/Manifest | 1 + net-misc/modemmanager/metadata.xml | 1 + net-misc/modemmanager/modemmanager-1.18.10.ebuild | 152 ++++++++++++++++++++++ profiles/arch/ia64/package.use.mask | 4 + profiles/arch/sparc/package.use.mask | 4 + 5 files changed, 162 insertions(+) diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest index d50c102766a0..8281970d3e29 100644 --- a/net-misc/modemmanager/Manifest +++ b/net-misc/modemmanager/Manifest @@ -1 +1,2 @@ +DIST ModemManager-1.18.10.tar.xz 2611480 BLAKE2B ca6c690f2365917b5c879c1bd80ec2752880fb4ffe779c0dae7e2b0852d5f77bb403b5cc1f529e254818fd3e6df2698cd77493d801f5c55d5fe60c817df1e713 SHA512 4615ddb852b750ba0ca62224b669145a408a22b841937d42271638a73bf59dff5fb8b73553388afee8e7d2b2126c61f51af3f8fcb4475a2e2ea313d438443f9b DIST ModemManager-1.18.8.tar.xz 2533392 BLAKE2B 7e95aa2303b55524174475ace96e0b938d2ac9abee0867bb56c6405f3460e73fad0ab68e50361c148551401ff2450abe70733616534507251cbaaee41ee02028 SHA512 fd853ad5ecd018303850f506cd75025bc0cad90d7a003b082178f7495b8763e71675ac34428d09002bf5d06963030d2ee5b84a1c888c959b03f00cddb1cdaf4c diff --git a/net-misc/modemmanager/metadata.xml b/net-misc/modemmanager/metadata.xml index 44a1c20ee048..97718f935bb7 100644 --- a/net-misc/modemmanager/metadata.xml +++ b/net-misc/modemmanager/metadata.xml @@ -9,5 +9,6 @@ <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="qrtr">Enable support for the QMI over IPC Router bus (QRTR) protocol</flag> </use> </pkgmetadata> diff --git a/net-misc/modemmanager/modemmanager-1.18.10.ebuild b/net-misc/modemmanager/modemmanager-1.18.10.ebuild new file mode 100644 index 000000000000..0a04e243061b --- /dev/null +++ b/net-misc/modemmanager/modemmanager-1.18.10.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{8..11} ) +inherit gnome2 python-any-r1 readme.gentoo-r1 systemd udev vala + +DESCRIPTION="Modem and mobile broadband management libraries" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/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 ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + +IUSE="elogind +introspection mbim policykit +qmi +qrtr systemd test +udev vala" +REQUIRED_USE=" + ?? ( elogind systemd ) + vala? ( introspection ) +" +RESTRICT="!test? ( test )" + +DEPEND=" + >=dev-libs/glib-2.56.0:2 + udev? ( >=dev-libs/libgudev-232:= ) + introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) + mbim? ( >=net-libs/libmbim-1.26.0 ) + policykit? ( >=sys-auth/polkit-0.106[introspection?] ) + qmi? ( >=net-libs/libqmi-1.30.8:=[qrtr?] ) + qrtr? ( >=net-libs/libqrtr-glib-1.0.0:= ) + elogind? ( sys-auth/elogind ) + systemd? ( >=sys-apps/systemd-209 ) +" +RDEPEND="${DEPEND} + policykit? ( acct-group/plugdev ) +" +BDEPEND=" + dev-util/gdbus-codegen + dev-util/glib-utils + >=dev-util/gtk-doc-am-1 + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + test? ( + ${PYTHON_DEPS} + $(python_gen_any_dep ' + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + ') + ) + vala? ( $(vala_depend) ) +" + +S="${WORKDIR}/ModemManager-${PV}" + +python_check_deps() { + has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && + has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + DOC_CONTENTS=" + If your USB modem shows up only as a storage device when you plug it in, + then 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() { + local myconf=( + --disable-Werror + --disable-static + --with-dist-version=${PVR} + --with-udev-base-dir="$(get_udevdir)" + $(use_with udev) + $(use_enable introspection) + $(use_with mbim) + $(use_with policykit polkit) + $(use_with systemd systemd-journal) + $(use_with qmi) + $(use_with qrtr) + $(use_enable vala) + ) + if use systemd || use elogind; then + myconf+=(--with-systemd-suspend-resume) + else + myconf+=(--without-systemd-suspend-resume) + fi + gnome2_src_configure "${myconf[@]}" +} + +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 + + newinitd "${FILESDIR}/modemmanager.initd" modemmanager +} + +pkg_postinst() { + gnome2_pkg_postinst + + # 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 + + if ! use udev; then + ewarn "You have built ModemManager without udev support. You may have to teach it" + ewarn "about your modem port manually." + fi + + use udev && udev_reload + + systemd_reenable ModemManager.service + + readme.gentoo_print_elog +} + +pkg_postrm() { + use udev && udev_reload +} diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask index c741d1d2c32c..304930905334 100644 --- a/profiles/arch/ia64/package.use.mask +++ b/profiles/arch/ia64/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Matt Turner <[email protected]> (2022-06-25) +# net-libs/libqrtr-glib not keyworded +net-misc/modemmanager qrtr + # Sergey Torokhov <[email protected]> (2022-06-22) # media-libs/libjxl is not keyworded # bug https://bugs.gentoo.org/853628 diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask index 7fe4569b7611..6298a47b94a1 100644 --- a/profiles/arch/sparc/package.use.mask +++ b/profiles/arch/sparc/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Matt Turner <[email protected]> (2022-06-25) +# net-libs/libqrtr-glib not keyworded +net-misc/modemmanager qrtr + # Sam James <[email protected]> (2022-06-25) # sys-devel/lld lacks sparc support right now dev-lang/rust wasm
