gentoo resync : 16.09.2021

3 files changed, 133 insertions, 2 deletions

diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index f9ad19193448..16b1a6a0a4b5 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -2,6 +2,8 @@ AUX 01-org.freedesktop.ModemManager1.rules 293 BLAKE2B 56c4edb97cf97328a71f56962
 AUX modemmanager.initd 234 BLAKE2B 391d7b1809b86d33bfd3a37dd2fb953b3ed34152e91495485906572c41c8137f92417f0509d5861e0e96a7472876ee2411e4407651aba8dc4b05880d46e70d7c SHA512 950f5a6b12427f2eb23232f56b054de972650e181abe1d2f0b836af319c34ad272505060caf1a60573ce8c7acea68ae51fc1bf0a600f0ec938422f86d8afbcf4
 DIST ModemManager-1.16.6.tar.xz 2339528 BLAKE2B b76a8b6959d988a27d411384440b9bd1b7ac1a9d780b77319e735c4b42c55c51f51304ae936aa9b385634640bcb1a55696d4bd25ffdaf88eb73839bfefe5e091 SHA512 78a928007732baaa0eaed9d587913774d4fb79049d652474f39176190496012dc4c93fd0bd774ed6f86f845f3b9f345bcccf4c7b2438b83cf5846b2bcdcb39d5
 DIST ModemManager-1.16.8.tar.xz 2344748 BLAKE2B 70ed052a7cd5561518577948419b0363816805d8a1af7de2874fa3dae795e38611d34733f5ed5dcfb12270421430249ee0a49bf54e4dcb87abe4ab595bd0b4c2 SHA512 be32ef03210035a93bad5ac0e339863c247cd000276e1bfa1acf584df652a78eda74990226a00a20e957481ce92801ed365b153de8f927a983cec41d3bbe3082
+DIST ModemManager-1.18.0.tar.xz 2493576 BLAKE2B 36034a589fb38447c83a232b6d24ca2fceed15ebc89a41af969bdcebeb482d4baf2657d063b1011c0df252b4ba7f703284cbf111b90d565d66157006331d6e69 SHA512 6e99e5529a74e6fdf814b4fcb9c9f5cd6a0398cd75303feee62c3564f9d62f54bb5a435a9847ed085fe2031af5a8d821d43f9cabed7d3be019ae0f5c8b0e11d2
 EBUILD modemmanager-1.16.6.ebuild 3567 BLAKE2B 65802d8c7595ae478afea4d0232ca4da9b3a34f6a98bd4dc7443b76899c576b0c31c6c14d0c70378241fda1a5bbc7e5816c5cff12eabce6e4b8ef7a2b5d99bba SHA512 75c7aa58d2cb1097cab704b5a301b3a2a752f9ad043d853e7292d0f8963fc4f1cc0b8775b9df7a880136f5beb980679ed58349b041551787afd627f14b8bee34
 EBUILD modemmanager-1.16.8.ebuild 3574 BLAKE2B a5b0d70185d35e3008abbf4616ff7f8f344527b792a826388e5ed0ea3c85bc6adc23be3fbf3f3fd86dce64f8a1e60d38092da5d619ebb1600eb326ce8935d5e4 SHA512 06d2668d1b3a5215b80cc8a5839c4078662526f1c1fa8fb4a73a932c6e3ffe4c517c9b4ab426927201f6215b17c114d49e931f989d69b4ec3f863efda69f2b1c
-MISC metadata.xml 431 BLAKE2B 26bfa60702d5e90e5eaf6ca1cc6e734486014870951cbc2fd3e2fa37383f0918604d0e388be1589ed6dd5f36396c499ba011f42fc00f608522f21c736c8205b2 SHA512 dd79c43f378b564769087531ce871d7daf0b07d15720b375e9f3114e5794c692c19ac4d3cfa5b041e88cbf3dca78bf51de9dee861aba3f717eb77248a4d8edde
+EBUILD modemmanager-1.18.0.ebuild 3625 BLAKE2B e83ebbf4dcd334a898ab1b2a3bd205752c3a9ec72adc303c60a26a78050f524bd7685bdcd70a9b1fba1450f6c21ef27bbb0cbec025558e3081b22f69d46c5ee8 SHA512 3d457df4b1fc853c32f9af4f23d90cd49362a78ac567c96ae7ba1e2d6e4e4554604b8493e27aea00023c8d332a428a07cec6af93b2a4964780a3203c0dd94106
+MISC metadata.xml 432 BLAKE2B f9a84e1bbcd6bb14effe1d41ef9eddfdf5b10ccaee4cfe041ac2f68e405dfdffe4930d5e701f9808d62832253e3255498425df53b6c652fb313365f260765433 SHA512 57f8df2fc04eea86d59a03e151dbd1df719faf3fad8c2ff6b8a74567ea01c0c30a1a92d4bd29db29116b4cdb8b688821f4fe62b81a89239c68ca884b160cefee
diff --git a/net-misc/modemmanager/metadata.xml b/net-misc/modemmanager/metadata.xml
index 8d49dd5a7e8d..44a1c20ee048 100644
--- a/net-misc/modemmanager/metadata.xml
+++ b/net-misc/modemmanager/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 		<email>gnome@gentoo.org</email>
diff --git a/net-misc/modemmanager/modemmanager-1.18.0.ebuild b/net-misc/modemmanager/modemmanager-1.18.0.ebuild
new file mode 100644
index 000000000000..efa8c2c4ef4e
--- /dev/null
+++ b/net-misc/modemmanager/modemmanager-1.18.0.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 readme.gentoo-r1 systemd toolchain-funcs 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 +udev vala"
+REQUIRED_USE="
+	?? ( elogind systemd )
+	vala? ( introspection )
+"
+
+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
+	vala? ( $(vala_depend) )
+"
+
+S="${WORKDIR}/ModemManager-${PV}"
+
+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
+}