From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- net-misc/modemmanager/Manifest | 8 +- net-misc/modemmanager/metadata.xml | 1 + .../modemmanager/modemmanager-1.18.10-r1.ebuild | 153 +++++++++++++++++++++ net-misc/modemmanager/modemmanager-1.18.6.ebuild | 145 ------------------- net-misc/modemmanager/modemmanager-1.18.8.ebuild | 4 +- 5 files changed, 161 insertions(+), 150 deletions(-) create mode 100644 net-misc/modemmanager/modemmanager-1.18.10-r1.ebuild delete mode 100644 net-misc/modemmanager/modemmanager-1.18.6.ebuild (limited to 'net-misc/modemmanager') diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest index e1cacea302c3..09dbab131df3 100644 --- a/net-misc/modemmanager/Manifest +++ b/net-misc/modemmanager/Manifest @@ -1,7 +1,7 @@ AUX 01-org.freedesktop.ModemManager1.rules 293 BLAKE2B 56c4edb97cf97328a71f569625cbb6bb0be236fe8c612d8cf83da0f6bb8cf0064b9159cc88197f8dcd42f718bb50e796461639e1c9793c79f576d8fc6ee18a26 SHA512 1839bd770dfaf4c85048a16e41389c7ef43fac1cd36b81cf9129877444db1e0bc00cdbd2344b577316858f13a103d6007be6467d19de075060cab78c40859460 AUX modemmanager.initd 234 BLAKE2B 391d7b1809b86d33bfd3a37dd2fb953b3ed34152e91495485906572c41c8137f92417f0509d5861e0e96a7472876ee2411e4407651aba8dc4b05880d46e70d7c SHA512 950f5a6b12427f2eb23232f56b054de972650e181abe1d2f0b836af319c34ad272505060caf1a60573ce8c7acea68ae51fc1bf0a600f0ec938422f86d8afbcf4 -DIST ModemManager-1.18.6.tar.xz 2519572 BLAKE2B 022e461d43a10bfce8d97f39b855cd28e1d165d07ec65db15c4ec3e89d932829b8c88a1834d182bc966c22f0d848cb6bb06bae2cc2930f685c9fa43b277668d9 SHA512 3b154d459e1196494d7f99303f88088215992aadb57a8cc66f838b068e762fa3d25f19a597922c26a138f670e1da46d627de11cf41d83ce96b3197a086f8e91b +DIST ModemManager-1.18.10.tar.xz 2611480 BLAKE2B ca6c690f2365917b5c879c1bd80ec2752880fb4ffe779c0dae7e2b0852d5f77bb403b5cc1f529e254818fd3e6df2698cd77493d801f5c55d5fe60c817df1e713 SHA512 4615ddb852b750ba0ca62224b669145a408a22b841937d42271638a73bf59dff5fb8b73553388afee8e7d2b2126c61f51af3f8fcb4475a2e2ea313d438443f9b DIST ModemManager-1.18.8.tar.xz 2533392 BLAKE2B 7e95aa2303b55524174475ace96e0b938d2ac9abee0867bb56c6405f3460e73fad0ab68e50361c148551401ff2450abe70733616534507251cbaaee41ee02028 SHA512 fd853ad5ecd018303850f506cd75025bc0cad90d7a003b082178f7495b8763e71675ac34428d09002bf5d06963030d2ee5b84a1c888c959b03f00cddb1cdaf4c -EBUILD modemmanager-1.18.6.ebuild 3997 BLAKE2B 899f0debecec6c84737ac6abcf6a1bbf09b2caa9c112d138836817acf583d398369791c081362dfdfcd5cdad4f2899334506ba39e0390972f101c6bda6a8ae88 SHA512 3c6d50fb4c231fbaa57394d8a04edb627815be67aa6acead2caa5e8f57e5f5a02d81546a9d6ed86bf28484a826181f6a0c7eee6116ea3eb3dac9aca5b53975c6 -EBUILD modemmanager-1.18.8.ebuild 4003 BLAKE2B d800093327f92efb25a1fcdd4950af83bc1381d9635f6ca6fdd62b215dd1051d35f76de0d6bab201c3354f2f9e3d29154e06b61e8e1b83772229843612f3d9ea SHA512 539908220d8ea7ebf96772e08d2dbc6bdfabe9f6284d84b8de49dc2786c6d81ad8e87c25910bae2122e8cc06a97385a6856f1470bbb5d7389b645600e56608c0 -MISC metadata.xml 432 BLAKE2B f9a84e1bbcd6bb14effe1d41ef9eddfdf5b10ccaee4cfe041ac2f68e405dfdffe4930d5e701f9808d62832253e3255498425df53b6c652fb313365f260765433 SHA512 57f8df2fc04eea86d59a03e151dbd1df719faf3fad8c2ff6b8a74567ea01c0c30a1a92d4bd29db29116b4cdb8b688821f4fe62b81a89239c68ca884b160cefee +EBUILD modemmanager-1.18.10-r1.ebuild 4118 BLAKE2B 03257b54e6dffc1173cc13ca13567acf7c5be6d85460f74a36b7b96b749b728b77be13062b8e58d0fc08939934f6f0c3d300b2df26060669f0ebd43dd672ae36 SHA512 cd382fbe17bc683d930bd3b8397fcaafbf4c75059c9d7392350195368bf967664b662350258932b0ba2603eb42fdf63a9936fd37e877613783c18071e88bc72e +EBUILD modemmanager-1.18.8.ebuild 4030 BLAKE2B 9ee5f4baa98a5a28b09b2b663a283c6af93fd7c51c6518bff6bb287cfc3ca081cc2a4169b0427d6ecb0298607b8661598f930e9aed66108205400fdf251acb63 SHA512 dd4971c173bf32e59434a427ed904888fee2ec098c7ae3e046c019411d1d23792d6ce37db6569e2060307ff94b7e846b764fe47b93f3bfb83fc25184d917ca80 +MISC metadata.xml 522 BLAKE2B 9a2c3612abbf39e1518eac9eb5d1be220a11c81c0612c876779caced0a00c282a5a571cf19a1ab174accd2c22c071e69b16336cc0e93e45c1b3903a4013ac242 SHA512 2539c9975be03c6b365bdf32353529469dc3fece4f4df7d31784d8e5299126d813bb6a310c4fefba5e81d2db5aa073446ef4697c059a2eac7efe1502a6671a4f 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 @@ Enable MBIM modem protocol Enable support for the QMI modem protocol used by devices with Qualcomm chipsets + Enable support for the QMI over IPC Router bus (QRTR) protocol diff --git a/net-misc/modemmanager/modemmanager-1.18.10-r1.ebuild b/net-misc/modemmanager/modemmanager-1.18.10-r1.ebuild new file mode 100644 index 000000000000..9b2baf49b464 --- /dev/null +++ b/net-misc/modemmanager/modemmanager-1.18.10-r1.ebuild @@ -0,0 +1,153 @@ +# 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 ) + qrtr? ( qmi ) + 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_setup + 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/net-misc/modemmanager/modemmanager-1.18.6.ebuild b/net-misc/modemmanager/modemmanager-1.18.6.ebuild deleted file mode 100644 index 0b3fef8057f3..000000000000 --- a/net-misc/modemmanager/modemmanager-1.18.6.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) -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 ~mips ppc ppc64 ~riscv ~sparc x86" - -IUSE="elogind +introspection mbim policykit +qmi 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.2:= ) - 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) - --without-qrtr # libqrtr-glib not packaged - $(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 - - systemd_reenable ModemManager.service - - readme.gentoo_print_elog -} diff --git a/net-misc/modemmanager/modemmanager-1.18.8.ebuild b/net-misc/modemmanager/modemmanager-1.18.8.ebuild index a86bab79aa95..6ed05d4bf7f3 100644 --- a/net-misc/modemmanager/modemmanager-1.18.8.ebuild +++ b/net-misc/modemmanager/modemmanager-1.18.8.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.ta LICENSE="GPL-2+" SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N} -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" IUSE="elogind +introspection mbim policykit +qmi systemd test +udev vala" REQUIRED_USE=" @@ -139,6 +139,8 @@ pkg_postinst() { ewarn "about your modem port manually." fi + use udev && udev_reload + systemd_reenable ModemManager.service readme.gentoo_print_elog -- cgit v1.2.3