commit: bd80961acf8606f3dc547dd1cfbe1ff6290864b3 Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Sun Jul 13 03:08:18 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jul 13 06:48:12 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd80961a
net-misc/modemmanager: add 1.24.0 Bug: https://bugs.gentoo.org/935351 Bug: https://bugs.gentoo.org/944740 Closes: https://bugs.gentoo.org/930729 Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/42981 Signed-off-by: Sam James <sam <AT> gentoo.org> net-misc/modemmanager/Manifest | 1 + .../files/modemmanager-1.24.0-gtkdoc-fix.patch | 136 +++++++++++++++++++++ net-misc/modemmanager/modemmanager-1.24.0.ebuild | 128 +++++++++++++++++++ 3 files changed, 265 insertions(+) diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest index f5d8c5f8ea28..32e1684a886c 100644 --- a/net-misc/modemmanager/Manifest +++ b/net-misc/modemmanager/Manifest @@ -1 +1,2 @@ DIST ModemManager-1.20.6.tar.bz2 1467367 BLAKE2B 6fc6e678fac966ccd6697e469152e3b0fa93d868d16985828e01b4890ba35beacc8f1c5a47a74bf8586035088c6f61124d12214d022e30dbc3b9196b0dd6f28e SHA512 2c5c121d6a74a7dc0922231a88ba64e350e947a57dae25ce7e8c58b6041b60fd5c4ff395e641beef3447b0239e1e60c15c2752e47e77a648a1bea9ef5f3ac577 +DIST ModemManager-1.24.0.tar.bz2 1512276 BLAKE2B 58c5326df6fb028fd37c3fc397ee2fe9f2f82f2189040f7bf35484697b43b4053251d3e443dce0c32d64c26e53189606fa24f0540fc8a08941dd9ba8b7b0b180 SHA512 3ff8605abf40551501c867dd3dda0a591524d9796962dca095a9101d538d90463b1620f1af20a4fce8235742fa995f9445b7a88ed7c403da4c043aa59df55d79 diff --git a/net-misc/modemmanager/files/modemmanager-1.24.0-gtkdoc-fix.patch b/net-misc/modemmanager/files/modemmanager-1.24.0-gtkdoc-fix.patch new file mode 100644 index 000000000000..8673442d8dee --- /dev/null +++ b/net-misc/modemmanager/files/modemmanager-1.24.0-gtkdoc-fix.patch @@ -0,0 +1,136 @@ +https://bugs.gentoo.org/944740 +https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/078a92cd5cb0a58da32e8c6c879917ee51ce95ac + +From 078a92cd5cb0a58da32e8c6c879917ee51ce95ac Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <[email protected]> +Date: Fri, 11 Apr 2025 03:20:09 +0200 +Subject: [PATCH] docs: Fix gtk-doc build + +Fix a duplicate `id` and the inclusions of gdbus docs. + +Signed-off-by: Jan Alexander Steffens (heftig) <[email protected]> +--- a/docs/reference/api/ModemManager-dbus-reference.xml ++++ b/docs/reference/api/ModemManager-dbus-reference.xml +@@ -92,7 +92,7 @@ + This object also controls any process-wide operation, such as the log + level being used by the daemon. + </para> +- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.xml"/> ++ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.xml"/> + </chapter> + + <chapter id="ref-dbus-object-modem"> +@@ -129,22 +129,22 @@ + or the + <link linkend="gdbus-org.freedesktop.ModemManager1.Modem.ModemCdma">CDMA interface</link>. + </para> +- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.xml"/> +- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Simple.xml"/> +- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.xml"/> +- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.ProfileManager.xml"/> +- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml"/> +- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.ModemCdma.xml"/> +- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Messaging.xml"/> +- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Location.xml"/> +- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Time.xml"/> +- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Voice.xml"/> +- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.CellBroadcast.xml"/> +- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Firmware.xml"/> +- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Sar.xml"/> +- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Signal.xml"/> +- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Oma.xml"/> +- <!--xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Contacts.xml"/--> ++ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.xml"/> ++ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Simple.xml"/> ++ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.xml"/> ++ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.ProfileManager.xml"/> ++ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml"/> ++ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.ModemCdma.xml"/> ++ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Messaging.xml"/> ++ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Location.xml"/> ++ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Time.xml"/> ++ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Voice.xml"/> ++ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.CellBroadcast.xml"/> ++ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Firmware.xml"/> ++ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Sar.xml"/> ++ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Signal.xml"/> ++ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Oma.xml"/> ++ <!--xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Contacts.xml"/--> + </chapter> + + <chapter id="ref-dbus-object-bearer"> +@@ -155,7 +155,7 @@ + may expose one or more Bearer objects, which can then be used to get the + modem into connected state. + </para> +- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Bearer.xml"/> ++ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Bearer.xml"/> + </chapter> + + <chapter id="ref-dbus-object-sim"> +@@ -166,7 +166,7 @@ + expose up to one SIM object, which allows SIM-specific actions such as PIN + unlocking. + </para> +- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Sim.xml"/> ++ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Sim.xml"/> + </chapter> + + <chapter id="ref-dbus-object-sms"> +@@ -176,7 +176,7 @@ + <link linkend="gdbus-org.freedesktop.ModemManager1.Modem.Messaging">Messaging interface</link> + will export one SMS object for each SMS stored in the device. + </para> +- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Sms.xml"/> ++ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Sms.xml"/> + </chapter> + + <chapter id="ref-dbus-object-call"> +@@ -186,17 +186,17 @@ + <link linkend="gdbus-org.freedesktop.ModemManager1.Modem.Voice">Voice interface</link> + will export one Call object for each Call managed in the device. + </para> +- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Call.xml"/> ++ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Call.xml"/> + </chapter> + +- <chapter id="ref-dbus-object-call"> ++ <chapter id="ref-dbus-object-cbm"> + <title>The <literal>/org/freedesktop/ModemManager/CBM</literal> objects</title> + <para> + Modems implementing the + <link linkend="gdbus-org.freedesktop.ModemManager1.Modem.CellBroadcast">Cell Broadcast interface</link> + will export one CBM object for each Cell Broadcast message received by the device. + </para> +- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Call.xml"/> ++ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Cbm.xml"/> + </chapter> + + </part> +--- a/docs/reference/api/meson.build ++++ b/docs/reference/api/meson.build +@@ -22,6 +22,9 @@ expand_content_files = [ + 'ModemManager-overview.xml', + # FIXME: workaround because only strings can be included and not custom targets (gen_docs) + generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Bearer.xml', ++ generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Call.xml', ++ generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Cbm.xml', ++ generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.CellBroadcast.xml', + generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Firmware.xml', + generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Location.xml', + generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Messaging.xml', +@@ -30,9 +33,11 @@ expand_content_files = [ + generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.xml', + generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.ModemCdma.xml', + generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Oma.xml', ++ generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Sar.xml', + generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Signal.xml', + generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Simple.xml', + generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Time.xml', ++ generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Voice.xml', + generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.xml', + generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Sim.xml', + generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Sms.xml', +-- +GitLab + diff --git a/net-misc/modemmanager/modemmanager-1.24.0.ebuild b/net-misc/modemmanager/modemmanager-1.24.0.ebuild new file mode 100644 index 000000000000..8a0caf80d434 --- /dev/null +++ b/net-misc/modemmanager/modemmanager-1.24.0.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{11..14} ) +inherit bash-completion-r1 meson python-any-r1 optfeature systemd udev vala xdg + +DESCRIPTION="Modem and mobile broadband management libraries" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/ https://gitlab.freedesktop.org/mobile-broadband/ModemManager"; +SRC_URI="https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/archive/${PV}/ModemManager-${PV}.tar.bz2"; +S="${WORKDIR}/ModemManager-${PV}" + +LICENSE="GPL-2+" +SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N} +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + +IUSE="elogind gtk-doc +introspection +mbim policykit +qmi +qrtr selinux systemd test +udev vala" +REQUIRED_USE=" + ?? ( elogind systemd ) + qrtr? ( qmi ) + vala? ( introspection ) +" +RESTRICT="!test? ( test )" + +DEPEND=" + >=dev-libs/glib-2.56.0:2 + sys-apps/dbus + udev? ( >=dev-libs/libgudev-232:= ) + introspection? ( >=dev-libs/gobject-introspection-1.38:= ) + mbim? ( >=net-libs/libmbim-1.32.0 ) + policykit? ( >=sys-auth/polkit-0.106[introspection?] ) + qmi? ( >=net-libs/libqmi-1.36.0:=[qrtr?] ) + qrtr? ( >=net-libs/libqrtr-glib-1.0.0:= ) + elogind? ( sys-auth/elogind ) + systemd? ( >=sys-apps/systemd-209 ) +" +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-modemmanager ) +" +BDEPEND=" + dev-libs/libxslt + dev-util/gdbus-codegen + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc ) + test? ( + ${PYTHON_DEPS} + $(python_gen_any_dep ' + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + ') + ) + vala? ( $(vala_depend) ) +" + +PATCHES=( + "${FILESDIR}"/modemmanager-1.24.0-gtkdoc-fix.patch +) + +python_check_deps() { + python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && + python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + use vala && vala_setup + default +} + +src_configure() { + # Let's avoid BuildRequiring bash-completion, install it manually + local emesonargs=( + -Dbash_completion=false + $(meson_use gtk-doc gtk_doc) + $(meson_use introspection) + + $(meson_use udev) + -Dudevdir="${EPREFIX}$(get_udevdir)" + -Dsystemdsystemunitdir="$(systemd_get_systemunitdir)" + + $(meson_use systemd systemd_journal) + + -Dpolkit=$(usex policykit permissive no) + + $(meson_use mbim) + $(meson_use qmi) + $(meson_use qrtr) + + $(meson_use vala vapi) + ) + if use systemd || use elogind; then + emesonargs+=(-Dsystemd_suspend_resume=true) + else + emesonargs+=(-Dsystemd_suspend_resume=false) + fi + meson_src_configure +} + +src_install() { + meson_src_install + newinitd "${FILESDIR}/modemmanager.initd" modemmanager + newbashcomp cli/mmcli-completion mmcli +} + +pkg_postinst() { + xdg_pkg_postinst + + 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 + + optfeature "the case your modem shows up as a storage drive" sys-apps/usb_modeswitch +} + +pkg_postrm() { + xdg_pkg_postrm + use udev && udev_reload +}
